diff --git a/.cproject b/.cproject
index 8f37d4ae1..f4c0aff9b 100644
--- a/.cproject
+++ b/.cproject
@@ -39,6 +39,7 @@
 					<fileInfo id="0.2079208171.2090246372" name="ringback.wav" rcbsApplicability="disable" resourcePath="tester/sounds/ringback.wav" toolsToInvoke=""/>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="coreapi"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="daemon"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="gtk"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="include"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="tester"/>
diff --git a/.gitignore b/.gitignore
index 36ee91daf..b262a4641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,22 +50,31 @@ coreapi/help/chatroom
 coreapi/help/doc/
 coreapi/help/helloworld
 coreapi/help/registration
+coreapi/help/realtimetext_receiver
+coreapi/help/realtimetext_sender
 coreapi/test_ecc
 coreapi/test_lsd
 gtk/version_date.h
+daemon/linphone-daemon
+daemon/linphone-daemon-pipetest
+*.la
+*.lo
+*.deps
+*.libs
+share/certdata.txt
+coreapi/test_numbers
 specs.c
 *.orig
 *.rej
 *.kdev4
-*.lo
-*.la
 *.swp
 .deps
 .libs
-coreapi/test_numbers
+tools/test_ecc
+tools/test_lsd
+tools/test_numbers
 coreapi/help/notify
 share/fresh-rootca.pem
-share/certdata.txt
 tester/liblinphone_tester
 tools/lp-gen-wrappers
 tools/lpc2xml_test
@@ -85,10 +94,14 @@ tester/linphone_log.gz.txt
 tools/auto_answer
 tools/lp-autoanswer
 build/macos/pkg-distribution.xml
-tester/record_for_lc_*.wav
+record_for_lc_*.wav
 tester/record-call_with_file_player.wav
 tester/ZIDCache*.xml
 
 tester/stereo-record.wav
 .dirstamp
 git-clang-format.diff
+*.log
+.bc_tester_utils.tmp
+tools/lp-test-ecc
+tools/lp-sendmsg
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80f393877..ee02b53b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,30 +21,35 @@
 ############################################################################
 
 cmake_minimum_required(VERSION 3.0)
-project(LINPHONE C CXX)
+project(linphone VERSION 3.10.2 LANGUAGES C CXX)
 
 
-set(LINPHONE_MAJOR_VERSION "3")
-set(LINPHONE_MINOR_VERSION "8")
-set(LINPHONE_MICRO_VERSION "5")
-set(LINPHONE_VERSION "${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}")
-set(LINPHONE_SO_VERSION "7")
+set(LINPHONE_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
+set(LINPHONE_MINOR_VERSION ${PROJECT_VERSION_MINOR})
+set(LINPHONE_MICRO_VERSION ${PROJECT_VERSION_PATCH})
+set(LINPHONE_VERSION ${PROJECT_VERSION})
+set(LINPHONE_SO_VERSION "9")
 
-file(GLOB LINPHONE_PO_FILES RELATIVE "${CMAKE_SOURCE_DIR}/po" "${CMAKE_SOURCE_DIR}/po/*.po")
+file(GLOB LINPHONE_PO_FILES RELATIVE "${CMAKE_CURRENT_LIST_DIR}/po" "${CMAKE_CURRENT_LIST_DIR}/po/*.po")
 string(REGEX REPLACE "([a-zA-Z_]+)\\.po" "\\1" LINPHONE_ALL_LANGS_LIST "${LINPHONE_PO_FILES}")
 string(REPLACE ";" " " LINPHONE_ALL_LANGS "${LINPHONE_ALL_LANGS_LIST}")
 
 include(CMakeDependentOption)
 
-option(ENABLE_STATIC "Build static library (default is shared library)." NO)
+option(ENABLE_SHARED "Build shared library." YES)
+option(ENABLE_STATIC "Build static library." YES)
 option(ENABLE_CONSOLE_UI "Turn on or off compilation of console interface." YES)
 option(ENABLE_DATE "Use build date in internal version number." NO)
+cmake_dependent_option(ENABLE_DAEMON "Enable the linphone daemon interface." YES "NOT WIN32" NO)
 option(ENABLE_DOC "Enable documentation generation with Doxygen." YES)
+option(ENABLE_JAVADOC "Add a target to generate documentation for Java API" NO)
 option(ENABLE_GTK_UI "Turn on or off compilation of gtk interface." YES)
 option(ENABLE_LDAP "Enable LDAP support." NO)
-option(ENABLE_MSG_STORAGE "Turn on compilation of message storage." YES)
-cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI" NO)
+option(ENABLE_LIME "Enable Instant Messaging Encryption." YES)
+option(ENABLE_SQLITE_STORAGE "Turn on compilation sqlite storage, for messages, contacts, history" YES)
+cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI;NOT APPLE" NO)
 option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
+option(ENABLE_STRICT "Build with strict compile options." YES)
 option(ENABLE_TOOLS "Turn on or off compilation of tools." YES)
 option(ENABLE_TUNNEL "Turn on compilation of tunnel support." NO)
 option(ENABLE_TUTORIALS "Enable compilation of tutorials." YES)
@@ -54,63 +59,73 @@ option(ENABLE_VIDEO "Build with video support." YES)
 cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO)
 option(ENABLE_DEBUG_LOGS "Turn on or off debug level logs." NO)
 option(ENABLE_NLS "Build with internationalisation support" YES)
+option(ENABLE_VCARD "Turn on compilation of vcard4 support." YES)
 
 
+macro(apply_compile_flags SOURCE_FILES)
+	if(${SOURCE_FILES})
+		set(options "")
+		foreach(a ${ARGV})
+			if(STRICT_OPTIONS_${a})
+				string(REPLACE ";" " " options_${a} "${STRICT_OPTIONS_${a}}")
+				set(options "${options} ${options_${a}}")
+			endif()
+		endforeach()
+		if(options)
+			set_source_files_properties(${${SOURCE_FILES}} PROPERTIES COMPILE_FLAGS "${options}")
+		endif()
+	endif()
+endmacro()
+
+if(ENABLE_STATIC)
+	set(LINPHONE_LIBS_FOR_TOOLS linphone-static)
+else()
+	set(LINPHONE_LIBS_FOR_TOOLS linphone)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(CheckSymbolExists)
 include(CMakePushCheckState)
+include(GNUInstallDirs)
+
+if(NOT CMAKE_INSTALL_RPATH AND CMAKE_INSTALL_PREFIX)
+	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+	message(STATUS "Setting install rpath to ${CMAKE_INSTALL_RPATH}")
+endif()
 
 set(MSVC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/MSVC")
 if(MSVC)
 	list(APPEND CMAKE_REQUIRED_INCLUDES "${MSVC_INCLUDE_DIR}")
-
-	if(ENABLE_GTK_UI)
-		if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/intltool_win32.zip")
-			message(STATUS "Installing intltool")
-			file(DOWNLOAD http://ftp.acc.umu.se/pub/GNOME/binaries/win32/intltool/0.40/intltool_0.40.4-1_win32.zip "${CMAKE_CURRENT_BINARY_DIR}/intltool_win32.zip" SHOW_PROGRESS)
-			execute_process(
-				COMMAND "${CMAKE_COMMAND}" "-E" "tar" "x" "${CMAKE_CURRENT_BINARY_DIR}/intltool_win32.zip"
-				WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
-			)
-		endif()
-		if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/gtk+-bundle_win32.zip")
-			message(STATUS "Installing GTK")
-			file(DOWNLOAD http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip "${CMAKE_CURRENT_BINARY_DIR}/gtk+-bundle_win32.zip" SHOW_PROGRESS)
-			execute_process(
-				COMMAND "${CMAKE_COMMAND}" "-E" "tar" "x" "${CMAKE_CURRENT_BINARY_DIR}/gtk+-bundle_win32.zip"
-				WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
-			)
-		endif()
-	endif()
 endif()
 
-find_package(BelleSIP REQUIRED)
-find_package(Mediastreamer2 REQUIRED)
+# find_package should be invoked here to check for libraries - however do NOT
+# call include_directories here (see below)
+
+if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+	include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
+	include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
+	set(BcToolbox_FIND_COMPONENTS tester)
+	include("${EP_bctoolbox_CONFIG_DIR}/BcToolboxConfig.cmake")
+else()
+	find_package(BelleSIP REQUIRED)
+	find_package(Mediastreamer2 REQUIRED)
+	find_package(BcToolbox 0.0.3 REQUIRED OPTIONAL_COMPONENTS tester)
+endif()
 find_package(XML2 REQUIRED)
 find_package(Zlib)
-if(ENABLE_UNIT_TESTS)
-	find_package(CUnit)
-	if(CUNIT_FOUND)
-		cmake_push_check_state(RESET)
-		list(APPEND CMAKE_REQUIRED_INCLUDES ${CUNIT_INCLUDE_DIRS})
-		list(APPEND CMAKE_REQUIRED_LIBRARIES ${CUNIT_LIBRARIES})
-		check_symbol_exists("CU_get_suite" "CUnit/CUnit.h" HAVE_CU_GET_SUITE)
-		check_symbol_exists("CU_curses_run_tests" "CUnit/CUnit.h" HAVE_CU_CURSES)
-		cmake_pop_check_state()
-	else()
-		message(WARNING "Could not find the cunit library!")
-		set(ENABLE_UNIT_TESTS OFF CACHE BOOL "Enable compilation of unit tests." FORCE)
-	endif()
-endif()
 if(ENABLE_TUNNEL)
-	find_package(Tunnel)
+	if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+		include("${EP_tunnel_CONFIG_DIR}/TunnelConfig.cmake")
+	else()
+		find_package(Tunnel)
+	endif()
 	if(NOT TUNNEL_FOUND)
 		message(WARNING "Could not find the tunnel library!")
 		set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support." FORCE)
 	endif()
 endif()
-if(ENABLE_MSG_STORAGE)
+if(ENABLE_SQLITE_STORAGE)
 	find_package(Sqlite3 REQUIRED)
 endif()
 if(ENABLE_NOTIFY)
@@ -131,6 +146,15 @@ if(ENABLE_GTK_UI)
 		message(WARNING "You need at least GTK 2.22 to enable the assistant")
 		set(ENABLE_ASSISTANT OFF CACHE BOOL "Turn on assistant compiling." FORCE)
 	endif()
+	if(APPLE)
+		find_package(GtkMacIntegration)
+		if(GTKMACINTEGRATION_FOUND)
+			set(HAVE_GTK_OSX 1)
+			add_definitions("${GTKMACINTEGRATION_CPPFLAGS}")
+		else()
+			message(WARNING "gtk-mac-integration not found. Please install gtk-osx-application package.")
+		endif()
+	endif()
 endif()
 if(ENABLE_ASSISTANT)
 	set(BUILD_WIZARD 1)
@@ -138,7 +162,22 @@ endif()
 if(ENABLE_NLS)
 	find_package(Gettext REQUIRED)
 	find_package(Intl REQUIRED)
-	include_directories(${INTL_INCLUDE_DIRS})
+endif()
+if(ENABLE_LIME)
+	set(HAVE_LIME 1)
+endif()
+if (ENABLE_VCARD)
+	if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+		include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake")
+	else()
+		find_package(Belcard)
+	endif()
+	if(NOT BELCARD_FOUND)
+		message(WARNING "Could not find the belcard library!")
+		set(ENABLE_VCARD OFF CACHE BOOL "Enable vcard support." FORCE)
+	else()
+		add_definitions(-DVCARD_ENABLED)
+	endif()
 endif()
 
 if(UNIX AND NOT APPLE)
@@ -146,6 +185,13 @@ if(UNIX AND NOT APPLE)
 	check_include_files(libudev.h HAVE_LIBUDEV_H)
 endif()
 
+set(LINPHONE_LDFLAGS "${BELLESIP_LDFLAGS} ${MEDIASTREAMER2_LDFLAGS}")
+if(BELCARD_FOUND AND APPLE)
+    set(LINPHONE_LDFLAGS "${LINPHONE_LDFLAGS} -stdlib=libc++")
+endif()
+
+# include_directories must be called only UNDER THIS LINE in order to use our
+# projects submodules first (we do NOT want to have system headers in first position)
 include_directories(
 	include/
 	coreapi/
@@ -153,49 +199,77 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}/coreapi/
 	${BELLESIP_INCLUDE_DIRS}
 	${MEDIASTREAMER2_INCLUDE_DIRS}
-	${XML2_INCLUDE_DIRS}
+	${BCTOOLBOX_CORE_INCLUDE_DIRS}
 )
+if(ENABLE_TUNNEL)
+	include_directories(${TUNNEL_INCLUDE_DIRS})
+endif()
+if (ENABLE_VCARD)
+	include_directories(${BELCARD_INCLUDE_DIRS})
+endif()
+
+include_directories(${XML2_INCLUDE_DIRS})
+
 if(ZLIB_FOUND)
 	include_directories(${ZLIB_INCLUDE_DIRS})
 	set(HAVE_ZLIB 1)
 endif()
 if(SQLITE3_FOUND)
 	include_directories(${SQLITE3_INCLUDE_DIRS})
-	add_definitions("-DMSG_STORAGE_ENABLED")
+	if(ENABLE_SQLITE_STORAGE)
+		add_definitions("-DSQLITE_STORAGE_ENABLED")
+	endif()
 endif()
-if(ENABLE_TUNNEL)
-	include_directories(${TUNNEL_INCLUDE_DIRS})
-endif()
-if(ENABLE_DEBUG_LOGS)
-	add_definitions("-DDEBUG")
+if(INTL_FOUND)
+	set(HAVE_INTL 1)
+	include_directories(${INTL_INCLUDE_DIRS})
 endif()
 if(MSVC)
 	include_directories(${MSVC_INCLUDE_DIR})
 endif()
-if(INTL_FOUND)
-	set(HAVE_INTL 1)
-	include_directories(${INTL_INCLUDE_DIRECTORIES})
-endif()
 
 add_definitions("-DIN_LINPHONE")
+if(ENABLE_DEBUG_LOGS)
+	add_definitions("-DDEBUG")
+endif()
+if(ANDROID)
+	add_definitions("-DANDROID")
+endif()
 
-
+set(STRICT_OPTIONS_CPP )
+set(STRICT_OPTIONS_C )
+set(STRICT_OPTIONS_CXX )
+set(STRICT_OPTIONS_OBJC )
 if(MSVC)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
-else()
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wuninitialized -Wdeclaration-after-statement -fno-strict-aliasing -Werror")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wuninitialized -Werror")
-	if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -Wno-array-bounds")
+	list(APPEND STRICT_OPTIONS_CPP "/wd4995") # Disable "name was marked as #pragma deprecated" warnings
+	if(ENABLE_STRICT)
+		list(APPEND STRICT_OPTIONS_CPP "/WX")
 	endif()
-	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -Wno-array-bounds")
+else()
+	list(APPEND STRICT_OPTIONS_CPP "-Wall" "-Wuninitialized" "-Wno-error=deprecated-declarations")
+	list(APPEND STRICT_OPTIONS_C "-Wdeclaration-after-statement" "-Wstrict-prototypes" "-Werror=strict-prototypes")
+	if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+		list(APPEND STRICT_OPTIONS_C "-fno-inline-small-functions")
+	endif()
+	if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+		list(APPEND STRICT_OPTIONS_CPP "-Qunused-arguments" "-Wno-array-bounds")
 	endif()
 	if(APPLE)
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unknown-warning-option -Wno-tautological-compare -Wno-unused-function")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unknown-warning-option -Wno-tautological-compare -Wno-unused-function")
+		list(APPEND STRICT_OPTIONS_CPP "-Wno-error=unknown-warning-option" "-Qunused-arguments" "-Wno-tautological-compare" "-Wno-unused-function" "-Wno-array-bounds")
 	endif()
+	if(ENABLE_STRICT)
+		list(APPEND STRICT_OPTIONS_C "-Werror" "-Wextra" "-Wno-unused-parameter" "-Wno-missing-field-initializers" "-fno-strict-aliasing")
+		list(APPEND STRICT_OPTIONS_CPP "-Werror" "-Wextra" "-Wno-unused-parameter" "-Wno-missing-field-initializers" "-fno-strict-aliasing")
+	endif()
+endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+	list(APPEND STRICT_OPTIONS_CPP "/wd4996")
+endif()
+if(STRICT_OPTIONS_CPP)
+	list(REMOVE_DUPLICATES STRICT_OPTIONS_CPP)
+endif()
+if(STRICT_OPTIONS_C)
+	list(REMOVE_DUPLICATES STRICT_OPTIONS_C)
 endif()
 
 
@@ -205,13 +279,13 @@ if(ENABLE_RELATIVE_PREFIX)
 else()
 	set(LINPHONE_DATA_DIR "${CMAKE_INSTALL_PREFIX}")
 endif()
-set(LINPHONE_PLUGINS_DIR "${LINPHONE_DATA_DIR}/lib/liblinphone/plugins")
+set(LINPHONE_PLUGINS_DIR "${LINPHONE_DATA_DIR}/${CMAKE_INSTALL_LIBDIR}/liblinphone/plugins")
 if(WIN32)
 	set(LINPHONE_CONFIG_DIR "Linphone")
 endif()
-set(PACKAGE_LOCALE_DIR "${LINPHONE_DATA_DIR}/share/locale")
-set(PACKAGE_DATA_DIR "${LINPHONE_DATA_DIR}/share")
-set(PACKAGE_SOUND_DIR "${LINPHONE_DATA_DIR}/share/sounds/linphone")
+set(PACKAGE_LOCALE_DIR "${LINPHONE_DATA_DIR}/${CMAKE_INSTALL_DATADIR}/locale")
+set(PACKAGE_DATA_DIR "${LINPHONE_DATA_DIR}/${CMAKE_INSTALL_DATADIR}")
+set(PACKAGE_SOUND_DIR "${LINPHONE_DATA_DIR}/${CMAKE_INSTALL_DATADIR}/sounds/linphone")
 set(PACKAGE_RING_DIR "${PACKAGE_SOUND_DIR}/rings")
 set(PACKAGE_FREEDESKTOP_DIR "${PACKAGE_DATA_DIR}/applications")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -224,11 +298,22 @@ if(ENABLE_VIDEO)
 endif()
 
 
+if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+	set(EXPORT_TARGETS_NAME "LinphoneBuilder")
+else()
+	set(EXPORT_TARGETS_NAME "Linphone")
+endif()
+
+
+add_subdirectory(java)
 add_subdirectory(coreapi)
 add_subdirectory(share)
 if(ENABLE_CONSOLE_UI)
 	add_subdirectory(console)
 endif()
+if(ENABLE_DAEMON)
+	add_subdirectory(daemon)
+endif()
 if(ENABLE_GTK_UI)
 	add_subdirectory(gtk)
 	add_subdirectory(pixmaps)
@@ -237,7 +322,7 @@ endif()
 if(ENABLE_TOOLS)
 	add_subdirectory(tools)
 endif()
-if(ENABLE_UNIT_TESTS)
+if(ENABLE_UNIT_TESTS AND BCTOOLBOX_TESTER_FOUND)
 	add_subdirectory(tester)
 endif()
 
@@ -248,23 +333,21 @@ write_basic_package_version_file(
 	VERSION ${LINPHONE_VERSION}
 	COMPATIBILITY AnyNewerVersion
 )
-export(EXPORT LinphoneTargets
+export(EXPORT ${EXPORT_TARGETS_NAME}Targets
 	FILE "${CMAKE_CURRENT_BINARY_DIR}/LinphoneTargets.cmake"
-	NAMESPACE BelledonneCommunications::
 )
 configure_file(cmake/LinphoneConfig.cmake.in
 	"${CMAKE_CURRENT_BINARY_DIR}/LinphoneConfig.cmake"
 	@ONLY
 )
 
-set(ConfigPackageLocation lib/cmake/Linphone)
-install(EXPORT LinphoneTargets
+set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/Linphone/cmake")
+install(EXPORT ${EXPORT_TARGETS_NAME}Targets
 	FILE LinphoneTargets.cmake
-	NAMESPACE BelledonneCommunications::
-	DESTINATION ${ConfigPackageLocation}
+	DESTINATION ${CONFIG_PACKAGE_LOCATION}
 )
 install(FILES
 	"${CMAKE_CURRENT_BINARY_DIR}/LinphoneConfig.cmake"
 	"${CMAKE_CURRENT_BINARY_DIR}/LinphoneConfigVersion.cmake"
-	DESTINATION ${ConfigPackageLocation}
+	DESTINATION ${CONFIG_PACKAGE_LOCATION}
 )
diff --git a/COPYING b/COPYING
index 365b8c279..ce1d99769 100644
--- a/COPYING
+++ b/COPYING
@@ -349,7 +349,7 @@ About The Cisco-Provided Binary of OpenH264 Video Codec
 
 Cisco provides this program under the terms of the BSD license.  
 
-Additionally, this binary is licensed under Cisco’s AVC/H.264 Patent Portfolio
+Additionally, this binary is licensed under Cisco's AVC/H.264 Patent Portfolio
 License from MPEG LA, at no cost to you, provided that the requirements and 
 conditions shown below in the AVC/H.264 Patent Portfolio sections are met.  
 
@@ -367,7 +367,7 @@ BSD terms, which can be found at http://www.openh264.org
 BSD License
 -----------
 
-Copyright © 2014 Cisco Systems, Inc.
+Copyright (C) 2014 Cisco Systems, Inc.
 
 All rights reserved.
 
diff --git a/Makefile.am b/Makefile.am
index 007dc5dbf..7960711f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,7 @@
 ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_MACOS_FLAGS)
 
 SUBDIRS = build m4 pixmaps po @ORTP_DIR@ @MS2_DIR@ \
-		coreapi console gtk share scripts tools tester include
-
+		coreapi console gtk share scripts tools daemon tester include
 
 GITVERSION=`cd $(top_srcdir) && git describe --always || echo $(VERSION)`
 
@@ -62,6 +61,30 @@ EXTRA_DIST =		BUGS  \
 			$(LINPHONEDEPS_FILELIST) \
 			$(ISS_SCRIPT).in
 
+EXTRA_DIST += CMakeLists.txt \
+cmake/FindGtkMacIntegration.cmake \
+cmake/FindIconv.cmake \
+cmake/FindIntl.cmake \
+cmake/FindNotify.cmake \
+cmake/FindSqlite3.cmake \
+cmake/FindXML2.cmake \
+cmake/FindZlib.cmake \
+cmake/LinphoneConfig.cmake.in \
+config.h.cmake \
+console/CMakeLists.txt \
+coreapi/CMakeLists.txt \
+coreapi/gitversion.cmake \
+coreapi/help/CMakeLists.txt \
+gtk/CMakeLists.txt \
+java/CMakeLists.txt \
+pixmaps/CMakeLists.txt \
+po/CMakeLists.txt \
+share/CMakeLists.txt \
+share/rings/CMakeLists.txt \
+share/rootca.cmake \
+tester/CMakeLists.txt \
+tools/CMakeLists.txt
+
 DISTCLEANFILES= $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST)
 
 CLEANFILES=Portfile Portfile-devel
@@ -226,11 +249,7 @@ Linphone.app:
 	MS2_PLUGINS_INSTALL_PREFIX=$(prefix) \
 	LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX=$(LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX) \
 	gtk-mac-bundler $(PACKAGE_BUNDLE_FILE)
-	printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
-	> $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc
-	cp -f $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig
-	sed -e 's:@executable_path.*/::g' $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules.orig  > $(BUNDLEDIR)/Contents/Resources/etc/pango/pango.modules
-	patch -R ${BUNDLEDIR}/Contents/Resources/share/themes/Quartz/gtk-2.0/gtkrc ${srcdir}/build/macos/quartz-theme-gtkrc.patch
+	patch ${BUNDLEDIR}/Contents/Resources/share/themes/Quartz/gtk-2.0/gtkrc ${srcdir}/build/macos/quartz-theme-gtkrc.patch
 	rm -f ${BUNDLEDIR}/Contents/Resources/lib/libopenh264*
 
 bundle: $(MACAPPNAME)
@@ -248,7 +267,7 @@ pkg: $(MACAPPNAME)
 	cp ${srcdir}/pixmaps/linphone.png ./packaging
 	pkgbuild --install-location /Applications --scripts ${srcdir}/build/macos/pkg-scripts --component $(MACAPPNAME) ./packaging/linphone.pkg
 	productbuild --resources . --distribution ${srcdir}/build/macos/pkg-distribution.xml --package-path ./packaging $(MACAPPPKG)
-	
+
 signed-pkg: pkg
 	mv $(MACAPPPKG) $(MACAPPPKG).tmp
 	productsign --sign "$(BUNDLE_SIGNING_ID)" $(MACAPPPKG).tmp $(MACAPPPKG)
@@ -263,7 +282,7 @@ clean-local:
 discovery:
 	touch specs.c
 	$(CC) --include $(top_builddir)/config.h \
-        $(TUNNEL_CFLAGS) $(CFLAGS) $(MEDIASTREAMER2_CFLAGS) $(ORTP_CFLAGS)  $(SIPSTACK_CFLAGS) $(CUNIT_CFLAGS) -E -P -v -dD specs.c
+        $(TUNNEL_CFLAGS) $(CFLAGS) $(MEDIASTREAMER2_CFLAGS) $(ORTP_CFLAGS)  $(SIPSTACK_CFLAGS) $(BCTOOLBOXTESTER_CFLAGS) -E -P -v -dD specs.c
 
 .PHONY: $(MACAPPNAME) pkg
 
diff --git a/NEWS b/NEWS
index 385b7831a..0d5eb29eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+linphone-3.10.2 -- August 30th, 2016
+	* Fixing linphone python version compilation - fixing vcards
+
+inphone-3.10.0 -- August 8th, 2016
+	* Adding lime_experimental_feature : set to 1 in .linphonerc [GtkUi] to 
+	show the Lime menu in the graphical user interface. Caution : Experimental.
+	* Video conference support through a conference server (SDK only)
+	* Disable dummy STUN packets sending when ICE is activated.
+	* Signal AVPF support as AVP : Enable rtcp feedback on RTP/AVP by default
+	* Adding linphone daemon
+	* gtk - Show links to files received in chat by file transfer
+	* gtk - Debug window now stores “scroll to end” preference
+	* gtk - Added button to take screenshot of video call
+ 	* Fix - gtk : Fixed issue busy presence not displayed in red 
+	* Fix 0002832: Date/time of calls not shown in call history on Windows.
+	* Fix 0002690: Bad SDP when no audio codec has been enabled
+	* Fix 0000750: DTMF RFC2833 event always goes up in the same LinphoneCoreListener 
+
+linphone-3.9.1 -- November 16th, 2015
+	* Fix crash when recording video calls with the VP8 codec
+	* Fix H.264 codec support in Mac OS X package
+	* Fix translation of account assistant
+	* Bug fixes
+
+linphone-3.9.0 -- November 2nd, 2015
+	* Video recording of calls in MKV format
+	* Clickable URLs in chat view
+	* Add buttons to change the record and playback volumes during a call
+	* Add button to start chatting without having to create a contact first
+	* Some icon changes
+	* Call logs now stored in database
+	* Bug fixes
+
 linphone-3.8.5 -- June 30th, 2015
 	* Fix bug about status icon on MacOSX. Attention request worked only once
 	* Fix crash at the end of the audio assistant
@@ -19,7 +52,7 @@ linphone-3.8.2 -- May 7th, 2015
 	* add support of the StatusNotifierItem standard to display a status icon on KDE5
 	* auto-answering can be set through the preferences panel
 	* bug fixes
-	
+
 	Liblinphone level improvements:
 	* fix audio bug with opus codec
 	* fix ICE corner case not properly handled and resulting bad final ice status
@@ -67,14 +100,14 @@ linphone-3.7.0 -- February 20th, 2014
 	* Keyboard can be used for DTMF input
 	* Faster and higly responsive UI thanks to fully asynchronous operation of the liblinphone.
 	* Addon of opus codec
-	* Possibility to specify a remote provisionning http URI for configuration
+	* Possibility to specify a remote provisioning http URI for configuration
 	* LDAP search integration for Linux and MacOSX
-	* is-composing notification in chat area 
+	* is-composing notification in chat area
 
 	Liblinphone level improvements thanks to new "belle-sip" SIP stack:
 	* multiple SIP transports simultaneously now allowed
 	* IP dual stack: can use IPv6 and IPv4 simultaneously
-	* fully asynchronous behavior: no more lengthly DNS or connections 
+	* fully asynchronous behavior: no more lengthly DNS or connections
 	* +sip.instance parameter (RFC5626)
 	* alias parameter (RFC5923)
 	* better management of network disconnections
@@ -92,7 +125,7 @@ linphone-3.7.0 -- February 20th, 2014
 
 linphone-3.6.1 -- June 17, 2013
 	* fix memory leak with some video cameras on windows.
-	
+
 	Requires: mediastreamer2 = 2.9.1 and ortp = 0.22.0
 
 linphone-3.6.0 -- May 27, 2013
@@ -157,9 +190,9 @@ linphone-3.4.1 -- February 17th, 2011
 	Requires mediastreamer-2.7.1
 
 linphone-3.4.0 -- February 7th, 2011
-	* implement multiple calls feature: 
+	* implement multiple calls feature:
 		- call hold (with possibility to play a music file)
-		- call resume 
+		- call resume
 		- acceptance of 2nd call while putting the others on hold
 		- creation of another outgoing call while already in call
 		- blind call transfer
@@ -330,7 +363,7 @@ linphone-1.4.1 -- September 18, 2006
 	* do not change mixer settings at startup
 
 linphone-1.4.0 -- September 11, 2006
-	* no more glib dependency at all 
+	* no more glib dependency at all
 	* new mediastreamer2 framework for audio/video streaming
 	* stable video support with H.263-1998
 	* echo cancelation
diff --git a/README b/README
index 7e0b97524..cde6c760e 100644
--- a/README
+++ b/README
@@ -1,7 +1,12 @@
 This is Linphone, a free (GPL) video softphone based on the SIP protocol.
 
+# Warning
 
-******************Building linphone ***********************************
+Unless you exactly know what you are doing, you should take at look at [linphone-desktop](https://github.com/BelledonneCommunications/linphone-desktop).
+
+# Otherwise…
+
+## Building Linphone
 
 - Install build time dependencies
 	- libtool
@@ -11,6 +16,7 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
  	- belle-sip>=1.3.0
 	- speex>=1.2.0 (including libspeexdsp part)
 	- libxml2
+	- bctoolbox
 
 	+ if you want the gtk/glade interface:
 		- libgtk >=2.16.0
@@ -41,7 +47,7 @@ libglew1.6-dev libv4l-dev libxml2-dev
 libsqlite3-dev libupnp4-dev libsrtp-dev
 
 	+ Install zrtp (optional), for unbreakable call encryption
-		$ git clone git://git.linphone.org:bzrtp
+		$ git clone git://git.linphone.org/bzrtp.git
 		$ cd bzrtp && ./autogen.sh && ./configure && make
 		$ sudo make install
 
@@ -58,7 +64,7 @@ For windows compilation see README.mingw.
 For macOS X, see README.macos
 
 
-******************************** Notes for developers *****************************
+## Notes for developers
 
 Here is a short description of the content of the source tree.
 
diff --git a/README.macos.md b/README.macos.md
index 5e34f88ad..b655ba141 100644
--- a/README.macos.md
+++ b/README.macos.md
@@ -23,7 +23,7 @@ In order to enable generation of bundle for older MacOS version, it is recommend
 
 ##### Linphone library (liblinphone)
 
-        sudo port install automake autoconf libtool pkgconfig intltool wget cunit \
+        sudo port install automake autoconf libtool pkgconfig intltool wget bcunit \
         antlr3 speex readline sqlite3 openldap libupnp \
         ffmpeg-devel -gpl2
 
@@ -32,7 +32,7 @@ In order to enable generation of bundle for older MacOS version, it is recommend
 Install `GTK`. It is recommended to use the `quartz` backend for better integration.
 
         sudo port install gtk2 +quartz +no_x11
-        sudo port install gtk-osx-application +no_python
+        sudo port install gtk-osx-application-gtk2 +no_python
         sudo port install hicolor-icon-theme
 
 #### Using HomeBrew
@@ -78,24 +78,24 @@ The next pieces need to be compiled manually.
 
 * Install libvpx (Must be manualy build because the macport recipe does not support 'macosx_deployment_target')
 
-	git clone https://chromium.googlesource.com/webm/libvpx -b v1.3.0
-	cd libvpx
-	./configure --prefix=/opt/local \
-		--target=x86_64-darwin10-gcc \
-	        --enable-error-concealment \
-	        --enable-multithread \
-	        --enable-realtime-only \
-	        --enable-spatial-resampling \
-	        --enable-vp8 \
-	        --disable-vp9 \
-	        --enable-libs \
-	        --disable-install-docs \
-	        --disable-debug-libs \
-	        --disable-examples \
-	        --disable-unit-tests \
-	        --as=yasm
-	make
-	sudo make install
+        git clone https://chromium.googlesource.com/webm/libvpx -b v1.4.0
+        cd libvpx
+        ./configure --prefix=/opt/local \
+                --target=x86_64-darwin10-gcc \
+                --enable-error-concealment \
+                --enable-multithread \
+                --enable-realtime-only \
+                --enable-spatial-resampling \
+                --enable-vp8 \
+                --disable-vp9 \
+                --enable-libs \
+                --disable-install-docs \
+                --disable-debug-libs \
+                --disable-examples \
+                --disable-unit-tests \
+                --as=yasm
+        make
+        sudo make install
 
 * Install belle-sip (sip stack)
 
@@ -143,15 +143,12 @@ The next pieces need to be compiled manually.
 
 ### Generate portable bundle
 
-If you want to generate a portable bundle, then install `gtk-mac-bundler`:
+If you want to generate a portable bundle, then install `gtk-mac-bundler` linphone fork:
 
-        git clone https://github.com/jralls/gtk-mac-bundler.git
-        cd gtk-mac-bundler
-	git checkout 6e2ed855aaeae43c29436c342ae83568573b5636
+	git clone git://git.linphone.org/gtk-mac-bundler.git
+	cd gtk-mac-bundler
 	make install
-        export PATH=$PATH:~/.local/bin
-        # make this dummy charset.alias file for the bundler to be happy:
-        sudo touch /opt/local/lib/charset.alias
+    export PATH=$PATH:~/.local/bin
 	# set writing right for owner on the libssl and libcrypto libraries in order gtk-mac-bundler
 	# be able to rewrite their rpath
 	sudo chmod u+w /opt/local/lib/libssl.1.0.0.dylib /opt/local/lib/libcrypto.1.0.0.dylib
@@ -180,11 +177,11 @@ The resulting bundle is located in Linphone build directory, together with a zip
 
 * For a better appearance, you can install `gtk-quartz-engine` (a GTK theme) that makes GTK application more similar to other Mac applications (but not perfect).
 	sudo port install gnome-common
-        git clone https://github.com/jralls/gtk-quartz-engine.git
-        cd gtk-quartz-engine
-        ./autogen.sh
-        ./configure --prefix=/opt/local CFLAGS="$CFLAGS -Wno-error" && make
-        sudo make install
+	git clone https://github.com/jralls/gtk-quartz-engine.git
+	cd gtk-quartz-engine
+	./autogen.sh
+	./configure --prefix=/opt/local CFLAGS="$CFLAGS -Wno-error" && make
+	sudo make install
 
 Generate a new bundle to have it included.
 
diff --git a/build/Makefile.am b/build/Makefile.am
index 84ac3e909..8145474f1 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS=macos
 
+EXTRA_DIST = openembedded
+
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 9dfd049fa..705ddc2ab 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -45,13 +45,16 @@ LOCAL_SRC_FILES := \
 	callbacks.c \
 	call_log.c \
 	call_params.c \
+	carddav.c \
 	chat.c \
-	conference.c \
+	chat_file_transfer.c \
+	conference.cc \
 	content.c \
 	ec-calibrator.c \
 	enum.c \
 	event.c \
 	friend.c \
+	friendlist.c \
 	info.c \
 	linphonecall.c \
 	linphonecore.c \
@@ -75,13 +78,15 @@ LOCAL_SRC_FILES := \
 	xml2lpc.c \
 	xml.c \
 	xmlrpc.c \
-	vtables.c
+	vtables.c \
+	ringtoneplayer.c
 
 ifndef LIBLINPHONE_VERSION
 LIBLINPHONE_VERSION = "Devel"
 endif
 
 LOCAL_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-D_BYTE_ORDER=_LITTLE_ENDIAN \
 	-DORTP_INET6 \
 	-DINET6 \
@@ -119,11 +124,12 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../oRTP/include \
 	$(LOCAL_PATH)/../mediastreamer2/include \
 	$(LOCAL_PATH)/../mediastreamer2/src/audiofilters/ \
+	$(LOCAL_PATH)/../../bctoolbox/include \
 	$(LOCAL_PATH)/../../belle-sip/include \
 	$(LOCAL_PATH)/../../../gen \
 	$(LOCAL_PATH)/../../externals/libxml2/include \
 	$(LOCAL_PATH)/../../externals/build/libxml2 \
-	$(LOCAL_PATH)/../../externals/polarssl/include
+	$(LOCAL_PATH)/../../externals/polarssl/include \
 
 LOCAL_LDLIBS += -llog -ldl -lz
 
@@ -132,6 +138,7 @@ LOCAL_STATIC_LIBRARIES := \
 	libmediastreamer2 \
 	libortp \
 	libbellesip \
+	libbctoolbox \
 	libgsm \
 	liblpxml2
 
@@ -178,33 +185,52 @@ LOCAL_CFLAGS += -DHAVE_CODEC2
 LOCAL_STATIC_LIBRARIES += libcodec2 libmscodec2
 endif
 
-ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
+ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)$(BUILD_ILBC),000)
 LOCAL_CFLAGS += -DHAVE_WEBRTC
 LOCAL_STATIC_LIBRARIES += libmswebrtc
 endif
+
 ifneq ($(BUILD_WEBRTC_AECM),0)
 LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_aecm \
+	libwebrtc_aecm 
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_aecm_neon 
+endif
+endif
+
+
+ifneq ($(BUILD_WEBRTC_ISAC),0)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_isacfix
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_isacfix_neon
+endif
+endif
+
+ifneq ($(BUILD_ILBC),0)
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_ilbc 
+endif
+
+
+ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)$(BUILD_ILBC),000)
+
+LOCAL_STATIC_LIBRARIES += \
+	libwebrtc_apm_utility \
+	libwebrtc_system_wrappers \
 	libwebrtc_apm_utility \
 	libwebrtc_spl \
 	libwebrtc_system_wrappers
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
 LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_aecm_neon \
-	libwebrtc_spl_neon
-endif
-endif
-ifneq ($(BUILD_WEBRTC_ISAC),0)
-LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_isacfix \
-	libwebrtc_spl
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-LOCAL_STATIC_LIBRARIES += \
-	libwebrtc_isacfix_neon \
 	libwebrtc_spl_neon
 endif
+
 endif
 
+
 ifeq ($(BUILD_G729),1)
 LOCAL_CFLAGS += -DHAVE_G729
 LOCAL_STATIC_LIBRARIES += libbcg729 libmsbcg729
@@ -236,6 +262,10 @@ ifeq ($(BUILD_SRTP), 1)
 	LOCAL_C_INCLUDES += $(SRTP_C_INCLUDE)
 endif
 
+ifeq ($(BUILD_VCARD),1)
+	LOCAL_C_INCLUDES += $(VCARD_C_INCLUDE)
+endif
+
 ifeq ($(BUILD_ILBC), 1)
 ifneq ($(TARGET_ARCH_ABI),armeabi)
 LOCAL_CFLAGS += -DHAVE_ILBC=1
@@ -257,8 +287,16 @@ ifeq ($(BUILD_SRTP),1)
 	LOCAL_STATIC_LIBRARIES += libsrtp
 endif
 
+ifeq ($(BUILD_VCARD),1)
+	LOCAL_CFLAGS += -DVCARD_ENABLED
+	LOCAL_SRC_FILES += vcard.cc
+	LOCAL_STATIC_LIBRARIES += libbelr libbelcard
+else
+	LOCAL_SRC_FILES += vcard_stubs.c
+endif
+
 ifeq ($(BUILD_SQLITE),1)
-LOCAL_CFLAGS += -DMSG_STORAGE_ENABLED
+LOCAL_CFLAGS += -DMSG_STORAGE_ENABLED -DCALL_LOGS_STORAGE_ENABLED -DFRIENDS_SQL_STORAGE_ENABLED
 LOCAL_STATIC_LIBRARIES += liblinsqlite
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/../../externals/sqlite3/
@@ -280,8 +318,9 @@ LOCAL_MODULE_FILENAME := liblinphone-$(TARGET_ARCH_ABI)
 
 include $(BUILD_SHARED_LIBRARY)
 
-LOCAL_CPPFLAGS=$(LOCAL_CFLAGS)
+LOCAL_CPPFLAGS += $(LOCAL_CFLAGS)
 LOCAL_CFLAGS += -Wdeclaration-after-statement
+LOCAL_LDFLAGS := -Wl,-soname,$(LOCAL_MODULE_FILENAME).so
 
 $(call import-module,android/cpufeatures)
 
diff --git a/build/android/liblinphone_tester.mk b/build/android/liblinphone_tester.mk
index 8395df144..597e412fa 100644
--- a/build/android/liblinphone_tester.mk
+++ b/build/android/liblinphone_tester.mk
@@ -1,7 +1,6 @@
 LOCAL_PATH := $(call my-dir)/../../tester
 
 common_SRC_FILES := \
-	common/bc_tester_utils.c \
 	accountmanager.c \
 	call_tester.c \
 	dtmf_tester.c \
@@ -24,14 +23,15 @@ common_SRC_FILES := \
 	tunnel_tester.c \
 	upnp_tester.c \
  	multicast_call_tester.c \
+ 	vcard_tester.c \
+	complex_sip_call_tester.c \
 
 common_C_INCLUDES += \
         $(LOCAL_PATH) \
         $(LOCAL_PATH)/../include \
         $(LOCAL_PATH)/../coreapi \
         $(LOCAL_PATH)/../oRTP/include \
-        $(LOCAL_PATH)/../mediastreamer2/include \
-		$(LOCAL_PATH)/common
+        $(LOCAL_PATH)/../mediastreamer2/include 
 
 
 include $(CLEAR_VARS)
@@ -47,7 +47,9 @@ ifeq ($(BUILD_MATROSKA), 1)
 LOCAL_CFLAGS += -DHAVE_MATROSKA -DHAVE_ZLIB
 endif
 
-LOCAL_SHARED_LIBRARIES := cunit liblinphone
+LOCAL_STATIC_LIBRARIES := bctoolbox_tester
+
+LOCAL_SHARED_LIBRARIES := bcunit liblinphone
 include $(BUILD_SHARED_LIBRARY)
 
 #end
diff --git a/build/macos/environment.sh b/build/macos/environment.sh
index fae264e0e..879db36dc 100644
--- a/build/macos/environment.sh
+++ b/build/macos/environment.sh
@@ -3,6 +3,7 @@ export LINPHONE_WORKDIR="$bundle_res"
 export GIO_EXTRA_MODULES="$bundle_lib/gio/modules"
 export PANGO_LIBDIR="$bundle_lib"
 export PANGO_SYSCONFDIR="$bundle_etc"
+export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 
 #this is very important not to force a shared library path so that native frameworks can find their dependencies by themselves, 
 #and not be forced to use the few libraries we have in the bundle that have the same name as native libs (ex: libiconv)
@@ -23,4 +24,4 @@ esac
 
 export LANG
 
-echo "LANG is $LANG"
\ No newline at end of file
+echo "LANG is $LANG"
diff --git a/build/macos/linphone.bundle b/build/macos/linphone.bundle
index 8109ff6cb..19793fe78 100644
--- a/build/macos/linphone.bundle
+++ b/build/macos/linphone.bundle
@@ -17,6 +17,7 @@
     <prefix name="ms2plugins">${env:MS2_PLUGINS_INSTALL_PREFIX}</prefix>
     <!-- This prefix definition is necessary if some dependencies are to be taken from /usr/local/lib -->
     <prefix name="local">${env:LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX}</prefix>
+
     <!-- The project directory is the default location of the created
          app. If you leave out the path, the current directory is
          used. Note the usage of an environment variable here again.
@@ -71,19 +72,11 @@
      ${prefix}/lib/${gtkdir}/modules/*.so
   </binary>
 
-  <binary>
-     ${prefix}/lib/gdk-pixbuf-2.0
-  </binary>
-
   <data>
-    ${prefix}/share/mime/globs
+    ${prefix}/share/mime/mime.cache
   </data>
 
-  <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
-  </binary>
-
-  <!-- Copy in GTK+ theme engines. Note the use of the
+  <!-- Copy in GTK+ theme engines and print backends. Note the use of the
        "${pkg:module:variable}" macro, which evaluates to a pkg-config
        variable in the specified module. Note that any libraries that
        binaries link to are also copied in automatically.  Note also
@@ -93,30 +86,58 @@
     ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
   </binary>
   <binary>
-    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
-  </binary>
-  <!-- Copy GIO modules, required for https access for wizard-->
-  <binary>
-     ${prefix}/lib/gio/modules/libgiognutls.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
   </binary>
 
-  <!-- Translation filenames, one for each program or library that you
+<!-- Starting with 2.24, gdk-pixbuf installs into its own directory. Do
+     not install the svg pixbuf loader as it does not work. -->
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/libpixbufloader-bmp.so
+  </binary>
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/libpixbufloader-gif.so
+  </binary>
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/libpixbufloader-icns.so
+  </binary>
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/libpixbufloader-ico.so
+  </binary>
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/libpixbufloader-jpeg.so
+  </binary>
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/libpixbufloader-png.so
+  </binary>
+
+
+   <!--binary>
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
+  </binary-->
+
+  <!--data>
+    ${prefix}/etc/pango/
+  </data-->
+
+ <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
        library/program under the indicated directory and copy them.-->
-  <data name="linphone">
-    ${prefix:linphone}/share/locale
-  </data>
-  <translations name="gdk-pixbuf">
-    ${prefix}/share/locale
-  </translations>
-  <translations name="glib20">
-    ${prefix}/share/locale
-  </translations>
   <translations name="gtk20">
     ${prefix}/share/locale
   </translations>
 
+  <data name="linphone">
+    ${prefix:linphone}/share/locale
+  </data>
+
+  <translations name="gdk-pixbuf">
+    ${prefix}/share/locale
+  </translations>
+
+  <translations name="glib20">
+    ${prefix}/share/locale
+  </translations>
 
   <!-- Data to copy in, usually Glade/UI files, images, sounds files
        etc. The destination inside the bundle can be specified if the
@@ -136,6 +157,9 @@
     ${prefix:linphone}/share/images
   </data>
 
+  <data>
+    ${prefix:linphone}/share/icons
+  </data>
 
   <!-- Copy in the themes data. You may want to trim this to save space
        in your bundle. -->
@@ -151,7 +175,6 @@
     ${project}/../../pixmaps/linphone.icns
   </data>
 
-
   <data dest="${bundle}/Contents/Resources">
     ${project}/environment.sh
   </data>
@@ -164,14 +187,18 @@
     ${project}/../../gtk/gtkrc.mac
   </data>
 
-  <data dest="${bundle}/Contents/Resources/share/sounds/linphone/rings/oldphone.wav">
-      ${prefix:linphone}/share/sounds/linphone/rings/oldphone.wav
+  <data dest="${bundle}/Contents/Resources/share/sounds/linphone/rings/oldphone-mono.wav">
+      ${prefix:linphone}/share/sounds/linphone/rings/oldphone-mono.wav
+  </data>
+
+  <data dest="${bundle}/Contents/Resources/share/sounds/linphone/toy-mono.wav">
+      ${prefix:linphone}/share/sounds/linphone/toy-mono.wav
   </data>
 
   <data dest="${bundle}/Contents/Resources/share/sounds/linphone/ringback.wav">
       ${prefix:linphone}/share/sounds/linphone/ringback.wav
   </data>
-  
+
   <data dest="${bundle}/Contents/Resources/share/sounds/linphone/incoming_chat.wav">
       ${prefix:linphone}/share/sounds/linphone/incoming_chat.wav
   </data>
diff --git a/build/macos/quartz-theme-gtkrc.patch b/build/macos/quartz-theme-gtkrc.patch
index 9099f2cac..ac7a48a98 100644
--- a/build/macos/quartz-theme-gtkrc.patch
+++ b/build/macos/quartz-theme-gtkrc.patch
@@ -1,4 +1,20 @@
-85c85
-<         buttontype = "textured"
----
->         buttontype = "aqua"
+--- /opt/local/share/themes/Quartz/gtk-2.0/gtkrc	2015-03-25 15:29:53.000000000 +0100
++++ gtkrc	2015-10-29 13:43:15.000000000 +0100
+@@ -12,7 +12,7 @@
+ gtk-menu-images       = 0
+ gtk-toolbar-style     = 0
+ gtk-enable-mnemonics  = 0
+-gtk-icon-sizes        = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22"
++gtk-icon-sizes        = "gtk-menu=12,12:gtk-button=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=22,22"
+ gtk-toolbar-icon-size = large-toolbar
+ gtk-error-bell        = 0
+ gtk-show-input-method-menu = 0
+@@ -82,7 +82,7 @@
+ 
+     engine "quartz"
+     {
+-        buttontype = "aqua"
++        buttontype = "textured"
+     }
+ }
+ 
diff --git a/build/openembedded/README b/build/openembedded/README
new file mode 100644
index 000000000..ec505a9c3
--- /dev/null
+++ b/build/openembedded/README
@@ -0,0 +1,57 @@
+Recipes for open embedded: http://www.openembedded.org
+
+Documentations:
+http://docs.openembedded.org/usermanual/
+http://bitbake.berlios.de/manual/
+
+
+
+Instructions for compilation from sources: (requires 10 Go of free space)
+- Choose a distribution and build it.
+  For example, to build Angstrom follow the guide at http://www.angstrom-distribution.org/building-angstrom
+  For IGEPv2 use environment variable MACHINE=igep0020
+  It is possible to use MACHINE=qemuarm to build an image that can be run on a computer with qemu.
+
+- Add linphone recipes to the pool with an higher priority:
+  Edit conf/bblayers.conf to set EXTRALAYERS to point to the source repository of linphone. Search the EXTRALAYERS definition in conf/bblayers.conf
+  and modify it like this:
+
+     # Add your overlay location to EXTRALAYERS
+     # Make sure to have a conf/layers.conf in there
+     EXTRALAYERS ?= "/home/smorlat/sources/git/linphone-daemon/build/openembedded"
+
+  This additional layer gives access to the various linphone recipes but also to a recipe to build an entire image containing linphone.
+  To build this image based on the generic console image you will need to use:
+  bitbake console-linphone-image
+
+
+- Prepare compilation
+  Source appropriate environment with "~/.oe/enviro*"  
+  Change directory to where you launched Angstrom install script.
+
+- Compile linphone
+  bitbake -c clean linphone
+  bitbake linphone
+
+- If you want additional codecs (e.g. iLBC or AMR) compile linphone-plugins
+  bitbake -c clean linphone-plugins
+  bitbake linphone-plugins
+
+- Find the generated packages "*.ipk"
+  Example: /Data/work/angstrom/angstrom-setup-scripts/build/tmp-angstrom_2008_1/deploy/glibc/ipk/armv7a/
+
+
+
+ 
+Installation
+- check network connectivity
+	* ping linphone.org
+	* see "route -n"
+	* see "/etc/resolv.conf"
+- update package list
+	* opkg update
+- copy ipk files to install to /tmp
+- eventually remove previously installed packages
+- install with "opkg install libortp*.ipk libmediastreamer*.ipk liblinphone*.ipk linphonec*.ipk"
+
+
diff --git a/build/openembedded/antlr3/antlr3c.inc b/build/openembedded/antlr3/antlr3c.inc
new file mode 100644
index 000000000..e13b73088
--- /dev/null
+++ b/build/openembedded/antlr3/antlr3c.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Linphone version of antlr3"
+LICENSE = "GPL"
+
+PROVIDES = "antlr3c antlr3c-dev"
+ALLOW_EMPTY_${PN} = "1"
+
+S = "${WORKDIR}/git/runtime/C"
+
+inherit autotools pkgconfig lib_package
+
+do_fetch_append() {
+    import os
+    os.system("autogen.sh")
+}
+
diff --git a/build/openembedded/antlr3/antlr3c_linphone.bb b/build/openembedded/antlr3/antlr3c_linphone.bb
new file mode 100644
index 000000000..1c090ffab
--- /dev/null
+++ b/build/openembedded/antlr3/antlr3c_linphone.bb
@@ -0,0 +1,7 @@
+require antlr3c.inc
+
+SRCREV="f0dbcbbcd22a7fd9a479ff68d4daa9225fb2f3b1"
+PR="R3"
+SRC_URI = "git://git.linphone.org/antlr3.git"
+
+LIC_FILES_CHKSUM= "file://COPYING;md5=13c502aaa9b2ca91d01a3aae44d899b4"
diff --git a/build/openembedded/belle-sip/belle-sip.inc b/build/openembedded/belle-sip/belle-sip.inc
new file mode 100644
index 000000000..a57e4e41a
--- /dev/null
+++ b/build/openembedded/belle-sip/belle-sip.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "SIP stack from Belledonne Communications"
+LICENSE = "GPL"
+
+DEPENDS_${PN} = "polarssl-dev antlr3c-dev"
+DEPENDS = "polarssl-dev antlr3c-dev"
+RDEPENDS_${PN} = "polarssl-dev antlr3c-dev"
+
+EXTRA_OECONF += "--disable-strict --with-antlr=${STAGING_DIR_HOST}${layout_exec_prefix}/usr --with-polarssl=${STAGING_DIR_HOST}${layout_exec_prefix}/usr"
+INSANE_SKIP_belle-sip += "dev-deps"
+
+inherit autotools pkgconfig
+
+do_autoreconf () {
+    ./autogen.sh
+}
diff --git a/build/openembedded/belle-sip/belle-sip_master.bb b/build/openembedded/belle-sip/belle-sip_master.bb
new file mode 100644
index 000000000..f0f843543
--- /dev/null
+++ b/build/openembedded/belle-sip/belle-sip_master.bb
@@ -0,0 +1,10 @@
+require belle-sip.inc
+
+SRCREV="af93922ac91cf3cbf5ceed0328bf43d08d37714e"
+S = "${WORKDIR}/git"
+
+PR="R1"
+
+
+SRC_URI = "git://git.linphone.org/belle-sip.git;commit=${SRCREV}"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9f9938e31db89d55a796e86808c96848"
diff --git a/build/openembedded/conf/layer.conf b/build/openembedded/conf/layer.conf
new file mode 100644
index 000000000..1b29844a8
--- /dev/null
+++ b/build/openembedded/conf/layer.conf
@@ -0,0 +1,9 @@
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/*.bb ${LAYERDIR}/*/*.bb"
+
+BBFILE_COLLECTIONS += "linphone-layer"
+BBFILE_PATTERN_linphone-layer := "^${LAYERDIR}/"
+BBFILE_PRIORITY_linphone-layer = "50"
diff --git a/build/openembedded/files/igep0020/alsa_8khz.patch b/build/openembedded/files/igep0020/alsa_8khz.patch
new file mode 100644
index 000000000..17774d4e6
--- /dev/null
+++ b/build/openembedded/files/igep0020/alsa_8khz.patch
@@ -0,0 +1,13 @@
+--- linphone/mediastreamer2/src/alsa.c_orig	2011-05-24 12:39:33.824600109 +0200
++++ linphone/mediastreamer2/src/alsa.c	2011-05-24 12:40:04.760407404 +0200
+@@ -32,8 +32,8 @@
+ /*in case of troubles with a particular driver, try incrementing ALSA_PERIOD_SIZE
+ to 512, 1024, 2048, 4096...
+ then try incrementing the number of periods*/
+-#define ALSA_PERIODS 8
+-#define ALSA_PERIOD_SIZE 256
++#define ALSA_PERIODS 4
++#define ALSA_PERIOD_SIZE 512
+ 
+ /*uncomment the following line if you have problems with an alsa driver
+ having sound quality trouble:*/
diff --git a/build/openembedded/libgsm/libgsm-1.0.13/01_makefile.patch b/build/openembedded/libgsm/libgsm-1.0.13/01_makefile.patch
new file mode 100644
index 000000000..947db37bf
--- /dev/null
+++ b/build/openembedded/libgsm/libgsm-1.0.13/01_makefile.patch
@@ -0,0 +1,71 @@
+diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile
+--- libgsm-1.0.12~/Makefile	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.12/Makefile	2007-11-01 15:43:06.000000000 +0100
+@@ -96,7 +96,7 @@
+ #  Other tools
+ 
+ SHELL		= /bin/sh
+-LN		= ln
++LN		= ln -s
+ BASENAME 	= basename
+ AR		= ar
+ ARFLAGS		= cr
+@@ -140,6 +140,7 @@
+ # Targets
+ 
+ LIBGSM	= $(LIB)/libgsm.a
++LIBGSMSO= $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -279,7 +280,7 @@
+ 
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,6 +300,11 @@
+ 
+ # The basic API: libgsm
+ 
++$(LIBGSMSO):	$(LIB) $(GSM_OBJECTS)
++		$(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc $(LDFLAGS)
++		ln -fs libgsm.so.1.0.12 lib/libgsm.so.1
++		ln -fs libgsm.so.1.0.12 lib/libgsm.so
++
+ $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
+ 		-rm $(RMFLAGS) $(LIBGSM)
+ 		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+@@ -308,15 +314,15 @@
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+ $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
+-		$(LN) $(TOAST) $(UNTOAST)
++		$(LN) toast $(UNTOAST)
+ 
+ $(TCAT):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(TCAT)
+-		$(LN) $(TOAST) $(TCAT)
++		$(LN) toast $(TCAT)
+ 
+ 
+ # The local bin and lib directories
+@@ -426,7 +432,9 @@
+ 
+ clean:	semi-clean
+ 		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
+-			$(TOAST) $(TCAT) $(UNTOAST)	\
++			$(LIBGSMSO) $(LIB)/libgsm.so.1.0.12	\
++			$(LIB)libgsm.so.1			\
++			$(TOAST) $(TCAT) $(UNTOAST)		\
+ 			$(ROOT)/gsm-1.0.tar.Z
+ 
+ 
diff --git a/build/openembedded/libgsm/libgsm-1.0.13/02_cplusplus.patch b/build/openembedded/libgsm/libgsm-1.0.13/02_cplusplus.patch
new file mode 100644
index 000000000..a4bbb4067
--- /dev/null
+++ b/build/openembedded/libgsm/libgsm-1.0.13/02_cplusplus.patch
@@ -0,0 +1,25 @@
+diff -urNad libgsm-1.0.10~/inc/gsm.h libgsm-1.0.10/inc/gsm.h
+--- libgsm-1.0.10~/inc/gsm.h	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/inc/gsm.h	2007-11-01 15:44:52.000000000 +0100
+@@ -54,6 +54,10 @@
+ #define	GSM_OPT_FRAME_INDEX	5
+ #define	GSM_OPT_FRAME_CHAIN	6
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ extern gsm  gsm_create 	GSM_P((void));
+ extern void gsm_destroy GSM_P((gsm));	
+ 
+@@ -66,6 +70,10 @@
+ extern int  gsm_explode GSM_P((gsm, gsm_byte   *, gsm_signal *));
+ extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte   *));
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #undef	GSM_P
+ 
+ #endif	/* GSM_H */
diff --git a/build/openembedded/libgsm/libgsm-1.0.13/03_config.patch b/build/openembedded/libgsm/libgsm-1.0.13/03_config.patch
new file mode 100644
index 000000000..dad241e2b
--- /dev/null
+++ b/build/openembedded/libgsm/libgsm-1.0.13/03_config.patch
@@ -0,0 +1,154 @@
+diff -urNad libgsm-1.0.10~/Makefile libgsm-1.0.10/Makefile
+--- libgsm-1.0.10~/Makefile	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/Makefile	2007-11-01 15:48:02.000000000 +0100
+@@ -151,7 +151,7 @@
+ 
+ HEADERS	=	$(INC)/proto.h		\
+ 		$(INC)/unproto.h	\
+-		$(INC)/config.h		\
++		$(INC)/gsm_config.h	\
+ 		$(INC)/private.h	\
+ 		$(INC)/gsm.h		\
+ 		$(INC)/toast.h		\
+diff -urNad libgsm-1.0.10~/inc/config.h libgsm-1.0.10/inc/config.h
+--- libgsm-1.0.10~/inc/config.h	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/inc/config.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+- * Universitaet Berlin.  See the accompanying file "COPYRIGHT" for
+- * details.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+- */
+-
+-/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/
+-
+-#ifndef	CONFIG_H
+-#define	CONFIG_H
+-
+-/*efine	SIGHANDLER_T	int 		/* signal handlers are void	*/
+-/*efine HAS_SYSV_SIGNAL	1		/* sigs not blocked/reset?	*/
+-
+-#define	HAS_STDLIB_H	1		/* /usr/include/stdlib.h	*/
+-#define	HAS_LIMITS_H	1		/* /usr/include/limits.h	*/
+-#define	HAS_FCNTL_H	1		/* /usr/include/fcntl.h		*/
+-#define	HAS_ERRNO_DECL	1		/* errno.h declares errno	*/
+-
+-#define	HAS_FSTAT 	1		/* fstat syscall		*/
+-#define	HAS_FCHMOD 	1		/* fchmod syscall		*/
+-#define	HAS_CHMOD 	1		/* chmod syscall		*/
+-#define	HAS_FCHOWN 	1		/* fchown syscall		*/
+-#define	HAS_CHOWN 	1		/* chown syscall		*/
+-/*efine	HAS__FSETMODE 	1		/* _fsetmode -- set file mode	*/
+-
+-#define	HAS_STRING_H 	1		/* /usr/include/string.h 	*/
+-/*efine	HAS_STRINGS_H	1		/* /usr/include/strings.h 	*/
+-
+-#define	HAS_UNISTD_H	1		/* /usr/include/unistd.h	*/
+-#define	HAS_UTIME	1		/* POSIX utime(path, times)	*/
+-/*efine	HAS_UTIMES	1		/* use utimes()	syscall instead	*/
+-#define	HAS_UTIME_H	1		/* UTIME header file		*/
+-#define	HAS_UTIMBUF	1		/* struct utimbuf		*/
+-/*efine	HAS_UTIMEUSEC   1		/* microseconds in utimbuf?	*/
+-
+-#endif	/* CONFIG_H */
+diff -urNad libgsm-1.0.10~/inc/gsm_config.h libgsm-1.0.10/inc/gsm_config.h
+--- libgsm-1.0.10~/inc/gsm_config.h	1970-01-01 01:00:00.000000000 +0100
++++ libgsm-1.0.10/inc/gsm_config.h	2007-11-01 15:46:19.000000000 +0100
+@@ -0,0 +1,37 @@
++/*
++ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
++ * Universitaet Berlin.  See the accompanying file "COPYRIGHT" for
++ * details.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
++ */
++
++/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/
++
++#ifndef	CONFIG_H
++#define	CONFIG_H
++
++/*efine	SIGHANDLER_T	int 		-* signal handlers are void	*/
++/*efine HAS_SYSV_SIGNAL	1		-* sigs not blocked/reset?	*/
++
++#define	HAS_STDLIB_H	1		/* /usr/include/stdlib.h	*/
++#define	HAS_STDIO_H 	1		/* /usr/include/stdio.h 	*/
++/*efine	HAS_LIMITS_H	1		-* /usr/include/limits.h	*/
++#define	HAS_FCNTL_H	1		/* /usr/include/fcntl.h		*/
++
++#define	HAS_FSTAT 	1		/* fstat syscall		*/
++#define	HAS_FCHMOD 	1		/* fchmod syscall		*/
++#define	HAS_CHMOD 	1		/* chmod syscall		*/
++#define	HAS_FCHOWN 	1		/* fchown syscall		*/
++#define	HAS_CHOWN 	1		/* chown syscall		*/
++/*efine	HAS__FSETMODE 	1		-* _fsetmode -- set file mode	*/
++
++#define	HAS_STRING_H 	1		/* /usr/include/string.h 	*/
++/*efine	HAS_STRINGS_H	1		-* /usr/include/strings.h 	*/
++
++#define	HAS_UNISTD_H	1		/* /usr/include/unistd.h	*/
++#define	HAS_UTIME	1		/* POSIX utime(path, times)	*/
++/*efine	HAS_UTIMES	1		-* use utimes()	syscall instead	*/
++#define	HAS_UTIME_H	1		/* UTIME header file		*/
++/*efine	HAS_UTIMBUF	1		-* struct utimbuf		*/
++/*efine	HAS_UTIMEUSEC   1		-* microseconds in utimbuf?	*/
++
++#endif	/* CONFIG_H */
+diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h
+--- libgsm-1.0.10~/inc/toast.h	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/inc/toast.h	2007-11-01 15:48:17.000000000 +0100
+@@ -9,7 +9,7 @@
+ #ifndef	TOAST_H
+ #define	TOAST_H				/* Guard against multiple includes */
+ 
+-#include "config.h"
++#include "gsm_config.h"
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c
+--- libgsm-1.0.10~/src/code.c	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/src/code.c	2007-11-01 15:48:34.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/code.c,v 1.3 1996/07/02 09:59:05 jutta Exp $ */
+ 
+-#include	"config.h"
++#include	"gsm_config.h"
+ 
+ 
+ #ifdef	HAS_STDLIB_H
+diff -urNad libgsm-1.0.10~/src/gsm_create.c libgsm-1.0.10/src/gsm_create.c
+--- libgsm-1.0.10~/src/gsm_create.c	1996-07-02 16:32:44.000000000 +0200
++++ libgsm-1.0.10/src/gsm_create.c	2007-11-01 15:48:48.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ static char const	ident[] = "$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_create.c,v 1.4 1996/07/02 09:59:05 jutta Exp $";
+ 
+-#include	"config.h"
++#include	"gsm_config.h"
+ 
+ #ifdef	HAS_STRING_H
+ #include	<string.h>
+diff -urNad libgsm-1.0.10~/src/gsm_destroy.c libgsm-1.0.10/src/gsm_destroy.c
+--- libgsm-1.0.10~/src/gsm_destroy.c	1996-07-02 16:32:39.000000000 +0200
++++ libgsm-1.0.10/src/gsm_destroy.c	2007-11-01 15:48:57.000000000 +0100
+@@ -7,7 +7,7 @@
+ /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_destroy.c,v 1.3 1994/11/28 19:52:25 jutta Exp $ */
+ 
+ #include "gsm.h"
+-#include "config.h"
++#include "gsm_config.h"
+ #include "proto.h"
+ 
+ #ifdef	HAS_STDLIB_H
+diff -urNad libgsm-1.0.10~/tls/taste.c libgsm-1.0.10/tls/taste.c
+--- libgsm-1.0.10~/tls/taste.c	1996-07-02 16:33:05.000000000 +0200
++++ libgsm-1.0.10/tls/taste.c	2007-11-01 15:49:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ #include	<string.h>
+ #include	<memory.h>
+ 
+-#include	"config.h"
++#include	"gsm_config.h"
+ 
+ #ifdef	HAS_STDLIB_H
+ #	include	<stdlib.h>
diff --git a/build/openembedded/libgsm/libgsm-1.0.13/04_includes.patch b/build/openembedded/libgsm/libgsm-1.0.13/04_includes.patch
new file mode 100644
index 000000000..2769b40b0
--- /dev/null
+++ b/build/openembedded/libgsm/libgsm-1.0.13/04_includes.patch
@@ -0,0 +1,43 @@
+diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h
+--- libgsm-1.0.10~/inc/toast.h	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/inc/toast.h	2007-11-01 15:52:33.000000000 +0100
+@@ -16,11 +16,12 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <pthread.h>
+ #include <signal.h>
+ 
+ #include <errno.h>
+-#ifndef	HAS_ERRNO_DECL
+-	 extern int	errno;
++#ifndef errno
++ extern int	errno;
+ #endif
+ 
+ #ifdef	HAS_LIMITS_H
+@@ -37,6 +38,10 @@
+ # endif
+ #endif
+ 
++#ifdef  HAS_STDIO_H
++# include <stdio.h>
++#endif
++
+ #include "gsm.h"
+ 
+ #ifndef	S_ISREG
+diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c
+--- libgsm-1.0.10~/src/code.c	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/src/code.c	2007-11-01 15:52:33.000000000 +0100
+@@ -9,8 +9,8 @@
+ #include	"config.h"
+ 
+ 
+-#ifdef	HAS_STDLIB_H
+-#include	<stdlib.h>
++#ifdef	HAS_STRING_H
++#include	<string.h>
+ #else
+ #	include "proto.h"
+ 	extern char	* memcpy P((char *, char *, int));
diff --git a/build/openembedded/libgsm/libgsm-1.0.13/05_compiler_warnings.patch b/build/openembedded/libgsm/libgsm-1.0.13/05_compiler_warnings.patch
new file mode 100644
index 000000000..c40100c92
--- /dev/null
+++ b/build/openembedded/libgsm/libgsm-1.0.13/05_compiler_warnings.patch
@@ -0,0 +1,98 @@
+diff -urNad libgsm-1.0.10~/src/debug.c libgsm-1.0.10/src/debug.c
+--- libgsm-1.0.10~/src/debug.c	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/src/debug.c	2007-11-01 15:53:42.000000000 +0100
+@@ -49,7 +49,7 @@
+ 	fprintf( stderr, "%s [%d .. %d]: ", name, from, to );
+ 	while (from <= to) {
+ 
+-		fprintf(stderr, "%d ", ptr[ from ] );
++		fprintf(stderr, "%ld ", ptr[ from ] );
+ 		from++;
+ 		if (nprinted++ >= 7) {
+ 			nprinted = 0;
+@@ -63,14 +63,14 @@
+ 	char		* name,
+ 	longword	  value	)
+ {
+-	fprintf(stderr, "%s: %d\n", name, (long)value );
++	fprintf(stderr, "%s: %ld\n", name, (long)value );
+ }
+ 
+ void gsm_debug_word P2(  (name, value),
+ 	char	* name,
+ 	word	  value	)
+ {
+-	fprintf(stderr, "%s: %d\n", name, (long)value);
++	fprintf(stderr, "%s: %ld\n", name, (long)value);
+ }
+ 
+ #endif
+diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c
+--- libgsm-1.0.10~/src/toast.c	2007-11-01 15:37:52.000000000 +0100
++++ libgsm-1.0.10/src/toast.c	2007-11-01 15:53:42.000000000 +0100
+@@ -251,8 +251,8 @@
+ {
+ 	char * s;
+ 	if (!(s = malloc(len))) {
+-		fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n",
+-			progname, len);
++		fprintf(stderr, "%s: failed to malloc %ld bytes -- abort\n",
++			progname, (long) len);
+ 		onintr();
+ 		exit(1);
+ 	}
+@@ -270,7 +270,7 @@
+ 	maxlen = strlen(name) + 1 + strlen(want) + strlen(cut);
+ 	p = strcpy(emalloc(maxlen), name);
+ 
+-	if (s = suffix(p, cut)) strcpy(s, want);
++	if ((s = suffix(p, cut))) strcpy(s, want);
+ 	else if (*want && !suffix(p, want)) strcat(p, want);
+ 
+ 	return p;
+@@ -386,7 +386,7 @@
+ 		ut[0] = instat.st_atime;
+ 		ut[1] = instat.st_mtime;
+ 
+-		(void) utime(outname, ut);
++		(void) utime(outname, (struct utimbuf *)ut);
+ 
+ #endif	/* UTIMBUF */
+ 	}
+@@ -416,7 +416,7 @@
+ 	}
+ 	if (st->st_nlink > 1 && !f_cat && !f_precious) {
+ 		fprintf(stderr, 
+-		      "%s: \"%s\" has %s other link%s -- unchanged.\n",
++		      "%s: \"%s\" has %d other link%s -- unchanged.\n",
+ 			progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2));
+ 		return 0;
+ 	}
+@@ -585,8 +585,8 @@
+ 
+ 		if (cc != sizeof(s)) {
+ 			if (cc >= 0) fprintf(stderr,
+-			"%s: incomplete frame (%d byte%s missing) from %s\n",
+-					progname, sizeof(s) - cc,
++			"%s: incomplete frame (%ld byte%s missing) from %s\n",
++					progname, (long) sizeof(s) - cc,
+ 					"s" + (sizeof(s) - cc == 1),
+ 					inname ? inname : "stdin" );
+ 			gsm_destroy(r);
+@@ -624,8 +624,6 @@
+ 
+ static int process P1((name), char * name)
+ {
+-	int step = 0;
+-
+ 	out     = (FILE *)0;
+ 	in      = (FILE *)0;
+ 
+@@ -779,7 +777,6 @@
+ 	case 'h': help();    exit(0);
+ 
+ 	default: 
+-	usage:
+ 		fprintf(stderr,
+ 	"Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n",
+ 			progname);
diff --git a/build/openembedded/libgsm/libgsm.inc b/build/openembedded/libgsm/libgsm.inc
new file mode 100644
index 000000000..a731e81b8
--- /dev/null
+++ b/build/openembedded/libgsm/libgsm.inc
@@ -0,0 +1,34 @@
+DESCRIPTION = "GSM Audio Library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "libgsm"
+
+INC_PR = "r2"
+
+SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \
+	   file://01_makefile.patch \
+           file://02_cplusplus.patch \
+           file://03_config.patch \
+           file://04_includes.patch \
+           file://05_compiler_warnings.patch \
+	  "
+
+CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc"
+
+PARALLEL_MAKE = ""
+
+do_compile() {
+	unset LD
+	oe_runmake CCFLAGS="${CFLAGS}"
+}
+
+do_install() {
+	oe_libinstall -a -C lib libgsm ${D}${libdir}
+        oe_libinstall -so -C lib libgsm ${D}${libdir}
+        install -d ${D}${includedir}/gsm
+        install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/
+	cd ${D}${includedir}
+	ln -s gsm/gsm.h gsm.h
+}
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5"
\ No newline at end of file
diff --git a/build/openembedded/libgsm/libgsm_1.0.13.bb b/build/openembedded/libgsm/libgsm_1.0.13.bb
new file mode 100644
index 000000000..e6bf9baf6
--- /dev/null
+++ b/build/openembedded/libgsm/libgsm_1.0.13.bb
@@ -0,0 +1,8 @@
+require libgsm.inc
+
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/gsm-1.0-pl13/"
+
+SRC_URI[md5sum] = "c1ba392ce61dc4aff1c29ea4e92f6df4"
+SRC_URI[sha256sum] = "52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad"
diff --git a/build/openembedded/libilbc-rfc3951_git.bb b/build/openembedded/libilbc-rfc3951_git.bb
new file mode 100644
index 000000000..250976172
--- /dev/null
+++ b/build/openembedded/libilbc-rfc3951_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "iLBC codec as published in IETF RFC 3951"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPLv3"
+PR = "r1"
+
+SRC_URI = "git://git.linphone.org/libilbc-rfc3951.git;protocol=git"
+SRCREV = "b9490e0cbdda6a4ec29f7c47d81d3997004fedba"
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=586c8a6efdeabd095cc4206ce4d0699b"
+
+inherit autotools pkgconfig
diff --git a/build/openembedded/linphone-plugins.bb b/build/openembedded/linphone-plugins.bb
new file mode 100644
index 000000000..4d31895cd
--- /dev/null
+++ b/build/openembedded/linphone-plugins.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Plugins for linphone to have additional codecs."
+LICENSE = ""
+ALLOW_EMPTY_${PN} = "1"
+PACKAGES = "${PN}"
+DEPENDS_${PN} = "linphone msamr msilbc msx264"
+RDEPENDS_${PN} = "linphonec msamr msilbc msx264"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
diff --git a/build/openembedded/linphone/linphone-common.inc b/build/openembedded/linphone/linphone-common.inc
new file mode 100644
index 000000000..64309228a
--- /dev/null
+++ b/build/openembedded/linphone/linphone-common.inc
@@ -0,0 +1,66 @@
+SECTION = "x11/network"
+SECTION_liblinphone = "libs/network"
+SECTION_libmediastreamer = "libs/network"
+SECTION_libortp = "libs/network"
+SECTION_linphonec =  "console/network"
+
+SRC_URI_append_igep0020 = " file://alsa_8khz.patch"
+
+DEPENDS_${PN} = "intltool-native speex alsa-lib spandsp belle-sip liblinphone libxv ffmpeg libv4l libgsm"
+DEPENDS_liblinphone = "libmediastreamer libortp"
+DEPENDS_libmediastreamer = "speex alsa-lib libortp"
+
+PROVIDES = "linphone linphonec liblinphone libmediastreamer libortp"
+
+inherit autotools pkgconfig gettext
+
+INSANE_SKIP_linphone += "dev-deps"
+INSANE_SKIP_liblinphone += "dev-deps"
+
+do_install_append(){
+  install -d ${D}${bindir}
+}
+
+EXTRA_OECONF = " \
+                --disable-tests \
+                --with-ffmpeg=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-video --disable-vp8 \
+                --disable-glx \
+                --enable-alsa --disable-pulseaudio \
+                --without-readline \
+                --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --disable-manual --enable-tests=yes \
+                --enable-console_ui=no \
+                --enable-gtk_ui=no \
+                --with-realprefix=/usr \
+                "
+
+EXTRA_OEMAKE = " V=1"
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc ${PN}c ${PN}-common linphone-rings liblinphone libmediastreamer-bin libmediastreamer libortp ${PN}-utils ${PN}-tests"
+
+FILES_${PN}-common = "\
+            ${bindir}/lp-gen-wrappers \
+            ${datadir}/pixmaps \
+            ${datadir}/applications \
+            ${datadir}/gnome \
+            ${datadir}/tutorials \
+            ${datadir}/linphone \
+            ${datadir}/sounds/linphone/hello8000.wav \
+            ${datadir}/sounds/linphone/hello16000.wav \
+            ${datadir}/sounds/linphone/incoming_chat.wav \
+            ${datadir}/sounds/linphone/ringback.wav \
+            ${datadir}/images/nowebcamCIF.jpg \
+            ${datadir}/appdata/linphone.appdata.xml \
+            ${datadir}/icons \ 
+            "
+FILES_${PN}-tests = "${bindir}/xml2lpc_test ${bindir}/lpc2xml_test"
+FILES_${PN} = "${bindir}/linphone"
+FILES_${PN}c = "${bindir}/linphonec ${bindir}/linphone-daemon ${bindir}/linphone-daemon-pipetest ${bindir}/linphonecsh ${bindir}/sipomatic ${bindir}/auto_answer"
+FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
+FILES_liblinphone = "${libdir}/liblinphone.so.*"
+FILES_libmediastreamer-bin = "${bindir}/mediastream ${bindir}/msaudiocmp"
+FILES_libmediastreamer = "${libdir}/libmediastreamer_base.so.* ${libdir}/libmediastreamer_voip.so.* ${libdir}/mediastreamer/ ${libdir}/mediastreamer/plugins"
+FILES_libortp = "${libdir}/libortp.so.*"
+FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+FILES_${PN}-utils = "${bindir}/test_ecc ${bindir}/test_lsd"
+FILES_${PN}-doc = "${docdir}/ortp-0.24.1 ${docdir}/mediastreamer-2.11.1 ${docdir}/linphone-3.8.1-linphone-daemon ${mandir}"
diff --git a/build/openembedded/linphone/linphone-common_git.inc b/build/openembedded/linphone/linphone-common_git.inc
new file mode 100644
index 000000000..3d92b7f46
--- /dev/null
+++ b/build/openembedded/linphone/linphone-common_git.inc
@@ -0,0 +1,37 @@
+
+SRCREV = "cfa356c8680d26eec970c7b54beea0717b91f2b0"
+L_GIT_SRC_URI = "gitosis@git.linphone.org:linphone-daemon"
+PR_append = "+gitr${SRCREV}"
+
+LINPHONE_TMP_DIR="/tmp/LINPHONE_TMP_${SRCREV}"
+SRC_URI = "file://${LINPHONE_TMP_DIR}/linphone.tar.gz"
+
+S = "${WORKDIR}/linphone"
+
+# bitbake git fetcher currently doesn't handle git submodules
+# There is also a problem with autogen and AC_SUBST
+# note: don't use a ssh key with password, it does not work.
+do_fetch_prepend () {
+	import os,bb
+	bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}")
+	os.system("rm -rf ${LINPHONE_TMP_DIR}")
+	os.system("mkdir -p ${LINPHONE_TMP_DIR}")
+
+	bb.note("Hack cloning linphone !recursively")
+	os.system("cd ${LINPHONE_TMP_DIR}; git clone --recursive ${L_GIT_SRC_URI} linphone")
+
+	bb.note("Hack launching autogen.sh manually")
+	os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh")
+
+	bb.note("Hack preparing linphone.tar.gz")
+	# we need to keep the .git since the versioning in linphone is done through `git describe`
+	os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz linphone")
+}
+
+require linphone-common.inc
+
+
+#Required to avoid compile errors on May 2011.
+EXTRA_OECONF +=" --disable-strict"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=9f9938e31db89d55a796e86808c96848"
diff --git a/build/openembedded/linphone/linphone-common_local.inc b/build/openembedded/linphone/linphone-common_local.inc
new file mode 100644
index 000000000..a77b212e3
--- /dev/null
+++ b/build/openembedded/linphone/linphone-common_local.inc
@@ -0,0 +1,15 @@
+SRC_URI = "file://${HOME}/linphone-3.6.1.tar.gz"
+
+S = "${WORKDIR}/linphone-3.6.1"
+
+require linphone-common.inc
+
+do_configure_prepend () {
+        ./autogen.sh
+        libtoolize --copy --force
+}
+
+#Required to avoid compile errors on May 2011.
+EXTRA_OECONF +=" --disable-strict --disable-glx"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
diff --git a/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb
new file mode 100644
index 000000000..0d55b7665
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb
@@ -0,0 +1,16 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r0"
+
+DEFAULT_PREFERENCE = "3"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+OVERRIDES_append = ":video"
+OVERRIDES_append = ":x11"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_git.inc
diff --git a/build/openembedded/linphone/linphone_+git-nogtk-gsm-video.bb b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video.bb
new file mode 100644
index 000000000..ae1120632
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video.bb
@@ -0,0 +1,15 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r14"
+
+DEFAULT_PREFERENCE = "3"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+OVERRIDES_append = ":video"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_git.inc
diff --git a/build/openembedded/linphone/linphone_+git-nogtk-gsm.bb b/build/openembedded/linphone/linphone_+git-nogtk-gsm.bb
new file mode 100644
index 000000000..a9496c1ef
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+git-nogtk-gsm.bb
@@ -0,0 +1,14 @@
+
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r15"
+
+DEFAULT_PREFERENCE = "3"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_git.inc
diff --git a/build/openembedded/linphone/linphone_+git-nogtk.bb b/build/openembedded/linphone/linphone_+git-nogtk.bb
new file mode 100644
index 000000000..a9228042a
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+git-nogtk.bb
@@ -0,0 +1,13 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r14"
+
+DEFAULT_PREFERENCE = "3"
+OVERRIDES_append = ":console"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_git.inc
diff --git a/build/openembedded/linphone/linphone_+local-nogtk-gsm-video-x11.bb b/build/openembedded/linphone/linphone_+local-nogtk-gsm-video-x11.bb
new file mode 100644
index 000000000..427eb94bc
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+local-nogtk-gsm-video-x11.bb
@@ -0,0 +1,16 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r9"
+
+DEFAULT_PREFERENCE = "-1"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+OVERRIDES_append = ":video"
+OVERRIDES_append = ":x11"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_local.inc
diff --git a/build/openembedded/linphone/linphone_+local-nogtk-gsm-video.bb b/build/openembedded/linphone/linphone_+local-nogtk-gsm-video.bb
new file mode 100644
index 000000000..9a599dc4f
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+local-nogtk-gsm-video.bb
@@ -0,0 +1,15 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r9"
+
+DEFAULT_PREFERENCE = "-1"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+OVERRIDES_append = ":video"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_local.inc
diff --git a/build/openembedded/linphone/linphone_+local-nogtk-gsm.bb b/build/openembedded/linphone/linphone_+local-nogtk-gsm.bb
new file mode 100644
index 000000000..d48a1a17e
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+local-nogtk-gsm.bb
@@ -0,0 +1,14 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r9"
+
+DEFAULT_PREFERENCE = "-1"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_local.inc
diff --git a/build/openembedded/linphone/linphone_+local-nogtk.bb b/build/openembedded/linphone/linphone_+local-nogtk.bb
new file mode 100644
index 000000000..9a54c256a
--- /dev/null
+++ b/build/openembedded/linphone/linphone_+local-nogtk.bb
@@ -0,0 +1,13 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r9"
+
+DEFAULT_PREFERENCE = "-1"
+OVERRIDES_append = ":console"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_local.inc
diff --git a/build/openembedded/linphone/linphone_git.bb b/build/openembedded/linphone/linphone_git.bb
new file mode 100644
index 000000000..f1c65a799
--- /dev/null
+++ b/build/openembedded/linphone/linphone_git.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+
+SRCREV = "855f3aa1b83fd979bb8ff4c6373522bc72fe77ec"
+L_GIT_SRC_URI = "gitosis@git.linphone.org:linphone-daemon"
+
+LINPHONE_TMP_DIR="/tmp/LINPHONE_TMP_${SRCREV}"
+SRC_URI = "file://${LINPHONE_TMP_DIR}/linphone.tar.gz"
+
+S = "${WORKDIR}/linphone"
+
+# bitbake git fetcher currently doesn't handle git submodules
+# There is also a problem with autogen and AC_SUBST
+# note: don't use a ssh key with password, it does not work.
+do_fetch_prepend () {
+    import os,bb
+    bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}")
+    os.system("rm -rf ${LINPHONE_TMP_DIR}")
+    os.system("mkdir -p ${LINPHONE_TMP_DIR}")
+
+    bb.note("Hack cloning linphone !recursively")
+    os.system("cd ${LINPHONE_TMP_DIR}; git clone ${L_GIT_SRC_URI} linphone; cd linphone; git checkout ${SRCREV}; git submodule update --recursive --init")
+
+    bb.note("Hack launching autogen.sh manually")
+    os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh")
+
+    bb.note("Hack preparing linphone.tar.gz")
+    # we need to keep the .git since the versioning in linphone is done through `git describe`
+    os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz linphone")
+}
+
+require linphone-common.inc
+
+
+#Required to avoid compile errors on May 2011.
+EXTRA_OECONF +=" --disable-strict"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=9f9938e31db89d55a796e86808c96848"
diff --git a/build/openembedded/msamr/msamr-common.inc b/build/openembedded/msamr/msamr-common.inc
new file mode 100644
index 000000000..4f35dafc3
--- /dev/null
+++ b/build/openembedded/msamr/msamr-common.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "Mediastreamer2 plugin adding support for AMR codec"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv3"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = "linphone opencore-amr"
+DEPENDS_append_wideband = " vo-amrwbenc"
+
+MSAMR_WIDEBAND = ""
+MSAMR_WIDEBAND_wideband = "--enable-wideband"
+
+EXTRA_OECONF =        "\
+                ${MSAMR_WIDEBAND} \
+                "
+
+FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
+FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
+inherit autotools pkgconfig
diff --git a/build/openembedded/msamr/msamr_git+wb.bb b/build/openembedded/msamr/msamr_git+wb.bb
new file mode 100644
index 000000000..63f1caa8b
--- /dev/null
+++ b/build/openembedded/msamr/msamr_git+wb.bb
@@ -0,0 +1,8 @@
+PR = "r2"
+SRC_URI = "git://git.linphone.org/msamr.git;protocol=git" 
+SRCREV = "6ed342ed00526c21e85f8a06538fe3da2c7a24f4"
+S = "${WORKDIR}/git"
+
+OVERRIDES_append = ":wideband"
+
+require msamr-common.inc
diff --git a/build/openembedded/msamr/msamr_git.bb b/build/openembedded/msamr/msamr_git.bb
new file mode 100644
index 000000000..07b394dc2
--- /dev/null
+++ b/build/openembedded/msamr/msamr_git.bb
@@ -0,0 +1,6 @@
+PR = "r2"
+SRC_URI = "git://git.linphone.org/msamr.git;protocol=git" 
+SRCREV = "6ed342ed00526c21e85f8a06538fe3da2c7a24f4"
+S = "${WORKDIR}/git"
+
+require msamr-common.inc
diff --git a/build/openembedded/msamr/msamr_local+wb.bb b/build/openembedded/msamr/msamr_local+wb.bb
new file mode 100644
index 000000000..cb89a1bde
--- /dev/null
+++ b/build/openembedded/msamr/msamr_local+wb.bb
@@ -0,0 +1,13 @@
+PR = "r1"
+SRC_URI = "file://${HOME}/msamr-0.0.2.tar.gz"
+S = "${WORKDIR}/msamr-0.0.2"
+
+do_configure_prepend () {
+        ./autogen.sh
+}
+
+OVERRIDES_append = ":wideband"
+
+DEFAULT_PREFERENCE="-1"
+
+require msamr-common.inc
diff --git a/build/openembedded/msamr/msamr_local.bb b/build/openembedded/msamr/msamr_local.bb
new file mode 100644
index 000000000..f6349af74
--- /dev/null
+++ b/build/openembedded/msamr/msamr_local.bb
@@ -0,0 +1,11 @@
+PR = "r1"
+SRC_URI = "file://${HOME}/msamr-0.0.2.tar.gz"
+S = "${WORKDIR}/msamr-0.0.2"
+
+do_configure_prepend () {
+        ./autogen.sh
+}
+
+DEFAULT_PREFERENCE="-1"
+
+require msamr-common.inc
diff --git a/build/openembedded/msilbc/msilbc-common.inc b/build/openembedded/msilbc/msilbc-common.inc
new file mode 100644
index 000000000..6651f9a70
--- /dev/null
+++ b/build/openembedded/msilbc/msilbc-common.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Mediastreamer2 plugin adding support for ILBC codec"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "linphone libilbc-rfc3951"
+
+FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
+FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+inherit autotools pkgconfig
diff --git a/build/openembedded/msilbc/msilbc_git.bb b/build/openembedded/msilbc/msilbc_git.bb
new file mode 100644
index 000000000..3ed186094
--- /dev/null
+++ b/build/openembedded/msilbc/msilbc_git.bb
@@ -0,0 +1,6 @@
+PR = "r1"
+SRC_URI = "git://git.linphone.org/msilbc.git;protocol=git"
+SRCREV = "2bf845d7f537eb671dd32ca5b0cc932e8bb48952"
+S = "${WORKDIR}/git"
+
+require msilbc-common.inc
diff --git a/build/openembedded/msilbc/msilbc_local.bb b/build/openembedded/msilbc/msilbc_local.bb
new file mode 100644
index 000000000..72b08b239
--- /dev/null
+++ b/build/openembedded/msilbc/msilbc_local.bb
@@ -0,0 +1,11 @@
+PR = "r0"
+SRC_URI = "file://${HOME}/msilbc-2.0.3.tar.gz"
+S = "${WORKDIR}/msilbc-2.0.3"
+
+do_configure_prepend () {
+        ./autogen.sh
+}
+
+DEFAULT_PREFERENCE="-1"
+
+require msilbc-common.inc
diff --git a/build/openembedded/msimx6vpu-h264/msimx6vpu-h264.inc b/build/openembedded/msimx6vpu-h264/msimx6vpu-h264.inc
new file mode 100644
index 000000000..74c31cdb1
--- /dev/null
+++ b/build/openembedded/msimx6vpu-h264/msimx6vpu-h264.inc
@@ -0,0 +1,12 @@
+SECTION = "libs"
+
+DEPENDS_${PN} = "libmediastreamer imx-lib imx-vpu"
+DEPENDS = "libmediastreamer imx-lib imx-vpu"
+
+PROVIDES = "msimx6vpu-h264 msimx6vpu-h264-dbg"
+
+inherit autotools gettext
+
+FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
+FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
+FILES_${PN}-dbg = "${libdir}/mediastreamer/plugins/.debug/*.so.* /usr/src/debug"
diff --git a/build/openembedded/msimx6vpu-h264/msimx6vpu-h264_git.bb b/build/openembedded/msimx6vpu-h264/msimx6vpu-h264_git.bb
new file mode 100644
index 000000000..13137448a
--- /dev/null
+++ b/build/openembedded/msimx6vpu-h264/msimx6vpu-h264_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A H264 encoder/decoder plugin for mediastreamer using Freescale's IMX6's VPU"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv3+"
+
+GIT_SRC_URI = "gitosis@git.linphone.org:msimx6vpu-h264.git"
+SRCREV = "master"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803"
+
+TMP_DIR="/tmp/TMP_MSIMX6VPUH264_${SRCREV}"
+SRC_URI = "file://${TMP_DIR}/msimx6vpu-h264.tar.gz"
+
+S = "${WORKDIR}/msimx6vpu-h264"
+
+# note: don't use a ssh key with password, it does not work.
+do_fetch_prepend () {
+    import os,bb
+    os.system("rm -rf ${TMP_DIR}")
+    os.system("mkdir -p ${TMP_DIR}")
+    os.system("cd ${TMP_DIR}; git clone ${GIT_SRC_URI} msimx6vpu-h264")
+    os.system("cd ${TMP_DIR}; tar czf msimx6vpu-h264.tar.gz msimx6vpu-h264")
+}
+
+require msimx6vpu-h264.inc
diff --git a/build/openembedded/msv4l2-display/msv4l2-display-common.inc b/build/openembedded/msv4l2-display/msv4l2-display-common.inc
new file mode 100644
index 000000000..c58e41998
--- /dev/null
+++ b/build/openembedded/msv4l2-display/msv4l2-display-common.inc
@@ -0,0 +1,14 @@
+SECTION = "libs"
+
+DEPENDS_${PN} = "libmediastreamer"
+DEPENDS = "libmediastreamer"
+
+PROVIDES = "msv4l2-display"
+
+EXTRA_OECONF += ' CFLAGS="-DOUTPUT_VIDEO_DEVICE=17"'
+
+inherit autotools gettext
+
+FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
+FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
+FILES_${PN}-dbg = "${libdir}/mediastreamer/plugins/.debug/*.so.* /usr/src/debug"
diff --git a/build/openembedded/msv4l2-display/msv4l2-display_git.bb b/build/openembedded/msv4l2-display/msv4l2-display_git.bb
new file mode 100644
index 000000000..14c7b7c7e
--- /dev/null
+++ b/build/openembedded/msv4l2-display/msv4l2-display_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "V4L2 display filter plugin for mediastreamer/linphone"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv3+"
+
+GIT_SRC_URI = "gitosis@git.linphone.org:msv4l2-display.git"
+SRCREV = "master"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803"
+
+TMP_DIR="/tmp/TMP_MSV4L2Display_${SRCREV}"
+SRC_URI = "file://${TMP_DIR}/msv4l2-display.tar.gz"
+
+S = "${WORKDIR}/msv4l2-display"
+
+# note: don't use a ssh key with password, it does not work.
+do_fetch_prepend () {
+    import os,bb
+    os.system("rm -rf ${TMP_DIR}")
+    os.system("mkdir -p ${TMP_DIR}")
+    os.system("cd ${TMP_DIR}; git clone ${GIT_SRC_URI} msv4l2-display")
+    os.system("cd ${TMP_DIR}; tar czf msv4l2-display.tar.gz msv4l2-display")
+}
+
+require msv4l2-display-common.inc
diff --git a/build/openembedded/mswebrtc/mswebrtc-common.inc b/build/openembedded/mswebrtc/mswebrtc-common.inc
new file mode 100644
index 000000000..bdccee2f4
--- /dev/null
+++ b/build/openembedded/mswebrtc/mswebrtc-common.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Mediastreamer2 plugin adding support for WebRTC features (iSAC codec, AEC...)"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "linphone"
+
+EXTRA_OECONF = "--disable-isac"
+
+FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
+FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
+FILES_${PN}-dbg = "${libdir}/mediastreamer/plugins/.debug/*.so.* /usr/src/debug"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+inherit autotools pkgconfig
diff --git a/build/openembedded/mswebrtc/mswebrtc_git.bb b/build/openembedded/mswebrtc/mswebrtc_git.bb
new file mode 100644
index 000000000..526f70554
--- /dev/null
+++ b/build/openembedded/mswebrtc/mswebrtc_git.bb
@@ -0,0 +1,6 @@
+PR = "r3"
+SRC_URI = "git://git.linphone.org/mswebrtc.git;protocol=git"
+SRCREV = "a9b5929928dd58299ceaed0aeb507c82bae80b55"
+S = "${WORKDIR}/git"
+
+require mswebrtc-common.inc
diff --git a/build/openembedded/mswebrtc/mswebrtc_local.bb b/build/openembedded/mswebrtc/mswebrtc_local.bb
new file mode 100644
index 000000000..8921a3c8e
--- /dev/null
+++ b/build/openembedded/mswebrtc/mswebrtc_local.bb
@@ -0,0 +1,11 @@
+PR = "r0"
+SRC_URI = "file://${HOME}/mswebrtc-1.0.tar.gz"
+S = "${WORKDIR}/mswebrtc-1.0"
+
+do_configure_prepend () {
+        ./autogen.sh
+}
+
+DEFAULT_PREFERENCE="-1"
+
+require mswebrtc-common.inc
diff --git a/build/openembedded/msx264/msx264-common.inc b/build/openembedded/msx264/msx264-common.inc
new file mode 100644
index 000000000..b340dc99f
--- /dev/null
+++ b/build/openembedded/msx264/msx264-common.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Mediastreamer2 plugin adding support for H264 codec"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv3"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+DEPENDS = "linphone x264"
+
+FILES_${PN} = "${libdir}/mediastreamer/plugins/*.so.*"
+FILES_${PN}-dev = "${libdir}/mediastreamer/plugins/*.la ${libdir}/mediastreamer/plugins/*.so"
+inherit autotools pkgconfig
diff --git a/build/openembedded/msx264/msx264_git.bb b/build/openembedded/msx264/msx264_git.bb
new file mode 100644
index 000000000..40a26e5fe
--- /dev/null
+++ b/build/openembedded/msx264/msx264_git.bb
@@ -0,0 +1,6 @@
+PR = "r1"
+SRC_URI = "git://git.linphone.org/msx264.git;protocol=git"
+SRCREV = "f1fd3d6be817dd5c1b8a46f68de04421f75cf056"
+S = "${WORKDIR}/git"
+
+require msx264-common.inc
diff --git a/build/openembedded/msx264/msx264_local.bb b/build/openembedded/msx264/msx264_local.bb
new file mode 100644
index 000000000..ef7ab1a82
--- /dev/null
+++ b/build/openembedded/msx264/msx264_local.bb
@@ -0,0 +1,11 @@
+PR = "r1"
+SRC_URI = "file://${HOME}/msx264-1.4.2.tar.gz"
+S = "${WORKDIR}/msx264-1.4.2"
+
+do_configure_prepend () {
+        ./autogen.sh
+}
+
+DEFAULT_PREFERENCE="-1"
+
+require msx264-common.inc
diff --git a/build/openembedded/opencore-amr_0.1.3.bb b/build/openembedded/opencore-amr_0.1.3.bb
new file mode 100644
index 000000000..7c338543d
--- /dev/null
+++ b/build/openembedded/opencore-amr_0.1.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "OpenCORE Adaptive Multi Rate (AMR) speech codec library implementation"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Apache"
+
+PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/opencore-amr/${PN}-${PV}.tar.gz" 
+
+inherit autotools pkgconfig
+SRC_URI[md5sum] = "09d2c5dfb43a9f6e9fec8b1ae678e725"
+SRC_URI[sha256sum] = "106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dd2c2486aca02190153cf399e508c7e7"
\ No newline at end of file
diff --git a/build/openembedded/polarssl/polarssl-linphone/darwin.patch b/build/openembedded/polarssl/polarssl-linphone/darwin.patch
new file mode 100644
index 000000000..9faf5c1b7
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl-linphone/darwin.patch
@@ -0,0 +1,14 @@
+diff -urN a/library/Makefile b/library/Makefile
+--- a/library/Makefile	2013-07-29 17:26:14.000000000 +0200
++++ b/library/Makefile	2013-07-29 17:26:58.000000000 +0200
+@@ -26,7 +26,9 @@
+ 
+ DLEXT=so
+ # OSX shared library extension:
+-# DLEXT=dylib
++ifdef DARWIN 
++DLEXT=dylib
++endif
+ 
+ # Windows shared library extension:
+ ifdef WINDOWS
diff --git a/build/openembedded/polarssl/polarssl-linphone/soname.patch b/build/openembedded/polarssl/polarssl-linphone/soname.patch
new file mode 100644
index 000000000..29a1ca955
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl-linphone/soname.patch
@@ -0,0 +1,51 @@
+diff -urN polarssl.orig/library/Makefile polarssl.new/library/Makefile
+--- polarssl.orig/library/Makefile	2013-08-22 10:24:46.353700982 +0200
++++ polarssl.new/library/Makefile	2013-08-22 10:21:43.933733318 +0200
+@@ -28,12 +28,14 @@
+ # OSX shared library extension:
+ ifdef DARWIN 
+ DLEXT=dylib
++SONAME=libpolarssl.0.dylib
+ endif
+ 
+ # Windows shared library extension:
+ ifdef WINDOWS
+ DLEXT=dll
+ LDFLAGS += -lws2_32
++SONAME=libpolarssl-0.dll
+ endif
+ 
+ OBJS=	aes.o		arc4.o		asn1parse.o		\
+@@ -73,15 +75,17 @@
+ 
+ libpolarssl.so: libpolarssl.a
+ 	echo "  LD    $@"
+-	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
++	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $(SONAME) $(OBJS)
++	ln -s $(SONAME) $@
+ 
+ libpolarssl.dylib: libpolarssl.a
+ 	echo "  LD    $@"
+-	$(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS)
++	$(CC) ${LDFLAGS} -dynamiclib -Wl,-install_name,$(SONAME) -o $(SONAME) $(OBJS)
++	ln -s $(SONAME) $@
+ 
+ libpolarssl.dll: libpolarssl.a 
+ 	echo "  LD    $@" 
+-	$(CC) -shared -Wl,-soname,$@,--out-implib,$@.a -o $@ $(OBJS) -lws2_32 -lwinmm -lgdi32 
++	$(CC) -shared -Wl,-soname,$(SONAME),--out-implib,$@.a -o $(SONAME) $(OBJS) -lws2_32 -lwinmm -lgdi32 
+ 
+ .c.o:
+ 	echo "  CC    $<"
+diff -urN polarssl.orig/Makefile polarssl.new/Makefile
+--- polarssl.orig/Makefile	2013-08-22 10:24:34.585703377 +0200
++++ polarssl.new/Makefile	2013-08-22 10:19:26.801749343 +0200
+@@ -21,7 +21,7 @@
+ 	cp -r include/polarssl $(DESTDIR)/include
+ 	
+ 	mkdir -p $(DESTDIR)/lib
+-	cp library/libpolarssl.* $(DESTDIR)/lib
++	cp -d library/libpolarssl* $(DESTDIR)/lib
+ 	
+ 	mkdir -p $(DESTDIR)/bin
+ 	cp library/libpolarssl*.dll $(DESTDIR)/bin
diff --git a/build/openembedded/polarssl/polarssl.inc b/build/openembedded/polarssl/polarssl.inc
new file mode 100644
index 000000000..c9957212e
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "SSL/TLS library"
+LICENSE = "GPL"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE += " SHARED=1"
+
+PROVIDES = "polarssl polarssl-dev"
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGES += "${PN}-utils"
+
+MAKE_DESTDIR = "DESTDIR=${D}/${prefix}"
+
+FILES_${PN} += "${sharedlibdir}/*${SOLIBSDEV}"
+FILES_${PN}-dev += "!${sharedlibdir}/*${SOLIBSDEV}"
+FILES_${PN}-utils += "${bindir}/polarssl_*"
diff --git a/build/openembedded/polarssl/polarssl_linphone.bb b/build/openembedded/polarssl/polarssl_linphone.bb
new file mode 100644
index 000000000..41ed5060e
--- /dev/null
+++ b/build/openembedded/polarssl/polarssl_linphone.bb
@@ -0,0 +1,14 @@
+require polarssl.inc
+
+SRCREV="cecb44e4f13f42f793dde34b42793e1ebcce91a5"
+
+S = "${WORKDIR}/git"
+
+do_fetch_prepend () {
+    import bb
+    bb.note("Will checkout in %s" % "${S}" )
+}
+
+SRC_URI = "git://git.linphone.org/polarssl.git"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+
diff --git a/build/openembedded/spandsp_0.0.6-pre18.bb b/build/openembedded/spandsp_0.0.6-pre18.bb
new file mode 100644
index 000000000..c87ff3c9e
--- /dev/null
+++ b/build/openembedded/spandsp_0.0.6-pre18.bb
@@ -0,0 +1,24 @@
+PR = "r0"
+
+SRC_URI = "http://www.soft-switch.org/downloads/spandsp/${PN}-0.0.6pre18.tgz"
+
+S = "${WORKDIR}/spandsp-0.0.6"
+
+# *cough*
+do_configure_append() {
+      rm config.log
+}
+
+DESCRIPTION = "A library of many DSP functions for telephony."
+HOMEPAGE = "http://www.soft-switch.org"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS_${PN} = "tiff libxml2"
+
+inherit autotools
+
+#PARALLEL_MAKE = ""
+
+SRC_URI[md5sum] = "98330bc00a581ed8d71ebe34afabbcf9"
+SRC_URI[sha256sum] = "835cd886105e4e39791f0e8cfe004c39b069f2e6dcb0795a68a6c79b5d14af2c"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8791c23ddf418deb5be264cffb5fa6bc"
diff --git a/build/openembedded/vo-amrwbenc_0.1.2.bb b/build/openembedded/vo-amrwbenc_0.1.2.bb
new file mode 100644
index 000000000..a34b7de3b
--- /dev/null
+++ b/build/openembedded/vo-amrwbenc_0.1.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "VisualOn AMR-WB encoder library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Apache"
+DEPENDS = "opencore-amr"
+
+PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/opencore-amr/${PN}-${PV}.tar.gz" 
+
+inherit autotools pkgconfig
+SRC_URI[md5sum] = "588205f686adc23532e31fe3646ddcb6"
+SRC_URI[sha256sum] = "dd8c33e57bc415754f31fbb1b1536563bf731fc14e55f8182564e4c0fbb26435"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dd2c2486aca02190153cf399e508c7e7"
\ No newline at end of file
diff --git a/build/openembedded/x264_git.bb b/build/openembedded/x264_git.bb
new file mode 100644
index 000000000..481da9986
--- /dev/null
+++ b/build/openembedded/x264_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC format."
+SECTION = "libs/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://www.videolan.org/developers/x264.html"
+PR = "r1"
+
+SRC_URI = "git://git.videolan.org/x264.git;protocol=git"
+SRCREV = "e89c4cfc9f37d0b7684507974b333545b5bcc37a"
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF += "--disable-lavf --enable-pic"
+EXTRA_OEMAKE = ""
+AS = "${TARGET_PREFIX}gcc"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit autotools pkgconfig
diff --git a/build/wince/liblinphone.sln b/build/wince/liblinphone.sln
deleted file mode 100644
index fe4efff27..000000000
--- a/build/wince/liblinphone.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinphone", "liblinphone.vcproj", "{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linphonec", "linphonec\linphonec.vcproj", "{92574924-BF59-4DAA-994B-9978B80E5797}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|Windows Mobile 6 Professional SDK (ARMV4I) = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		Debug|Windows Mobile 6 Standard SDK (ARMV4I) = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		Release|Win32 = Release|Win32
-		Release|Windows Mobile 6 Professional SDK (ARMV4I) = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		Release|Windows Mobile 6 Standard SDK (ARMV4I) = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Win32.Build.0 = Debug|Win32
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Win32.ActiveCfg = Release|Win32
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Win32.Build.0 = Release|Win32
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-		{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Win32.ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Release|Win32.ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/wince/liblinphone.vcproj b/build/wince/liblinphone.vcproj
deleted file mode 100644
index 9909c8a1f..000000000
--- a/build/wince/liblinphone.vcproj
+++ /dev/null
@@ -1,585 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="liblinphone"
-	ProjectGUID="{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}"
-	RootNamespace="liblinphone"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="Windows Mobile 6 Standard SDK (ARMV4I)"
-		/>
-		<Platform
-			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\oRTP\include:..\..\mediastreamer2\include:..\..\..\..\linphone-builder\osip\include:..\..\..\..\linphone-builder\eXosip\include:..\..\..\..\linphone-builder\speex\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBLINPHONE_EXPORTS; OSIP_MT: ENABLE_TRACE:LOG_DOMAIN=\&quot;LinphoneCore\&quot;:ORTP_STATIC:"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalOptions="&#x0D;&#x0A;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\oRTP\include;..\..\mediastreamer2\include;&quot;..\..\..\..\linphone-builder\speex\include&quot;;&quot;..\..\..\..\linphone-builder\eXosip\include&quot;;&quot;..\..\..\..\linphone-builder\osip\include&quot;"
-				PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);LIBLINPHONE_EXPORTS;OSIP_MT;ENABLE_TRACE;LOG_DOMAIN=\&quot;LinphoneCore\&quot;;IN_LINPHONE;LINPHONE_PLUGINS_DIR=\&quot;\&quot;;LINPHONE_VERSION=\&quot;3.1.2\&quot;"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2.lib osip2.lib osipparser2.lib eXosip2.lib mediastreamer2.lib ortp.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;..\..\..\..\linphone-builder\osip\platform\wince\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\..\oRTP\build\wince\$(PlatformName)\$(ConfigurationName)&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalOptions="&#x0D;&#x0A;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\oRTP\include;..\..\mediastreamer2\include;&quot;..\..\..\..\linphone-builder\speex\include&quot;;&quot;..\..\..\..\linphone-builder\eXosip\include&quot;;&quot;..\..\..\..\linphone-builder\osip\include&quot;"
-				PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);LIBLINPHONE_EXPORTS;OSIP_MT;ENABLE_TRACE;LOG_DOMAIN=\&quot;LinphoneCore\&quot;;IN_LINPHONE;LINPHONE_PLUGINS_DIR=\&quot;\&quot;;LINPHONE_VERSION=\&quot;3.1.2\&quot;;_UNICODE;UNICODE;PACKAGE_SOUND_DIR=\&quot;\\Program Files\\Linphone\&quot;"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\oRTP\include:..\..\mediastreamer2\include:..\..\..\..\linphone-builder\osip\include::..\..\..\..\linphone-builder\eXosip::..\..\..\..\linphone-builder\speex\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBLINPHONE_EXPORTS; OSIP_MT: ENABLE_TRACE:LOG_DOMAIN=\&quot;LinphoneCore\&quot;:ORTP_STATIC:"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="..\..\oRTP\include:..\..\mediastreamer2\include:..\..\..\..\linphone-builder\osip\include::..\..\..\..\linphone-builder\eXosip::..\..\..\..\linphone-builder\speex\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBLINPHONE_EXPORTS; OSIP_MT: ENABLE_TRACE:LOG_DOMAIN=\&quot;LinphoneCore\&quot;:ORTP_STATIC:"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
-			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
-			ConfigurationType="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				AdditionalIncludeDirectories="..\..\oRTP\include:..\..\mediastreamer2\include:..\..\..\..\linphone-builder\osip\include::..\..\..\..\linphone-builder\eXosip::..\..\..\..\linphone-builder\speex\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBLINPHONE_EXPORTS; OSIP_MT: ENABLE_TRACE:LOG_DOMAIN=\&quot;LinphoneCore\&quot;:ORTP_STATIC:"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\coreapi\enum.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\exevents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\linphonecore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\lpconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\private.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\sdphandler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\sipsetup.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\coreapi\authentication.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\chat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\enum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\exevents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\friend.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\general_state.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\linphonecore.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\lpconfig.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\misc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\presence.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\proxy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\sdphandler.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\siplogin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\coreapi\sipsetup.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/wince/linphonec/linphonec.vcproj b/build/wince/linphonec/linphonec.vcproj
deleted file mode 100644
index 058ce425c..000000000
--- a/build/wince/linphonec/linphonec.vcproj
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="linphonec"
-	ProjectGUID="{92574924-BF59-4DAA-994B-9978B80E5797}"
-	RootNamespace="linphonec"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\..\linphone-builder\osip\include&quot;;..\..\..\mediastreamer2\include;..\..\..\oRTP\include;..\..\..\coreapi"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);IN_LINPHONE;PACKAGE_DIR=\&quot;\\Program Files\\Linphone\&quot;"
-				MinimalRebuild="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" /subsystem:windowsce,5.02"
-				AdditionalDependencies="mediastreamer2.lib ortp.lib liblinphone.lib ws2.lib mmtimer.lib iphlpapi.lib eXosip2.lib osip2.lib osipparser2.lib"
-				OutputFile="$(OutDir)/linphonec.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;..\..\..\oRTP\build\wince\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\..\..\mediastreamer2\build\wince\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\linphone-builder\eXosip\platform\wince\$(PlatformName)\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\linphone-builder\osip\platform\wince\$(PlatformName)\$(ConfigurationName)&quot;"
-				DelayLoadDLLs="$(NOINHERIT)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/linphonec.pdb"
-				SubSystem="0"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				EntryPointSymbol="mainWCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory="%CSIDL_PROGRAM_FILES%\linphone"
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				FavorSizeOrSpeed="2"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_CONSOLE;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" /subsystem:windowsce,5.02"
-				OutputFile="$(OutDir)/linphonec.exe"
-				LinkIncremental="1"
-				DelayLoadDLLs="$(NOINHERIT)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/linphonec.pdb"
-				SubSystem="0"
-				StackReserveSize="65536"
-				StackCommitSize="4096"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="mainWCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\console\commands.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\console\linphonec.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\console\linphonec.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/windows10/liblinphone-tester/App.xaml b/build/windows10/liblinphone-tester/App.xaml
deleted file mode 100644
index 8ed2e3f95..000000000
--- a/build/windows10/liblinphone-tester/App.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Application
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:liblinphone_tester"
-    xmlns:model="using:liblinphone_tester.DataModel" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
-    x:Class="liblinphone_tester.App"
-    RequestedTheme="Light">
-
-    <Application.Resources>
-        <ResourceDictionary>
-            <model:UnitTestCaseStateToSymbolConverter x:Key="UnitTestCaseStateToSymbol"/>
-            <model:UnitTestCaseStateToSymbolColorConverter x:Key="UnitTestCaseStateToSymbolColor"/>
-            <model:OutputTraceLevelToColorConverter x:Key="OutputTraceLevelToColor"/>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/build/windows10/liblinphone-tester/App.xaml.cs b/build/windows10/liblinphone-tester/App.xaml.cs
deleted file mode 100644
index e80598ed7..000000000
--- a/build/windows10/liblinphone-tester/App.xaml.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409
-
-namespace liblinphone_tester
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    sealed partial class App : Application
-    {
-        /// <summary>
-        /// Allows tracking page views, exceptions and other telemetry through the Microsoft Application Insights service.
-        /// </summary>
-        public static Microsoft.ApplicationInsights.TelemetryClient TelemetryClient;
-
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            TelemetryClient = new Microsoft.ApplicationInsights.TelemetryClient();
-
-            this.InitializeComponent();
-            this.Suspending += OnSuspending;
-        }
-
-        /// <summary>
-        /// Invoked when the application is launched normally by the end user.  Other entry points
-        /// will be used such as when the application is launched to open a specific file.
-        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
-        {
-
-#if DEBUG
-            if (System.Diagnostics.Debugger.IsAttached)
-            {
-                this.DebugSettings.EnableFrameRateCounter = true;
-            }
-#endif
-
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    //TODO: Load state from previously suspended application
-                }
-
-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            if (rootFrame.Content == null)
-            {
-                // When the navigation stack isn't restored navigate to the first page,
-                // configuring the new page by passing required information as a navigation
-                // parameter
-                rootFrame.Navigate(typeof(MainPage), e.Arguments);
-            }
-            // Ensure the current window is active
-            Window.Current.Activate();
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
-    }
-}
diff --git a/build/windows10/liblinphone-tester/ApplicationInsights.config b/build/windows10/liblinphone-tester/ApplicationInsights.config
deleted file mode 100644
index 8a6452a34..000000000
--- a/build/windows10/liblinphone-tester/ApplicationInsights.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings">
-  <!-- 
-    Learn more about Application Insights configuration with ApplicationInsights.config here: 
-    http://go.microsoft.com/fwlink/?LinkID=513840
-    
-    Note: If not present, please add <InstrumentationKey>Your Key</InstrumentationKey> to the top of this file.
-  -->
-  <TelemetryModules>
-    <Add Type="Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing.DiagnosticsTelemetryModule, Microsoft.ApplicationInsights"/>
-    <Add Type="Microsoft.ApplicationInsights.Extensibility.Windows.SessionTelemetryModule, Microsoft.ApplicationInsights.Extensibility.Windows"/>
-    <Add Type="Microsoft.ApplicationInsights.Extensibility.Windows.PageViewTelemetryModule, Microsoft.ApplicationInsights.Extensibility.Windows"/>
-    <Add Type="Microsoft.ApplicationInsights.Extensibility.Windows.UnhandledExceptionTelemetryModule, Microsoft.ApplicationInsights.Extensibility.Windows"/>
-  </TelemetryModules>
-  <TelemetryChannel Type="Microsoft.ApplicationInsights.Channel.PersistenceChannel, Microsoft.ApplicationInsights.PersistenceChannel"/>
-  <ContextInitializers>
-    <Add Type="Microsoft.ApplicationInsights.Extensibility.ComponentContextInitializer, Microsoft.ApplicationInsights"/>
-    <Add Type="Microsoft.ApplicationInsights.Extensibility.DeviceContextInitializer, Microsoft.ApplicationInsights"/>
-  </ContextInitializers>
-  <TelemetryInitializers>
-    <Add Type="Microsoft.ApplicationInsights.Extensibility.Windows.UserContextInitializer, Microsoft.ApplicationInsights.Extensibility.Windows"/>
-  </TelemetryInitializers>
-</ApplicationInsights>
\ No newline at end of file
diff --git a/build/windows10/liblinphone-tester/Assets/Logo.png b/build/windows10/liblinphone-tester/Assets/Logo.png
deleted file mode 100644
index ecfbad551..000000000
Binary files a/build/windows10/liblinphone-tester/Assets/Logo.png and /dev/null differ
diff --git a/build/windows10/liblinphone-tester/Assets/SmallLogo.png b/build/windows10/liblinphone-tester/Assets/SmallLogo.png
deleted file mode 100644
index ecfbad551..000000000
Binary files a/build/windows10/liblinphone-tester/Assets/SmallLogo.png and /dev/null differ
diff --git a/build/windows10/liblinphone-tester/Assets/SplashScreen.png b/build/windows10/liblinphone-tester/Assets/SplashScreen.png
deleted file mode 100644
index 0d83a7980..000000000
Binary files a/build/windows10/liblinphone-tester/Assets/SplashScreen.png and /dev/null differ
diff --git a/build/windows10/liblinphone-tester/Assets/WideLogo.scale-100.png b/build/windows10/liblinphone-tester/Assets/WideLogo.scale-100.png
deleted file mode 100644
index 85fd4db8f..000000000
Binary files a/build/windows10/liblinphone-tester/Assets/WideLogo.scale-100.png and /dev/null differ
diff --git a/build/windows10/liblinphone-tester/DataModel/UnitTestDataSource.cs b/build/windows10/liblinphone-tester/DataModel/UnitTestDataSource.cs
deleted file mode 100644
index a5bc5bdc3..000000000
--- a/build/windows10/liblinphone-tester/DataModel/UnitTestDataSource.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using liblinphone_tester_runtime_component;
-using System.Collections.ObjectModel;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Media;
-using System.ComponentModel;
-using Windows.UI;
-using Windows.UI.Xaml.Documents;
-using Windows.UI.Core;
-
-namespace liblinphone_tester.DataModel
-{
-    public class OutputTrace
-    {
-        public OutputTrace(String lev, String msg)
-        {
-            Level = lev;
-            Msg = msg;
-        }
-
-        public String Level { get; private set; }
-        public String Msg { get; private set; }
-    }
-
-    public class UnitTestSuite
-    {
-        public UnitTestSuite(string name)
-        {
-            Name = name;
-            Cases = new ObservableCollection<UnitTestCase>();
-            Selected = false;
-        }
-
-        public string Name { get; private set; }
-        public bool Selected
-        {
-            get { return Cases.All(x => x.Selected); }
-            set
-            {
-                foreach (UnitTestCase c in Cases)
-                {
-                    c.Selected = value;
-                }
-            }
-        }
-        public ObservableCollection<UnitTestCase> Cases { get; private set; }
-    }
-
-    public enum UnitTestCaseState
-    {
-        NotRun,
-        Success,
-        Failure
-    }
-    
-    public class UnitTestCase : INotifyPropertyChanged
-    {
-        public UnitTestCase(UnitTestSuite suite, string name)
-        {
-            _suite = new WeakReference(suite);
-            Name = name;
-            Selected = false;
-            State = UnitTestCaseState.NotRun;
-            Traces = new ObservableCollection<OutputTrace>();
-        }
-
-        public UnitTestSuite Suite
-        {
-            get { return _suite.Target as UnitTestSuite; }
-        }
-        public string Name { get; private set; }
-        public bool Selected
-        {
-            get { return _selected; }
-            set
-            {
-                _selected = value;
-                RaisePropertyChanged("Selected");
-            }
-        }
-        public UnitTestCaseState State
-        {
-            get { return _state; }
-            set
-            {
-                _state = value;
-                RaisePropertyChanged("State");
-            }
-        }
-        public ObservableCollection<OutputTrace> Traces
-        {
-            get { return _traces; }
-            set
-            {
-                _traces = value;
-                RaisePropertyChanged("Traces");
-            }
-        }
-        public CoreDispatcher Dispatcher { get; set; }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected void RaisePropertyChanged(string name)
-        {
-            if (PropertyChanged != null)
-            {
-                PropertyChanged(this, new PropertyChangedEventArgs(name));
-            }
-        }
-
-        private WeakReference _suite;
-        private bool _selected;
-        private UnitTestCaseState _state;
-        private ObservableCollection<OutputTrace> _traces;
-    }
-
-    public sealed class UnitTestDataSource
-    {
-        private static UnitTestDataSource _unitTestDataSource = new UnitTestDataSource();
-        private ObservableCollection<UnitTestSuite> _suites = new ObservableCollection<UnitTestSuite>();
-
-        public ObservableCollection<UnitTestSuite> Suites
-        {
-            get { return this._suites; }
-        }
-
-        public static IEnumerable<UnitTestSuite> GetSuites(LibLinphoneTester tester)
-        {
-            return _unitTestDataSource.FillSuites(tester);
-        }
-
-        private IEnumerable<UnitTestSuite> FillSuites(LibLinphoneTester tester)
-        {
-            if (this.Suites.Count != 0) return this.Suites;
-            for (int i = 0; i < tester.nbTestSuites(); i++)
-            {
-                UnitTestSuite suite = new UnitTestSuite(tester.testSuiteName(i));
-                for (int j = 0; j < tester.nbTests(suite.Name); j++)
-                {
-                    suite.Cases.Add(new UnitTestCase(suite, tester.testName(suite.Name, j)));
-                }
-                this.Suites.Add(suite);
-            }
-            return this.Suites;
-        }
-    }
-
-    public sealed class UnitTestCaseStateToSymbolConverter : IValueConverter
-    {
-        object IValueConverter.Convert(object value, Type targetType, object parametr, string language)
-        {
-            if (!value.GetType().Equals(typeof(UnitTestCaseState)))
-            {
-                throw new ArgumentException("Only UnitTestCaseState is supported");
-            }
-            if (targetType.Equals(typeof(Symbol)))
-            {
-                switch ((UnitTestCaseState)value)
-                {
-                    case UnitTestCaseState.Success:
-                        return Symbol.Like;
-                    case UnitTestCaseState.Failure:
-                        return Symbol.Dislike;
-                    case UnitTestCaseState.NotRun:
-                    default:
-                        return Symbol.Help;
-                }
-            }
-            else
-            {
-                throw new ArgumentException(string.Format("Unsupported type {0}", targetType.FullName));
-            }
-        }
-
-        object IValueConverter.ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public sealed class UnitTestCaseStateToSymbolColorConverter : IValueConverter
-    {
-        object IValueConverter.Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (!value.GetType().Equals(typeof(UnitTestCaseState)))
-            {
-                throw new ArgumentException("Only UnitTestCaseState is supported");
-            }
-            if (targetType.Equals(typeof(Brush)))
-            {
-                switch ((UnitTestCaseState)value)
-                {
-                    case UnitTestCaseState.Success:
-                        return new SolidColorBrush(Colors.ForestGreen);
-                    case UnitTestCaseState.Failure:
-                        return new SolidColorBrush(Colors.IndianRed);
-                    case UnitTestCaseState.NotRun:
-                    default:
-                        return new SolidColorBrush(Colors.LightGray);
-                }
-            }
-            else
-            {
-                throw new ArgumentException(string.Format("Unsupported format {0}", targetType.FullName));
-            }
-        }
-
-        object IValueConverter.ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public sealed class OutputTraceLevelToColorConverter : IValueConverter
-    {
-        object IValueConverter.Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (!value.GetType().Equals(typeof(String)))
-            {
-                throw new ArgumentException("Only String is supported");
-            }
-            if (targetType.Equals(typeof(Brush)))
-            {
-                if ((String)value == "Error")
-                {
-                    return new SolidColorBrush(Colors.IndianRed);
-                }
-                else if ((String)value == "Warning")
-                {
-                    return new SolidColorBrush(Colors.Orange);
-                }
-                return new SolidColorBrush(Colors.Black);
-            }
-            else
-            {
-                throw new ArgumentException(string.Format("Unsupported format {0}", targetType.FullName));
-            }
-        }
-
-        object IValueConverter.ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/build/windows10/liblinphone-tester/MainPage.xaml b/build/windows10/liblinphone-tester/MainPage.xaml
deleted file mode 100644
index 2cdea219c..000000000
--- a/build/windows10/liblinphone-tester/MainPage.xaml
+++ /dev/null
@@ -1,128 +0,0 @@
-<Page
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:liblinphone_tester"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:model="using:liblinphone_tester.DataModel"
-    xmlns:uixdata="using:Windows.UI.Xaml.Data" x:Name="page"
-    x:Class="liblinphone_tester.MainPage">
-
-    <Page.Resources>
-        <CollectionViewSource x:Name="UnitTestCVS"
-                              Source="{x:Bind Suites}"
-                              ItemsPath="Cases"
-                              IsSourceGrouped="True"/>
-
-        <DataTemplate x:Key="ZoomedInTemplate" x:DataType="model:UnitTestCase">
-            <Grid Width="320">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-
-                <CheckBox Grid.Column="0"
-                          Content="{x:Bind Name}"
-                          IsChecked="{Binding Selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                <SymbolIcon Grid.Column="1"
-                    Symbol="{Binding State, Mode=OneWay, Converter={StaticResource UnitTestCaseStateToSymbol}, UpdateSourceTrigger=PropertyChanged}"
-                            Foreground="{Binding State, Mode=OneWay, Converter={StaticResource UnitTestCaseStateToSymbolColor}, UpdateSourceTrigger=PropertyChanged}" Margin="16,0,32,0"/>
-            </Grid>
-        </DataTemplate>
-
-        <DataTemplate x:Key="ZoomedInGroupHeaderTemplate" x:DataType="model:UnitTestSuite">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{x:Bind Name}" Foreground="{ThemeResource ApplicationForegroundThemeBrush}" Style="{StaticResource SubtitleTextBlockStyle}"/>
-            </StackPanel>
-        </DataTemplate>
-
-        <DataTemplate x:Key="ZoomedOutTemplate" x:DataType="uixdata:ICollectionViewGroup">
-            <TextBlock Text="{x:Bind Group.(model:UnitTestSuite.Name)}" Style="{StaticResource SubtitleTextBlockStyle}" TextWrapping="Wrap"/>
-        </DataTemplate>
-
-        <DataTemplate x:Key="TraceTemplate">
-            <TextBlock FontFamily="Courier New">
-                <Run Text="{Binding Msg}" Foreground="{Binding Level, Converter={StaticResource OutputTraceLevelToColor}}"/>
-            </TextBlock>
-        </DataTemplate>
-    </Page.Resources>
-
-    <Page.BottomAppBar>
-        <CommandBar x:Name="CommandBar">
-            <AppBarButton x:Name="Run" Icon="Play" Label="Run" Click="RunSelected_Click"/>
-            <AppBarButton x:Name="SelectAll" Icon="SelectAll" Label="Select all" Click="SelectAll_Click"/>
-            <AppBarToggleButton x:Name="Verbose" Icon="Comment" IsChecked="True" Label="Verbose"/>
-        </CommandBar>
-    </Page.BottomAppBar>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-        <SplitView x:Name="splitView" Grid.Row="0" IsPaneOpen="True" DisplayMode="Inline">
-            <SplitView.Pane>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Grid.Row="0" Text="Test selection" Style="{StaticResource HeaderTextBlockStyle}" Margin="12,0,0,0"/>
-                    <SemanticZoom x:Name="SemanticZoom" Grid.Row="1">
-                        <SemanticZoom.ZoomedInView>
-                            <ListView ItemsSource="{x:Bind UnitTestCVS.View}"
-                              ScrollViewer.IsHorizontalScrollChainingEnabled="False"
-                              SelectionMode="None"
-                              ItemTemplate="{StaticResource ZoomedInTemplate}"
-                              IsItemClickEnabled="True"
-                              ItemClick="UnitTestCase_Click">
-                                <ListView.GroupStyle>
-                                    <GroupStyle HeaderTemplate="{StaticResource ZoomedInGroupHeaderTemplate}" />
-                                </ListView.GroupStyle>
-                            </ListView>
-                        </SemanticZoom.ZoomedInView>
-                        <SemanticZoom.ZoomedOutView>
-                            <ListView ItemsSource="{x:Bind UnitTestCVS.View.CollectionGroups}"
-                              SelectionMode="None"
-                              ItemTemplate="{StaticResource ZoomedOutTemplate}">
-                            </ListView>
-                        </SemanticZoom.ZoomedOutView>
-                    </SemanticZoom>
-                </Grid>
-            </SplitView.Pane>
-
-            <Grid x:Name="TestResultPage">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-
-                <TextBlock Grid.Row="0" Text="Test result" Style="{StaticResource HeaderTextBlockStyle}" Margin="12,0,0,0"/>
-                <Grid Grid.Row="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" Style="{StaticResource SubheaderTextBlockStyle}" Margin="16,0,0,0" Text="{Binding Name, Mode=OneWay}"/>
-                    <SymbolIcon Grid.Column="1" x:Name="TestResultState"
-                                Visibility="Collapsed"
-                                Symbol="{Binding State, Mode=OneWay, Converter={StaticResource UnitTestCaseStateToSymbol}, UpdateSourceTrigger=PropertyChanged}"
-                                Foreground="{Binding State, Mode=OneWay, Converter={StaticResource UnitTestCaseStateToSymbolColor}, UpdateSourceTrigger=PropertyChanged}" Margin="16,0,32,0"/>
-                    <AppBarButton Grid.Column="2" x:Name="TestResultRun"
-                                  Icon="Play" Label="Run"
-                                  IsEnabled="{Binding IsEnabled, ElementName=CommandBar}"
-                                  Click="RunSingle_Click" Visibility="Collapsed"/>
-                </Grid>
-                <ScrollViewer Grid.Row="2">
-                    <ItemsControl ItemsSource="{Binding Traces}" ItemTemplate="{StaticResource TraceTemplate}" Margin="20,12,0,0"/>
-                </ScrollViewer>
-            </Grid>
-        </SplitView>
-        <ProgressBar x:Name="ProgressIndicator" Grid.Row="1"
-                     Width="{Binding ActualWidth, ElementName=CommandBar, Mode=OneWay}" Margin="16,0,0,0"/>
-    </Grid>
-</Page>
diff --git a/build/windows10/liblinphone-tester/MainPage.xaml.cs b/build/windows10/liblinphone-tester/MainPage.xaml.cs
deleted file mode 100644
index 005f38891..000000000
--- a/build/windows10/liblinphone-tester/MainPage.xaml.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-using liblinphone_tester.DataModel;
-using liblinphone_tester_runtime_component;
-using System.Threading.Tasks;
-using Windows.UI.Core;
-using Windows.UI.Xaml.Documents;
-using Windows.Storage;
-
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
-
-namespace liblinphone_tester
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class MainPage : Page, OutputTraceListener
-    {
-        public MainPage()
-        {
-            this.InitializeComponent();           
-        }
-
-        protected override void OnNavigatedTo(NavigationEventArgs e)
-        {
-            base.OnNavigatedTo(e);
-            LibLinphoneTester.Instance.setWritableDirectory(ApplicationData.Current.LocalFolder);
-            _suites = UnitTestDataSource.GetSuites(LibLinphoneTester.Instance);
-            TryAutoLaunch();
-        }
-
-        public IEnumerable<UnitTestSuite> Suites
-        {
-            get { return _suites; }
-        }
-
-        private IEnumerable<UnitTestSuite> _suites;
-
-        private void SelectAll_Click(object sender, RoutedEventArgs e)
-        {
-            bool allSelected = Suites.All(x => x.Selected);
-            foreach (UnitTestSuite suite in Suites)
-            {
-                suite.Selected = !allSelected;
-            }
-        }
-
-        private void RunSelected_Click(object sender, RoutedEventArgs e)
-        {
-            int nbCases = 0;
-            foreach (UnitTestSuite suite in Suites)
-            {
-                foreach (UnitTestCase c in suite.Cases)
-                {
-                    if (c.Selected) nbCases++;
-                }
-            }
-            if (nbCases == 0) return;
-
-            PrepareRun(nbCases);
-
-            var tup = new Tuple<IEnumerable<UnitTestSuite>, bool?>(Suites, Verbose.IsChecked);
-            var t = Task.Factory.StartNew(async (object parameters) =>
-            {
-                var p = parameters as Tuple<IEnumerable<UnitTestSuite>, bool?>;
-                IEnumerable<UnitTestSuite> suites = p.Item1;
-                bool verbose = p.Item2 != null ? (bool)p.Item2 : false;
-                foreach (UnitTestSuite suite in suites)
-                {
-                    foreach (UnitTestCase c in suite.Cases)
-                    {
-                        if (c.Selected)
-                        {
-                            await RunUnitTestCase(c, verbose);
-                        }
-                    }
-                }
-            }, tup);
-        }
-
-        private void RunSingle_Click(object sender, RoutedEventArgs e)
-        {
-            PrepareRun(1);
-
-            var tup = new Tuple<UnitTestCase, bool?>(DisplayedTestCase, Verbose.IsChecked);
-            var t = Task.Factory.StartNew(async (object parameters) =>
-            {
-                var p = parameters as Tuple<UnitTestCase, bool?>;
-                UnitTestCase c = p.Item1;
-                bool verbose = p.Item2 != null ? (bool)p.Item2 : false;
-                await RunUnitTestCase(c, verbose);
-            }, tup);
-        }
-
-        private void PrepareRun(int nbCases)
-        {
-            CommandBar.IsEnabled = false;
-            ProgressIndicator.IsEnabled = true;
-            ProgressIndicator.Minimum = 0;
-            ProgressIndicator.Maximum = nbCases;
-            ProgressIndicator.Value = 0;
-            LibLinphoneTester.Instance.setOutputTraceListener(this);
-        }
-
-        private async Task RunUnitTestCase(UnitTestCase c, bool verbose)
-        {
-            UnitTestCaseState newState = UnitTestCaseState.NotRun;
-            await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                RunningTestCase = c;
-            });
-            await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                c.Traces.Clear();
-            });
-            c.Dispatcher = Dispatcher;
-            if (LibLinphoneTester.Instance.run(c.Suite.Name, c.Name, verbose))
-            {
-                newState = UnitTestCaseState.Failure;
-            }
-            else
-            {
-                newState = UnitTestCaseState.Success;
-            }
-            await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                c.State = newState;
-                ProgressIndicator.Value += 1;
-                if (ProgressIndicator.Value == ProgressIndicator.Maximum)
-                {
-                    UnprepareRun();
-                }
-            });
-        }
-
-        private void UnprepareRun()
-        {
-            LibLinphoneTester.Instance.setOutputTraceListener(null);
-            RunningTestCase = null;
-            ProgressIndicator.IsEnabled = false;
-            CommandBar.IsEnabled = true;
-        }
-
-        private void UnitTestCase_Click(object sender, ItemClickEventArgs e)
-        {
-            DisplayedTestCase = (e.ClickedItem as UnitTestCase);
-            TestResultPage.DataContext = DisplayedTestCase;
-            TestResultState.Visibility = Visibility.Visible;
-            TestResultRun.Visibility = Visibility.Visible;
-        }
-
-        public async void outputTrace(String lev, String msg)
-        {
-            await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
-            {
-                if (RunningTestCase != null)
-                {
-                    RunningTestCase.Traces.Add(new OutputTrace(lev, msg));
-                }
-            });
-        }
-
-        private async void TryAutoLaunch()
-        {
-            try
-            {
-                await ApplicationData.Current.LocalFolder.GetFileAsync("autolaunch");
-                CommandBar.IsEnabled = false;
-                ProgressIndicator.IsIndeterminate = true;
-                ProgressIndicator.IsEnabled = true;
-                LibLinphoneTester.Instance.runAllToXml();
-                if (LibLinphoneTester.Instance.AsyncAction != null)
-                {
-                    LibLinphoneTester.Instance.AsyncAction.Completed += (asyncInfo, asyncStatus) => {
-                        App.Current.Exit();
-                    };
-                }
-            }
-            catch (Exception) { }
-        }
-
-        private UnitTestCase RunningTestCase;
-        private UnitTestCase DisplayedTestCase;
-    }
-}
diff --git a/build/windows10/liblinphone-tester/Package.appxmanifest b/build/windows10/liblinphone-tester/Package.appxmanifest
deleted file mode 100644
index f7f9cb6dd..000000000
--- a/build/windows10/liblinphone-tester/Package.appxmanifest
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="BelledonneCommunications.LibLinphoneTester"
-    Publisher="CN=belledonne communications, O=belledonne communications, L=Grenoble, C=FR"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="7fdbb4f3-13d7-4ca5-a0b9-c7fe297c78f1" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>liblinphone-tester</DisplayName>
-    <PublisherDisplayName>Belledonne Communications</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10069.0" MaxVersionTested="10.0.10069.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="liblinphone_tester.App">
-      <uap:VisualElements
-        DisplayName="liblinphone-tester"
-        Square150x150Logo="Assets\Logo.png"
-        Square44x44Logo="Assets\SmallLogo.png"
-        Description="liblinphone-tester"
-        BackgroundColor="#ffffff">
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <DeviceCapability Name="microphone" />
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/build/windows10/liblinphone-tester/Properties/AssemblyInfo.cs b/build/windows10/liblinphone-tester/Properties/AssemblyInfo.cs
deleted file mode 100644
index d4b2a0c81..000000000
--- a/build/windows10/liblinphone-tester/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("liblinphone-tester")]
-[assembly: AssemblyDescription("LibLinphone tester for Windows 10")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Belledonne Communications")]
-[assembly: AssemblyProduct("liblinphone-tester-windows10")]
-[assembly: AssemblyCopyright("Copyright © 2015 Belledonne Communications")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/build/windows10/liblinphone-tester/Properties/Default.rd.xml b/build/windows10/liblinphone-tester/Properties/Default.rd.xml
deleted file mode 100644
index 80a960ce3..000000000
--- a/build/windows10/liblinphone-tester/Properties/Default.rd.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
--->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
\ No newline at end of file
diff --git a/build/windows10/liblinphone-tester/liblinphone-tester-runtime-component/liblinphone-tester-runtime-component.vcxproj b/build/windows10/liblinphone-tester/liblinphone-tester-runtime-component/liblinphone-tester-runtime-component.vcxproj
deleted file mode 100644
index a66c5e7ed..000000000
--- a/build/windows10/liblinphone-tester/liblinphone-tester-runtime-component/liblinphone-tester-runtime-component.vcxproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\tester\liblinphone_tester_windows.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\tester\liblinphone_tester_windows.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\bcg729\build\windows10\libmsbcg729\libmsbcg729.vcxproj">
-      <Project>{acf5ea95-d647-4d0c-8f97-2cd9aae8a2e0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\build\sqlite\sqlite.vcxproj">
-      <Project>{74cad9d0-d8ae-4896-b71b-b2d9b48f30aa}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\msamr\build\windows10\libmsamr\libmsamr.vcxproj">
-      <Project>{8c1bc968-c5c8-4d4b-9ef3-d6a065fc7c97}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\msilbc\build\windows10\libmsilbc\libmsilbc.vcxproj">
-      <Project>{6a18bbb9-08d1-41a8-be57-17fc992cc36f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\mssilk\build\windows10\libmssilk\libmssilk.vcxproj">
-      <Project>{b84d5c3b-6de5-49c8-b3dd-5eb67b01a527}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\mswasapi\windows10\libmswasapi\libmswasapi.vcxproj">
-      <Project>{266b769a-c04e-424c-9033-7209f0425bc0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\mswebrtc\build\windows10\libmswebrtc\libmswebrtc.vcxproj">
-      <Project>{878cf9d3-9761-479e-a715-a1de9f99cb78}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\zlib\build\windows10\zlib\zlib.vcxproj">
-      <Project>{a34f450d-392d-4660-9618-810bd695b3b0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\liblinphone-tester-static\liblinphone-tester-static.vcxproj">
-      <Project>{9eb3fe8d-2d91-4d29-a3bb-98ddb51d45b7}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1ce10f06-8fad-437f-b3d7-3b7a8909a190}</ProjectGuid>
-    <Keyword>WindowsRuntimeComponent</Keyword>
-    <ProjectName>liblinphone-tester-runtime-component</ProjectName>
-    <RootNamespace>liblinphone_tester_runtime_component</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10</ApplicationTypeRevision>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10069.0</WindowsTargetPlatformMinVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>IN_LINPHONE;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\coreapi;$(ProjectDir)..\..\..\..\tester\common;$(ProjectDir)..\..\..\..\mediastreamer2\include;$(ProjectDir)..\..\..\..\oRTP\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>IN_LINPHONE;_WINRT_DLL;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\coreapi;$(ProjectDir)..\..\..\..\tester\common;$(ProjectDir)..\..\..\..\mediastreamer2\include;$(ProjectDir)..\..\..\..\oRTP\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/windows10/liblinphone-tester/liblinphone-tester-static/liblinphone-tester-static.vcxproj b/build/windows10/liblinphone-tester/liblinphone-tester-static/liblinphone-tester-static.vcxproj
deleted file mode 100644
index 80e57dedb..000000000
--- a/build/windows10/liblinphone-tester/liblinphone-tester-static/liblinphone-tester-static.vcxproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\tester\accountmanager.c" />
-    <ClCompile Include="..\..\..\..\tester\call_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\common\bc_tester_utils.c" />
-    <ClCompile Include="..\..\..\..\tester\dtmf_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\eventapi_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\flexisip_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\liblinphone_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\log_collection_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\message_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\multicast_call_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\multi_call_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\offeranswer_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\player_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\presence_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\proxy_config_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\quality_reporting_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\register_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\remote_provisioning_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\setup_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\stun_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\tester.c" />
-    <ClCompile Include="..\..\..\..\tester\tunnel_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\upnp_tester.c" />
-    <ClCompile Include="..\..\..\..\tester\video_tester.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\tester\common\bc_tester_utils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\belle-sip\build\windows10\belle-sip\belle-sip.vcxproj">
-      <Project>{b6cdf482-7da3-43d4-9b12-70150106c191}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\cunit\build\windows10\cunit\cunit.vcxproj">
-      <Project>{025e28a8-9dfb-4015-ad56-19896aa6cc9b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\mediastreamer2\build\windows10\mediastreamer2\mediastreamer2.vcxproj">
-      <Project>{88e3c241-eb6f-4c84-80dc-89b8961daf80}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\oRTP\build\windows10\ortp\ortp.vcxproj">
-      <Project>{2e56b851-9d8d-40e5-84bb-e4ee63b71d25}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\liblinphone\liblinphone.vcxproj">
-      <Project>{c7139899-d8bc-48a3-a437-6844a8baabef}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9eb3fe8d-2d91-4d29-a3bb-98ddb51d45b7}</ProjectGuid>
-    <Keyword>StaticLibrary</Keyword>
-    <ProjectName>liblinphone-tester-static</ProjectName>
-    <RootNamespace>liblinphone_tester_static</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10</ApplicationTypeRevision>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10069.0</WindowsTargetPlatformMinVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\include;$(ProjectDir)..\..\..\..\tester;$(ProjectDir)..\..\..\..\tester\common;$(ProjectDir)..\..\liblinphone;$(ProjectDir)..\..\..\..\coreapi;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\mediastreamer2\include;$(ProjectDir)..\..\..\..\oRTP\include;$(ProjectDir)..\..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\..\..\sqlite;$(ProjectDir)..\..\..\..\..\zlib;$(ProjectDir)..\..\..\..\..\cunit\build\windows10\cunit\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>BC_CONFIG_FILE="config.h";IN_LINPHONE;MSG_STORAGE_ENABLED;VIDEO_ENABLED;HAVE_CU_GET_SUITE;HAVE_ZLIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/windows10/liblinphone-tester/liblinphone-tester.csproj b/build/windows10/liblinphone-tester/liblinphone-tester.csproj
deleted file mode 100644
index 7cea98872..000000000
--- a/build/windows10/liblinphone-tester/liblinphone-tester.csproj
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>liblinphone_tester</RootNamespace>
-    <AssemblyName>liblinphone-tester</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10069.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>liblinphone-tester_TemporaryKey.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <Content Include="ApplicationInsights.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DataModel\UnitTestDataSource.cs" />
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <None Include="liblinphone-tester_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\images\nowebcamCIF.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\empty_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\laure_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_early_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_h264_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_quality_reporting_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_rc_rtcp_xr">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_404_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_default_values_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_https_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_invalid_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_invalid_uri_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_localfile2_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_localfile_android_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_localfile_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_remote_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_sips_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_transient_remote_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_zrtp_aes256_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_zrtp_b256_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\marie_zrtp_srtpsuite_aes256_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\multi_account_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_alt_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_h264_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_rc_rtcp_xr">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_sips_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_tcp_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_wild_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_zrtp_aes256_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_zrtp_b256_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\pauline_zrtp_srtpsuite_aes256_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\remote_zero_length_params_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\stun_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\upnp_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\rcfiles\zero_length_params_rc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\ahbahouaismaisbon.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\hello8000.mkv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\hello8000.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\hello8000_mkv_ref.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\hello_opus_h264.mkv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\oldphone.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\ringback.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\sounds\vrroom.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\tester_hosts">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\certificates\altname\agent.pem">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\certificates\altname\cafile.pem">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\certificates\altname\openssl-altname.cnf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\certificates\cn\agent.pem">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\certificates\cn\cafile.pem">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\certificates\cn\openssl-cn.cnf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Logo.png" />
-    <Content Include="Assets\SmallLogo.png" />
-    <Content Include="Assets\SplashScreen.png" />
-    <Content Include="Assets\WideLogo.scale-100.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="liblinphone-tester-runtime-component\liblinphone-tester-runtime-component.vcxproj">
-      <Project>{1ce10f06-8fad-437f-b3d7-3b7a8909a190}</Project>
-      <Name>liblinphone-tester-runtime-component</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>XCopy /I /Y $(ProjectDir)..\..\..\tester\tester_hosts $(ProjectDir)Assets\
-XCopy /I /Y $(ProjectDir)..\..\..\tester\certificates\altname $(ProjectDir)Assets\certificates\altname
-XCopy /I /Y $(ProjectDir)..\..\..\tester\certificates\cn $(ProjectDir)Assets\certificates\cn
-XCopy /I /Y $(ProjectDir)..\..\..\tester\images $(ProjectDir)Assets\images
-XCopy /I /Y $(ProjectDir)..\..\..\tester\rcfiles $(ProjectDir)Assets\rcfiles
-XCopy /I /Y $(ProjectDir)..\..\..\tester\sounds $(ProjectDir)Assets\sounds</PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/build/windows10/liblinphone-tester/liblinphone-tester.sln b/build/windows10/liblinphone-tester/liblinphone-tester.sln
deleted file mode 100644
index 5c6955078..000000000
--- a/build/windows10/liblinphone-tester/liblinphone-tester.sln
+++ /dev/null
@@ -1,446 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "liblinphone-tester", "liblinphone-tester.csproj", "{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinphone-tester-static", "liblinphone-tester-static\liblinphone-tester-static.vcxproj", "{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinphone", "..\liblinphone\liblinphone.vcxproj", "{C7139899-D8BC-48A3-A437-6844A8BAABEF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastreamer2", "..\..\..\mediastreamer2\build\windows10\mediastreamer2\mediastreamer2.vcxproj", "{88E3C241-EB6F-4C84-80DC-89B8961DAF80}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ortp", "..\..\..\oRTP\build\windows10\ortp\ortp.vcxproj", "{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srtp", "..\..\..\..\srtp\build\windows10\srtp\srtp.vcxproj", "{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2", "..\..\..\..\build\xml2\xml2.vcxproj", "{2B04DE79-4D33-4405-AC01-C89E0593A71D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polarssl", "..\..\..\..\polarssl\build\windows10\polarssl\polarssl.vcxproj", "{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speex", "..\..\..\..\speex\build\windows10\speex\speex.vcxproj", "{971DD379-1C2D-44D2-9285-FDA556C48176}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdsp", "..\..\..\..\speex\build\windows10\speexdsp\speexdsp.vcxproj", "{104BF91B-8314-4328-A996-90B8DF6052AF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "..\..\..\..\opus\build\windows10\opus\opus.vcxproj", "{81AF1025-E0EE-4AD6-988D-2EF162778693}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzrtp", "..\..\..\..\bzrtp\build\windows10\bzrtp\bzrtp.vcxproj", "{45C7723D-3107-4906-9633-F43ABE8A7147}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsm", "..\..\..\..\gsm\build\windows10\gsm\gsm.vcxproj", "{EF1103C7-8AAC-464B-BA31-86B87246FA72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "belle-sip", "..\..\..\..\belle-sip\build\windows10\belle-sip\belle-sip.vcxproj", "{B6CDF482-7DA3-43D4-9B12-70150106C191}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr3c", "..\..\..\..\antlr3\runtime\C\build\windows10\antlr3c\antlr3c.vcxproj", "{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\..\zlib\build\windows10\zlib\zlib.vcxproj", "{A34F450D-392D-4660-9618-810BD695B3B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\..\..\..\build\sqlite\sqlite.vcxproj", "{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinphone-tester-runtime-component", "liblinphone-tester-runtime-component\liblinphone-tester-runtime-component.vcxproj", "{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cunit", "..\..\..\..\cunit\build\windows10\cunit\cunit.vcxproj", "{025E28A8-9DFB-4015-AD56-19896AA6CC9B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmsamr", "..\..\..\..\msamr\build\windows10\libmsamr\libmsamr.vcxproj", "{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmsilbc", "..\..\..\..\msilbc\build\windows10\libmsilbc\libmsilbc.vcxproj", "{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmssilk", "..\..\..\..\mssilk\build\windows10\libmssilk\libmssilk.vcxproj", "{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmswasapi", "..\..\..\..\mswasapi\windows10\libmswasapi\libmswasapi.vcxproj", "{266B769A-C04E-424C-9033-7209F0425BC0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmswebrtc", "..\..\..\..\mswebrtc\build\windows10\libmswebrtc\libmswebrtc.vcxproj", "{878CF9D3-9761-479E-A715-A1DE9F99CB78}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ilbc", "..\..\..\..\libilbc-rfc3951\build\windows10\ilbc\ilbc.vcxproj", "{995B01AF-C568-453E-9E5F-8AE81FB79B4B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencore_amrnb", "..\..\..\..\msamr\build\windows10\opencore_amrnb\opencore_amrnb.vcxproj", "{71A5F1C8-F76D-4297-95AA-75E1C967DC79}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencore_amrwb", "..\..\..\..\msamr\build\windows10\opencore_amrwb\opencore_amrwb.vcxproj", "{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vo-amrwbenc", "..\..\..\..\msamr\build\windows10\vo-amrwbenc\vo-amrwbenc.vcxproj", "{D829672F-3775-4718-A991-1ABC42CBA67C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webrtc", "..\..\..\..\mswebrtc\webrtc\build\windows10\webrtc\webrtc.vcxproj", "{C5895B75-BDCF-406C-B803-9CB954E90F0C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmsbcg729", "..\..\..\..\bcg729\build\windows10\libmsbcg729\libmsbcg729.vcxproj", "{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|ARM.ActiveCfg = Debug|ARM
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|ARM.Build.0 = Debug|ARM
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|ARM.Deploy.0 = Debug|ARM
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|x64.ActiveCfg = Debug|x64
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|x64.Build.0 = Debug|x64
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|x64.Deploy.0 = Debug|x64
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|x86.ActiveCfg = Debug|x86
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|x86.Build.0 = Debug|x86
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Debug|x86.Deploy.0 = Debug|x86
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|ARM.ActiveCfg = Release|ARM
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|ARM.Build.0 = Release|ARM
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|ARM.Deploy.0 = Release|ARM
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|x64.ActiveCfg = Release|x64
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|x64.Build.0 = Release|x64
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|x64.Deploy.0 = Release|x64
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|x86.ActiveCfg = Release|x86
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|x86.Build.0 = Release|x86
-		{EC78E1D3-6FD8-4CAF-8D3F-6F4F97093BE5}.Release|x86.Deploy.0 = Release|x86
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Debug|ARM.ActiveCfg = Debug|ARM
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Debug|ARM.Build.0 = Debug|ARM
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Debug|x64.ActiveCfg = Debug|x64
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Debug|x64.Build.0 = Debug|x64
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Debug|x86.ActiveCfg = Debug|Win32
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Debug|x86.Build.0 = Debug|Win32
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Release|ARM.ActiveCfg = Release|ARM
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Release|ARM.Build.0 = Release|ARM
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Release|x64.ActiveCfg = Release|x64
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Release|x64.Build.0 = Release|x64
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Release|x86.ActiveCfg = Release|Win32
-		{9EB3FE8D-2D91-4D29-A3BB-98DDB51D45B7}.Release|x86.Build.0 = Release|Win32
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|ARM.Build.0 = Debug|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x64.ActiveCfg = Debug|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x64.Build.0 = Debug|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x86.ActiveCfg = Debug|Win32
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x86.Build.0 = Debug|Win32
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|ARM.ActiveCfg = Release|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|ARM.Build.0 = Release|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x64.ActiveCfg = Release|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x64.Build.0 = Release|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x86.ActiveCfg = Release|Win32
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x86.Build.0 = Release|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|ARM.ActiveCfg = Debug|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|ARM.Build.0 = Debug|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x64.ActiveCfg = Debug|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x64.Build.0 = Debug|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x86.ActiveCfg = Debug|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x86.Build.0 = Debug|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|ARM.ActiveCfg = Release|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|ARM.Build.0 = Release|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x64.ActiveCfg = Release|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x64.Build.0 = Release|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x86.ActiveCfg = Release|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x86.Build.0 = Release|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|ARM.Build.0 = Debug|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x64.ActiveCfg = Debug|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x64.Build.0 = Debug|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x86.ActiveCfg = Debug|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x86.Build.0 = Debug|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|ARM.ActiveCfg = Release|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|ARM.Build.0 = Release|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x64.ActiveCfg = Release|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x64.Build.0 = Release|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x86.ActiveCfg = Release|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x86.Build.0 = Release|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|ARM.ActiveCfg = Debug|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|ARM.Build.0 = Debug|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x64.ActiveCfg = Debug|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x64.Build.0 = Debug|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x86.ActiveCfg = Debug|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x86.Build.0 = Debug|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|ARM.ActiveCfg = Release|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|ARM.Build.0 = Release|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x64.ActiveCfg = Release|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x64.Build.0 = Release|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x86.ActiveCfg = Release|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x86.Build.0 = Release|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|ARM.Build.0 = Debug|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x64.ActiveCfg = Debug|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x64.Build.0 = Debug|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x86.ActiveCfg = Debug|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x86.Build.0 = Debug|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|ARM.ActiveCfg = Release|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|ARM.Build.0 = Release|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x64.ActiveCfg = Release|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x64.Build.0 = Release|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x86.ActiveCfg = Release|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x86.Build.0 = Release|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|ARM.ActiveCfg = Debug|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|ARM.Build.0 = Debug|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x64.ActiveCfg = Debug|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x64.Build.0 = Debug|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x86.ActiveCfg = Debug|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x86.Build.0 = Debug|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|ARM.ActiveCfg = Release|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|ARM.Build.0 = Release|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x64.ActiveCfg = Release|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x64.Build.0 = Release|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x86.ActiveCfg = Release|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x86.Build.0 = Release|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|ARM.ActiveCfg = Debug|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|ARM.Build.0 = Debug|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x64.ActiveCfg = Debug|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x64.Build.0 = Debug|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x86.ActiveCfg = Debug|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x86.Build.0 = Debug|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|ARM.ActiveCfg = Release|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|ARM.Build.0 = Release|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x64.ActiveCfg = Release|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x64.Build.0 = Release|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x86.ActiveCfg = Release|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x86.Build.0 = Release|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|ARM.Build.0 = Debug|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x64.ActiveCfg = Debug|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x64.Build.0 = Debug|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x86.ActiveCfg = Debug|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x86.Build.0 = Debug|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|ARM.ActiveCfg = Release|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|ARM.Build.0 = Release|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x64.ActiveCfg = Release|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x64.Build.0 = Release|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x86.ActiveCfg = Release|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x86.Build.0 = Release|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|ARM.ActiveCfg = Debug|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|ARM.Build.0 = Debug|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x64.ActiveCfg = Debug|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x64.Build.0 = Debug|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x86.ActiveCfg = Debug|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x86.Build.0 = Debug|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|ARM.ActiveCfg = Release|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|ARM.Build.0 = Release|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x64.ActiveCfg = Release|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x64.Build.0 = Release|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x86.ActiveCfg = Release|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x86.Build.0 = Release|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|ARM.ActiveCfg = Debug|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|ARM.Build.0 = Debug|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x64.ActiveCfg = Debug|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x64.Build.0 = Debug|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x86.ActiveCfg = Debug|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x86.Build.0 = Debug|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|ARM.ActiveCfg = Release|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|ARM.Build.0 = Release|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x64.ActiveCfg = Release|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x64.Build.0 = Release|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x86.ActiveCfg = Release|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x86.Build.0 = Release|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|ARM.ActiveCfg = Debug|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|ARM.Build.0 = Debug|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x64.ActiveCfg = Debug|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x64.Build.0 = Debug|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x86.ActiveCfg = Debug|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x86.Build.0 = Debug|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|ARM.ActiveCfg = Release|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|ARM.Build.0 = Release|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x64.ActiveCfg = Release|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x64.Build.0 = Release|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x86.ActiveCfg = Release|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x86.Build.0 = Release|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|ARM.ActiveCfg = Debug|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|ARM.Build.0 = Debug|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x64.ActiveCfg = Debug|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x64.Build.0 = Debug|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x86.ActiveCfg = Debug|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x86.Build.0 = Debug|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|ARM.ActiveCfg = Release|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|ARM.Build.0 = Release|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x64.ActiveCfg = Release|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x64.Build.0 = Release|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x86.ActiveCfg = Release|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x86.Build.0 = Release|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|ARM.ActiveCfg = Debug|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|ARM.Build.0 = Debug|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x64.ActiveCfg = Debug|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x64.Build.0 = Debug|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x86.ActiveCfg = Debug|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x86.Build.0 = Debug|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|ARM.ActiveCfg = Release|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|ARM.Build.0 = Release|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x64.ActiveCfg = Release|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x64.Build.0 = Release|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x86.ActiveCfg = Release|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x86.Build.0 = Release|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|ARM.ActiveCfg = Debug|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|ARM.Build.0 = Debug|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x64.ActiveCfg = Debug|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x64.Build.0 = Debug|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x86.ActiveCfg = Debug|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x86.Build.0 = Debug|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|ARM.ActiveCfg = Release|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|ARM.Build.0 = Release|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x64.ActiveCfg = Release|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x64.Build.0 = Release|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x86.ActiveCfg = Release|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x86.Build.0 = Release|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|ARM.ActiveCfg = Debug|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|ARM.Build.0 = Debug|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x64.ActiveCfg = Debug|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x64.Build.0 = Debug|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x86.ActiveCfg = Debug|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x86.Build.0 = Debug|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|ARM.ActiveCfg = Release|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|ARM.Build.0 = Release|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x64.ActiveCfg = Release|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x64.Build.0 = Release|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x86.ActiveCfg = Release|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x86.Build.0 = Release|Win32
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Debug|ARM.ActiveCfg = Debug|ARM
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Debug|ARM.Build.0 = Debug|ARM
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Debug|x64.ActiveCfg = Debug|x64
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Debug|x64.Build.0 = Debug|x64
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Debug|x86.ActiveCfg = Debug|Win32
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Debug|x86.Build.0 = Debug|Win32
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Release|ARM.ActiveCfg = Release|ARM
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Release|ARM.Build.0 = Release|ARM
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Release|x64.ActiveCfg = Release|x64
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Release|x64.Build.0 = Release|x64
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Release|x86.ActiveCfg = Release|Win32
-		{1CE10F06-8FAD-437F-B3D7-3B7A8909A190}.Release|x86.Build.0 = Release|Win32
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Debug|ARM.ActiveCfg = Debug|ARM
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Debug|ARM.Build.0 = Debug|ARM
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Debug|x64.ActiveCfg = Debug|x64
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Debug|x64.Build.0 = Debug|x64
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Debug|x86.ActiveCfg = Debug|Win32
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Debug|x86.Build.0 = Debug|Win32
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Release|ARM.ActiveCfg = Release|ARM
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Release|ARM.Build.0 = Release|ARM
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Release|x64.ActiveCfg = Release|x64
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Release|x64.Build.0 = Release|x64
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Release|x86.ActiveCfg = Release|Win32
-		{025E28A8-9DFB-4015-AD56-19896AA6CC9B}.Release|x86.Build.0 = Release|Win32
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Debug|ARM.ActiveCfg = Debug|ARM
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Debug|ARM.Build.0 = Debug|ARM
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Debug|x64.ActiveCfg = Debug|x64
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Debug|x64.Build.0 = Debug|x64
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Debug|x86.ActiveCfg = Debug|Win32
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Debug|x86.Build.0 = Debug|Win32
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Release|ARM.ActiveCfg = Release|ARM
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Release|ARM.Build.0 = Release|ARM
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Release|x64.ActiveCfg = Release|x64
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Release|x64.Build.0 = Release|x64
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Release|x86.ActiveCfg = Release|Win32
-		{8C1BC968-C5C8-4D4B-9EF3-D6A065FC7C97}.Release|x86.Build.0 = Release|Win32
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Debug|ARM.ActiveCfg = Debug|ARM
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Debug|ARM.Build.0 = Debug|ARM
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Debug|x64.ActiveCfg = Debug|x64
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Debug|x64.Build.0 = Debug|x64
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Debug|x86.ActiveCfg = Debug|Win32
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Debug|x86.Build.0 = Debug|Win32
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Release|ARM.ActiveCfg = Release|ARM
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Release|ARM.Build.0 = Release|ARM
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Release|x64.ActiveCfg = Release|x64
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Release|x64.Build.0 = Release|x64
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Release|x86.ActiveCfg = Release|Win32
-		{6A18BBB9-08D1-41A8-BE57-17FC992CC36F}.Release|x86.Build.0 = Release|Win32
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Debug|ARM.ActiveCfg = Debug|ARM
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Debug|ARM.Build.0 = Debug|ARM
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Debug|x64.ActiveCfg = Debug|x64
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Debug|x64.Build.0 = Debug|x64
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Debug|x86.ActiveCfg = Debug|Win32
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Debug|x86.Build.0 = Debug|Win32
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Release|ARM.ActiveCfg = Release|ARM
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Release|ARM.Build.0 = Release|ARM
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Release|x64.ActiveCfg = Release|x64
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Release|x64.Build.0 = Release|x64
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Release|x86.ActiveCfg = Release|Win32
-		{B84D5C3B-6DE5-49C8-B3DD-5EB67B01A527}.Release|x86.Build.0 = Release|Win32
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Debug|ARM.ActiveCfg = Debug|ARM
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Debug|ARM.Build.0 = Debug|ARM
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Debug|x64.ActiveCfg = Debug|x64
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Debug|x64.Build.0 = Debug|x64
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Debug|x86.ActiveCfg = Debug|Win32
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Debug|x86.Build.0 = Debug|Win32
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Release|ARM.ActiveCfg = Release|ARM
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Release|ARM.Build.0 = Release|ARM
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Release|x64.ActiveCfg = Release|x64
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Release|x64.Build.0 = Release|x64
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Release|x86.ActiveCfg = Release|Win32
-		{266B769A-C04E-424C-9033-7209F0425BC0}.Release|x86.Build.0 = Release|Win32
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Debug|ARM.ActiveCfg = Debug|ARM
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Debug|ARM.Build.0 = Debug|ARM
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Debug|x64.ActiveCfg = Debug|x64
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Debug|x64.Build.0 = Debug|x64
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Debug|x86.ActiveCfg = Debug|Win32
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Debug|x86.Build.0 = Debug|Win32
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Release|ARM.ActiveCfg = Release|ARM
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Release|ARM.Build.0 = Release|ARM
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Release|x64.ActiveCfg = Release|x64
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Release|x64.Build.0 = Release|x64
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Release|x86.ActiveCfg = Release|Win32
-		{878CF9D3-9761-479E-A715-A1DE9F99CB78}.Release|x86.Build.0 = Release|Win32
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Debug|ARM.ActiveCfg = Debug|ARM
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Debug|ARM.Build.0 = Debug|ARM
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Debug|x64.ActiveCfg = Debug|x64
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Debug|x64.Build.0 = Debug|x64
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Debug|x86.ActiveCfg = Debug|Win32
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Debug|x86.Build.0 = Debug|Win32
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Release|ARM.ActiveCfg = Release|ARM
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Release|ARM.Build.0 = Release|ARM
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Release|x64.ActiveCfg = Release|x64
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Release|x64.Build.0 = Release|x64
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Release|x86.ActiveCfg = Release|Win32
-		{995B01AF-C568-453E-9E5F-8AE81FB79B4B}.Release|x86.Build.0 = Release|Win32
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Debug|ARM.ActiveCfg = Debug|ARM
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Debug|ARM.Build.0 = Debug|ARM
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Debug|x64.ActiveCfg = Debug|x64
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Debug|x64.Build.0 = Debug|x64
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Debug|x86.ActiveCfg = Debug|Win32
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Debug|x86.Build.0 = Debug|Win32
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Release|ARM.ActiveCfg = Release|ARM
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Release|ARM.Build.0 = Release|ARM
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Release|x64.ActiveCfg = Release|x64
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Release|x64.Build.0 = Release|x64
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Release|x86.ActiveCfg = Release|Win32
-		{71A5F1C8-F76D-4297-95AA-75E1C967DC79}.Release|x86.Build.0 = Release|Win32
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Debug|ARM.ActiveCfg = Debug|ARM
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Debug|ARM.Build.0 = Debug|ARM
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Debug|x64.ActiveCfg = Debug|x64
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Debug|x64.Build.0 = Debug|x64
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Debug|x86.ActiveCfg = Debug|Win32
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Debug|x86.Build.0 = Debug|Win32
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Release|ARM.ActiveCfg = Release|ARM
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Release|ARM.Build.0 = Release|ARM
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Release|x64.ActiveCfg = Release|x64
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Release|x64.Build.0 = Release|x64
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Release|x86.ActiveCfg = Release|Win32
-		{3CC91899-3E98-49FD-BED5-FA290A9A5C8E}.Release|x86.Build.0 = Release|Win32
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Debug|ARM.ActiveCfg = Debug|ARM
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Debug|ARM.Build.0 = Debug|ARM
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Debug|x64.ActiveCfg = Debug|x64
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Debug|x64.Build.0 = Debug|x64
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Debug|x86.ActiveCfg = Debug|Win32
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Debug|x86.Build.0 = Debug|Win32
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Release|ARM.ActiveCfg = Release|ARM
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Release|ARM.Build.0 = Release|ARM
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Release|x64.ActiveCfg = Release|x64
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Release|x64.Build.0 = Release|x64
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Release|x86.ActiveCfg = Release|Win32
-		{D829672F-3775-4718-A991-1ABC42CBA67C}.Release|x86.Build.0 = Release|Win32
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Debug|ARM.ActiveCfg = Debug|ARM
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Debug|ARM.Build.0 = Debug|ARM
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Debug|x64.ActiveCfg = Debug|x64
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Debug|x64.Build.0 = Debug|x64
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Debug|x86.ActiveCfg = Debug|Win32
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Debug|x86.Build.0 = Debug|Win32
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Release|ARM.ActiveCfg = Release|ARM
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Release|ARM.Build.0 = Release|ARM
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Release|x64.ActiveCfg = Release|x64
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Release|x64.Build.0 = Release|x64
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Release|x86.ActiveCfg = Release|Win32
-		{C5895B75-BDCF-406C-B803-9CB954E90F0C}.Release|x86.Build.0 = Release|Win32
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|ARM.ActiveCfg = Debug|ARM
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|ARM.Build.0 = Debug|ARM
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x64.ActiveCfg = Debug|x64
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x64.Build.0 = Debug|x64
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x86.ActiveCfg = Debug|Win32
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x86.Build.0 = Debug|Win32
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|ARM.ActiveCfg = Release|ARM
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|ARM.Build.0 = Release|ARM
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x64.ActiveCfg = Release|x64
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x64.Build.0 = Release|x64
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x86.ActiveCfg = Release|Win32
-		{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/windows10/liblinphone-tester/liblinphone-tester_TemporaryKey.pfx b/build/windows10/liblinphone-tester/liblinphone-tester_TemporaryKey.pfx
deleted file mode 100644
index 3aeb9f3b9..000000000
Binary files a/build/windows10/liblinphone-tester/liblinphone-tester_TemporaryKey.pfx and /dev/null differ
diff --git a/build/windows10/liblinphone-tester/project.json b/build/windows10/liblinphone-tester/project.json
deleted file mode 100644
index e3b2dba25..000000000
--- a/build/windows10/liblinphone-tester/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.ApplicationInsights": "1.0.0",
-    "Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
-    "Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
diff --git a/build/windows10/liblinphone/liblinphone.sln b/build/windows10/liblinphone/liblinphone.sln
deleted file mode 100644
index abfa15a85..000000000
--- a/build/windows10/liblinphone/liblinphone.sln
+++ /dev/null
@@ -1,230 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinphone", "liblinphone.vcxproj", "{C7139899-D8BC-48A3-A437-6844A8BAABEF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastreamer2", "..\..\..\mediastreamer2\build\windows10\mediastreamer2\mediastreamer2.vcxproj", "{88E3C241-EB6F-4C84-80DC-89B8961DAF80}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ortp", "..\..\..\oRTP\build\windows10\ortp\ortp.vcxproj", "{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srtp", "..\..\..\..\srtp\build\windows10\srtp\srtp.vcxproj", "{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2", "..\..\..\..\build\xml2\xml2.vcxproj", "{2B04DE79-4D33-4405-AC01-C89E0593A71D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polarssl", "..\..\..\..\polarssl\build\windows10\polarssl\polarssl.vcxproj", "{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speex", "..\..\..\..\speex\build\windows10\speex\speex.vcxproj", "{971DD379-1C2D-44D2-9285-FDA556C48176}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdsp", "..\..\..\..\speex\build\windows10\speexdsp\speexdsp.vcxproj", "{104BF91B-8314-4328-A996-90B8DF6052AF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "..\..\..\..\opus\build\windows10\opus\opus.vcxproj", "{81AF1025-E0EE-4AD6-988D-2EF162778693}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzrtp", "..\..\..\..\bzrtp\build\windows10\bzrtp\bzrtp.vcxproj", "{45C7723D-3107-4906-9633-F43ABE8A7147}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsm", "..\..\..\..\gsm\build\windows10\gsm\gsm.vcxproj", "{EF1103C7-8AAC-464B-BA31-86B87246FA72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "belle-sip", "..\..\..\..\belle-sip\build\windows10\belle-sip\belle-sip.vcxproj", "{B6CDF482-7DA3-43D4-9B12-70150106C191}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr3c", "..\..\..\..\antlr3\runtime\C\build\windows10\antlr3c\antlr3c.vcxproj", "{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\..\zlib\build\windows10\zlib\zlib.vcxproj", "{A34F450D-392D-4660-9618-810BD695B3B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\..\..\..\build\sqlite\sqlite.vcxproj", "{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|ARM.Build.0 = Debug|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x64.ActiveCfg = Debug|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x64.Build.0 = Debug|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x86.ActiveCfg = Debug|Win32
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Debug|x86.Build.0 = Debug|Win32
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|ARM.ActiveCfg = Release|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|ARM.Build.0 = Release|ARM
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x64.ActiveCfg = Release|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x64.Build.0 = Release|x64
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x86.ActiveCfg = Release|Win32
-		{C7139899-D8BC-48A3-A437-6844A8BAABEF}.Release|x86.Build.0 = Release|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|ARM.ActiveCfg = Debug|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|ARM.Build.0 = Debug|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x64.ActiveCfg = Debug|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x64.Build.0 = Debug|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x86.ActiveCfg = Debug|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x86.Build.0 = Debug|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|ARM.ActiveCfg = Release|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|ARM.Build.0 = Release|ARM
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x64.ActiveCfg = Release|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x64.Build.0 = Release|x64
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x86.ActiveCfg = Release|Win32
-		{88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x86.Build.0 = Release|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|ARM.Build.0 = Debug|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x64.ActiveCfg = Debug|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x64.Build.0 = Debug|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x86.ActiveCfg = Debug|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x86.Build.0 = Debug|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|ARM.ActiveCfg = Release|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|ARM.Build.0 = Release|ARM
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x64.ActiveCfg = Release|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x64.Build.0 = Release|x64
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x86.ActiveCfg = Release|Win32
-		{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x86.Build.0 = Release|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|ARM.ActiveCfg = Debug|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|ARM.Build.0 = Debug|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x64.ActiveCfg = Debug|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x64.Build.0 = Debug|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x86.ActiveCfg = Debug|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x86.Build.0 = Debug|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|ARM.ActiveCfg = Release|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|ARM.Build.0 = Release|ARM
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x64.ActiveCfg = Release|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x64.Build.0 = Release|x64
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x86.ActiveCfg = Release|Win32
-		{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x86.Build.0 = Release|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|ARM.Build.0 = Debug|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x64.ActiveCfg = Debug|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x64.Build.0 = Debug|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x86.ActiveCfg = Debug|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x86.Build.0 = Debug|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|ARM.ActiveCfg = Release|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|ARM.Build.0 = Release|ARM
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x64.ActiveCfg = Release|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x64.Build.0 = Release|x64
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x86.ActiveCfg = Release|Win32
-		{2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x86.Build.0 = Release|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|ARM.ActiveCfg = Debug|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|ARM.Build.0 = Debug|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x64.ActiveCfg = Debug|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x64.Build.0 = Debug|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x86.ActiveCfg = Debug|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x86.Build.0 = Debug|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|ARM.ActiveCfg = Release|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|ARM.Build.0 = Release|ARM
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x64.ActiveCfg = Release|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x64.Build.0 = Release|x64
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x86.ActiveCfg = Release|Win32
-		{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x86.Build.0 = Release|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|ARM.ActiveCfg = Debug|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|ARM.Build.0 = Debug|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x64.ActiveCfg = Debug|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x64.Build.0 = Debug|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x86.ActiveCfg = Debug|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x86.Build.0 = Debug|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|ARM.ActiveCfg = Release|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|ARM.Build.0 = Release|ARM
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x64.ActiveCfg = Release|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x64.Build.0 = Release|x64
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x86.ActiveCfg = Release|Win32
-		{971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x86.Build.0 = Release|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|ARM.Build.0 = Debug|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x64.ActiveCfg = Debug|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x64.Build.0 = Debug|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x86.ActiveCfg = Debug|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x86.Build.0 = Debug|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|ARM.ActiveCfg = Release|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|ARM.Build.0 = Release|ARM
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x64.ActiveCfg = Release|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x64.Build.0 = Release|x64
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x86.ActiveCfg = Release|Win32
-		{104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x86.Build.0 = Release|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|ARM.ActiveCfg = Debug|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|ARM.Build.0 = Debug|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x64.ActiveCfg = Debug|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x64.Build.0 = Debug|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x86.ActiveCfg = Debug|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x86.Build.0 = Debug|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|ARM.ActiveCfg = Release|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|ARM.Build.0 = Release|ARM
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x64.ActiveCfg = Release|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x64.Build.0 = Release|x64
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x86.ActiveCfg = Release|Win32
-		{81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x86.Build.0 = Release|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|ARM.ActiveCfg = Debug|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|ARM.Build.0 = Debug|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x64.ActiveCfg = Debug|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x64.Build.0 = Debug|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x86.ActiveCfg = Debug|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x86.Build.0 = Debug|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|ARM.ActiveCfg = Release|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|ARM.Build.0 = Release|ARM
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x64.ActiveCfg = Release|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x64.Build.0 = Release|x64
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x86.ActiveCfg = Release|Win32
-		{45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x86.Build.0 = Release|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|ARM.ActiveCfg = Debug|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|ARM.Build.0 = Debug|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x64.ActiveCfg = Debug|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x64.Build.0 = Debug|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x86.ActiveCfg = Debug|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x86.Build.0 = Debug|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|ARM.ActiveCfg = Release|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|ARM.Build.0 = Release|ARM
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x64.ActiveCfg = Release|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x64.Build.0 = Release|x64
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x86.ActiveCfg = Release|Win32
-		{EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x86.Build.0 = Release|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|ARM.ActiveCfg = Debug|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|ARM.Build.0 = Debug|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x64.ActiveCfg = Debug|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x64.Build.0 = Debug|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x86.ActiveCfg = Debug|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Debug|x86.Build.0 = Debug|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|ARM.ActiveCfg = Release|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|ARM.Build.0 = Release|ARM
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x64.ActiveCfg = Release|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x64.Build.0 = Release|x64
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x86.ActiveCfg = Release|Win32
-		{B6CDF482-7DA3-43D4-9B12-70150106C191}.Release|x86.Build.0 = Release|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|ARM.ActiveCfg = Debug|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|ARM.Build.0 = Debug|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x64.ActiveCfg = Debug|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x64.Build.0 = Debug|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x86.ActiveCfg = Debug|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Debug|x86.Build.0 = Debug|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|ARM.ActiveCfg = Release|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|ARM.Build.0 = Release|ARM
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x64.ActiveCfg = Release|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x64.Build.0 = Release|x64
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x86.ActiveCfg = Release|Win32
-		{01CCCCC9-CA0C-4528-92BC-5B8BE1D02D6D}.Release|x86.Build.0 = Release|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|ARM.ActiveCfg = Debug|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|ARM.Build.0 = Debug|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x64.ActiveCfg = Debug|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x64.Build.0 = Debug|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x86.ActiveCfg = Debug|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Debug|x86.Build.0 = Debug|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|ARM.ActiveCfg = Release|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|ARM.Build.0 = Release|ARM
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x64.ActiveCfg = Release|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x64.Build.0 = Release|x64
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x86.ActiveCfg = Release|Win32
-		{A34F450D-392D-4660-9618-810BD695B3B0}.Release|x86.Build.0 = Release|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|ARM.ActiveCfg = Debug|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|ARM.Build.0 = Debug|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x64.ActiveCfg = Debug|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x64.Build.0 = Debug|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x86.ActiveCfg = Debug|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Debug|x86.Build.0 = Debug|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|ARM.ActiveCfg = Release|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|ARM.Build.0 = Release|ARM
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x64.ActiveCfg = Release|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x64.Build.0 = Release|x64
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x86.ActiveCfg = Release|Win32
-		{74CAD9D0-D8AE-4896-B71B-B2D9B48F30AA}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/windows10/liblinphone/liblinphone.vcxproj b/build/windows10/liblinphone/liblinphone.vcxproj
deleted file mode 100644
index 2be93aeb0..000000000
--- a/build/windows10/liblinphone/liblinphone.vcxproj
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\coreapi\account_creator.c" />
-    <ClCompile Include="..\..\..\coreapi\address.c" />
-    <ClCompile Include="..\..\..\coreapi\authentication.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_address_impl.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_impl.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_call.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_call_transfer.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_events.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_impl.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_info.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_message.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_presence.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_publish.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_op_registration.c" />
-    <ClCompile Include="..\..\..\coreapi\bellesip_sal\sal_sdp.c" />
-    <ClCompile Include="..\..\..\coreapi\buffer.c" />
-    <ClCompile Include="..\..\..\coreapi\callbacks.c" />
-    <ClCompile Include="..\..\..\coreapi\call_log.c" />
-    <ClCompile Include="..\..\..\coreapi\call_params.c" />
-    <ClCompile Include="..\..\..\coreapi\chat.c" />
-    <ClCompile Include="..\..\..\coreapi\conference.c" />
-    <ClCompile Include="..\..\..\coreapi\content.c" />
-    <ClCompile Include="..\..\..\coreapi\dict.c" />
-    <ClCompile Include="..\..\..\coreapi\ec-calibrator.c" />
-    <ClCompile Include="..\..\..\coreapi\enum.c" />
-    <ClCompile Include="..\..\..\coreapi\event.c" />
-    <ClCompile Include="..\..\..\coreapi\friend.c" />
-    <ClCompile Include="..\..\..\coreapi\info.c" />
-    <ClCompile Include="..\..\..\coreapi\lime.c" />
-    <ClCompile Include="..\..\..\coreapi\linphonecall.c" />
-    <ClCompile Include="..\..\..\coreapi\linphonecore.c" />
-    <ClCompile Include="..\..\..\coreapi\linphone_tunnel_config.c" />
-    <ClCompile Include="..\..\..\coreapi\linphone_tunnel_stubs.c" />
-    <ClCompile Include="..\..\..\coreapi\localplayer.c" />
-    <ClCompile Include="..\..\..\coreapi\lpc2xml.c" />
-    <ClCompile Include="..\..\..\coreapi\lpconfig.c" />
-    <ClCompile Include="..\..\..\coreapi\lsd.c" />
-    <ClCompile Include="..\..\..\coreapi\message_storage.c" />
-    <ClCompile Include="..\..\..\coreapi\misc.c" />
-    <ClCompile Include="..\..\..\coreapi\offeranswer.c" />
-    <ClCompile Include="..\..\..\coreapi\player.c" />
-    <ClCompile Include="..\..\..\coreapi\presence.c" />
-    <ClCompile Include="..\..\..\coreapi\proxy.c" />
-    <ClCompile Include="..\..\..\coreapi\quality_reporting.c" />
-    <ClCompile Include="..\..\..\coreapi\remote_provisioning.c" />
-    <ClCompile Include="..\..\..\coreapi\sal.c" />
-    <ClCompile Include="..\..\..\coreapi\siplogin.c" />
-    <ClCompile Include="..\..\..\coreapi\sipsetup.c" />
-    <ClCompile Include="..\..\..\coreapi\vtables.c" />
-    <ClCompile Include="..\..\..\coreapi\xml.c" />
-    <ClCompile Include="..\..\..\coreapi\xml2lpc.c" />
-    <ClCompile Include="..\..\..\coreapi\xmlrpc.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\coreapi\account_creator.h" />
-    <ClInclude Include="..\..\..\coreapi\bellesip_sal\sal_impl.h" />
-    <ClInclude Include="..\..\..\coreapi\buffer.h" />
-    <ClInclude Include="..\..\..\coreapi\call_log.h" />
-    <ClInclude Include="..\..\..\coreapi\call_params.h" />
-    <ClInclude Include="..\..\..\coreapi\content.h" />
-    <ClInclude Include="..\..\..\coreapi\enum.h" />
-    <ClInclude Include="..\..\..\coreapi\event.h" />
-    <ClInclude Include="..\..\..\coreapi\lime.h" />
-    <ClInclude Include="..\..\..\coreapi\linphonecore.h" />
-    <ClInclude Include="..\..\..\coreapi\linphonecore_utils.h" />
-    <ClInclude Include="..\..\..\coreapi\linphonefriend.h" />
-    <ClInclude Include="..\..\..\coreapi\linphonepresence.h" />
-    <ClInclude Include="..\..\..\coreapi\linphone_tunnel.h" />
-    <ClInclude Include="..\..\..\coreapi\lpc2xml.h" />
-    <ClInclude Include="..\..\..\coreapi\lpconfig.h" />
-    <ClInclude Include="..\..\..\coreapi\offeranswer.h" />
-    <ClInclude Include="..\..\..\coreapi\private.h" />
-    <ClInclude Include="..\..\..\coreapi\quality_reporting.h" />
-    <ClInclude Include="..\..\..\coreapi\sipsetup.h" />
-    <ClInclude Include="..\..\..\coreapi\xml2lpc.h" />
-    <ClInclude Include="..\..\..\coreapi\xmlrpc.h" />
-    <ClInclude Include="config.h" />
-    <ClInclude Include="liblinphone_gitversion.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\belle-sip\build\windows10\belle-sip\belle-sip.vcxproj">
-      <Project>{b6cdf482-7da3-43d4-9b12-70150106c191}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\build\sqlite\sqlite.vcxproj">
-      <Project>{74cad9d0-d8ae-4896-b71b-b2d9b48f30aa}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\build\xml2\xml2.vcxproj">
-      <Project>{2b04de79-4d33-4405-ac01-c89e0593a71d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\zlib\build\windows10\zlib\zlib.vcxproj">
-      <Project>{a34f450d-392d-4660-9618-810bd695b3b0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\mediastreamer2\build\windows10\mediastreamer2\mediastreamer2.vcxproj">
-      <Project>{88e3c241-eb6f-4c84-80dc-89b8961daf80}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\oRTP\build\windows10\ortp\ortp.vcxproj">
-      <Project>{2e56b851-9d8d-40e5-84bb-e4ee63b71d25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{c7139899-d8bc-48a3-a437-6844a8baabef}</ProjectGuid>
-    <Keyword>DynamicLibrary</Keyword>
-    <ProjectName>liblinphone</ProjectName>
-    <RootNamespace>liblinphone</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>10</ApplicationTypeRevision>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10069.0</WindowsTargetPlatformMinVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\include;$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\mediastreamer2\include;$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\oRTP\include;$(ProjectDir)..\..\..\..\sqlite;$(ProjectDir)..\..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;HAVE_ZLIB;MSG_STORAGE_ENABLED;VIDEO_ENABLED;IN_LINPHONE;LINPHONE_PLUGINS_DIR="\\linphone\\plugins";_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-    <PreBuildEvent>
-      <Command>version.bat</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Batch script to get the git version</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/windows10/liblinphone/version.bat b/build/windows10/liblinphone/version.bat
deleted file mode 100644
index c015636e2..000000000
--- a/build/windows10/liblinphone/version.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@ECHO off
-
-SET gitlog=
-FOR /f "delims=" %%a IN ('git log -1 "--pretty=format:%%H" ../../../configure.ac') DO SET gitlog=%%a
-
-IF [%gitlog%] == [] GOTO UnknownGitVersion
-
-FOR /f "delims=" %%a IN ('git describe --always') DO SET gitdescribe=%%a
-GOTO End
-
-:UnknownGitVersion
-SET gitdescribe=unknown
-
-:End
-ECHO #define LIBLINPHONE_GIT_VERSION "%gitdescribe%" > liblinphone_gitversion.h
-
-
-FOR /F "delims=" %%a IN ('findstr /B AC_INIT ..\..\..\configure.ac') DO (
-	FOR /F "tokens=1,2,3 delims=[,]" %%1 IN ("%%a") DO (
-		ECHO #define LIBLINPHONE_VERSION "%%3" > config.h
-	)
-)
diff --git a/build/wp8/LibLinphoneTester-native/LibLinphoneTester-native.vcxproj b/build/wp8/LibLinphoneTester-native/LibLinphoneTester-native.vcxproj
index 6bc245f9f..e60a5a6dc 100644
--- a/build/wp8/LibLinphoneTester-native/LibLinphoneTester-native.vcxproj
+++ b/build/wp8/LibLinphoneTester-native/LibLinphoneTester-native.vcxproj
@@ -50,7 +50,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\oRTP\include;$(ProjectDir)..\..\..\mediastreamer2\include;$(ProjectDir)..\..\..\tester;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\..\cunit\build\wp8\cunit\$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\belle-sip\include;$(ProjectDir)..\..\..\oRTP\include;$(ProjectDir)..\..\..\mediastreamer2\include;$(ProjectDir)..\..\..\tester;$(ProjectDir)..\..\..\coreapi;$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\..\bcunit\build\wp8\bcunit\$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;HAVE_CU_GET_SUITE;IN_LINPHONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -124,7 +124,7 @@
     <ProjectReference Include="..\..\..\..\belle-sip\build\wp8\belle-sip\belle-sip.vcxproj">
       <Project>{4c225a82-800b-427b-ba7b-61686a9b347f}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cunit\build\wp8\cunit\cunit.vcxproj">
+    <ProjectReference Include="..\..\..\..\bcunit\build\wp8\bcunit\bcunit.vcxproj">
       <Project>{902daf1d-ebf1-4d03-b598-143500a50ab4}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\msamr\build\wp8\msamr\msamr.vcxproj">
diff --git a/build/wp8/LibLinphoneTester-native/linphone-tester-native.cpp b/build/wp8/LibLinphoneTester-native/linphone-tester-native.cpp
index 941b50916..3c511f0fd 100644
--- a/build/wp8/LibLinphoneTester-native/linphone-tester-native.cpp
+++ b/build/wp8/LibLinphoneTester-native/linphone-tester-native.cpp
@@ -2,7 +2,7 @@
 
 #include "linphone-tester-native.h"
 #include "ortp/logging.h"
-#include "cunit/Util.h"
+#include "bcunit/Util.h"
 
 
 using namespace linphone_tester_native;
@@ -52,7 +52,7 @@ static void LinphoneNativeVerboseOutputTraceHandler(OrtpLogLevel lev, const char
 	LinphoneNativeGenericOutputTraceHandler(lev, fmt, args);
 }
 
-static void CUnitNativeOutputTraceHandler(int lev, const char *fmt, va_list args)
+static void BCUnitNativeOutputTraceHandler(int lev, const char *fmt, va_list args)
 {
 	nativeOutputTraceHandler(Raw, fmt, args);
 }
@@ -87,7 +87,7 @@ void LinphoneTesterNative::run(Platform::String^ suiteName, Platform::String^ ca
 	} else {
 		linphone_core_enable_logs_with_cb(LinphoneNativeOutputTraceHandler);
 	}
-	CU_set_trace_handler(CUnitNativeOutputTraceHandler);
+	CU_set_trace_handler(BCUnitNativeOutputTraceHandler);
 
 	liblinphone_tester_run_tests(wssuitename == all ? 0 : csuitename, wscasename == all ? 0 : ccasename);
 }
diff --git a/build/wp8/LibLinphoneTester-wp8/LibLinphoneTester-wp8.sln b/build/wp8/LibLinphoneTester-wp8/LibLinphoneTester-wp8.sln
index cf0d4a086..42a854fb1 100644
--- a/build/wp8/LibLinphoneTester-wp8/LibLinphoneTester-wp8.sln
+++ b/build/wp8/LibLinphoneTester-wp8/LibLinphoneTester-wp8.sln
@@ -39,7 +39,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speex", "..\..\..\..\speex\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdsp", "..\..\..\..\speex\build\wp8\speex\speexdsp.vcxproj", "{6BD78980-9C71-4341-8775-AD19E9EC7305}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cunit", "..\..\..\..\cunit\build\wp8\cunit\cunit.vcxproj", "{902DAF1D-EBF1-4D03-B598-143500A50AB4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bcunit", "..\..\..\..\bcunit\build\wp8\bcunit\bcunit.vcxproj", "{902DAF1D-EBF1-4D03-B598-143500A50AB4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmswasapi", "..\..\..\..\mswasapi\mswasapi\mswasapi.vcxproj", "{D22BD217-D0F8-4274-9B3A-F3F35F46482C}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/cmake/FindCUnit.cmake b/cmake/FindGtkMacIntegration.cmake
similarity index 52%
rename from cmake/FindCUnit.cmake
rename to cmake/FindGtkMacIntegration.cmake
index 91bc67fbd..17c8efc8c 100644
--- a/cmake/FindCUnit.cmake
+++ b/cmake/FindGtkMacIntegration.cmake
@@ -1,5 +1,5 @@
 ############################################################################
-# FindCUnit.txt
+# FindGtkMacIntegration.txt
 # Copyright (C) 2015  Belledonne Communications, Grenoble France
 #
 ############################################################################
@@ -20,39 +20,35 @@
 #
 ############################################################################
 #
-# - Find the CUnit include file and library
+# - Find the libgtkmacintegration include file and library
 #
-#  CUNIT_FOUND - system has CUnit
-#  CUNIT_INCLUDE_DIRS - the CUnit include directory
-#  CUNIT_LIBRARIES - The libraries needed to use CUnit
+#  GTKMACINTEGRATION_FOUND - system has libgtkmacintegration
+#  GTKMACINTEGRATION_INCLUDE_DIRS - the libgtkmacintegration include directory
+#  GTKMACINTEGRATION_LIBRARIES - The libraries needed to use libgtkmacintegration
+#  GTKMACINTEGRATION_CPPFLAGS - The cflags needed to use libgtkmacintegration
 
-include(CheckIncludeFile)
-include(CheckLibraryExists)
-
-set(_CUNIT_ROOT_PATHS
+set(_GTKMACINTEGRATION_ROOT_PATHS
 	${CMAKE_INSTALL_PREFIX}
 )
 
-find_path(CUNIT_INCLUDE_DIRS
-	NAMES CUnit/CUnit.h
-	HINTS _CUNIT_ROOT_PATHS
-	PATH_SUFFIXES include
+find_path(GTKMACINTEGRATION_INCLUDE_DIRS
+	NAMES gtkosxapplication.h
+	HINTS _GTKMACINTEGRATION_ROOT_PATHS
+	PATH_SUFFIXES include/gtkmacintegration-gtk2 include/gtkmacintegration
 )
 
-if(CUNIT_INCLUDE_DIRS)
-	set(HAVE_CUNIT_CUNIT_H 1)
-endif()
-
-find_library(CUNIT_LIBRARIES
-	NAMES cunit
-	HINTS ${_CUNIT_ROOT_PATHS}
+find_library(GTKMACINTEGRATION_LIBRARIES
+	NAMES gtkmacintegration-gtk2 gtkmacintegration
+	HINTS ${_GTKMACINTEGRATION_ROOT_PATHS}
 	PATH_SUFFIXES bin lib
 )
 
+set(GTKMACINTEGRATION_CPPFLAGS "-DMAC_INTEGRATION")
+
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CUnit
+find_package_handle_standard_args(GTKMACINTEGRATION
 	DEFAULT_MSG
-	CUNIT_INCLUDE_DIRS CUNIT_LIBRARIES
+	GTKMACINTEGRATION_INCLUDE_DIRS GTKMACINTEGRATION_LIBRARIES GTKMACINTEGRATION_CPPFLAGS
 )
 
-mark_as_advanced(CUNIT_INCLUDE_DIRS CUNIT_LIBRARIES)
+mark_as_advanced(GTKMACINTEGRATION_INCLUDE_DIRS GTKMACINTEGRATION_LIBRARIES GTKMACINTEGRATION_CPPFLAGS)
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
index 8497e9f58..d238426c7 100644
--- a/cmake/FindIconv.cmake
+++ b/cmake/FindIconv.cmake
@@ -26,13 +26,16 @@
 #  ICONV_INCLUDE_DIRS - the libiconv include directory
 #  ICONV_LIBRARIES - The libraries needed to use libiconv
 
-set(_ICONV_ROOT_PATHS
-	${CMAKE_INSTALL_PREFIX}
-)
+if(APPLE AND NOT IOS)
+	set(ICONV_HINTS "${CMAKE_OSX_SYSROOT}/usr" "/usr")
+endif()
+if(ICONV_HINTS)
+	set(ICONV_LIBRARIES_HINTS "${ICONV_HINTS}/lib")
+endif()
 
 find_path(ICONV_INCLUDE_DIRS
 	NAMES iconv.h
-	HINTS _ICONV_ROOT_PATHS
+	HINTS "${ICONV_HINTS}"
 	PATH_SUFFIXES include
 )
 
@@ -42,8 +45,7 @@ endif()
 
 find_library(ICONV_LIBRARIES
 	NAMES iconv
-	HINTS ${_ICONV_ROOT_PATHS}
-	PATH_SUFFIXES bin lib
+	HINTS "${ICONV_LIBRARIES_HINTS}"
 )
 
 include(FindPackageHandleStandardArgs)
diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
index e634b0813..0dd14d183 100644
--- a/cmake/FindSqlite3.cmake
+++ b/cmake/FindSqlite3.cmake
@@ -26,13 +26,16 @@
 #  SQLITE3_INCLUDE_DIRS - the sqlite3 include directory
 #  SQLITE3_LIBRARIES - The libraries needed to use sqlite3
 
-set(_SQLITE3_ROOT_PATHS
-	${CMAKE_INSTALL_PREFIX}
-)
+if(APPLE AND NOT IOS)
+	set(SQLITE3_HINTS "/usr")
+endif()
+if(SQLITE3_HINTS)
+	set(SQLITE3_LIBRARIES_HINTS "${SQLITE3_HINTS}/lib")
+endif()
 
 find_path(SQLITE3_INCLUDE_DIRS
 	NAMES sqlite3.h
-	HINTS _SQLITE3_ROOT_PATHS
+	HINTS "${SQLITE3_HINTS}"
 	PATH_SUFFIXES include
 )
 
@@ -42,8 +45,7 @@ endif()
 
 find_library(SQLITE3_LIBRARIES
 	NAMES sqlite3
-	HINTS ${_SQLITE3_ROOT_PATHS}
-	PATH_SUFFIXES bin lib
+	HINTS "${SQLITE3_LIBRARIES_HINTS}"
 )
 
 include(FindPackageHandleStandardArgs)
diff --git a/cmake/FindXML2.cmake b/cmake/FindXML2.cmake
index 3f35ab497..da801bcd0 100644
--- a/cmake/FindXML2.cmake
+++ b/cmake/FindXML2.cmake
@@ -26,13 +26,16 @@
 #  XML2_INCLUDE_DIRS - the libxml2 include directory
 #  XML2_LIBRARIES - The libraries needed to use libxml2
 
-set(_XML2_ROOT_PATHS
-	${CMAKE_INSTALL_PREFIX}
-)
+if(APPLE AND NOT IOS)
+	set(XML2_HINTS "/usr")
+endif()
+if(XML2_HINTS)
+	set(XML2_LIBRARIES_HINTS "${XML2_HINTS}/lib")
+endif()
 
 find_path(XML2_INCLUDE_DIRS
 	NAMES libxml/xmlreader.h
-	HINTS _XML2_ROOT_PATHS
+	HINTS "${XML2_HINTS}"
 	PATH_SUFFIXES include/libxml2
 )
 
@@ -42,8 +45,7 @@ endif()
 
 find_library(XML2_LIBRARIES
 	NAMES xml2
-	HINTS ${_XML2_ROOT_PATHS}
-	PATH_SUFFIXES bin lib
+	HINTS "${XML2_LIBRARIES_HINTS}"
 )
 
 include(FindPackageHandleStandardArgs)
diff --git a/cmake/FindZlib.cmake b/cmake/FindZlib.cmake
index 1f42aaf81..8f7e23430 100644
--- a/cmake/FindZlib.cmake
+++ b/cmake/FindZlib.cmake
@@ -26,13 +26,16 @@
 #  ZLIB_INCLUDE_DIRS - the zlib include directory
 #  ZLIB_LIBRARIES - The libraries needed to use zlib
 
-set(_ZLIB_ROOT_PATHS
-	${CMAKE_INSTALL_PREFIX}
-)
+if(APPLE AND NOT IOS)
+	set(ZLIB_HINTS "/usr")
+endif()
+if(ZLIB_HINTS)
+	set(ZLIB_LIBRARIES_HINTS "${ZLIB_HINTS}/lib")
+endif()
 
 find_path(ZLIB_INCLUDE_DIRS
 	NAMES zlib.h
-	HINTS _ZLIB_ROOT_PATHS
+	HINTS "${ZLIB_HINTS}"
 	PATH_SUFFIXES include
 )
 
@@ -41,21 +44,14 @@ if(ZLIB_INCLUDE_DIRS)
 endif()
 
 if(ENABLE_STATIC)
-	if(IOS)
-		set(_ZLIB_STATIC_NAMES z)
-	else()
-		set(_ZLIB_STATIC_NAMES zstatic zlibstatic zlibstaticd)
-	endif()
 	find_library(ZLIB_LIBRARIES
-		NAMES ${_ZLIB_STATIC_NAMES}
-		HINTS ${_ZLIB_ROOT_PATHS}
-		PATH_SUFFIXES bin lib
+		NAMES zstatic zlibstatic zlibstaticd z
+		HINTS "${ZLIB_LIBRARIES_HINTS}"
 	)
 else()
 	find_library(ZLIB_LIBRARIES
 		NAMES z zlib zlibd
-		HINTS ${_ZLIB_ROOT_PATHS}
-		PATH_SUFFIXES bin lib
+		HINTS "${ZLIB_LIBRARIES_HINTS}"
 	)
 endif()
 
diff --git a/cmake/LinphoneConfig.cmake.in b/cmake/LinphoneConfig.cmake.in
index 62d0fa74e..2bbdf4118 100644
--- a/cmake/LinphoneConfig.cmake.in
+++ b/cmake/LinphoneConfig.cmake.in
@@ -29,17 +29,34 @@
 #  LINPHONE_CPPFLAGS - The compilation flags needed to use linphone
 #  LINPHONE_LDFLAGS - The linking flags needed to use linphone
 
-include("${CMAKE_CURRENT_LIST_DIR}/LinphoneTargets.cmake")
+if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+	include("${CMAKE_CURRENT_LIST_DIR}/LinphoneTargets.cmake")
+endif()
+
 find_package(Mediastreamer2 REQUIRED)
 find_package(BelleSIP REQUIRED)
 if(@ENABLE_TUNNEL@)
-	find_package(Tunnel)
+	if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+		include("${EP_tunnel_CONFIG_DIR}/TunnelConfig.cmake")
+	else()
+		find_package(Tunnel)
+	endif()
+endif()
+if(@ENABLE_VCARD@)
+	if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+		include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake")
+	else()
+		find_package(Belcard)
+	endif()
 endif()
 
 get_filename_component(LINPHONE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(LINPHONE_INCLUDE_DIRS "${LINPHONE_CMAKE_DIR}/../../../include")
-set(LINPHONE_LIBRARIES BelledonneCommunications::linphone)
-set(LINPHONE_LDFLAGS @LINK_FLAGS@)
+if(@ENABLE_SHARED@)
+	set(LINPHONE_LIBRARIES linphone)
+else()
+	set(LINPHONE_LIBRARIES linphone-static)
+endif()
 list(APPEND LINPHONE_INCLUDE_DIRS ${MEDIASTREAMER2_INCLUDE_DIRS} ${BELLESIP_INCLUDE_DIRS})
 list(APPEND LINPHONE_LIBRARIES ${MEDIASTREAMER2_LIBRARIES} ${BELLESIP_LIBRARIES})
 set(LINPHONE_CPPFLAGS "${MEDIASTREAMER2_CPPFLAGS}")
@@ -48,4 +65,8 @@ if(TUNNEL_FOUND)
 	list(APPEND LINPHONE_INCLUDE_DIRS ${TUNNEL_INCLUDE_DIRS})
 	list(APPEND LINPHONE_LIBRARIES ${TUNNEL_LIBRARIES})
 endif()
+if(BELCARD_FOUND)
+	list(APPEND LINPHONE_INCLUDE_DIRS ${BELCARD_INCLUDE_DIRS})
+	list(APPEND LINPHONE_LIBRARIES ${BELCARD_LIBRARIES})
+endif()
 set(LINPHONE_FOUND 1)
diff --git a/config.h.cmake b/config.h.cmake
index 6e8fd92dd..c608fb77c 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -38,9 +38,11 @@
 #define PACKAGE_SOUND_DIR "${PACKAGE_SOUND_DIR}"
 
 #cmakedefine BUILD_WIZARD
+#cmakedefine HAVE_GTK_OSX 1
 #cmakedefine HAVE_NOTIFY4
 #cmakedefine HAVE_ZLIB 1
 #cmakedefine HAVE_CU_GET_SUITE 1
 #cmakedefine HAVE_CU_CURSES 1
 #cmakedefine HAVE_LIBUDEV_H 0
+#cmakedefine HAVE_LIME
 #cmakedefine ENABLE_NLS 1
diff --git a/configure.ac b/configure.ac
index 191c7fd7d..80c7c7b4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.8.5],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.10.2],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 
@@ -17,7 +17,7 @@ if test "$LINPHONE_EXTRA_VERSION" != "" ;then
 	LINPHONE_VERSION=$LINPHONE_VERSION.${LINPHONE_EXTRA_VERSION}
 fi
 
-LIBLINPHONE_SO_CURRENT=7 dnl increment this number when you add/change/remove an interface
+LIBLINPHONE_SO_CURRENT=9 dnl increment this number when you add/change/remove an interface
 LIBLINPHONE_SO_REVISION=0 dnl increment this number when you change source code, without changing interfaces; set to 0 when incrementing CURRENT
 LIBLINPHONE_SO_AGE=0 dnl increment this number when you add an interface, set to 0 if you remove an interface
 
@@ -39,6 +39,7 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl do not put anythingelse before AC_PROG_CC unless checking if macro still work for clang
 AC_PROG_CXX(["xcrun clang++" g++])
 AC_PROG_CC(["xcrun clang" gcc])
+AC_PROG_OBJC(["xcrun clang" gcc])
 
 gl_LD_OUTPUT_DEF
 
@@ -132,7 +133,7 @@ AC_CONFIG_COMMANDS([libtool-hacking],
 
 dnl Add the languages which your application supports here.
 PKG_PROG_PKG_CONFIG
-ALL_LINGUAS=$(cd po && echo *.po | sed 's/\.po//g')
+ALL_LINGUAS=$(cd $srcdir/po && echo *.po | sed 's/\.po//g')
 AC_SUBST(ALL_LINGUAS)
 AC_DEFINE_UNQUOTED(LINPHONE_ALL_LANGS, "$ALL_LINGUAS", [All supported languages])
 
@@ -157,6 +158,11 @@ AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext package name])
 dnl AC_CHECK_LIB(intl,libintl_gettext)
 
+PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox, [found_bctoolbox=yes],[found_bctoolbox=no])
+if test "x$found_bctoolbox" != "xyes" ; then
+	AC_MSG_ERROR(["Could not find bctoolbox (required dependency)"])
+fi
+
 AC_CHECK_FUNCS([get_current_dir_name strndup stpcpy] )
 
 AC_ARG_ENABLE(x11,
@@ -595,6 +601,8 @@ AC_ARG_WITH(ffmpeg,
 	[ ffmpegdir=/usr ]
 )
 
+AM_CONDITIONAL([BUILD_MACOS], [test "x$build_macos" = "xyes"])
+
 if test "$video" = "true"; then
 
 	if test "$enable_x11" = "true"; then
@@ -768,12 +776,15 @@ AC_ARG_ENABLE(strict,
 )
 
 STRICT_OPTIONS="-Wall -Wuninitialized"
-STRICT_OPTIONS_CC="-Wdeclaration-after-statement "
+STRICT_OPTIONS_CC="-Wdeclaration-after-statement -Wstrict-prototypes"
 STRICT_OPTIONS_CXX=""
 
 #for clang
 
 case $CC in
+	*gcc*)
+		STRICT_OPTIONS="$STRICT_OPTIONS -fno-inline-small-functions"
+	;;
 	*clang*)
 		STRICT_OPTIONS="$STRICT_OPTIONS -Qunused-arguments "
 		#disabled due to wrong optimization false positive with small string
@@ -791,7 +802,7 @@ case "$target_os" in
 	;;
 esac
 if test "$strictness" = "yes" ; then
-	STRICT_OPTIONS="$STRICT_OPTIONS -Werror"
+	STRICT_OPTIONS="$STRICT_OPTIONS -Werror -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations -Wno-error=strict-prototypes -Wno-missing-field-initializers"
 	CFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
 
@@ -873,46 +884,81 @@ AC_ARG_ENABLE(tunnel,
 )
 AM_CONDITIONAL(BUILD_TUNNEL, test x$enable_tunnel = xtrue)
 if test x$enable_tunnel = xtrue; then
-	PKG_CHECK_MODULES(TUNNEL, tunnel >= 0.3.3)
+	PKG_CHECK_MODULES(TUNNEL, tunnel >= 0.6.0)
 	AC_DEFINE(TUNNEL_ENABLED,1,[Tells tunnel extension is built-in])
 fi
 
-AC_ARG_ENABLE(msg-storage,
-	[AS_HELP_STRING([--enable-msg-storage=[yes/no]], [Turn on compilation of message storage (default=auto)])],
+AC_ARG_ENABLE(vcard,
+	[AS_HELP_STRING([--enable-vcard=[yes/no]], [Turn on compilation of vcard (default=auto)])],
 	[case "${enableval}" in
-		yes)	enable_msg_storage=true ;;
-		no)	enable_msg_storage=false ;;
-		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-msg-storage) ;;
+		yes)	enable_vcard=true ;;
+		no)		enable_vcard=false ;;
+		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-vcard) ;;
 	esac],
-	[enable_msg_storage=auto]
+	[enable_vcard=auto]
 )
 
-if test x$enable_msg_storage != xfalse; then
+if test x$enable_vcard != xfalse; then
+	PKG_CHECK_MODULES(BELCARD, belcard, [found_vcard=yes],[found_vcard=no])
+	if test "$found_vcard" = "no"; then
+		dnl Check the lib presence in case the PKG-CONFIG version is not found
+		AC_LANG_CPLUSPLUS
+		AC_CHECK_LIB(belcard, main, [BELCARD_LIBS+=" -lbelr -lbelcard"; found_vcard=yes], [foo=bar])
+		AC_LANG_C
+	fi
+	if test "$found_vcard" = "yes"; then
+		BELCARD_CFLAGS+=" -DVCARD_ENABLED"
+		enable_vcard=true
+	else
+		if test x$enable_vcard = xtrue; then
+			AC_MSG_ERROR([belcard, required for vcard support, not found])
+		fi
+		enable_vcard=false
+	fi
+
+	AC_SUBST(BELCARD_CFLAGS)
+	AC_SUBST(BELCARD_LIBS)
+fi
+
+AM_CONDITIONAL(BUILD_VCARD, test x$enable_vcard = xtrue)
+
+AC_ARG_ENABLE(sqlite-storage,
+	[AS_HELP_STRING([--sqlite-msg-storage=[yes/no]], [Turn on compilation of sqlite storage for call history, messages, friends (default=auto)])],
+	[case "${enableval}" in
+		yes)	enable_sqlite_storage=true ;;
+		no)	enable_sqlite_storage=false ;;
+		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-sqlite-storage) ;;
+	esac],
+	[enable_sqlite_storage=auto]
+)
+
+if test x$enable_sqlite_storage != xfalse; then
 	PKG_CHECK_MODULES(SQLITE3,[sqlite3 >= 3.6.0],[found_sqlite=yes],[found_sqlite=no])
 	if test "$found_sqlite" = "no"; then
 		dnl Check the lib presence in case the PKG-CONFIG version is not found
 		AC_CHECK_LIB(sqlite3, sqlite3_open, [SQLITE3_LIBS+=" -lsqlite3 "; found_sqlite=yes], [foo=bar])
 	fi
 	if test "$found_sqlite" = "yes"; then
-		SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
+		SQLITE3_CFLAGS+=" -DSQLITE_STORAGE_ENABLED"
 		if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
 			SQLITE3_LIBS+=" -liconv"
 		fi
-		enable_msg_storage=true
+		enable_sqlite_storage=true
 	else
-		if test x$enable_msg_storage = xtrue; then
-			AC_MSG_ERROR([sqlite3, required for message storage, not found])
+		if test x$enable_sqlite_storage = xtrue; then
+			AC_MSG_ERROR([sqlite3, required for storage, not found])
 		fi
-		enable_msg_storage=false
+		enable_sqlite_storage=false
 	fi
 
 	AC_SUBST(SQLITE3_CFLAGS)
 	AC_SUBST(SQLITE3_LIBS)
 fi
 
-AM_CONDITIONAL(BUILD_MSG_STORAGE, test x$enable_msg_storage = xtrue)
+AM_CONDITIONAL(BUILD_SQLITE_STORAGE, test x$enable_sqlite_storage = xtrue)
 
-PKG_CHECK_MODULES(BELLESIP, [belle-sip >= 1.4.0])
+
+PKG_CHECK_MODULES(BELLESIP, [belle-sip >= 1.4.2])
 
 SIPSTACK_CFLAGS="$BELLESIP_CFLAGS"
 SIPSTACK_LIBS="$BELLESIP_LIBS"
@@ -962,44 +1008,13 @@ AC_ARG_ENABLE(tests,
 )
 AM_CONDITIONAL(ENABLE_TESTS, test x$tests_enabled = xyes)
 
-PKG_CHECK_MODULES(CUNIT, cunit, [found_cunit=yes],[found_cunit=no])
+PKG_CHECK_MODULES(BCTOOLBOXTESTER, bctoolbox-tester, [found_pkg_config_bctoolboxtester=yes],[found_pkg_config_bctoolboxtester=no])
 
-if test "$found_cunit" = "no" ; then
-        AC_CHECK_HEADERS(CUnit/CUnit.h,
-                [
-                        AC_CHECK_LIB(cunit,CU_add_suite,[
-                                found_cunit=yes
-                                CUNIT_LIBS+=" -lcunit"
-                        ])
-
-                ])
+AM_CONDITIONAL([ENABLE_TESTS], [test x$found_pkg_config_bctoolboxtester = xyes && test x$tests_enabled != xfalse])
+if test "$found_pkg_config_bctoolboxtester" = "no" ; then
+        AC_MSG_WARN([Could not find bctoolbox-tester wrapper, tests are not compiled.])
 fi
 
-case "$target_os" in
-	*darwin*)
-		#hack for macport
-		CUNIT_LIBS+=" -lncurses"
-	;;
-esac
-AM_CONDITIONAL([BUILD_CUNIT_TESTS], [test x$found_cunit = xyes && test x$tests_enabled != xfalse])
-if test "$found_cunit" = "no" ; then
-        AC_MSG_WARN([Could not find cunit framework, tests are not compiled.])
-else
-		AC_CHECK_LIB(cunit,CU_get_suite,[
-										AC_DEFINE(HAVE_CU_GET_SUITE,1,[defined when CU_get_suite is available])
-										],[foo=bar],[$CUNIT_LIBS])
-
-        AC_CHECK_LIB(cunit,CU_curses_run_tests,[
-                                        AC_DEFINE(HAVE_CU_CURSES,1,[defined when CU_curses_run_tests is available])
-                                        ],[foo=bar],[$CUNIT_LIBS])
-fi
-
-case "$target_os" in
-	*linux*)
-		# Eliminate -lstdc++ addition to postdeps for cross compiles.
-		postdeps_CXX=`echo " $postdeps_CXX " | sed 's, -lstdc++ ,,g'`
-	;;
-esac
 
 
 dnl ##################################################
@@ -1022,6 +1037,11 @@ else
 fi
 AM_CONDITIONAL(HAVE_DOXYGEN, test "$DOXYGEN" != "false")
 
+AC_PATH_PROG([SIPP],[sipp],[false])
+if test "x$SIPP" != "xfalse" ; then
+	AC_DEFINE(HAVE_SIPP,1,[defined when SIPP is available])
+	AC_DEFINE_UNQUOTED(SIPP_COMMAND,"$SIPP",[defined when SIPP is available])
+fi
 
 AC_CONFIG_FILES([
 	Makefile
@@ -1039,6 +1059,7 @@ AC_CONFIG_FILES([
 	tester/Makefile
 	gtk/Makefile
 	console/Makefile
+	daemon/Makefile
 	share/Makefile
 	share/C/Makefile
 	share/fr/Makefile
@@ -1064,7 +1085,8 @@ printf "* %-30s %s\n" "GTK interface"		$gtk_ui
 printf "* %-30s %s\n" "Account assistant"	$build_wizard
 printf "* %-30s %s\n" "Console interface"	$console_ui
 printf "* %-30s %s\n" "Tools"				$build_tools
-printf "* %-30s %s\n" "Message storage"		$enable_msg_storage
+printf "* %-30s %s\n" "Sqlite storage"		$enable_sqlite_storage
+printf "* %-30s %s\n" "VCard support"		$enable_vcard
 printf "* %-30s %s\n" "IM encryption"		$lime
 printf "* %-30s %s\n" "uPnP support" 		$build_upnp
 printf "* %-30s %s\n" "LDAP support" 		$enable_ldap
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 696d33a43..d4dc9d259 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -29,16 +29,32 @@ set(LINPHONECSH_SOURCE_FILES
 	shell.c
 )
 
+apply_compile_flags(LINPHONEC_SOURCE_FILES "CPP" "C")
+if(MSVC)
+	get_source_file_property(COMMANDS_C_COMPILE_FLAGS commands.c COMPILE_FLAGS)
+	set(COMMANDS_C_COMPILE_FLAGS "${COMMANDS_C_COMPILE_FLAGS} /wd4996") # Disable "was declared deprecated" warnings
+	set_source_files_properties(commands.c PROPERTY COMPILE_FLAGS "${COMMANDS_C_COMPILE_FLAGS}")
+endif()
+
 add_executable(linphonec ${LINPHONEC_SOURCE_FILES})
-target_link_libraries(linphonec linphone)
+target_link_libraries(linphonec ${LINPHONE_LIBS_FOR_TOOLS} ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
+set_target_properties(linphonec PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+
+if(INTL_FOUND)
+	target_link_libraries(linphonec ${INTL_LIBRARIES})
+endif()
 
 if(WIN32)
 	add_executable(linphoned WIN32 ${LINPHONEC_SOURCE_FILES})
-	target_link_libraries(linphoned linphone)
+	target_link_libraries(linphoned ${LINPHONE_LIBS_FOR_TOOLS} ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
+	if(INTL_FOUND)
+		target_link_libraries(linphoned ${INTL_LIBRARIES})
+	endif()
 endif()
 
 add_executable(linphonecsh ${LINPHONECSH_SOURCE_FILES})
-target_link_libraries(linphonecsh linphone)
+target_link_libraries(linphonecsh ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES})
+set_target_properties(linphonecsh PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 
 set(INSTALL_TARGETS linphonec linphonecsh)
 if(WIN32)
@@ -46,8 +62,8 @@ if(WIN32)
 endif()
 
 install(TARGETS ${INSTALL_TARGETS}
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
diff --git a/console/Makefile.am b/console/Makefile.am
index 482948329..c43570e6f 100644
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -15,7 +15,8 @@ COMMON_CFLAGS=\
 	$(VIDEO_CFLAGS) \
 	$(READLINE_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
-	$(LIBXML2_CFLAGS)
+	$(LIBXML2_CFLAGS) \
+	$(BCTOOLBOX_CFLAGS)
 
 if BUILD_CONSOLE
 
@@ -32,7 +33,8 @@ linphonec_LDADD=$(top_builddir)/coreapi/liblinphone.la \
 		$(SQLITE3_LIBS) \
 		$(X11_LIBS) \
 		$(BELLESIP_LIBS) \
-		$(LIBXML2_LIBS)
+		$(LIBXML2_LIBS) \
+		$(BCTOOLBOX_LIBS)
 
 if BUILD_WIN32
 #special build of linphonec to detach from the windows console
diff --git a/console/commands.c b/console/commands.c
index 75dbbb688..72510bd65 100644
--- a/console/commands.c
+++ b/console/commands.c
@@ -35,7 +35,7 @@
 #include "linphonec.h"
 #include "lpconfig.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <sys/wait.h>
 #include <unistd.h>
 #endif
@@ -118,7 +118,7 @@ static void linphonec_friend_display(LinphoneFriend *fr);
 static int linphonec_friend_list(LinphoneCore *lc, char *arg);
 static void linphonec_display_command_help(LPC_COMMAND *cmd);
 static int linphonec_friend_call(LinphoneCore *lc, unsigned int num);
-#ifndef WIN32
+#ifndef _WIN32
 static int linphonec_friend_add(LinphoneCore *lc, const char *name, const char *addr);
 #endif
 static int linphonec_friend_delete(LinphoneCore *lc, int num);
@@ -133,8 +133,8 @@ static LPC_COMMAND *lpc_find_command(const char *name);
 
 void linphonec_out(const char *fmt,...);
 
-VideoParams lpc_video_params={-1,-1,-1,-1,0,TRUE};
-VideoParams lpc_preview_params={-1,-1,-1,-1,0,TRUE};
+VideoParams lpc_video_params={-1,-1,-1,-1,NULL,TRUE,FALSE};
+VideoParams lpc_preview_params={-1,-1,-1,-1,NULL,TRUE,FALSE};
 
 /***************************************************************************
  *
@@ -212,7 +212,8 @@ static LPC_COMMAND commands[] = {
 		"'ipv6 disable' : do not use ipv6 network."
 	},
 	{ "mute", lpc_cmd_mute_mic,
-	  "Mute microphone and suspend voice transmission."
+		"Mute microphone and suspend voice transmission.",
+		NULL
 	},
 	{ "nat", lpc_cmd_nat, "Set nat address",
 		"'nat'        : show nat settings.\n"
@@ -228,7 +229,8 @@ static LPC_COMMAND commands[] = {
 		"'play <wav file>'    : play a wav file."
 	},
 	{ "playbackgain", lpc_cmd_playback_gain,
-		"Adjust playback gain."
+		"Adjust playback gain.",
+		NULL
 	},
 	{ "proxy", lpc_cmd_proxy, "Manage proxies",
 		"'proxy list' : list all proxy setups.\n"
@@ -269,7 +271,8 @@ static LPC_COMMAND commands[] = {
 		"'transfer <call id1> --to-call <call id2>': transfers the call with 'id1' to the destination of call 'id2' (attended transfer)\n"
 	},
 	{ "unmute", lpc_cmd_unmute_mic,
-		"Unmute microphone and resume voice transmission."
+		"Unmute microphone and resume voice transmission.",
+		NULL
 	},
 	{ "webcam", lpc_cmd_webcam, "Manage webcams",
 		"'webcam list' : list all known devices.\n"
@@ -287,10 +290,10 @@ static LPC_COMMAND advanced_commands[] = {
             "'codec list' : list audio codecs\n"
             "'codec enable <index>' : enable available audio codec\n"
             "'codec disable <index>' : disable audio codec" },
-    { "vcodec", lpc_cmd_vcodec, "Video codec configuration",
-            "'vcodec list' : list video codecs\n"
-            "'vcodec enable <index>' : enable available video codec\n"
-            "'vcodec disable <index>' : disable video codec" },
+	{ "vcodec", lpc_cmd_vcodec, "Video codec configuration",
+		"'vcodec list' : list video codecs\n"
+		"'vcodec enable <index>' : enable available video codec\n"
+		"'vcodec disable <index>' : disable video codec" },
 	{ "ec", lpc_cmd_echocancellation, "Echo cancellation",
 	    "'ec on [<delay>] [<tail>] [<framesize>]' : turn EC on with given delay, tail length and framesize\n"
 	    "'ec off' : turn echo cancellation (EC) off\n"
@@ -327,8 +330,9 @@ static LPC_COMMAND advanced_commands[] = {
 	{ "preview-snapshot", lpc_cmd_preview_snapshot, "Take a snapshot of currently captured video stream",
 		"'preview-snapshot <file path>': take a snapshot and records it in jpeg format into the supplied path\n"
 	},
-	{ "vfureq", lpc_cmd_vfureq, "Request the other side to send VFU for the current call"
-},
+	{ "vfureq", lpc_cmd_vfureq, "Request the other side to send VFU for the current call",
+		NULL
+	},
 #endif
 	{ "states", lpc_cmd_states, "Show internal states of liblinphone, registrations and calls, according to linphonecore.h definitions",
 		"'states global': shows global state of liblinphone \n"
@@ -367,7 +371,8 @@ static LPC_COMMAND advanced_commands[] = {
 		"'ringback disable'\t: Disable playing of ringback tone to callers\n"
 	},
 	{ "redirect", lpc_cmd_redirect, "Redirect an incoming call",
-		"'redirect <redirect-uri>'\t: Redirect all pending incoming calls to the <redirect-uri>\n"
+		"'redirect <id> <redirect-uri>'\t: Redirect the specified call to the <redirect-uri>\n"
+		"'redirect all <redirect-uri>'\t: Redirect all pending incoming calls to the <redirect-uri>\n"
 	},
 	{ "zrtp-set-verified", lpc_cmd_zrtp_verified,"Set ZRTP SAS verified.",
 		"'Set ZRTP SAS verified'\n"
@@ -414,7 +419,8 @@ linphonec_parse_command_line(LinphoneCore *lc, char *cl)
 	{
 		while ( isdigit(*cl) || *cl == '#' || *cl == '*' )
 		{
-			linphone_core_send_dtmf(lc, *cl);
+			if (linphone_core_get_current_call(lc))
+				linphone_call_send_dtmf(linphone_core_get_current_call(lc), *cl);
 			linphone_core_play_dtmf (lc,*cl,100);
 			ms_sleep(1); // be nice
 			++cl;
@@ -564,7 +570,7 @@ lpc_cmd_call(LinphoneCore *lc, char *args)
 	}
 	{
 		LinphoneCall *call;
-		LinphoneCallParams *cp=linphone_core_create_default_call_parameters (lc);
+		LinphoneCallParams *cp=linphone_core_create_call_params (lc, NULL);
 		char *opt1,*opt2;
 		if ( linphone_core_in_call(lc) )
 		{
@@ -598,7 +604,7 @@ lpc_cmd_call(LinphoneCore *lc, char *args)
 
 static int
 lpc_cmd_calls(LinphoneCore *lc, char *args){
-	const MSList *calls = linphone_core_get_calls(lc);
+	const bctbx_list_t *calls = linphone_core_get_calls(lc);
 	if(calls)
 	{
 		lpc_display_call_states(lc);
@@ -638,11 +644,11 @@ lpc_cmd_chat(LinphoneCore *lc, char *args)
 	return 1;
 }
 
-const char *linphonec_get_callee(){
+const char *linphonec_get_callee(void){
 	return callee_name;
 }
 
-const char *linphonec_get_caller(){
+const char *linphonec_get_caller(void){
 	return caller_name;
 }
 
@@ -663,7 +669,7 @@ lpc_cmd_transfer(LinphoneCore *lc, char *args)
 		int n=sscanf(args,"%255s %265s %li",arg1,arg2,&id2);
 		if (n==1 || isalpha(*arg1)){
 			call=linphone_core_get_current_call(lc);
-			if (call==NULL && ms_list_size(linphone_core_get_calls(lc))==1){
+			if (call==NULL && bctbx_list_size(linphone_core_get_calls(lc))==1){
 				call=(LinphoneCall*)linphone_core_get_calls(lc)->data;
 			}
 			refer_to=args;
@@ -732,24 +738,44 @@ lpc_cmd_terminate(LinphoneCore *lc, char *args)
 
 static int
 lpc_cmd_redirect(LinphoneCore *lc, char *args){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	int didit=0;
 	if (!args) return 0;
 	if ((elem=linphone_core_get_calls(lc))==NULL){
 		linphonec_out("No active calls.\n");
 		return 1;
 	}
-	while(elem!=NULL){
-		LinphoneCall *call=(LinphoneCall*)elem->data;
-		if (linphone_call_get_state(call)==LinphoneCallIncomingReceived){
-			linphone_core_redirect_call(lc,call,args);
-			didit=1;
-			/*as the redirection closes the call, we need to re-check the call list that is invalidated.*/
-			elem=linphone_core_get_calls(lc);
-		}else elem=elem->next;
-	}
-	if (didit==0){
-		linphonec_out("There is no pending incoming call to redirect.");
+	if (strncmp(args, "all ", 4) == 0) {
+		while(elem!=NULL){
+			LinphoneCall *call=(LinphoneCall*)elem->data;
+			if (linphone_call_get_state(call)==LinphoneCallIncomingReceived){
+				if (linphone_core_redirect_call(lc,call,args+4) != 0) {
+					linphonec_out("Could not redirect call.\n");
+					elem=elem->next;
+				} else {
+					didit=1;
+					/*as the redirection closes the call, we need to re-check the call list that is invalidated.*/
+					elem=linphone_core_get_calls(lc);
+				}
+			}else elem=elem->next;
+		}
+		if (didit==0){
+			linphonec_out("There is no pending incoming call to redirect.\n");
+		}
+	} else {
+		char space;
+		long id;
+		int charRead;
+		if ( sscanf(args, "%li%c%n", &id, &space, &charRead) == 2 && space == ' ') {
+			LinphoneCall * call = linphonec_get_call(id);
+			if ( call != NULL ) {
+				if (linphone_call_get_state(call)!=LinphoneCallIncomingReceived) {
+					linphonec_out("The state of the call is not incoming, can't be redirected.\n");
+				} else if (linphone_core_redirect_call(lc,call,args+charRead) != 0) {
+					linphonec_out("Could not redirect call.\n");
+				}
+			}
+		} else return 0;
 	}
 	return 1;
 }
@@ -758,7 +784,7 @@ static int
 lpc_cmd_answer(LinphoneCore *lc, char *args){
 	if (!args)
 	{
-		int nb=ms_list_size(linphone_core_get_calls(lc));
+		int nb=bctbx_list_size(linphone_core_get_calls(lc));
 		if (nb==1){
 			//if just one call is present answer the only one in passing NULL to the linphone_core_accept_call ...
 			if ( -1 == linphone_core_accept_call(lc, NULL) )
@@ -927,7 +953,7 @@ lpc_cmd_firewall(LinphoneCore *lc, char *args)
 	return 1;
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 /* Helper function for processing freind names */
 static int
 lpc_friend_name(char **args, char **name)
@@ -1012,7 +1038,7 @@ lpc_cmd_friend(LinphoneCore *lc, char *args)
 	}
 	else if ( !strncmp(args, "add", 3) )
 	{
-#ifndef WIN32
+#ifndef _WIN32
 		char  *name;
 		char  addr[80];
 		char *addr_p = addr;
@@ -1040,7 +1066,7 @@ lpc_cmd_friend(LinphoneCore *lc, char *args)
 		linphonec_friend_add(lc, name, addr);
 #else
 		LinphoneFriend *new_friend;
-		new_friend = linphone_friend_new_with_address(args);
+		new_friend = linphone_core_create_friend_with_address(lc, args);
 		linphone_core_add_friend(lc, new_friend);
 #endif
 		return 1;
@@ -1154,8 +1180,8 @@ lpc_cmd_proxy(LinphoneCore *lc, char *args)
 static int
 lpc_cmd_call_logs(LinphoneCore *lc, char *args)
 {
-	const MSList *elem=linphone_core_get_call_logs(lc);
-	for (;elem!=NULL;elem=ms_list_next(elem))
+	const bctbx_list_t *elem=linphone_core_get_call_logs(lc);
+	for (;elem!=NULL;elem=bctbx_list_next(elem))
 	{
 		LinphoneCallLog *cl=(LinphoneCallLog*)elem->data;
 		char *str=linphone_call_log_to_str(cl);
@@ -1242,12 +1268,16 @@ static int lpc_cmd_soundcard(LinphoneCore *lc, char *args)
 
 	if (strcmp(arg1, "show")==0)
 	{
-		linphonec_out("Ringer device: %s\n",
-			linphone_core_get_ringer_device(lc));
-		linphonec_out("Playback device: %s\n",
-			linphone_core_get_playback_device(lc));
-		linphonec_out("Capture device: %s\n",
-			linphone_core_get_capture_device(lc));
+		if (linphone_core_get_use_files(lc)) {
+			linphonec_out("Using files.\n");
+		} else {
+			linphonec_out("Ringer device: %s\n",
+				linphone_core_get_ringer_device(lc));
+			linphonec_out("Playback device: %s\n",
+				linphone_core_get_playback_device(lc));
+			linphonec_out("Capture device: %s\n",
+				linphone_core_get_capture_device(lc));
+		}
 		return 1;
 	}
 
@@ -1260,6 +1290,8 @@ static int lpc_cmd_soundcard(LinphoneCore *lc, char *args)
 			return 1;
 		}
 
+		linphone_core_use_files(lc,FALSE);
+
 		dev=linphone_core_get_sound_devices(lc);
 		index=atoi(arg2); /* FIXME: handle not-a-number */
 		for(i=0;dev[i]!=NULL;i++)
@@ -1275,6 +1307,7 @@ static int lpc_cmd_soundcard(LinphoneCore *lc, char *args)
 		linphonec_out("No such sound device\n");
 		return 1;
 	}
+
 	if (strcmp(arg1, "capture")==0)
 	{
 		const char *devname=linphone_core_get_capture_device(lc);
@@ -1403,7 +1436,7 @@ lpc_cmd_staticpic(LinphoneCore *lc, char *args)
 
 	if (strcmp(arg1, "fps")==0) {
 	  if (arg2) {
-	        float fps = atof(arg2); /* FIXME: Handle not-a-float */
+	        float fps = (float)atof(arg2); /* FIXME: Handle not-a-float */
 		linphone_core_set_static_picture_fps(lc, fps);
 		return 1;
 	  } else {
@@ -1451,8 +1484,8 @@ static int lpc_cmd_resume(LinphoneCore *lc, char *args){
 	}
 	else
 	{
-		const MSList *calls = linphone_core_get_calls(lc);
-		int nbcalls=ms_list_size(calls);
+		const bctbx_list_t *calls = linphone_core_get_calls(lc);
+		int nbcalls=bctbx_list_size(calls);
 		if( nbcalls == 1)
 		{
 			if(linphone_core_resume_call(lc,calls->data) < 0)
@@ -1737,7 +1770,7 @@ linphonec_proxy_display(LinphoneProxyConfig *cfg)
 
 static void linphonec_proxy_show(LinphoneCore *lc, int index)
 {
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	int i;
 	for(elem=linphone_core_get_proxy_config_list(lc),i=0;elem!=NULL;elem=elem->next,++i){
 		if (index==i){
@@ -1752,12 +1785,12 @@ static void linphonec_proxy_show(LinphoneCore *lc, int index)
 static void
 linphonec_proxy_list(LinphoneCore *lc)
 {
-	const MSList *proxies;
+	const bctbx_list_t *proxies;
 	int n;
 	int def=linphone_core_get_default_proxy(lc,NULL);
 
 	proxies=linphone_core_get_proxy_config_list(lc);
-	for(n=0;proxies!=NULL;proxies=ms_list_next(proxies),n++){
+	for(n=0;proxies!=NULL;proxies=bctbx_list_next(proxies),n++){
 		if (n==def)
 			linphonec_out("****** Proxy %i - this is the default one - *******\n",n);
 		else
@@ -1770,10 +1803,10 @@ linphonec_proxy_list(LinphoneCore *lc)
 static void
 linphonec_proxy_remove(LinphoneCore *lc, int index)
 {
-	const MSList *proxies;
+	const bctbx_list_t *proxies;
 	LinphoneProxyConfig *cfg;
 	proxies=linphone_core_get_proxy_config_list(lc);
-	cfg=(LinphoneProxyConfig*)ms_list_nth_data(proxies,index);
+	cfg=(LinphoneProxyConfig*)bctbx_list_nth_data(proxies,index);
 	if (cfg==NULL){
 		linphonec_out("No such proxy.\n");
 		return;
@@ -1785,10 +1818,10 @@ linphonec_proxy_remove(LinphoneCore *lc, int index)
 static int
 linphonec_proxy_use(LinphoneCore *lc, int index)
 {
-	const MSList *proxies;
+	const bctbx_list_t *proxies;
 	LinphoneProxyConfig *cfg;
 	proxies=linphone_core_get_proxy_config_list(lc);
-	cfg=(LinphoneProxyConfig*)ms_list_nth_data(proxies,index);
+	cfg=(LinphoneProxyConfig*)bctbx_list_nth_data(proxies,index);
 	if (cfg==NULL){
 		linphonec_out("No such proxy (try 'proxy list').");
 		return 0;
@@ -1800,19 +1833,19 @@ linphonec_proxy_use(LinphoneCore *lc, int index)
 static void
 linphonec_friend_display(LinphoneFriend *fr)
 {
-	LinphoneAddress *uri=linphone_address_clone(linphone_friend_get_address(fr));
-	char *str;
+	const LinphoneAddress *addr = linphone_friend_get_address(fr);
+	char *str = NULL;
 
-	linphonec_out("name: %s\n", linphone_address_get_display_name(uri));
-	linphone_address_set_display_name(uri,NULL);
-	str=linphone_address_as_string(uri);
+	linphonec_out("name: %s\n", linphone_friend_get_name(fr));
+	if (addr) str = linphone_address_as_string_uri_only(addr);
 	linphonec_out("address: %s\n", str);
+	if (str) ms_free(str);
 }
 
 static int
 linphonec_friend_list(LinphoneCore *lc, char *pat)
 {
-	const MSList *friend;
+	const bctbx_list_t *friend;
 	int n;
 
 	if (pat) {
@@ -1821,12 +1854,11 @@ linphonec_friend_list(LinphoneCore *lc, char *pat)
 	}
 
 	friend = linphone_core_get_friend_list(lc);
-	for(n=0; friend!=NULL; friend=ms_list_next(friend), ++n )
+	for(n=0; friend!=NULL; friend=bctbx_list_next(friend), ++n )
 	{
 		if ( pat ) {
-			const char *name = linphone_address_get_display_name(
-			    linphone_friend_get_address((LinphoneFriend*)friend->data));
-			if (name && ! strstr(name, pat) ) continue;
+			const char *name = linphone_friend_get_name((LinphoneFriend *)friend->data);
+			if (name && !strstr(name, pat)) continue;
 		}
 		linphonec_out("****** Friend %i *******\n",n);
 		linphonec_friend_display((LinphoneFriend*)friend->data);
@@ -1838,26 +1870,31 @@ linphonec_friend_list(LinphoneCore *lc, char *pat)
 static int
 linphonec_friend_call(LinphoneCore *lc, unsigned int num)
 {
-	const MSList *friend = linphone_core_get_friend_list(lc);
+	const bctbx_list_t *friend = linphone_core_get_friend_list(lc);
 	unsigned int n;
-	char *addr;
+	char *addr_str;
 
-	for(n=0; friend!=NULL; friend=ms_list_next(friend), ++n )
+	for(n=0; friend!=NULL; friend=bctbx_list_next(friend), ++n )
 	{
 		if ( n == num )
 		{
 			int ret;
-			addr = linphone_address_as_string(linphone_friend_get_address((LinphoneFriend*)friend->data));
-			ret=lpc_cmd_call(lc, addr);
-			ms_free(addr);
-			return ret;
+			const LinphoneAddress *addr = linphone_friend_get_address((LinphoneFriend*)friend->data);
+			if (addr) {
+				addr_str = linphone_address_as_string(addr);
+				ret=lpc_cmd_call(lc, addr_str);
+				ms_free(addr_str);
+				return ret;
+			} else {
+				linphonec_out("Friend %u does not have an address\n", num);
+			}
 		}
 	}
 	linphonec_out("No such friend %u\n", num);
 	return 1;
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 static int
 linphonec_friend_add(LinphoneCore *lc, const char *name, const char *addr)
 {
@@ -1866,7 +1903,7 @@ linphonec_friend_add(LinphoneCore *lc, const char *name, const char *addr)
 	char url[PATH_MAX];
 
 	snprintf(url, PATH_MAX, "%s <%s>", name, addr);
-	newFriend = linphone_friend_new_with_address(url);
+	newFriend = linphone_core_create_friend_with_address(lc, url);
 	linphone_core_add_friend(lc, newFriend);
 	return 0;
 }
@@ -1875,10 +1912,10 @@ linphonec_friend_add(LinphoneCore *lc, const char *name, const char *addr)
 static int
 linphonec_friend_delete(LinphoneCore *lc, int num)
 {
-	const MSList *friend = linphone_core_get_friend_list(lc);
-	unsigned int n;
+	const bctbx_list_t *friend = linphone_core_get_friend_list(lc);
+	int n;
 
-	for(n=0; friend!=NULL; friend=ms_list_next(friend), ++n )
+	for(n=0; friend!=NULL; friend=bctbx_list_next(friend), ++n )
 	{
 		if ( n == num )
 		{
@@ -1889,13 +1926,13 @@ linphonec_friend_delete(LinphoneCore *lc, int num)
 
 	if (-1 == num)
 	{
-		unsigned int i;
+		int i;
 		for (i = 0 ; i < n ; i++)
 			linphonec_friend_delete(lc, 0);
 		return 0;
 	}
 
-	linphonec_out("No such friend %u\n", num);
+	linphonec_out("No such friend %i\n", num);
 	return 1;
 }
 
@@ -1912,13 +1949,12 @@ static int lpc_cmd_register(LinphoneCore *lc, char *args){
 	char proxy[512];
 	char passwd[512];
 	LinphoneProxyConfig *cfg;
-	const MSList *elem;
+	const bctbx_list_t *elem;
 
 	if (!args)
 		{
 			/* it means that you want to register the default proxy */
-			LinphoneProxyConfig *cfg=NULL;
-			linphone_core_get_default_proxy(lc,&cfg);
+			LinphoneProxyConfig *cfg = linphone_core_get_default_proxy_config(lc);
 			if (cfg)
 			{
 				if(!linphone_proxy_config_is_registered(cfg)) {
@@ -1965,8 +2001,7 @@ static int lpc_cmd_register(LinphoneCore *lc, char *args){
 }
 
 static int lpc_cmd_unregister(LinphoneCore *lc, char *args){
-	LinphoneProxyConfig *cfg=NULL;
-	linphone_core_get_default_proxy(lc,&cfg);
+	LinphoneProxyConfig *cfg = linphone_core_get_default_proxy_config(lc);
 	if (cfg && linphone_proxy_config_is_registered(cfg)) {
 		linphone_proxy_config_edit(cfg);
 		linphone_proxy_config_enable_register(cfg,FALSE);
@@ -1979,7 +2014,7 @@ static int lpc_cmd_unregister(LinphoneCore *lc, char *args){
 
 static int lpc_cmd_duration(LinphoneCore *lc, char *args){
 	LinphoneCallLog *cl;
-	const MSList *elem=linphone_core_get_call_logs(lc);
+	const bctbx_list_t *elem=linphone_core_get_call_logs(lc);
 	for(;elem!=NULL;elem=elem->next){
 		if (elem->next==NULL){
 			cl=(LinphoneCallLog*)elem->data;
@@ -1994,7 +2029,7 @@ static int lpc_cmd_status(LinphoneCore *lc, char *args)
 	LinphoneProxyConfig *cfg;
 
 	if ( ! args ) return 0;
-	linphone_core_get_default_proxy(lc,&cfg);
+	cfg = linphone_core_get_default_proxy_config(lc);
 	if (strstr(args,"register"))
 	{
 		if (cfg)
@@ -2110,7 +2145,7 @@ static int lpc_cmd_param(LinphoneCore *lc, char *args)
 }
 
 static int lpc_cmd_speak(LinphoneCore *lc, char *args){
-#ifndef WIN32
+#ifndef _WIN32
 	char voice[64];
 	char *sentence;
 	char cl[128];
@@ -2207,7 +2242,7 @@ static int lpc_cmd_codec(int type, LinphoneCore *lc, char *args){
 static void linphonec_codec_list(int type, LinphoneCore *lc){
 	PayloadType *pt;
 	int index=0;
-	const MSList *node=NULL;
+	const bctbx_list_t *node=NULL;
 
     if (type == AUDIO) {
       node=linphone_core_get_audio_codecs(lc);
@@ -2215,7 +2250,7 @@ static void linphonec_codec_list(int type, LinphoneCore *lc){
       node=linphone_core_get_video_codecs(lc);
     }
 
-	for(;node!=NULL;node=ms_list_next(node)){
+	for(;node!=NULL;node=bctbx_list_next(node)){
 		pt=(PayloadType*)(node->data);
         linphonec_out("%2d: %s (%d) %s\n", index, pt->mime_type, pt->clock_rate,
 		    linphone_core_payload_type_enabled(lc,pt) ? "enabled" : "disabled");
@@ -2226,7 +2261,7 @@ static void linphonec_codec_list(int type, LinphoneCore *lc){
 static void linphonec_codec_enable(int type, LinphoneCore *lc, int sel_index){
 	PayloadType *pt;
 	int index=0;
-	const MSList *node=NULL;
+	const bctbx_list_t *node=NULL;
 
 	if (type == AUDIO) {
 		node=linphone_core_get_audio_codecs(lc);
@@ -2234,7 +2269,7 @@ static void linphonec_codec_enable(int type, LinphoneCore *lc, int sel_index){
 		node=linphone_core_get_video_codecs(lc);
 	}
 
-    for(;node!=NULL;node=ms_list_next(node)){
+    for(;node!=NULL;node=bctbx_list_next(node)){
         if (index == sel_index || sel_index == -1) {
 		    pt=(PayloadType*)(node->data);
             linphone_core_enable_payload_type (lc,pt,TRUE);
@@ -2247,7 +2282,7 @@ static void linphonec_codec_enable(int type, LinphoneCore *lc, int sel_index){
 static void linphonec_codec_disable(int type, LinphoneCore *lc, int sel_index){
 	PayloadType *pt;
 	int index=0;
-	const MSList *node=NULL;
+	const bctbx_list_t *node=NULL;
 
 	if (type == AUDIO) {
 		node=linphone_core_get_audio_codecs(lc);
@@ -2255,7 +2290,7 @@ static void linphonec_codec_disable(int type, LinphoneCore *lc, int sel_index){
 		node=linphone_core_get_video_codecs(lc);
 	}
 
-	for(;node!=NULL;node=ms_list_next(node)){
+	for(;node!=NULL;node=bctbx_list_next(node)){
 		if (index == sel_index || sel_index == -1) {
 			pt=(PayloadType*)(node->data);
 			linphone_core_enable_payload_type (lc,pt,FALSE);
@@ -2336,19 +2371,19 @@ static int lpc_cmd_echolimiter(LinphoneCore *lc, char *args){
 
 static int lpc_cmd_mute_mic(LinphoneCore *lc, char *args)
 {
-	linphone_core_mute_mic(lc, 1);
+	linphone_core_enable_mic(lc, 0);
 	return 1;
 }
 
 static int lpc_cmd_unmute_mic(LinphoneCore *lc, char *args){
-	linphone_core_mute_mic(lc, 0);
+	linphone_core_enable_mic(lc, 1);
 	return 1;
 }
 
 static int lpc_cmd_playback_gain(LinphoneCore *lc, char *args)
 {
 	if (args){
-	        linphone_core_set_playback_gain_db(lc, atof(args));
+	        linphone_core_set_playback_gain_db(lc, (float)atof(args));
         	return 1;
 	}
 	return 0;
@@ -2439,7 +2474,7 @@ static void lpc_display_global_state(LinphoneCore *lc){
 
 static void lpc_display_call_states(LinphoneCore *lc){
 	LinphoneCall *call;
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	char *tmp;
 	linphonec_out("Call states\n"
 	              "Id |            Destination              |      State      |    Flags   |\n"
@@ -2452,7 +2487,7 @@ static void lpc_display_call_states(LinphoneCore *lc){
 			const char *flag;
 			bool_t in_conference;
 			call=(LinphoneCall*)elem->data;
-			in_conference=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call));
+			in_conference=(linphone_call_get_conference(call) != NULL);
 			tmp=linphone_call_get_remote_address_as_string (call);
 			flag=in_conference ? "conferencing" : "";
 			flag=linphone_call_has_transfer_pending(call) ? "transfer pending" : flag;
@@ -2464,7 +2499,7 @@ static void lpc_display_call_states(LinphoneCore *lc){
 }
 
 static void lpc_display_proxy_states(LinphoneCore *lc){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	linphonec_out("Proxy registration states\n"
 	              "           Identity                      |      State\n"
 	              "------------------------------------------------------------\n");
diff --git a/console/linphonec.c b/console/linphonec.c
index 1ad119ed5..248f419dd 100644
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -37,8 +37,9 @@
 #include <linphonecore.h>
 
 #include "linphonec.h"
+#include <bctoolbox/vfs.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #include <ctype.h>
 #ifndef _WIN32_WCE
@@ -102,7 +103,7 @@ static int linphonec_main_loop (LinphoneCore * opm);
 static int linphonec_idle_call (void);
 #ifdef HAVE_READLINE
 static int linphonec_initialize_readline(void);
-static int linphonec_finish_readline();
+static int linphonec_finish_readline(void);
 static char **linephonec_readline_completion(const char *text,
 	int start, int end);
 #endif
@@ -290,9 +291,12 @@ linphonec_transfer_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneC
 static void
 linphonec_notify_presence_received(LinphoneCore *lc,LinphoneFriend *fid)
 {
-	char *tmp=linphone_address_as_string(linphone_friend_get_address(fid));
-	printf("Friend %s is %s\n", tmp, linphone_online_status_to_string(linphone_friend_get_status(fid)));
-	ms_free(tmp);
+	const LinphoneAddress *addr = linphone_friend_get_address(fid);
+	if (addr) {
+		char *tmp=linphone_address_as_string(addr);
+		printf("Friend %s is %s\n", tmp, linphone_online_status_to_string(linphone_friend_get_status(fid)));
+		ms_free(tmp);
+	}
 	// todo: update Friend list state (unimplemented)
 }
 
@@ -359,7 +363,7 @@ static void linphonec_call_state_changed(LinphoneCore *lc, LinphoneCall *call, L
 			if ( auto_answer)  {
 				answer_call=TRUE;
 			} else if (real_early_media_sending) {
-				LinphoneCallParams* callparams = linphone_core_create_default_call_parameters(lc);
+				LinphoneCallParams* callparams = linphone_core_create_call_params(lc, call);
 				linphonec_out("Sending early media using real hardware\n");
 				linphone_call_params_enable_early_media_sending(callparams, TRUE);
 				if (vcap_enabled) linphone_call_params_enable_video(callparams, TRUE);
@@ -439,7 +443,7 @@ static void start_prompt_reader(void){
 #if !defined(_WIN32_WCE)
 static ortp_pipe_t create_server_socket(void){
 	char path[128];
-#ifndef WIN32
+#ifndef _WIN32
 	snprintf(path,sizeof(path)-1,"linphonec-%i",getuid());
 #else
 	{
@@ -459,7 +463,7 @@ static void *pipe_thread(void*p){
 	if (server_sock==ORTP_PIPE_INVALID) return NULL;
 	while(pipe_reader_run){
 		while(client_sock!=ORTP_PIPE_INVALID){ /*sleep until the last command is finished*/
-#ifndef WIN32
+#ifndef _WIN32
 			usleep(20000);
 #else
 			Sleep(20);
@@ -537,7 +541,7 @@ char *linphonec_readline(char *prompt){
 			}
 			ms_mutex_unlock(&prompt_mutex);
 			linphonec_idle_call();
-#ifdef WIN32
+#ifdef _WIN32
 			{
 				MSG msg;
 				Sleep(20);
@@ -593,7 +597,7 @@ void linphonec_set_autoanswer(bool_t enabled){
 	auto_answer=enabled;
 }
 
-bool_t linphonec_get_autoanswer(){
+bool_t linphonec_get_autoanswer(void){
 	return auto_answer;
 }
 
@@ -965,7 +969,7 @@ static void x11_apply_video_params(VideoParams *params, Window window){
 #endif
 
 
-static void lpc_apply_video_params(){
+static void lpc_apply_video_params(void){
 	static void *old_wid=NULL;
 	static void *old_pwid=NULL;
 	void *wid=linphone_core_get_native_video_window_id(linphonec);
@@ -1206,7 +1210,7 @@ linphonec_parse_cmdline(int argc, char **argv)
 			if (strcmp(argv[arg_num], "NUL") != 0) {
 #endif
 #if !defined(_WIN32_WCE)
-				if (access(argv[arg_num], F_OK) != 0)
+				if (bctbx_file_exist(argv[arg_num]) != 0)
 				{
 					fprintf(stderr,
 						"Cannot open config file %s.\n",
@@ -1223,7 +1227,7 @@ linphonec_parse_cmdline(int argc, char **argv)
 		{
 			if ( ++arg_num >= argc ) print_usage(EXIT_FAILURE);
 #if !defined(_WIN32_WCE)
-			if (access(argv[arg_num],F_OK)!=0 )
+			if (bctbx_file_exist(argv[arg_num])!=0 )
 			{
 				fprintf (stderr,
 					"Cannot open config file %s.\n",
@@ -1331,7 +1335,7 @@ handle_configfile_migration()
 	 * If the *NEW* configuration already exists
 	 * do nothing.
 	 */
-	if (access(new_cfg,F_OK)==0)
+	if (bctbx_file_exist(new_cfg)==0)
 	{
 		free(new_cfg);
 		return 0;
@@ -1343,7 +1347,7 @@ handle_configfile_migration()
 	 * If the *OLD* CLI configurations exist copy it to
 	 * the new file and make it a symlink.
 	 */
-	if (access(old_cfg_cli, F_OK)==0)
+	if (bctbx_file_exist(old_cfg_cli)==0)
 	{
 		if ( ! copy_file(old_cfg_cli, new_cfg) )
 		{
@@ -1364,7 +1368,7 @@ handle_configfile_migration()
 	 * If the *OLD* GUI configurations exist copy it to
 	 * the new file and make it a symlink.
 	 */
-	if (access(old_cfg_gui, F_OK)==0)
+	if (bctbx_file_exist(old_cfg_gui)==0)
 	{
 		if ( ! copy_file(old_cfg_gui, new_cfg) )
 		{
diff --git a/console/linphonec.h b/console/linphonec.h
index 23c0ee5a0..975fcee90 100644
--- a/console/linphonec.h
+++ b/console/linphonec.h
@@ -116,11 +116,11 @@ extern VideoParams lpc_preview_params;
 
 extern int linphonec_parse_command_line(LinphoneCore *lc, char *cl);
 extern char *linphonec_command_generator(const char *text, int state);
-void linphonec_main_loop_exit();
+void linphonec_main_loop_exit(void);
 extern void linphonec_finish(int exit_status);
 extern char *linphonec_readline(char *prompt);
 void linphonec_set_autoanswer(bool_t enabled);
-bool_t linphonec_get_autoanswer();
+bool_t linphonec_get_autoanswer(void);
 void linphonec_command_finished(void);
 void linphonec_set_caller(const char *caller);
 LinphoneCall *linphonec_get_call(long id);
diff --git a/console/shell.c b/console/shell.c
index 49b1b5d45..f80a15378 100644
--- a/console/shell.c
+++ b/console/shell.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <assert.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #include <windows.h>
 #include <winbase.h>
@@ -39,6 +39,7 @@
 #endif
 
 #include "ortp/ortp.h"
+#include <bctoolbox/port.h>
 
 #define DEFAULT_REPLY_SIZE 4096
 
@@ -82,7 +83,7 @@ static int send_command(const char *command, char *reply, int reply_len, int pri
 	int i;
 	int err;
 	char path[128];
-#ifndef WIN32
+#ifndef _WIN32
 	snprintf(path,sizeof(path)-1,"linphonec-%i",getuid());
 #else
 	{
@@ -130,7 +131,7 @@ static void print_usage(void){
 	exit(-1);
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 static char *argv_to_line(int argc, char *argv[]) {
 	int i;
 	int line_length;
@@ -157,7 +158,7 @@ static char *argv_to_line(int argc, char *argv[]) {
 
 #define MAX_ARGS 10
 
-#ifndef WIN32
+#ifndef _WIN32
 static void spawn_linphonec(int argc, char *argv[]){
 	char * args[MAX_ARGS];
 	int i,j;
diff --git a/console/sipomatic.c b/console/sipomatic.c
index e7a1c6a88..25afdbdb8 100644
--- a/console/sipomatic.c
+++ b/console/sipomatic.c
@@ -76,7 +76,7 @@ void call_accept(Call *call)
 	sdp_context_t *ctx;
 	PayloadType *payload;
 	char *hellofile;
-	static int call_count=0;	
+	static int call_count=0;
 	char record_file[250];
 	osip_message_t *msg=NULL;
 	sprintf(record_file,"/tmp/sipomatic%i.wav",call_count);
@@ -105,7 +105,7 @@ void call_accept(Call *call)
 #ifdef VIDEO_ENABLED
 	if (call->video.remoteport!=0){
 		video_stream_send_only_start(call->video_stream,call->profile,
-			call->video.remaddr,call->video.remoteport,call->video.remoteport+1,call->video.pt, 60, 
+			call->video.remaddr,call->video.remoteport,call->video.remoteport+1,call->video.pt, 60,
 			ms_web_cam_manager_get_default_cam(ms_web_cam_manager_get()));
 	}
 #endif
@@ -124,7 +124,7 @@ PayloadType * sipomatic_payload_is_supported(sdp_payload_t *payload,RtpProfile *
 		localpt=payload->pt;
 		ms_warning("payload has no rtpmap.");
 	}
-	
+
 	if (localpt>=0){
 		/* this payload is supported in our local rtp profile, so add it to the dialog rtp
 		profile */
@@ -160,7 +160,7 @@ int sipomatic_accept_audio_offer(sdp_context_t *ctx,sdp_payload_t *payload)
 	Call *call=(Call*)sdp_context_get_user_pointer(ctx);
 	PayloadType *supported;
 	struct stream_params *params=&call->audio;
-	
+
 	/* see if this codec is supported in our local rtp profile*/
 	supported=sipomatic_payload_is_supported(payload,&av_profile,call->profile);
 	if (supported==NULL) {
@@ -191,7 +191,7 @@ int sipomatic_accept_video_offer(sdp_context_t *ctx,sdp_payload_t *payload)
 	Call *call=(Call*)sdp_context_get_user_pointer(ctx);
 	PayloadType *supported;
 	struct stream_params *params=&call->video;
-	
+
 	/* see if this codec is supported in our local rtp profile*/
 	supported=sipomatic_payload_is_supported(payload,&av_profile,call->profile);
 	if (supported==NULL) {
@@ -221,9 +221,9 @@ void sipomatic_init(Sipomatic *obj, char *url, bool_t ipv6)
 {
 	osip_uri_t *uri=NULL;
 	int port=5064;
-	
+
 	obj->ipv6=ipv6;
-	
+
 	if (url==NULL){
 		url=getenv("SIPOMATIC_URL");
 		if (url==NULL){
@@ -237,7 +237,7 @@ void sipomatic_init(Sipomatic *obj, char *url, bool_t ipv6)
 			if (uri->port!=NULL) port=atoi(uri->port);
 		}else{
 			ms_warning("Invalid identity uri:%s",url);
-		}	
+		}
 	}
 	ms_message("Starting using url %s",url);
 	ms_mutex_init(&obj->lock,NULL);
@@ -271,8 +271,8 @@ void sipomatic_uninit(Sipomatic *obj)
 
 void sipomatic_iterate(Sipomatic *obj)
 {
-	MSList *elem;
-	MSList *to_be_destroyed=NULL;
+	bctbx_list_t *elem;
+	bctbx_list_t *to_be_destroyed=NULL;
 	Call *call;
 	double elapsed;
 	eXosip_event_t *ev;
@@ -293,13 +293,13 @@ void sipomatic_iterate(Sipomatic *obj)
 			case CALL_STATE_RUNNING:
 				if (elapsed>obj->max_call_time || call->eof){
 					call_release(call);
-					to_be_destroyed=ms_list_append(to_be_destroyed,call);
+					to_be_destroyed=bctbx_list_append(to_be_destroyed,call);
 				}
 			break;
 		}
-		elem=ms_list_next(elem);
+		elem=bctbx_list_next(elem);
 	}
-	for(;to_be_destroyed!=NULL; to_be_destroyed=ms_list_next(to_be_destroyed)){
+	for(;to_be_destroyed!=NULL; to_be_destroyed=bctbx_list_next(to_be_destroyed)){
 		call_destroy((Call*)to_be_destroyed->data);
 	}
 }
@@ -307,9 +307,9 @@ void sipomatic_iterate(Sipomatic *obj)
 
 Call* sipomatic_find_call(Sipomatic *obj,int did)
 {
-	MSList *it;
+	bctbx_list_t *it;
 	Call *call=NULL;
-	for (it=obj->calls;it!=NULL;it=ms_list_next(it)){
+	for (it=obj->calls;it!=NULL;it=bctbx_list_next(it)){
 		call=(Call*)it->data;
 		if ( call->did==did) return call;
 	}
@@ -324,7 +324,7 @@ Call * call_new(Sipomatic *root, eXosip_event_t *ev)
 	int status;
 	sdp_message_t *sdp;
 	sdp_context_t *sdpc;
-	
+
 	sdp=eXosip_get_sdp_info(ev->request);
 	sdpc=sdp_handler_create_context(&sipomatic_sdp_handler,NULL,"sipomatic",NULL);
 	obj=ms_new0(Call,1);
@@ -334,7 +334,7 @@ Call * call_new(Sipomatic *root, eXosip_event_t *ev)
 	sdpans=sdp_context_get_answer(sdpc,sdp);
 	if (sdpans!=NULL){
 		eXosip_call_send_answer(ev->tid,180,NULL);
-		
+
 	}else{
 		status=sdp_context_get_status(sdpc);
 		eXosip_call_send_answer(ev->tid,status,NULL);
@@ -351,7 +351,7 @@ Call * call_new(Sipomatic *root, eXosip_event_t *ev)
 	obj->state=CALL_STATE_INIT;
 	obj->eof=0;
 	obj->root=root;
-	root->calls=ms_list_append(root->calls,obj);
+	root->calls=bctbx_list_append(root->calls,obj);
 	return obj;
 }
 
@@ -367,7 +367,7 @@ void call_release(Call *call)
 
 void call_destroy(Call *obj)
 {
-	obj->root->calls=ms_list_remove(obj->root->calls,obj);
+	obj->root->calls=bctbx_list_remove(obj->root->calls,obj);
 	rtp_profile_destroy(obj->profile);
 	sdp_context_free(obj->sdpc);
 	ms_free(obj);
@@ -409,7 +409,7 @@ int main(int argc, char *argv[])
 	char *url=NULL;
 	bool_t ipv6=FALSE;
 	int i;
-	
+
 	for(i=1;i<argc;i++){
 		if ( (strcmp(argv[i],"-h")==0) || (strcmp(argv[i],"--help")==0) ){
 			display_help();
@@ -441,7 +441,7 @@ int main(int argc, char *argv[])
 			continue;
 		}
 	}
-	
+
 	signal(SIGINT,stop_handler);
 	ortp_init();
 	ms_init();
@@ -453,18 +453,18 @@ int main(int argc, char *argv[])
 	rtp_profile_set_payload(&av_profile,101,&payload_type_telephone_event);
 	rtp_profile_set_payload(&av_profile,116,&payload_type_truespeech);
 	rtp_profile_set_payload(&av_profile,98,&payload_type_h263_1998);
-	
+
 	sipomatic_init(&sipomatic,url,ipv6);
 	if (file!=NULL) sipomatic_set_annouce_file(&sipomatic,file);
-	
+
 	while (run_cond){
 		sipomatic_iterate(&sipomatic);
-#ifndef WIN32
+#ifndef _WIN32
 		usleep(20000);
 #else
 		Sleep(20);
 #endif
 	}
-	
+
 	return(0);
 }
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 3920d619a..c3279b34b 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -20,17 +20,44 @@
 #
 ############################################################################
 
-if(MSVC AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
+if(MSVC AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	find_library(LIBGCC NAMES gcc)
 	find_library(LIBMINGWEX NAMES mingwex)
 endif()
 
 if(NOT WIN32)
-	find_package(Iconv)
+	find_package(Iconv QUIET)
 endif()
 
 
-set(SOURCE_FILES
+set(LINPHONE_HEADER_FILES
+	account_creator.h
+	buffer.h
+	call_log.h
+	call_params.h
+	carddav.h
+	conference.h
+	content.h
+	event.h
+	friendlist.h
+	linphonecore.h
+	linphonecore_utils.h
+	linphonefriend.h
+	linphonepresence.h
+	linphone_proxy_config.h
+	linphone_tunnel.h
+	lpc2xml.h
+	lpconfig.h
+	nat_policy.h
+	ringtoneplayer.h
+	sipsetup.h
+	sqlite3_bctbx_vfs.h
+	xml2lpc.h
+	xmlrpc.h
+	vcard.h
+)
+
+set(LINPHONE_SOURCE_FILES_C
 	account_creator.c
 	address.c
 	authentication.c
@@ -51,16 +78,20 @@ set(SOURCE_FILES
 	callbacks.c
 	call_log.c
 	call_params.c
+	carddav.c
 	chat.c
-	conference.c
+	chat_file_transfer.c
 	contactprovider.c
 	content.c
+	dial_plan.c
 	dict.c
 	ec-calibrator.c
+	echo-tester.c
 	enum.c
 	enum.h
 	event.c
 	friend.c
+	friendlist.c
 	info.c
 	ldap/ldapprovider.c
 	lime.c
@@ -68,11 +99,13 @@ set(SOURCE_FILES
 	linphonecore.c
 	linphone_tunnel_config.c
 	localplayer.c
+	lpc2xml.c
 	lpconfig.c
 	lpconfig.h
 	lsd.c
 	message_storage.c
 	misc.c
+	nat_policy.c
 	offeranswer.c
 	offeranswer.h
 	player.c
@@ -81,51 +114,43 @@ set(SOURCE_FILES
 	proxy.c
 	quality_reporting.c
 	remote_provisioning.c
+	ringtoneplayer.c
 	sal.c
 	siplogin.c
 	sipsetup.c
+	sqlite3_bctbx_vfs.c
 	xml2lpc.c
 	xml.c
 	xmlrpc.c
 	vtables.c
 )
+set(LINPHONE_SOURCE_FILES_CXX conference.cc)
+if(ANDROID)
+	list(APPEND LINPHONE_SOURCE_FILES_CXX linphonecore_jni.cc)
+	set_source_files_properties(linphonecore_jni.cc PROPERTIES COMPILE_DEFINITIONS "USE_JAVAH")
+endif()
+
+set(LINPHONE_SOURCE_FILES_OBJC)
+if (IOS)
+	list(APPEND LINPHONE_SOURCE_FILES_OBJC ringtoneplayer_ios.m ringtoneplayer_ios.h)
+endif()
+
 
-set(HEADER_FILES
-	account_creator.h
-	buffer.h
-	call_log.h
-	call_params.h
-	content.h
-	event.h
-	linphonecore.h
-	linphonecore_utils.h
-	linphonefriend.h
-	linphonepresence.h
-	linphone_proxy_config.h
-	linphone_tunnel.h
-	lpc2xml.h
-	lpconfig.h
-	sipsetup.h
-	xml2lpc.h
-	xmlrpc.h
-)
 if(ENABLE_TUNNEL)
-	list(APPEND SOURCE_FILES
+	list(APPEND LINPHONE_SOURCE_FILES_CXX
 		linphone_tunnel.cc
 		TunnelManager.cc
 	)
 	add_definitions(-DTUNNEL_ENABLED)
 else()
-	list(APPEND SOURCE_FILES linphone_tunnel_stubs.c)
+	list(APPEND LINPHONE_SOURCE_FILES_C linphone_tunnel_stubs.c)
 endif()
 
-set(GENERATED_SOURCE_FILES
-	${CMAKE_CURRENT_BINARY_DIR}/liblinphone_gitversion.h
-)
-set_source_files_properties(${GENERATED_SOURCE_FILES} PROPERTIES GENERATED TRUE)
 find_package(Git)
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liblinphone_gitversion.h
-	COMMAND ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/gitversion.cmake)
+add_custom_target(liblinphone-git-version
+	COMMAND ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DLINPHONE_VERSION=${LINPHONE_VERSION} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/gitversion.cmake
+	BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/liblinphone_gitversion.h"
+)
 
 add_definitions(
 	-DUSE_BELLESIP
@@ -133,6 +158,7 @@ add_definitions(
 )
 
 set(LIBS
+	${BCTOOLBOX_CORE_LIBRARIES}
 	${BELLESIP_LIBRARIES}
 	${MEDIASTREAMER2_LIBRARIES}
 	${XML2_LIBRARIES}
@@ -149,56 +175,107 @@ endif()
 if(ENABLE_TUNNEL)
 	list(APPEND LIBS ${TUNNEL_LIBRARIES})
 endif()
-if(MSVC AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
+if(MSVC AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	list(APPEND LIBS ${LIBGCC} ${LIBMINGWEX})
 endif()
-if(WIN32 AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
+if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	list(APPEND LIBS shlwapi)
 endif()
 if(INTL_FOUND)
 	list(APPEND LIBS ${INTL_LIBRARIES})
 endif()
+if(BELCARD_FOUND)
+	list(APPEND LIBS ${BELCARD_LIBRARIES})
+	list(APPEND LINPHONE_SOURCE_FILES_CXX vcard.cc)
+	if(NOT MSVC)
+		list(APPEND STRICT_OPTIONS_CXX "-std=c++11")
+	endif()
+	if(APPLE)
+		list(APPEND STRICT_OPTIONS_CXX "-stdlib=libc++")
+	endif()
+else()
+	list(APPEND LINPHONE_SOURCE_FILES_C vcard_stubs.c)
+endif()
+
+apply_compile_flags(LINPHONE_SOURCE_FILES_C "CPP" "C")
+apply_compile_flags(LINPHONE_SOURCE_FILES_CXX "CPP" "CXX")
+apply_compile_flags(LINPHONE_SOURCE_FILES_OBJC "CPP" "OBJC")
 
 if(ENABLE_STATIC)
-	add_library(linphone STATIC ${SOURCE_FILES} ${GENERATED_SOURCE_FILES})
-	target_link_libraries(linphone ${LIBS})
-else()
-	add_library(linphone SHARED ${SOURCE_FILES} ${GENERATED_SOURCE_FILES})
-	set_target_properties(linphone PROPERTIES VERSION ${LINPHONE_SO_VERSION} LINKER_LANGUAGE CXX)
-	target_link_libraries(linphone ${LIBS})
+	add_library(linphone-static STATIC ${LINPHONE_HEADER_FILES} ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC})
+	set_target_properties(linphone-static PROPERTIES OUTPUT_NAME linphone)
+	add_dependencies(linphone-static liblinphone-git-version)
+	target_link_libraries(linphone-static ${LIBS})
+	if(ANDROID)
+		add_dependencies(linphone-static linphonecore-jni-header)
+	endif()
+	if(IOS)
+		target_link_libraries(linphone-static "-framework Foundation" "-framework AVFoundation")
+	endif()
+	install(TARGETS linphone-static EXPORT ${EXPORT_TARGETS_NAME}Targets
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+	)
+endif()
+if(ENABLE_SHARED)
+	add_library(linphone SHARED ${LINPHONE_HEADER_FILES} ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC})
+
+	if(BELCARD_FOUND)
+		if(APPLE)
+	        set_target_properties(linphone PROPERTIES LINK_FLAGS "-stdlib=libc++")
+    	endif()
+	endif()
+
+	set_target_properties(linphone PROPERTIES LINKER_LANGUAGE CXX)
+	if(NOT ANDROID)
+		# Do not version shared library on Android
+		set_target_properties(linphone PROPERTIES SOVERSION ${LINPHONE_SO_VERSION})
+	endif()
+	add_dependencies(linphone liblinphone-git-version)
+	target_link_libraries(linphone PRIVATE ${LIBS})
+	if(WIN32 AND CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+		set_target_properties(linphone PROPERTIES PREFIX "lib")
+	elseif(ANDROID)
+		set_target_properties(linphone PROPERTIES OUTPUT_NAME "linphone-${CMAKE_SYSTEM_PROCESSOR}")
+		add_dependencies(linphone linphonecore-jni-header)
+	endif()
 	if(MSVC)
-		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-			install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/linphone.pdb
-				DESTINATION bin
+		if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+			install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/linphone.pdb
+				DESTINATION ${CMAKE_INSTALL_BINDIR}
 				PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 			)
 		endif()
 	endif()
-endif()
-if(WIN32 AND "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
-	set_target_properties(linphone PROPERTIES PREFIX "lib")
+	install(TARGETS linphone EXPORT ${EXPORT_TARGETS_NAME}Targets
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+	)
 endif()
 if(ICONV_FOUND)
 	if(APPLE)
 		# Prevent conflict between the system iconv.h header and the one from macports.
-		target_compile_options(linphone PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h")
+		if(ENABLE_STATIC)
+			target_compile_options(linphone-static PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h")
+		endif()
+		if(ENABLE_SHARED)
+			target_compile_options(linphone PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h")
+		endif()
 	else()
-		target_include_directories(linphone PRIVATE ${ICONV_INCLUDE_DIRS})
+		if(ENABLE_STATIC)
+			target_include_directories(linphone-static PRIVATE ${ICONV_INCLUDE_DIRS})
+		endif()
+		if(ENABLE_SHARED)
+			target_include_directories(linphone PRIVATE ${ICONV_INCLUDE_DIRS})
+		endif()
 	endif()
 endif()
 
-install(TARGETS linphone EXPORT LinphoneTargets
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-)
-
-install(FILES ${HEADER_FILES}
-	DESTINATION include/linphone
+install(FILES ${LINPHONE_HEADER_FILES}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/linphone
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
 )
 
-if(ENABLE_DOC)
-	add_subdirectory(help)
-endif()
+add_subdirectory(help)
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index d4c4516ce..a35031e3c 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -29,19 +29,26 @@ linphone_include_HEADERS=\
 	buffer.h \
 	call_log.h \
 	call_params.h \
+	conference.h \
 	content.h \
 	event.h \
+	friendlist.h \
 	linphonecore.h \
 	linphonecore_utils.h \
+	ringtoneplayer.h \
 	linphonefriend.h \
 	linphonepresence.h \
 	linphone_proxy_config.h \
 	linphone_tunnel.h \
 	lpc2xml.h \
 	lpconfig.h \
+	nat_policy.h \
 	sipsetup.h \
+	sqlite3_bctbx_vfs.h \
 	xml2lpc.h \
-	xmlrpc.h
+	xmlrpc.h \
+	vcard.h \
+	carddav.h
 
 lib_LTLIBRARIES=liblinphone.la
 
@@ -54,14 +61,18 @@ liblinphone_la_SOURCES=\
 	call_log.c \
 	call_params.c \
 	chat.c \
-	conference.c \
+	chat_file_transfer.c \
+	conference.cc conference_private.h \
 	contactprovider.c contactprovider.h contact_providers_priv.h \
 	content.c \
+	dial_plan.c \
 	dict.c \
 	ec-calibrator.c \
+	echo-tester.c \
 	enum.c enum.h \
 	event.c \
 	friend.c \
+	friendlist.c \
 	info.c \
 	ldap/ldapprovider.c ldap/ldapprovider.h \
 	linphonecall.c \
@@ -73,6 +84,7 @@ liblinphone_la_SOURCES=\
 	lsd.c \
 	message_storage.c \
 	misc.c  \
+	nat_policy.c \
 	offeranswer.c offeranswer.h\
 	player.c \
 	presence.c \
@@ -87,6 +99,9 @@ liblinphone_la_SOURCES=\
 	xml.c \
 	xmlrpc.c \
 	vtables.c \
+	carddav.c \
+	ringtoneplayer.c ringtoneplayer.h\
+	sqlite3_bctbx_vfs.c sqlite3_bctbx_vfs.h\
 	$(GITVERSION_FILE)
 
 if BUILD_UPNP
@@ -113,7 +128,11 @@ else
 liblinphone_la_SOURCES+=linphone_tunnel_stubs.c linphone_tunnel.h
 endif
 
-
+if BUILD_VCARD
+liblinphone_la_SOURCES+=vcard.cc
+else
+liblinphone_la_SOURCES+=vcard_stubs.c
+endif
 
 liblinphone_la_LDFLAGS= -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
 
@@ -141,35 +160,22 @@ liblinphone_la_LIBADD= \
 		$(LIBXML2_LIBS) \
 		$(LDAP_LIBS) \
 		$(SASL_LIBS) \
+		$(BELCARD_LIBS) \
 		$(ZLIB_LIBS)
 
 
-if ENABLE_TESTS
-noinst_PROGRAMS=test_lsd test_ecc test_numbers
-
-test_lsd_SOURCES=test_lsd.c
-
-test_lsd_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
-
-test_ecc_SOURCES=test_ecc.c
-
-test_ecc_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
-
-test_numbers_SOURCES=test_numbers.c
-
-test_numbers_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
-endif
-
 AM_CPPFLAGS=\
+	-DIN_LINPHONE \
 	-I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir) \
-		$(ORTP_CFLAGS) \
-		$(MEDIASTREAMER_CFLAGS)
+	$(ORTP_CFLAGS) \
+	$(MEDIASTREAMER_CFLAGS) \
+	$(LIBXML2_CFLAGS)
 
 COMMON_CFLAGS=\
 	$(STRICT_OPTIONS) \
 	-DIN_LINPHONE \
 	$(SIPSTACK_CFLAGS) \
-	-DENABLE_TRACE 	\
+	-DENABLE_TRACE \
 	-DLOG_DOMAIN=\"LinphoneCore\" \
 	$(IPV6_CFLAGS) \
 	-DORTP_INET6 \
@@ -179,6 +185,7 @@ COMMON_CFLAGS=\
 	$(LIBXML2_CFLAGS) \
 	$(LDAP_CFLAGS) \
 	$(SASL_CFLAGS) \
+	$(BELCARD_CFLAGS) \
 	$(ZLIB_CFLAGS)
 
 if BUILD_WIZARD
@@ -189,6 +196,9 @@ COMMON_CFLAGS+= -DUSE_BELLESIP
 
 AM_CFLAGS=$(COMMON_CFLAGS) $(STRICT_OPTIONS_CC)
 AM_CXXFLAGS=$(COMMON_CFLAGS) $(STRICT_OPTIONS_CXX)
+if BUILD_VCARD
+AM_CXXFLAGS+=-std=c++11
+endif
 
 #Make sure that we are in linphone's git tree by doing git log $(top_srcdir)/configure.ac.
 #if it is something known to git, then that will be ok to check the git describe number and make sure it is consistent with
diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index 128707a12..acd4d3bd9 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -29,8 +29,8 @@ using namespace ::std;
 
 void TunnelManager::addServer(const char *ip, int port,unsigned int udpMirrorPort,unsigned int delay) {
 	if (ip == NULL) {
-		ip = "";
 		ms_warning("Adding tunnel server with empty ip, it will not work!");
+		return;
 	}
 	addServer(ip,port);
 	mUdpMirrorClients.push_back(UdpMirrorClient(ServerAddr(ip,udpMirrorPort),delay));
@@ -38,8 +38,8 @@ void TunnelManager::addServer(const char *ip, int port,unsigned int udpMirrorPor
 
 void TunnelManager::addServer(const char *ip, int port) {
 	if (ip == NULL) {
-		ip = "";
 		ms_warning("Adding tunnel server with empty ip, it will not work!");
+		return;
 	}
 	mServerAddrs.push_back(ServerAddr(ip,port));
 	if (mTunnelClient) mTunnelClient->addServer(ip,port);
@@ -47,13 +47,17 @@ void TunnelManager::addServer(const char *ip, int port) {
 
 void TunnelManager::cleanServers() {
 	mServerAddrs.clear();
-
+	if (mLongRunningTaskId > 0) {
+		sal_end_background_task(mLongRunningTaskId);
+		mLongRunningTaskId = 0;
+	}
 	UdpMirrorClientList::iterator it;
 	for (it = mUdpMirrorClients.begin(); it != mUdpMirrorClients.end();) {
 		UdpMirrorClient& s=*it++;
 		s.stop();
 	}
 	mUdpMirrorClients.clear();
+	mCurrentUdpMirrorClient = mUdpMirrorClients.end();
 	if (mTunnelClient) mTunnelClient->cleanServers();
 }
 
@@ -62,8 +66,8 @@ void TunnelManager::reconnect(){
 		mTunnelClient->reconnect();
 }
 
-static void sCloseRtpTransport(RtpTransport *t, void *userData){
-	TunnelSocket *s=(TunnelSocket*)userData;
+static void sCloseRtpTransport(RtpTransport *t){
+	TunnelSocket *s=(TunnelSocket*)t->data;
 	TunnelManager *manager=(TunnelManager*)s->getUserPointer();
 	manager->closeRtpTransport(t, s);
 }
@@ -89,21 +93,50 @@ RtpTransport *TunnelManager::createRtpTransport(int port){
 	t->t_close=sCloseRtpTransport;
 	t->t_destroy=sDestroyRtpTransport;
 	t->data=socket;
+	ms_message("Creating tunnel RTP transport for local virtual port %i", port);
 	return t;
 }
 
 void TunnelManager::startClient() {
 	ms_message("TunnelManager: Starting tunnel client");
-	mTunnelClient = new TunnelClient(TRUE);
-	mTunnelClient->setCallback((TunnelClientController::StateCallback)tunnelCallback,this);
+	if (!mTunnelClient){
+		mTunnelClient = new TunnelClient(TRUE);
+		sal_set_tunnel(mCore->sal, mTunnelClient);
+		mTunnelClient->setCallback(tunnelCallback,this);
+	}
+	
+	if (mVerifyServerCertificate) {
+		const char *rootCertificatePath = linphone_core_get_root_ca(mCore);
+		if (rootCertificatePath != NULL) {
+			ms_message("TunnelManager: Load root certificate from %s", rootCertificatePath);
+			mTunnelClient->setRootCertificate(rootCertificatePath); /* give the path to root certificate to the tunnel client in order to be able to verify the server certificate */
+		} else {
+			ms_warning("TunnelManager is set to verify server certificate but no root certificate is available in linphoneCore");
+		}
+	}
+	mTunnelClient->cleanServers();
 	list<ServerAddr>::iterator it;
 	for(it=mServerAddrs.begin();it!=mServerAddrs.end();++it){
 		const ServerAddr &addr=*it;
 		mTunnelClient->addServer(addr.mAddr.c_str(), addr.mPort);
 	}
 	mTunnelClient->setHttpProxy(mHttpProxyHost.c_str(), mHttpProxyPort, mHttpUserName.c_str(), mHttpPasswd.c_str());
-	mTunnelClient->start();
-	sal_set_tunnel(mCore->sal, mTunnelClient);
+	if (!mTunnelClient->isStarted())
+		mTunnelClient->start();
+	else
+		mTunnelClient->reconnect(); /*force a reconnection to take into account new parameters*/
+	
+}
+
+void TunnelManager::stopClient(){
+	if (linphone_core_get_calls_nb(mCore) == 0){
+		/*if no calls are running, we can decide to stop the client completely, so that the connection to the tunnel server is terminated.*/
+		if (mTunnelClient) {
+			ms_message("TunnelManager: stoppping tunnel client");
+			mTunnelClient->stop();
+		}
+		/*otherwise, it doesn't really matter if the tunnel connection is kept alive even if it is not used anymore by the liblinphone.*/
+	}
 }
 
 bool TunnelManager::isConnected() const {
@@ -120,9 +153,11 @@ int TunnelManager::customSendto(struct _RtpTransport *t, mblk_t *msg , int flags
 
 int TunnelManager::customRecvfrom(struct _RtpTransport *t, mblk_t *msg, int flags, struct sockaddr *from, socklen_t *fromlen){
 	memset(&msg->recv_addr,0,sizeof(msg->recv_addr));
-	int err=((TunnelSocket*)t->data)->recvfrom(msg->b_wptr,msg->b_datap->db_lim-msg->b_datap->db_base,from,*fromlen);
+	int err=((TunnelSocket*)t->data)->recvfrom(msg->b_wptr,dblk_lim(msg->b_datap)-dblk_base(msg->b_datap),from,*fromlen);
 	//to make ice happy
 	inet_aton(((TunnelManager*)((TunnelSocket*)t->data)->getUserPointer())->mLocalAddr,&msg->recv_addr.addr.ipi_addr);
+	msg->recv_addr.family = AF_INET;
+	msg->recv_addr.port = htons((unsigned short)((TunnelSocket*)t->data)->getPort());
 	if (err>0) return err;
 	return 0;
 }
@@ -130,11 +165,11 @@ int TunnelManager::customRecvfrom(struct _RtpTransport *t, mblk_t *msg, int flag
 TunnelManager::TunnelManager(LinphoneCore* lc) :
 	mCore(lc),
 	mMode(LinphoneTunnelModeDisable),
-	mState(disabled),
-	mTunnelizeSipPackets(true),
 	mTunnelClient(NULL),
 	mHttpProxyPort(0),
-	mVTable(NULL)
+	mVTable(NULL),
+	mLongRunningTaskId(0),
+	mSimulateUdpLoss(false)
 {
 	linphone_core_add_iterate_hook(mCore,(LinphoneCoreIterateHook)sOnIterate,this);
 	mTransportFactories.audio_rtcp_func=sCreateRtpTransport;
@@ -149,20 +184,34 @@ TunnelManager::TunnelManager(LinphoneCore* lc) :
 	mVTable->network_reachable = networkReachableCb;
 	linphone_core_add_listener(mCore, mVTable);
 	linphone_core_get_local_ip_for(AF_INET, NULL, mLocalAddr);
+	mAutodetectionRunning = false;
+	mState = Off;
+	mTargetState = Off;
+	mStarted = false;
+	mTunnelizeSipPackets = true;
 }
 
 TunnelManager::~TunnelManager(){
+	if (mLongRunningTaskId > 0) {
+		sal_end_background_task(mLongRunningTaskId);
+		mLongRunningTaskId = 0;
+	}
 	for(UdpMirrorClientList::iterator udpMirror = mUdpMirrorClients.begin(); udpMirror != mUdpMirrorClients.end(); udpMirror++) {
 		udpMirror->stop();
 	}
-	if(mTunnelClient) delete mTunnelClient;
+	stopClient();
+	if (mTunnelClient) {
+		mTunnelClient->stop();
+		delete mTunnelClient;
+	}
+	sal_set_tunnel(mCore->sal,NULL);
 	linphone_core_remove_listener(mCore, mVTable);
 	linphone_core_v_table_destroy(mVTable);
 }
 
 void TunnelManager::doRegistration(){
 	LinphoneProxyConfig* lProxy;
-	linphone_core_get_default_proxy(mCore, &lProxy);
+	lProxy = linphone_core_get_default_proxy_config(mCore);
 	if (lProxy) {
 		ms_message("TunnelManager: New registration");
 		lProxy->commit = TRUE;
@@ -171,82 +220,105 @@ void TunnelManager::doRegistration(){
 
 void TunnelManager::doUnregistration() {
 	LinphoneProxyConfig *lProxy;
-	linphone_core_get_default_proxy(mCore, &lProxy);
+	lProxy = linphone_core_get_default_proxy_config(mCore);
 	if(lProxy) {
 		_linphone_proxy_config_unregister(lProxy);
 	}
 }
 
+void TunnelManager::tunnelizeLiblinphone(){
+	ms_message("LinphoneCore goes into tunneled mode.");
+	mState = On; /*do this first because _linphone_core_apply_transports() will use it to know if tunnel listening point is to be used*/
+	linphone_core_set_rtp_transport_factories(mCore,&mTransportFactories);
+	if (mTunnelizeSipPackets) {
+		doUnregistration();
+		_linphone_core_apply_transports(mCore);
+		doRegistration();
+	}
+}
+
+void TunnelManager::untunnelizeLiblinphone(){
+	ms_message("LinphoneCore leaves tunneled mode.");
+	mState = Off;
+	linphone_core_set_rtp_transport_factories(mCore, NULL);
+	if (mTunnelizeSipPackets) {
+		doUnregistration();
+		_linphone_core_apply_transports(mCore);
+		doRegistration();
+	}
+}
+
+
+void TunnelManager::applyState() {
+	if (!linphone_core_is_network_reachable(mCore)) return;
+	if (mTargetState == On && mState == Off){
+		if (!mTunnelClient || !mTunnelClient->isStarted()){
+			startClient();
+		}
+		if (mTunnelClient->isReady()) tunnelizeLiblinphone();
+	}else if (mTargetState == Off && mState == On){
+		untunnelizeLiblinphone();
+		stopClient();
+	}
+}
+
+void TunnelManager::setState ( TunnelManager::State state ) {
+	mTargetState = state;
+	applyState();
+}
+
+
+
 void TunnelManager::processTunnelEvent(const Event &ev){
 	if (ev.mData.mConnected){
 		ms_message("TunnelManager: tunnel is connected");
-		if(mState == connecting) {
-			linphone_core_set_rtp_transport_factories(mCore,&mTransportFactories);
-			mState = ready;
-			if(mTunnelizeSipPackets) {
-				doUnregistration();
-				_linphone_core_apply_transports(mCore);
-				doRegistration();
-			}
-			
-		}
+		applyState();
 	} else {
 		ms_error("TunnelManager: tunnel has been disconnected");
 	}
 }
 
-void TunnelManager::setMode(LinphoneTunnelMode mode) {
-	if(mMode == mode) return;
-	if((mode==LinphoneTunnelModeDisable && mState==disabled)
-			|| (mode==LinphoneTunnelModeEnable && mState==ready)) {
-		return;
-	}
-	ms_message("TunnelManager: switching mode from %s to %s",
-			   linphone_tunnel_mode_to_string(mMode),
-			   linphone_tunnel_mode_to_string(mode));
-	switch(mode) {
+void TunnelManager::applyMode() {
+	switch(mMode) {
 	case LinphoneTunnelModeEnable:
-		if(mState == disabled) {
-			startClient();
-			mState = connecting;
-			mMode = mode;
-		} else {
-			ms_error("TunnelManager: could not change mode. Bad state");
-		}
+		stopAutoDetection();
+		setState(On);
 		break;
 	case LinphoneTunnelModeDisable:
-		if(mState == ready) {
-			linphone_core_set_rtp_transport_factories(mCore,NULL);
-			mState = disabled;
-			mMode = mode;
-			if(mTunnelizeSipPackets) {
-				doUnregistration();
-				_linphone_core_apply_transports(mCore);
-			}
-			sal_set_tunnel(mCore->sal,NULL);
-			delete mTunnelClient;
-			mTunnelClient=NULL;
-		} else {
-			ms_error("TunnelManager: could not change mode. Bad state");
-		}
+		stopAutoDetection();
+		setState(Off);
 		break;
 	case LinphoneTunnelModeAuto:
-		if(mState == disabled || mState == ready) {
-			if(startAutoDetection()) {
-				mState = autodetecting;
-				mMode = mode;
-			}
-		} else {
-			ms_error("TunnelManager: could not change mode. Bad state");
-		}
+		if (linphone_core_is_network_reachable(mCore)) startAutoDetection();
 		break;
 	default:
-		ms_error("TunnelManager::setMode(): invalid mode (%d)", mode);
+		ms_error("TunnelManager::setMode(): invalid mode (%d)", (int)mMode);
 	}
 }
 
-void TunnelManager::tunnelCallback(bool connected, TunnelManager *zis){
+
+void TunnelManager::setMode(LinphoneTunnelMode mode) {
+	if(mMode == mode) return;
+	ms_message("TunnelManager: switching mode from %s to %s",
+			   linphone_tunnel_mode_to_string(mMode),
+			   linphone_tunnel_mode_to_string(mode));
+	mMode = mode;
+	applyMode();
+	
+}
+
+void TunnelManager::stopLongRunningTask() {
+	if (mLongRunningTaskId != 0) {
+		sal_end_background_task(mLongRunningTaskId);
+		mLongRunningTaskId = 0;
+	}
+}
+
+
+void TunnelManager::tunnelCallback(bool connected, void *user_pointer){
+	TunnelManager *zis = static_cast<TunnelManager*>(user_pointer);
 	Event ev;
+	
 	ev.mType=TunnelEvent;
 	ev.mData.mConnected=connected;
 	zis->postEvent(ev);
@@ -318,33 +390,30 @@ LinphoneTunnelMode TunnelManager::getMode() const {
 }
 
 void TunnelManager::processUdpMirrorEvent(const Event &ev){
-	if(mState != autodetecting) return;
-	if (ev.mData.mHaveUdp) {
-		ms_message("TunnelManager: UDP mirror test succeed");
-		if(mTunnelClient) {
-			if(mTunnelizeSipPackets) doUnregistration();
-			delete mTunnelClient;
-			mTunnelClient = NULL;
-			if(mTunnelizeSipPackets) doRegistration();
+	if (mAutodetectionRunning == false) return; /*auto detection was cancelled, for example by switching to disabled state*/
+	if (mSimulateUdpLoss || !ev.mData.mHaveUdp) {
+		if (mSimulateUdpLoss) {
+			ms_message("TunnelManager: simulate UDP lost on %s:%d", mCurrentUdpMirrorClient->getServerAddress().mAddr.c_str(), mCurrentUdpMirrorClient->getServerAddress().mPort);
+		} else {
+			ms_message("TunnelManager: UDP mirror test failed on %s:%d", mCurrentUdpMirrorClient->getServerAddress().mAddr.c_str(), mCurrentUdpMirrorClient->getServerAddress().mPort);
 		}
-		mState = disabled;
-	} else {
-		ms_message("TunnelManager: UDP mirror test failed");
 		mCurrentUdpMirrorClient++;
 		if (mCurrentUdpMirrorClient !=mUdpMirrorClients.end()) {
-			ms_message("TunnelManager: trying another UDP mirror");
+			ms_message("TunnelManager: trying another UDP mirror on %s:%d", mCurrentUdpMirrorClient->getServerAddress().mAddr.c_str(), mCurrentUdpMirrorClient->getServerAddress().mPort);
 			UdpMirrorClient &lUdpMirrorClient=*mCurrentUdpMirrorClient;
 			lUdpMirrorClient.start(TunnelManager::sUdpMirrorClientCallback,(void*)this);
+			mAutodetectionRunning = true;
+			return;
 		} else {
 			ms_message("TunnelManager: all UDP mirror tests failed");
-			if(mTunnelClient==NULL) {
-				startClient();
-				mState = connecting;
-			} else {
-				mState = ready;
-			}
+			setState(On);
 		}
+	} else {
+		ms_message("TunnelManager: UDP mirror test success on %s:%d", mCurrentUdpMirrorClient->getServerAddress().mAddr.c_str(), mCurrentUdpMirrorClient->getServerAddress().mPort);
+		setState(Off);
 	}
+	mAutodetectionRunning = false;
+	stopLongRunningTask();
 }
 
 void TunnelManager::postEvent(const Event &ev){
@@ -363,11 +432,32 @@ void TunnelManager::sUdpMirrorClientCallback(bool isUdpAvailable, void* data) {
 
 void TunnelManager::networkReachableCb(LinphoneCore *lc, bool_t reachable) {
 	TunnelManager *tunnel = bcTunnel(linphone_core_get_tunnel(lc));
-	if(reachable && tunnel->getMode() == LinphoneTunnelModeAuto && tunnel->mState != connecting && tunnel->mState != autodetecting) {
-		tunnel->startAutoDetection();
-		tunnel->mState = autodetecting;
+	
+	if (reachable) {
+		linphone_core_get_local_ip_for(AF_INET, NULL,tunnel->mLocalAddr);
+		if (tunnel->getMode() == LinphoneTunnelModeAuto){
+			tunnel->startAutoDetection();
+			/*autodetection will call applyState() when finished*/
+		}else{
+			tunnel->applyState();
+		}
+	} else if (!reachable) {
+		// if network is no more reachable, cancel autodetection if any
+		tunnel->stopAutoDetection();
+		//turn off the tunnel connection
+		tunnel->stopClient();
+		tunnel->untunnelizeLiblinphone();
+	}
+}
+
+void TunnelManager::stopAutoDetection(){
+	if (mAutodetectionRunning){
+		for(UdpMirrorClientList::iterator udpMirror = mUdpMirrorClients.begin(); udpMirror != mUdpMirrorClients.end(); udpMirror++) {
+			udpMirror->stop();
+		}
+		mAutodetectionRunning = false;
+		stopLongRunningTask();
 	}
-	linphone_core_get_local_ip_for(AF_INET, NULL,tunnel->mLocalAddr);
 }
 
 bool TunnelManager::startAutoDetection() {
@@ -377,21 +467,16 @@ bool TunnelManager::startAutoDetection() {
 	}
 	ms_message("TunnelManager: Starting auto-detection");
 	mCurrentUdpMirrorClient = mUdpMirrorClients.begin();
+	if (mLongRunningTaskId == 0)
+		 mLongRunningTaskId = sal_begin_background_task("Tunnel auto detect", NULL, NULL);
 	UdpMirrorClient &lUdpMirrorClient=*mCurrentUdpMirrorClient;
+	mAutodetectionRunning = true;
 	lUdpMirrorClient.start(TunnelManager::sUdpMirrorClientCallback,(void*)this);
 	return true;
 }
 
 bool TunnelManager::isActivated() const{
-	switch(getMode()){
-		case LinphoneTunnelModeAuto:
-			return !(mState==disabled);
-		case LinphoneTunnelModeDisable:
-			return false;
-		case LinphoneTunnelModeEnable:
-			return true;
-	}
-	return false;
+	return mState == On;
 }
 
 void TunnelManager::setHttpProxyAuthInfo(const char* username,const char* passwd) {
@@ -408,6 +493,14 @@ bool TunnelManager::tunnelizeSipPacketsEnabled() const {
 	return mTunnelizeSipPackets;
 }
 
+void TunnelManager::verifyServerCertificate(bool enable){
+	mVerifyServerCertificate = enable;
+}
+
+bool TunnelManager::verifyServerCertificateEnabled() const {
+	return mVerifyServerCertificate;
+}
+
 void TunnelManager::setHttpProxy(const char *host,int port, const char *username, const char *passwd){
 	mHttpUserName=username?username:"";
 	mHttpPasswd=passwd?passwd:"";
@@ -419,3 +512,7 @@ void TunnelManager::setHttpProxy(const char *host,int port, const char *username
 LinphoneCore *TunnelManager::getLinphoneCore() const{
 	return mCore;
 }
+
+void TunnelManager::simulateUdpLoss(bool enabled) {
+	mSimulateUdpLoss = enabled;
+}
diff --git a/coreapi/TunnelManager.hh b/coreapi/TunnelManager.hh
index f8002ee5d..48fb2ec23 100644
--- a/coreapi/TunnelManager.hh
+++ b/coreapi/TunnelManager.hh
@@ -110,6 +110,18 @@ namespace belledonnecomm {
 		 * @return True, SIP packets pass through the tunnel
 		 */
 		bool tunnelizeSipPacketsEnabled() const;
+		/**
+		 * Indicate to the tunnel manager wether server certificate
+		 * must be verified during TLS handshake. Default: disabled
+		 * @param enable If set to TRUE, SIP packets will pass through the tunnel.
+		 * If set to FALSE, SIP packets will pass by the configured proxies.
+		 */
+		void verifyServerCertificate(bool enable);
+		/**
+		 * Check wether the tunnel manager is set to verify server certificate during TLS handshake
+		 * @return True, server certificate is verified(using the linphonecore root certificate)
+		 */
+		bool verifyServerCertificateEnabled() const;
 		/**
 		 * @brief Constructor
 		 * @param lc The LinphoneCore instance of which the TunnelManager will be associated to.
@@ -143,14 +155,10 @@ namespace belledonnecomm {
 		bool isConnected() const;
 
 		bool isActivated() const;
-	private:
-		enum State {
-			disabled,
-			connecting,
-			ready,
-			autodetecting
-		};
 
+		void simulateUdpLoss(bool enabled);
+
+	private:
 		enum EventType{
 			UdpMirrorClientEvent,
 			TunnelEvent,
@@ -165,15 +173,16 @@ namespace belledonnecomm {
 		typedef std::list<UdpMirrorClient> UdpMirrorClientList;
 		static int customSendto(struct _RtpTransport *t, mblk_t *msg , int flags, const struct sockaddr *to, socklen_t tolen);
 		static int customRecvfrom(struct _RtpTransport *t, mblk_t *msg, int flags, struct sockaddr *from, socklen_t *fromlen);
-		static int eXosipSendto(int fd,const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen,void* userdata);
-		static int eXosipRecvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen,void* userdata);
-		static int eXosipSelect(int nfds, fd_set *s1, fd_set *s2, fd_set *s3, struct timeval *tv,void* userdata);
-		static void tunnelCallback(bool connected, TunnelManager *zis);
+		static void tunnelCallback(bool connected, void *zis);
 		static void sOnIterate(TunnelManager *zis);
 		static void sUdpMirrorClientCallback(bool result, void* data);
 		static void networkReachableCb(LinphoneCore *lc, bool_t reachable);
 
 	private:
+		enum State{
+			Off, /*no tunneling */
+			On /*tunneling activated*/
+		};
 		void onIterate();
 		void doRegistration();
 		void doUnregistration();
@@ -182,12 +191,18 @@ namespace belledonnecomm {
 		void processTunnelEvent(const Event &ev);
 		void processUdpMirrorEvent(const Event &ev);
 		void postEvent(const Event &ev);
-
+		void stopClient();
+		void stopAutoDetection();
+		void stopLongRunningTask();
+		void applyMode();
+		void setState(State state);
+		void applyState();
+		void tunnelizeLiblinphone();
+		void untunnelizeLiblinphone();
 	private:
+		
 		LinphoneCore* mCore;
 		LinphoneTunnelMode mMode;
-		State mState;
-		bool mTunnelizeSipPackets;
 		TunnelClient* mTunnelClient;
 		std::string mHttpUserName;
 		std::string mHttpPasswd;
@@ -201,6 +216,14 @@ namespace belledonnecomm {
 		Mutex mMutex;
 		std::queue<Event> mEvq;
 		char mLocalAddr[64];
+		unsigned long mLongRunningTaskId;
+		State mTargetState;
+		State mState;
+		bool mVerifyServerCertificate;
+		bool mStarted;
+		bool mAutodetectionRunning;
+		bool mTunnelizeSipPackets;
+		bool mSimulateUdpLoss;
 	};
 
 /**
diff --git a/coreapi/account_creator.c b/coreapi/account_creator.c
index b7c809df6..e26f6157c 100644
--- a/coreapi/account_creator.c
+++ b/coreapi/account_creator.c
@@ -17,9 +17,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include "linphonecore.h"
+#include "account_creator.h"
 #include "private.h"
+#if !_WIN32
+#include "regex.h"
+#endif
 
+#include <bctoolbox/crypto.h>
 
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneAccountCreatorCbs);
 
@@ -30,6 +34,12 @@ BELLE_SIP_INSTANCIATE_VPTR(LinphoneAccountCreatorCbs, belle_sip_object_t,
 	FALSE
 );
 
+static const char* ha1_for_passwd(const char* username, const char* realm, const char* passwd) {
+	static char ha1[33];
+	sal_auth_compute_ha1(username, realm, passwd, ha1);
+	return ha1;
+}
+
 static LinphoneAccountCreatorCbs * linphone_account_creator_cbs_new(void) {
 	return belle_sip_object_new(LinphoneAccountCreatorCbs);
 }
@@ -51,41 +61,92 @@ void linphone_account_creator_cbs_set_user_data(LinphoneAccountCreatorCbs *cbs,
 	cbs->user_data = ud;
 }
 
-LinphoneAccountCreatorCbsExistenceTestedCb linphone_account_creator_cbs_get_existence_tested(const LinphoneAccountCreatorCbs *cbs) {
-	return cbs->existence_tested;
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_used(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->is_account_used;
 }
 
-void linphone_account_creator_cbs_set_existence_tested(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsExistenceTestedCb cb) {
-	cbs->existence_tested = cb;
+void linphone_account_creator_cbs_set_is_account_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->is_account_used = cb;
 }
 
-LinphoneAccountCreatorCbsValidationTestedCb linphone_account_creator_cbs_get_validation_tested(const LinphoneAccountCreatorCbs *cbs) {
-	return cbs->validation_tested;
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_create_account(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->create_account;
 }
 
-void linphone_account_creator_cbs_set_validation_tested(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsValidationTestedCb cb) {
-	cbs->validation_tested = cb;
+void linphone_account_creator_cbs_set_create_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->create_account = cb;
 }
 
-LinphoneAccountCreatorCbsValidatedCb linphone_account_creator_cbs_get_validated(const LinphoneAccountCreatorCbs *cbs) {
-	return cbs->validated;
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_account(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->activate_account;
 }
 
-void linphone_account_creator_cbs_set_validated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsValidatedCb cb) {
-	cbs->validated = cb;
+void linphone_account_creator_cbs_set_activate_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->activate_account = cb;
+}
+
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_link_phone_number_with_account(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->link_phone_number_with_account;
+}
+
+void linphone_account_creator_cbs_set_link_phone_number_with_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->link_phone_number_with_account = cb;
+}
+
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_phone_number_link(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->activate_phone_number_link;
+}
+
+void linphone_account_creator_cbs_set_activate_phone_number_link(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->activate_phone_number_link = cb;
+}
+
+void linphone_account_creator_cbs_set_is_account_linked(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->is_account_linked = cb;
+}
+
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_linked(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->is_account_linked;
+}
+
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_activated(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->is_account_activated;
+}
+
+void linphone_account_creator_cbs_set_is_account_activated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->is_account_activated = cb;
+}
+
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_recover_phone_account(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->recover_phone_account;
+}
+
+void linphone_account_creator_cbs_set_recover_phone_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->recover_phone_account = cb;
+}
+
+LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_phone_number_used(const LinphoneAccountCreatorCbs *cbs) {
+	return cbs->is_phone_number_used;
+}
+
+void linphone_account_creator_cbs_set_is_phone_number_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb) {
+	cbs->is_phone_number_used = cb;
 }
 
 
 static void _linphone_account_creator_destroy(LinphoneAccountCreator *creator) {
-	linphone_xml_rpc_session_unref(creator->xmlrpc_session);
+	linphone_xml_rpc_session_release(creator->xmlrpc_session); /*this will drop all pending requests if any*/
 	linphone_account_creator_cbs_unref(creator->callbacks);
 	if (creator->username) ms_free(creator->username);
 	if (creator->password) ms_free(creator->password);
+	if (creator->ha1) ms_free(creator->ha1);
 	if (creator->domain) ms_free(creator->domain);
 	if (creator->route) ms_free(creator->route);
 	if (creator->email) ms_free(creator->email);
 	if (creator->display_name) ms_free(creator->display_name);
-	ms_free(creator);
+	if (creator->phone_country_code) ms_free(creator->phone_country_code);
+	if (creator->activation_code) ms_free(creator->activation_code);
+	if (creator->language) ms_free(creator->language);
 }
 
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneAccountCreator);
@@ -100,10 +161,14 @@ BELLE_SIP_INSTANCIATE_VPTR(LinphoneAccountCreator, belle_sip_object_t,
 
 LinphoneAccountCreator * linphone_account_creator_new(LinphoneCore *core, const char *xmlrpc_url) {
 	LinphoneAccountCreator *creator;
+	const char* domain = lp_config_get_string(core->config, "assistant", "domain", NULL);
 	creator = belle_sip_object_new(LinphoneAccountCreator);
 	creator->callbacks = linphone_account_creator_cbs_new();
 	creator->core = core;
 	creator->xmlrpc_session = linphone_xml_rpc_session_new(core, xmlrpc_url);
+	if (domain) {
+		linphone_account_creator_set_domain(creator, domain);
+	}
 	return creator;
 }
 
@@ -124,174 +189,299 @@ void linphone_account_creator_set_user_data(LinphoneAccountCreator *creator, voi
 	creator->user_data = ud;
 }
 
-void linphone_account_creator_set_username(LinphoneAccountCreator *creator, const char *username) {
-	set_string(&creator->username, username);
+static LinphoneAccountCreatorStatus validate_uri(const char* username, const char* domain, const char* route, const char* display_name) {
+	LinphoneAddress* addr;
+	LinphoneAccountCreatorStatus status = LinphoneAccountCreatorOK;
+	LinphoneProxyConfig* proxy = linphone_proxy_config_new();
+	linphone_proxy_config_set_identity(proxy, "sip:userame@domain.com");
+
+	if (route && linphone_proxy_config_set_route(proxy, route) != 0) {
+		status = LinphoneAccountCreatorRouteInvalid;
+		goto end;
+	}
+
+	if (username) {
+		addr = linphone_proxy_config_normalize_sip_uri(proxy, username);
+	} else {
+		addr = linphone_address_clone(linphone_proxy_config_get_identity_address(proxy));
+	}
+
+	if (addr == NULL) {
+		status = LinphoneAccountCreatorUsernameInvalid;
+		goto end;
+	}
+
+	if (domain && linphone_address_set_domain(addr, domain) != 0) {
+		status = LinphoneAccountCreatorDomainInvalid;
+	}
+
+	if (display_name && (!strlen(display_name) || linphone_address_set_display_name(addr, display_name) != 0)) {
+		status = LinphoneAccountCreatorDisplayNameInvalid;
+	}
+	linphone_address_unref(addr);
+end:
+	linphone_proxy_config_destroy(proxy);
+	return status;
+}
+
+static char* _get_identity(const LinphoneAccountCreator *creator) {
+	char *identity = NULL;
+	if ((creator->username || creator->phone_number) && creator->domain) {
+		//we must escape username
+		LinphoneProxyConfig* proxy = linphone_proxy_config_new();
+		LinphoneAddress* addr;
+		// creator->domain may contain some port or some transport (eg. toto.org:443;transport=tcp),
+		// we will accept that
+		char * tmpidentity = ms_strdup_printf("sip:username@%s", creator->domain);
+		linphone_proxy_config_set_identity(proxy, tmpidentity);
+		ms_free(tmpidentity);
+		addr = linphone_proxy_config_normalize_sip_uri(proxy, creator->username ? creator->username : creator->phone_number);
+
+		identity = linphone_address_as_string(addr);
+		linphone_address_destroy(addr);
+		linphone_proxy_config_destroy(proxy);
+	}
+	return identity;
+}
+
+static bool_t is_matching_regex(const char *entry, const char* regex) {
+#if _WIN32
+	return TRUE;
+#else
+	regex_t regex_pattern;
+	char err_msg[256];
+	int res;
+	res = regcomp(&regex_pattern, regex, REG_EXTENDED | REG_NOSUB);
+	if(res != 0) {
+		regerror(res, &regex_pattern, err_msg, sizeof(err_msg));
+		ms_error("Could not compile regex '%s: %s", regex, err_msg);
+		return FALSE;
+	}
+	res = regexec(&regex_pattern, entry, 0, NULL, 0);
+	regfree(&regex_pattern);
+	return (res != REG_NOMATCH);
+#endif
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_set_username(LinphoneAccountCreator *creator, const char *username) {
+	int min_length = lp_config_get_int(creator->core->config, "assistant", "username_min_length", -1);
+	int fixed_length = lp_config_get_int(creator->core->config, "assistant", "username_length", -1);
+	int max_length = lp_config_get_int(creator->core->config, "assistant", "username_max_length", -1);
+	bool_t use_phone_number = lp_config_get_int(creator->core->config, "assistant", "use_phone_number", 0);
+	const char* regex = lp_config_get_string(creator->core->config, "assistant", "username_regex", 0);
+	LinphoneAccountCreatorStatus status = LinphoneAccountCreatorOK;
+	if (!username) {
+		creator->username = NULL;
+		return LinphoneAccountCreatorOK;
+	} else if (min_length > 0 && strlen(username) < (size_t)min_length) {
+		return LinphoneAccountCreatorUsernameTooShort;
+	} else if (max_length > 0 && strlen(username) > (size_t)max_length) {
+		return LinphoneAccountCreatorUsernameTooLong;
+	} else if (fixed_length > 0 && strlen(username) != (size_t)fixed_length) {
+		return LinphoneAccountCreatorUsernameInvalidSize;
+	} else if (use_phone_number && !linphone_proxy_config_is_phone_number(NULL, username)) {
+		return LinphoneAccountCreatorUsernameInvalid;
+	} else if (regex && !is_matching_regex(username, regex)) {
+		return LinphoneAccountCreatorUsernameInvalid;
+	} else if ((status = validate_uri(username, NULL, NULL, NULL)) != LinphoneAccountCreatorOK) {
+		return status;
+	}
+
+	set_string(&creator->username, username, TRUE);
+
+	return LinphoneAccountCreatorOK;
 }
 
 const char * linphone_account_creator_get_username(const LinphoneAccountCreator *creator) {
 	return creator->username;
 }
 
-void linphone_account_creator_set_password(LinphoneAccountCreator *creator, const char *password){
-	set_string(&creator->password, password);
+
+LinphoneAccountCreatorStatus linphone_account_creator_set_phone_number(LinphoneAccountCreator *creator, const char *phone_number, const char *country_code) {
+	char *normalized_phone_number;
+	LinphoneAccountCreatorStatus return_status;
+	if (!phone_number || !country_code) {
+		if (!phone_number && !country_code) {
+			creator->phone_number = NULL;
+			creator->phone_country_code = NULL;
+			return LinphoneAccountCreatorOK;
+		} else {
+			return LinphoneAccountCreatorPhoneNumberInvalid;
+		}
+	} else {
+		LinphoneProxyConfig *numCfg = linphone_proxy_config_new();
+		creator->phone_country_code = ms_strdup(country_code[0] == '+' ? &country_code[1] : country_code);
+		linphone_proxy_config_set_dial_prefix(numCfg, creator->phone_country_code);
+		normalized_phone_number = linphone_proxy_config_normalize_phone_number(numCfg, phone_number);
+		linphone_proxy_config_destroy(numCfg);
+		if (!normalized_phone_number) {
+			return LinphoneAccountCreatorPhoneNumberInvalid;
+		}
+
+		// if phone is valid, we lastly want to check that length is OK
+		{
+			const LinphoneDialPlan* plan = linphone_dial_plan_by_ccc(creator->phone_country_code);
+			int size = (int)strlen(phone_number);
+			if (linphone_dial_plan_is_generic(plan)) {
+				return_status = LinphoneAccountCreatorCountryCodeInvalid;
+				goto end;
+			}
+			if (size < plan->nnl - 1) {
+				return_status = LinphoneAccountCreatorPhoneNumberTooShort;
+				goto end;
+			} else if (size > plan->nnl + 1) {
+				return_status = LinphoneAccountCreatorPhoneNumberTooLong;
+				goto end;
+			}
+		}
+	}
+	set_string(&creator->phone_number, normalized_phone_number, TRUE);
+	return_status = LinphoneAccountCreatorOK;
+
+end:
+	ms_free(normalized_phone_number);
+	return return_status;
+}
+
+const char * linphone_account_creator_get_phone_number(const LinphoneAccountCreator *creator) {
+	return creator->phone_number;
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_set_password(LinphoneAccountCreator *creator, const char *password){
+	int min_length = lp_config_get_int(creator->core->config, "assistant", "password_min_length", -1);
+	int max_length = lp_config_get_int(creator->core->config, "assistant", "password_max_length", -1);
+	if (!password) {
+		creator->password = NULL;
+		return LinphoneAccountCreatorPasswordTooShort;
+	}
+	if (min_length > 0 && strlen(password) < (size_t)min_length) {
+		return LinphoneAccountCreatorPasswordTooShort;
+	} else if (max_length > 0 && strlen(password) > (size_t)max_length) {
+		return LinphoneAccountCreatorPasswordTooLong;
+	}
+	set_string(&creator->password, password, FALSE);
+	return LinphoneAccountCreatorOK;
 }
 
 const char * linphone_account_creator_get_password(const LinphoneAccountCreator *creator) {
 	return creator->password;
 }
 
-void linphone_account_creator_set_domain(LinphoneAccountCreator *creator, const char *domain){
-	set_string(&creator->domain, domain);
+LinphoneAccountCreatorStatus linphone_account_creator_set_ha1(LinphoneAccountCreator *creator, const char *ha1){
+	set_string(&creator->ha1, ha1, FALSE);
+	return LinphoneAccountCreatorOK;
+}
+
+const char * linphone_account_creator_get_ha1(const LinphoneAccountCreator *creator) {
+	return creator->ha1;
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_set_activation_code(LinphoneAccountCreator *creator, const char *activation_code){
+	set_string(&creator->activation_code, activation_code, FALSE);
+	return LinphoneAccountCreatorOK;
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_set_language(LinphoneAccountCreator *creator, const char *lang) {
+	set_string(&creator->language, lang, FALSE);
+	return LinphoneAccountCreatorOK;
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_set_transport(LinphoneAccountCreator *creator, LinphoneTransportType transport){
+	if (!linphone_core_sip_transport_supported(creator->core, transport)) {
+		return LinphoneAccountCreatorTransportNotSupported;
+	}
+	creator->transport = transport;
+	return LinphoneAccountCreatorOK;
+}
+
+LinphoneTransportType linphone_account_creator_get_transport(const LinphoneAccountCreator *creator) {
+	return creator->transport;
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_set_domain(LinphoneAccountCreator *creator, const char *domain){
+	if (validate_uri(NULL, domain, NULL, NULL) != 0) {
+		return LinphoneAccountCreatorDomainInvalid;
+	}
+	set_string(&creator->domain, domain, TRUE);
+	return LinphoneAccountCreatorOK;
 }
 
 const char * linphone_account_creator_get_domain(const LinphoneAccountCreator *creator) {
 	return creator->domain;
 }
 
-void linphone_account_creator_set_route(LinphoneAccountCreator *creator, const char *route) {
-	set_string(&creator->route, route);
+LinphoneAccountCreatorStatus linphone_account_creator_set_route(LinphoneAccountCreator *creator, const char *route) {
+	if (validate_uri(NULL, NULL, route, NULL) != 0) {
+		return LinphoneAccountCreatorRouteInvalid;
+	}
+	set_string(&creator->route, route, TRUE);
+	return LinphoneAccountCreatorOK;
 }
 
 const char * linphone_account_creator_get_route(const LinphoneAccountCreator *creator) {
 	return creator->route;
 }
 
-void linphone_account_creator_set_display_name(LinphoneAccountCreator *creator, const char *display_name) {
-	set_string(&creator->display_name, display_name);
+LinphoneAccountCreatorStatus linphone_account_creator_set_display_name(LinphoneAccountCreator *creator, const char *display_name) {
+	if (validate_uri(NULL, NULL, NULL, display_name) != 0) {
+		return LinphoneAccountCreatorDisplayNameInvalid;
+	}
+	set_string(&creator->display_name, display_name, FALSE);
+	return LinphoneAccountCreatorOK;
 }
 
 const char * linphone_account_creator_get_display_name(const LinphoneAccountCreator *creator) {
 	return creator->display_name;
 }
 
-void linphone_account_creator_set_email(LinphoneAccountCreator *creator, const char *email) {
-	set_string(&creator->email, email);
+LinphoneAccountCreatorStatus linphone_account_creator_set_email(LinphoneAccountCreator *creator, const char *email) {
+	if (!is_matching_regex(email, "^.+@.+\\.[A-Za-z]{2}[A-Za-z]*$")) {
+		return LinphoneAccountCreatorEmailInvalid;
+	}
+	set_string(&creator->email, email, TRUE);
+	return LinphoneAccountCreatorOK;
 }
 
 const char * linphone_account_creator_get_email(const LinphoneAccountCreator *creator) {
 	return creator->email;
 }
 
-void linphone_account_creator_enable_newsletter_subscription(LinphoneAccountCreator *creator, bool_t subscribe) {
-	creator->subscribe_to_newsletter = subscribe;
-}
-
-bool_t linphone_account_creator_newsletter_subscription_enabled(const LinphoneAccountCreator *creator) {
-	return creator->subscribe_to_newsletter;
-}
-
 LinphoneAccountCreatorCbs * linphone_account_creator_get_callbacks(const LinphoneAccountCreator *creator) {
 	return creator->callbacks;
 }
 
-static void _test_existence_cb(LinphoneXmlRpcRequest *request) {
-	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
-	if (creator->callbacks->existence_tested != NULL) {
-		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorFailed;
-		if ((linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk)
-			&& (linphone_xml_rpc_request_get_int_response(request) == 0)) {
-			status = LinphoneAccountCreatorOk;
-		}
-		creator->callbacks->existence_tested(creator, status);
-	}
-}
-
-LinphoneAccountCreatorStatus linphone_account_creator_test_existence(LinphoneAccountCreator *creator) {
-	LinphoneXmlRpcRequest *request;
-	char *identity;
-
-	if (!creator->username || !creator->domain) return LinphoneAccountCreatorFailed;
-
-	identity = ms_strdup_printf("%s@%s", creator->username, creator->domain);
-	request = linphone_xml_rpc_request_new_with_args("check_account", LinphoneXmlRpcArgInt,
-		LinphoneXmlRpcArgString, identity,
-		LinphoneXmlRpcArgNone);
-	linphone_xml_rpc_request_set_user_data(request, creator);
-	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _test_existence_cb);
-	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
-	linphone_xml_rpc_request_unref(request);
-	ms_free(identity);
-	return LinphoneAccountCreatorOk;
-}
-
-static void _test_validation_cb(LinphoneXmlRpcRequest *request) {
-	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
-	if (creator->callbacks->validation_tested != NULL) {
-		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorFailed;
-		if ((linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk)
-			&& (linphone_xml_rpc_request_get_int_response(request) == 1)) {
-			status = LinphoneAccountCreatorOk;
-		}
-		creator->callbacks->validation_tested(creator, status);
-	}
-}
-
-LinphoneAccountCreatorStatus linphone_account_creator_test_validation(LinphoneAccountCreator *creator) {
-	LinphoneXmlRpcRequest *request;
-	char *identity;
-
-	if (!creator->username || !creator->domain) return LinphoneAccountCreatorFailed;
-
-	identity = ms_strdup_printf("%s@%s", creator->username, creator->domain);
-	request = linphone_xml_rpc_request_new_with_args("check_account_validated", LinphoneXmlRpcArgInt,
-		LinphoneXmlRpcArgString, identity,
-		LinphoneXmlRpcArgNone);
-	linphone_xml_rpc_request_set_user_data(request, creator);
-	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _test_validation_cb);
-	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
-	linphone_xml_rpc_request_unref(request);
-	ms_free(identity);
-	return LinphoneAccountCreatorOk;
-}
-
-static void _validate_cb(LinphoneXmlRpcRequest *request) {
-	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
-	if (creator->callbacks->validated != NULL) {
-		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorFailed;
-		if ((linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk)
-			&& (linphone_xml_rpc_request_get_int_response(request) == 0)) {
-			status = LinphoneAccountCreatorOk;
-		}
-		creator->callbacks->validated(creator, status);
-	}
-}
-
-LinphoneAccountCreatorStatus linphone_account_creator_validate(LinphoneAccountCreator *creator) {
-	LinphoneXmlRpcRequest *request;
-	char *identity;
-
-	if (!creator->username || !creator->domain) return LinphoneAccountCreatorFailed;
-
-	identity = ms_strdup_printf("%s@%s", creator->username, creator->domain);
-	request = linphone_xml_rpc_request_new_with_args("create_account", LinphoneXmlRpcArgInt,
-		LinphoneXmlRpcArgString, identity,
-		LinphoneXmlRpcArgString, creator->password,
-		LinphoneXmlRpcArgString, creator->email,
-		LinphoneXmlRpcArgInt, (creator->subscribe_to_newsletter == TRUE) ? 1 : 0,
-		LinphoneXmlRpcArgNone);
-	linphone_xml_rpc_request_set_user_data(request, creator);
-	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _validate_cb);
-	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
-	linphone_xml_rpc_request_unref(request);
-	ms_free(identity);
-	return LinphoneAccountCreatorOk;
-}
-
 LinphoneProxyConfig * linphone_account_creator_configure(const LinphoneAccountCreator *creator) {
 	LinphoneAuthInfo *info;
 	LinphoneProxyConfig *cfg = linphone_core_create_proxy_config(creator->core);
-	char *identity_str = ms_strdup_printf("sip:%s@%s", creator->username, creator->domain);
-	LinphoneAddress *identity = linphone_address_new(identity_str);
+	char *identity_str = _get_identity(creator);
+ 	LinphoneAddress *identity = linphone_address_new(identity_str);
+	char *route = NULL;
+	char *domain = NULL;
+	ms_free(identity_str);
 	if (creator->display_name) {
 		linphone_address_set_display_name(identity, creator->display_name);
 	}
-
-	linphone_proxy_config_set_identity(cfg, linphone_address_as_string(identity));
-	linphone_proxy_config_set_server_addr(cfg, creator->domain);
-	linphone_proxy_config_set_route(cfg, creator->route);
+	if (creator->route) {
+		route = ms_strdup_printf("%s;transport=%s", creator->route, linphone_transport_to_string(creator->transport));
+	}
+	if (creator->domain) {
+		domain = ms_strdup_printf("%s;transport=%s", creator->domain, linphone_transport_to_string(creator->transport));
+	}
+	linphone_proxy_config_set_identity_address(cfg, identity);
+	if (creator->phone_country_code) {
+		linphone_proxy_config_set_dial_prefix(cfg, creator->phone_country_code);
+	} else if (creator->phone_number) {
+		int dial_prefix_number = linphone_dial_plan_lookup_ccc_from_e164(creator->phone_number);
+		char buff[4];
+		snprintf(buff, sizeof(buff), "%d", dial_prefix_number);
+		linphone_proxy_config_set_dial_prefix(cfg, buff);
+	}
+	if (linphone_proxy_config_get_server_addr(cfg) == NULL)
+		linphone_proxy_config_set_server_addr(cfg, domain);
+	if (linphone_proxy_config_get_route(cfg) == NULL)
+		linphone_proxy_config_set_route(cfg, route);
 	linphone_proxy_config_enable_publish(cfg, FALSE);
 	linphone_proxy_config_enable_register(cfg, TRUE);
-	ms_free(identity_str);
 
 	if (strcmp(creator->domain, "sip.linphone.org") == 0) {
 		linphone_proxy_config_enable_avpf(cfg, TRUE);
@@ -310,7 +500,13 @@ LinphoneProxyConfig * linphone_account_creator_configure(const LinphoneAccountCr
 		linphone_core_set_firewall_policy(creator->core, LinphonePolicyUseIce);
 	}
 
-	info = linphone_auth_info_new(linphone_address_get_username(identity), NULL, creator->password, NULL, NULL, linphone_address_get_domain(identity));
+	info = linphone_auth_info_new(linphone_address_get_username(identity), // username
+								NULL, //user id
+								creator->password, // passwd
+								creator->password ? NULL : creator->ha1,  // ha1
+								!creator->password && creator->ha1 ? linphone_address_get_domain(identity) : NULL,  // realm - assumed to be domain
+								linphone_address_get_domain(identity) // domain
+	);
 	linphone_core_add_auth_info(creator->core, info);
 	linphone_address_destroy(identity);
 
@@ -323,3 +519,382 @@ LinphoneProxyConfig * linphone_account_creator_configure(const LinphoneAccountCr
 	linphone_proxy_config_unref(cfg);
 	return NULL;
 }
+
+/****************** START OF ACCOUNT USED SECTION *****************************/
+static void _is_account_used_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->is_account_used != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			status = (strcmp(resp, "ERROR_ACCOUNT_DOESNT_EXIST") == 0) ? LinphoneAccountCreatorAccountNotExist : (
+							(strcmp(resp, "ERROR_ALIAS_DOESNT_EXIST") == 0) ? LinphoneAccountCreatorAccountExist :
+														LinphoneAccountCreatorAccountExistWithAlias);
+			if (status == LinphoneAccountCreatorAccountExistWithAlias) {
+				set_string(&creator->phone_number, resp, FALSE);
+			}
+		}
+		creator->callbacks->is_account_used(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_is_account_used(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	if (!creator->username && !creator->phone_number) {
+		if (creator->callbacks->is_account_used != NULL) {
+			creator->callbacks->is_account_used(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		return LinphoneAccountCreatorReqFailed;
+	}
+
+	request = linphone_xml_rpc_request_new_with_args("get_phone_number_for_account", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->username ? creator->username : creator->phone_number,
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgNone);
+
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _is_account_used_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+
+	return LinphoneAccountCreatorOK;
+}
+/****************** END OF CREATE ACCOUNT USED SECTION ************************/
+
+/****************** START OF CREATE ACCOUNT SECTION ***************************/
+static void _create_account_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->create_account != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			status = (strcmp(resp, "OK") == 0) ? LinphoneAccountCreatorAccountCreated
+			: (strcmp(resp, "ERROR_CANNOT_SEND_SMS") == 0) ? LinphoneAccountCreatorErrorServer
+			: (strcmp(resp, "ERROR_ACCOUNT_ALREADY_IN_USE") == 0) ? LinphoneAccountCreatorAccountExist
+			: (strcmp(resp, "ERROR_ALIAS_ALREADY_IN_USE") == 0) ? LinphoneAccountCreatorAccountExistWithAlias
+			:LinphoneAccountCreatorAccountNotCreated;
+		}
+		creator->callbacks->create_account(creator, status, resp);
+	}
+}
+
+static LinphoneXmlRpcRequest * _create_account_with_phone(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	if (!creator->phone_number) {
+		return NULL;
+	}
+	request = linphone_xml_rpc_request_new_with_args("create_phone_account", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->phone_number,
+		LinphoneXmlRpcArgString, creator->username ? creator->username : creator->phone_number,
+		LinphoneXmlRpcArgString, creator->password ? ha1_for_passwd(creator->username ? creator->username : creator->phone_number, creator->domain, creator->password) : "",
+		LinphoneXmlRpcArgString, linphone_core_get_user_agent(creator->core),
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgString, creator->language,
+		LinphoneXmlRpcArgNone);
+	return request;
+}
+
+static LinphoneXmlRpcRequest * _create_account_with_email(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	if (!creator->username || !creator->email) {
+		return NULL;
+	}
+	request = linphone_xml_rpc_request_new_with_args("create_email_account", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->username,
+		LinphoneXmlRpcArgString, creator->email,
+		LinphoneXmlRpcArgString, ha1_for_passwd(creator->username ? creator->username : creator->phone_number, creator->domain, creator->password),
+		LinphoneXmlRpcArgString, linphone_core_get_user_agent(creator->core),
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgNone);
+	return request;
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_create_account(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	char *identity = _get_identity(creator);
+	if (!identity || (!(request = _create_account_with_phone(creator))
+		&& !(request = _create_account_with_email(creator)))) {
+		if (creator->callbacks->create_account != NULL) {
+			creator->callbacks->create_account(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		if (identity) ms_free(identity);
+		return LinphoneAccountCreatorReqFailed;
+	}
+
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _create_account_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+	ms_free(identity);
+	return LinphoneAccountCreatorOK;
+}
+/****************** END OF CREATE ACCOUNT SECTION *****************************/
+
+/****************** START OF VALIDATE ACCOUNT SECTION *************************/
+static void _activate_account_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->activate_account != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			if (strcmp(resp, "ERROR_ACCOUNT_ALREADY_ACTIVATED") == 0) {
+				status = LinphoneAccountCreatorAccountAlreadyActivated;
+			} else if (strstr(resp, "ERROR_") == resp) {
+				status = LinphoneAccountCreatorAccountNotActivated;
+			} else {
+				status = LinphoneAccountCreatorAccountActivated;
+				set_string(&creator->ha1, resp, FALSE);
+			}
+		}
+		creator->callbacks->activate_account(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_activate_account(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	char *identity = _get_identity(creator);
+	if (!identity || !creator->activation_code) {
+		if (creator->callbacks->is_account_activated != NULL) {
+			creator->callbacks->is_account_activated(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		return LinphoneAccountCreatorReqFailed;
+	}
+
+	if (creator->phone_number) {
+		request = linphone_xml_rpc_request_new_with_args("activate_phone_account", LinphoneXmlRpcArgString,
+			LinphoneXmlRpcArgString, creator->phone_number,
+			LinphoneXmlRpcArgString, creator->username ? creator->username : creator->phone_number,
+			LinphoneXmlRpcArgString, creator->activation_code,
+			LinphoneXmlRpcArgString, creator->domain,
+			LinphoneXmlRpcArgNone);
+	} else {
+		request = linphone_xml_rpc_request_new_with_args("activate_email_account", LinphoneXmlRpcArgString,
+			LinphoneXmlRpcArgString, creator->username,
+			LinphoneXmlRpcArgString, creator->activation_code,
+			LinphoneXmlRpcArgString, creator->domain,
+			LinphoneXmlRpcArgNone);
+	}
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _activate_account_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+	ms_free(identity);
+	return LinphoneAccountCreatorOK;
+}
+/****************** END OF CREATE VALIDATE ACCOUNT SECTION ********************/
+
+/****************** START OF ACCOUNT VALIDATED SECTION ************************/
+static void _is_account_activated_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->is_account_activated != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			status = (strcmp(resp, "OK") == 0) ? LinphoneAccountCreatorAccountActivated : LinphoneAccountCreatorAccountNotActivated;
+		}
+		creator->callbacks->is_account_activated(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_is_account_activated(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	char *identity = _get_identity(creator);
+	if (!identity) {
+		if (creator->callbacks->is_account_activated != NULL) {
+			creator->callbacks->is_account_activated(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		return LinphoneAccountCreatorReqFailed;
+	}
+	request = linphone_xml_rpc_request_new_with_args("is_account_activated", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->username ? creator->username : creator->phone_number,
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgNone);
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _is_account_activated_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+	ms_free(identity);
+	return LinphoneAccountCreatorOK;
+}
+/****************** END OF CREATE ACCOUNT VALIDATED SECTION********************/
+
+/****************** START OF PHONE NUMBER VALIDATED SECTION *******************/
+
+static void _is_phone_number_used_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->is_phone_number_used != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			status = (strcmp(resp, "OK_ACCOUNT") == 0) ? LinphoneAccountCreatorPhoneNumberUsedAccount
+			: (strcmp(resp, "OK_ALIAS") == 0) ? LinphoneAccountCreatorPhoneNumberUsedAlias
+			: LinphoneAccountCreatorPhoneNumberNotUsed;
+		}
+		creator->callbacks->is_phone_number_used(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_is_phone_number_used(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	char *identity = _get_identity(creator);
+	if (!identity) {
+		if (creator->callbacks->is_phone_number_used != NULL) {
+			creator->callbacks->is_phone_number_used(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		return LinphoneAccountCreatorReqFailed;
+	}
+	request = linphone_xml_rpc_request_new_with_args("is_phone_number_used", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->phone_number,
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgNone);
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _is_phone_number_used_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+	ms_free(identity);
+	return LinphoneAccountCreatorOK;
+}
+
+/****************** END OF PHONE NUMBER VALIDATED SECTION *********************/
+
+/****************** START OF LINK PHONE NUMBER WITH ACCOUNT SECTION ***********/
+static void _link_phone_number_with_account_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->link_phone_number_with_account != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			status = (strcmp(resp, "OK") == 0) ? LinphoneAccountCreatorOK : LinphoneAccountCreatorReqFailed;
+		}
+		creator->callbacks->link_phone_number_with_account(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_link_phone_number_with_account(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	if (!creator->phone_number || !creator->username) {
+		if (creator->callbacks->link_phone_number_with_account != NULL) {
+			creator->callbacks->link_phone_number_with_account(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		return LinphoneAccountCreatorReqFailed;
+	}
+	request = linphone_xml_rpc_request_new_with_args("link_phone_number_with_account", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->phone_number,
+		LinphoneXmlRpcArgString, creator->username,
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgString, creator->language,
+		LinphoneXmlRpcArgNone);
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _link_phone_number_with_account_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+	return LinphoneAccountCreatorOK;
+}
+
+static void _get_phone_number_for_account_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->is_account_linked != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			status = (strcmp(resp, "ERROR_USERNAME_PARAMETER_NOT_FOUND") == 0
+				|| strcmp(resp, "ERROR_ACCOUNT_DOESNT_EXIST") == 0
+				|| strcmp(resp, "ERROR_ALIAS_DOESNT_EXIST") == 0) ? LinphoneAccountCreatorAccountNotLinked : LinphoneAccountCreatorAccountLinked;
+		}
+		creator->callbacks->link_phone_number_with_account(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_is_account_linked(LinphoneAccountCreator *creator) {
+    LinphoneXmlRpcRequest *request;
+    if (!creator->username || !creator->domain) {
+		return LinphoneAccountCreatorReqFailed;
+    }
+    request = linphone_xml_rpc_request_new_with_args("get_phone_number_for_account",LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->username,
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgNone);
+    linphone_xml_rpc_request_set_user_data(request, creator);
+    linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _get_phone_number_for_account_cb);
+    linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+    linphone_xml_rpc_request_unref(request);
+    return LinphoneAccountCreatorOK;
+}
+/****************** END OF LINK PHONE NUMBER WITH ACCOUNT SECTION *************/
+
+/****************** START OF ACTIVE PHONE NUMBER LINK **************************/
+static void _activate_phone_number_link_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->activate_phone_number_link != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			status = (strstr(resp, "ERROR_") == resp) ? LinphoneAccountCreatorReqFailed : LinphoneAccountCreatorOK;
+		}
+		creator->callbacks->activate_phone_number_link(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_activate_phone_number_link(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	if (!creator->phone_number || !creator->username || !creator->activation_code || (!creator->password && !creator->ha1) || !creator->domain) {
+		if (creator->callbacks->activate_phone_number_link != NULL) {
+			creator->callbacks->activate_phone_number_link(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		return LinphoneAccountCreatorReqFailed;
+	}
+	request = linphone_xml_rpc_request_new_with_args("activate_phone_number_link", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->phone_number,
+		LinphoneXmlRpcArgString, creator->username,
+		LinphoneXmlRpcArgString, creator->activation_code,
+		LinphoneXmlRpcArgString, creator->ha1 ? creator->ha1 : ha1_for_passwd(creator->username, creator->domain, creator->password),
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgNone);
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _activate_phone_number_link_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+	return LinphoneAccountCreatorOK;
+}
+/****************** END OF ACTIVE PHONE NUMBER LINK **************************/
+
+/****************** START OF ACTIVE PHONE NUMBER LINK **************************/
+static void _recover_phone_account_cb(LinphoneXmlRpcRequest *request) {
+	LinphoneAccountCreator *creator = (LinphoneAccountCreator *)linphone_xml_rpc_request_get_user_data(request);
+	if (creator->callbacks->recover_phone_account != NULL) {
+		LinphoneAccountCreatorStatus status = LinphoneAccountCreatorReqFailed;
+		const char* resp = linphone_xml_rpc_request_get_string_response(request);
+		if (linphone_xml_rpc_request_get_status(request) == LinphoneXmlRpcStatusOk) {
+			if (strstr(resp, "ERROR_") == resp) {
+				status = (strstr(resp, "ERROR_CANNOT_SEND_SMS") == resp) ? LinphoneAccountCreatorErrorServer
+					: (strstr(resp, "ERROR_ACCOUNT_DOESNT_EXIST") == resp) ? LinphoneAccountCreatorAccountNotExist
+					: LinphoneAccountCreatorReqFailed;
+			} else {
+				status = LinphoneAccountCreatorOK;
+				set_string(&creator->username, resp, FALSE);
+			}
+		}
+		creator->callbacks->recover_phone_account(creator, status, resp);
+	}
+}
+
+LinphoneAccountCreatorStatus linphone_account_creator_recover_phone_account(LinphoneAccountCreator *creator) {
+	LinphoneXmlRpcRequest *request;
+	if (!creator->phone_number) {
+		if (creator->callbacks->recover_phone_account != NULL) {
+			creator->callbacks->recover_phone_account(creator, LinphoneAccountCreatorReqFailed, "Missing required parameters");
+		}
+		return LinphoneAccountCreatorReqFailed;
+	}
+	request = linphone_xml_rpc_request_new_with_args("recover_phone_account", LinphoneXmlRpcArgString,
+		LinphoneXmlRpcArgString, creator->phone_number,
+		LinphoneXmlRpcArgString, creator->domain,
+		LinphoneXmlRpcArgString, creator->language,
+		LinphoneXmlRpcArgNone);
+	linphone_xml_rpc_request_set_user_data(request, creator);
+	linphone_xml_rpc_request_cbs_set_response(linphone_xml_rpc_request_get_callbacks(request), _recover_phone_account_cb);
+	linphone_xml_rpc_session_send_request(creator->xmlrpc_session, request);
+	linphone_xml_rpc_request_unref(request);
+	return LinphoneAccountCreatorOK;
+}
+/****************** END OF ACTIVE PHONE NUMBER LINK **************************/
diff --git a/coreapi/account_creator.h b/coreapi/account_creator.h
index fbc5d5114..c308ba3df 100644
--- a/coreapi/account_creator.h
+++ b/coreapi/account_creator.h
@@ -20,12 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef LINPHONE_ACCOUNT_CREATOR_H_
 #define LINPHONE_ACCOUNT_CREATOR_H_
 
+#include "linphonecore.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 /**
  * @addtogroup misc
  * @{
@@ -35,8 +35,47 @@ extern "C" {
 * Enum describing the status of a LinphoneAccountCreator operation.
 **/
 typedef enum _LinphoneAccountCreatorStatus {
-	LinphoneAccountCreatorOk,
-	LinphoneAccountCreatorFailed
+	LinphoneAccountCreatorOK,
+	LinphoneAccountCreatorReqFailed,
+
+	LinphoneAccountCreatorAccountCreated,
+	LinphoneAccountCreatorAccountNotCreated,
+
+	LinphoneAccountCreatorAccountExist,
+	LinphoneAccountCreatorAccountExistWithAlias,
+	LinphoneAccountCreatorAccountNotExist,
+
+	LinphoneAccountCreatorAccountActivated,
+	LinphoneAccountCreatorAccountAlreadyActivated,
+	LinphoneAccountCreatorAccountNotActivated,
+
+	LinphoneAccountCreatorAccountLinked,
+	LinphoneAccountCreatorAccountNotLinked,
+
+	LinphoneAccountCreatorEmailInvalid,
+
+	LinphoneAccountCreatorUsernameInvalid,
+	LinphoneAccountCreatorUsernameTooShort,
+	LinphoneAccountCreatorUsernameTooLong,
+	LinphoneAccountCreatorUsernameInvalidSize,
+
+	LinphoneAccountCreatorPhoneNumberInvalid,
+	LinphoneAccountCreatorPhoneNumberTooShort,
+	LinphoneAccountCreatorPhoneNumberTooLong,
+	LinphoneAccountCreatorPhoneNumberUsedAccount,
+	LinphoneAccountCreatorPhoneNumberUsedAlias,
+	LinphoneAccountCreatorPhoneNumberNotUsed,
+
+	LinphoneAccountCreatorPasswordTooShort,
+	LinphoneAccountCreatorPasswordTooLong,
+
+	LinphoneAccountCreatorDomainInvalid,
+	LinphoneAccountCreatorRouteInvalid,
+	LinphoneAccountCreatorDisplayNameInvalid,
+	LinphoneAccountCreatorTransportNotSupported,
+	LinphoneAccountCreatorCountryCodeInvalid,
+
+	LinphoneAccountCreatorErrorServer,
 } LinphoneAccountCreatorStatus;
 
 /**
@@ -50,30 +89,16 @@ typedef struct _LinphoneAccountCreator LinphoneAccountCreator;
 typedef struct _LinphoneAccountCreatorCbs LinphoneAccountCreatorCbs;
 
 /**
- * Callback used to notify the end of a LinphoneAccountCreator test existence operation.
+ * Callback to notify a status change of the account creator.
  * @param[in] creator LinphoneAccountCreator object
  * @param[in] status The status of the LinphoneAccountCreator test existence operation that has just finished
 **/
-typedef void (*LinphoneAccountCreatorCbsExistenceTestedCb)(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status);
-
-/**
- * Callback used to notify the end of a LinphoneAccountCreator test validation operation.
- * @param[in] creator LinphoneAccountCreator object
- * @param[in] status The status of the LinphoneAccountCreator test validation operation that has just finished
-**/
-typedef void (*LinphoneAccountCreatorCbsValidationTestedCb)(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status);
-
-/**
- * Callback used to notify the end of a LinphoneAccountCreator validate operation.
- * @param[in] creator LinphoneAccountCreator object
- * @param[in] status The status of the LinphoneAccountCreator validate operation that has just finished
-**/
-typedef void (*LinphoneAccountCreatorCbsValidatedCb)(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status);
+typedef void (*LinphoneAccountCreatorCbsStatusCb)(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char* resp);
 
 /**
  * Create a LinphoneAccountCreator.
  * @param[in] core The LinphoneCore used for the XML-RPC communication
- * @param[in] xmlrpc_url The URL to the XML-RPC server
+ * @param[in] xmlrpc_url The URL to the XML-RPC server. Must be NON NULL.
  * @return The new LinphoneAccountCreator object
 **/
 LINPHONE_PUBLIC LinphoneAccountCreator * linphone_account_creator_new(LinphoneCore *core, const char *xmlrpc_url);
@@ -109,8 +134,9 @@ LINPHONE_PUBLIC void linphone_account_creator_set_user_data(LinphoneAccountCreat
  * Set the username.
  * @param[in] creator LinphoneAccountCreator object
  * @param[in] username The username to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_set_username(LinphoneAccountCreator *creator, const char *username);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_username(LinphoneAccountCreator *creator, const char *username);
 
 /**
  * Get the username.
@@ -119,12 +145,29 @@ LINPHONE_PUBLIC void linphone_account_creator_set_username(LinphoneAccountCreato
 **/
 LINPHONE_PUBLIC const char * linphone_account_creator_get_username(const LinphoneAccountCreator *creator);
 
+/**
+ * Set the phone number normalized.
+ * @param[in] creator LinphoneAccountCreator object
+ * @param[in] phone number The phone number to set
+ * @param[in] country code Country code to associate phone number with
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_phone_number(LinphoneAccountCreator *creator, const char *phone_number, const char *country_code);
+
+/**
+ * Get the RFC 3966 normalized phone number.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return The phone number of the LinphoneAccountCreator
+**/
+LINPHONE_PUBLIC const char * linphone_account_creator_get_phone_number(const LinphoneAccountCreator *creator);
+
 /**
  * Set the password.
  * @param[in] creator LinphoneAccountCreator object
  * @param[in] password The password to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_set_password(LinphoneAccountCreator *creator, const char *password);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_password(LinphoneAccountCreator *creator, const char *password);
 
 /**
  * Get the password.
@@ -133,12 +176,57 @@ LINPHONE_PUBLIC void linphone_account_creator_set_password(LinphoneAccountCreato
 **/
 LINPHONE_PUBLIC const char * linphone_account_creator_get_password(const LinphoneAccountCreator *creator);
 
+/**
+ * Set the ha1.
+ * @param[in] creator LinphoneAccountCreator object
+ * @param[in] password The ha1 to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_ha1(LinphoneAccountCreator *creator, const char *ha1);
+
+/**
+ * Get the ha1.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return The ha1 of the LinphoneAccountCreator
+**/
+LINPHONE_PUBLIC const char * linphone_account_creator_get_ha1(const LinphoneAccountCreator *creator);
+
+/**
+ * Set the activation code.
+ * @param[in] creator LinphoneAccountCreator object
+ * @param[in] activation_code The activation code to set
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_activation_code(LinphoneAccountCreator *creator, const char *activation_code);
+
+/**
+ * Set the language to use in email or SMS if supported.
+ * @param[in] creator LinphoneAccountCreator object
+ * @param[in] activation_code The language code to use
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_language(LinphoneAccountCreator *creator, const char *lang);
+
+/**
+ * Set the transport.
+ * @param[in] creator LinphoneAccountCreator object
+ * @param[in] transport The transport to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error if given transport is not supported by linphone core.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_transport(LinphoneAccountCreator *creator, LinphoneTransportType transport);
+
+/**
+ * Get the transport.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return The transport of the LinphoneAccountCreator
+**/
+LINPHONE_PUBLIC LinphoneTransportType linphone_account_creator_get_transport(const LinphoneAccountCreator *creator);
+
 /**
  * Set the domain.
  * @param[in] creator LinphoneAccountCreator object
  * @param[in] domain The domain to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_set_domain(LinphoneAccountCreator *creator, const char *domain);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_domain(LinphoneAccountCreator *creator, const char *domain);
 
 /**
  * Get the domain.
@@ -151,8 +239,9 @@ LINPHONE_PUBLIC const char * linphone_account_creator_get_domain(const LinphoneA
  * Set the route.
  * @param[in] creator LinphoneAccountCreator object
  * @param[in] route The route to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_set_route(LinphoneAccountCreator *creator, const char *route);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_route(LinphoneAccountCreator *creator, const char *route);
 
 /**
  * Get the route.
@@ -165,8 +254,9 @@ LINPHONE_PUBLIC const char * linphone_account_creator_get_route(const LinphoneAc
  * Set the email.
  * @param[in] creator LinphoneAccountCreator object
  * @param[in] display_name The display name to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_set_display_name(LinphoneAccountCreator *creator, const char *display_name);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_display_name(LinphoneAccountCreator *creator, const char *display_name);
 
 /**
  * Get the email.
@@ -179,8 +269,9 @@ LINPHONE_PUBLIC const char * linphone_account_creator_get_display_name(const Lin
  * Set the email.
  * @param[in] creator LinphoneAccountCreator object
  * @param[in] email The email to set
+ * @return LinphoneAccountCreatorOk if everything is OK, or a specific error otherwise.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_set_email(LinphoneAccountCreator *creator, const char *email);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_set_email(LinphoneAccountCreator *creator, const char *email);
 
 /**
  * Get the email.
@@ -189,20 +280,6 @@ LINPHONE_PUBLIC void linphone_account_creator_set_email(LinphoneAccountCreator *
 **/
 LINPHONE_PUBLIC const char * linphone_account_creator_get_email(const LinphoneAccountCreator *creator);
 
-/**
- * Enable the newsletter subscription.
- * @param[in] creator LinphoneAccountCreator object
- * @param[in] subscribe A boolean telling whether to subscribe to the newsletter or not.
-**/
-LINPHONE_PUBLIC void linphone_account_creator_enable_newsletter_subscription(LinphoneAccountCreator *creator, bool_t subscribe);
-
-/**
- * Tell whether to subscribe to the newsletter or not.
- * @param[in] creator LinphoneAccountCreator object
- * @return A boolean telling whether to subscribe to the newsletter or not.
-**/
-LINPHONE_PUBLIC bool_t linphone_account_creator_newsletter_subscription_enabled(const LinphoneAccountCreator *creator);
-
 /**
  * Get the LinphoneAccountCreatorCbs object associated with a LinphoneAccountCreator.
  * @param[in] creator LinphoneAccountCreator object
@@ -213,23 +290,60 @@ LINPHONE_PUBLIC LinphoneAccountCreatorCbs * linphone_account_creator_get_callbac
 /**
  * Send an XML-RPC request to test the existence of a Linphone account.
  * @param[in] creator LinphoneAccountCreator object
- * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorFailed otherwise
+ * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorReqFailed otherwise
 **/
-LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_test_existence(LinphoneAccountCreator *creator);
-
-/**
- * Send an XML-RPC request to test the validation of a Linphone account.
- * @param[in] creator LinphoneAccountCreator object
- * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorFailed otherwise
-**/
-LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_test_validation(LinphoneAccountCreator *creator);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_is_account_used(LinphoneAccountCreator *creator);
 
 /**
  * Send an XML-RPC request to create a Linphone account.
  * @param[in] creator LinphoneAccountCreator object
- * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorFailed otherwise
+ * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorReqFailed otherwise
 **/
-LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_validate(LinphoneAccountCreator *creator);
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_create_account(LinphoneAccountCreator *creator);
+
+/**
+ * Send an XML-RPC request to activate a Linphone account.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorReqFailed otherwise
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_activate_account(LinphoneAccountCreator *creator);
+
+/**
+ * Send an XML-RPC request to test the validation of a Linphone account.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorReqFailed otherwise
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_is_account_activated(LinphoneAccountCreator *creator);
+
+/**
+ * Send an XML-RPC request to test the existence a phone number with a Linphone account.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return LinphoneAccountCreatorOk if the request has been sent, LinphoneAccountCreatorReqFailed otherwise
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_is_phone_number_used(LinphoneAccountCreator *creator);
+
+/**
+ * Send an XML-RPC request to link a phone number with a Linphone account.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return LinphoneAccountCreatorOK if the request has been sent, LinphoneAccountCreatorReqFailed otherwise
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_link_phone_number_with_account(LinphoneAccountCreator *creator);
+
+/**
+ * Send an XML-RPC request to activate the link of a phone number with a Linphone account.
+ * @param[in] creator LinphoneAccountCreator object
+ * @return LinphoneAccountCreatorOK if the request has been sent, LinphoneAccountCreatorReqFailed otherwise
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_activate_phone_number_link(LinphoneAccountCreator *creator);
+
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_recover_phone_account(LinphoneAccountCreator *creator);
+
+/**
+ * Send an XML-RPC request to ask if an account is linked with a phone number
+ * @param[in] creator LinphoneAccountCreator object
+ * @return if this account is linked with a phone number
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_is_account_linked(LinphoneAccountCreator *creator);
 
 /**
  * Configure an account (create a proxy config and authentication info for it).
@@ -238,7 +352,6 @@ LINPHONE_PUBLIC LinphoneAccountCreatorStatus linphone_account_creator_validate(L
 **/
 LINPHONE_PUBLIC LinphoneProxyConfig * linphone_account_creator_configure(const LinphoneAccountCreator *creator);
 
-
 /**
  * Acquire a reference to a LinphoneAccountCreatorCbs object.
  * @param[in] cbs LinphoneAccountCreatorCbs object.
@@ -266,47 +379,120 @@ LINPHONE_PUBLIC void *linphone_account_creator_cbs_get_user_data(const LinphoneA
 **/
 LINPHONE_PUBLIC void linphone_account_creator_cbs_set_user_data(LinphoneAccountCreatorCbs *cbs, void *ud);
 
+/**
+ * Get the current linked tested callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @return The current linked tested callback.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_linked(const LinphoneAccountCreatorCbs *cbs);
+
+/**
+ * Set the linked tested callback
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @param[in] cb The existence tested callback to be used.
+**/
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_account_linked(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
+
 /**
  * Get the existence tested callback.
  * @param[in] cbs LinphoneAccountCreatorCbs object.
  * @return The current existence tested callback.
 **/
-LINPHONE_PUBLIC LinphoneAccountCreatorCbsExistenceTestedCb linphone_account_creator_cbs_get_existence_tested(const LinphoneAccountCreatorCbs *cbs);
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_used(const LinphoneAccountCreatorCbs *cbs);
 
 /**
  * Set the existence tested callback.
  * @param[in] cbs LinphoneAccountCreatorCbs object.
  * @param[in] cb The existence tested callback to be used.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_cbs_set_existence_tested(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsExistenceTestedCb cb);
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_account_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
+
+/**
+ * Get the create account callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @return The current create account callback.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_create_account(const LinphoneAccountCreatorCbs *cbs);
+
+/**
+ * Set the create account callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @param[in] cb The create account callback to be used.
+**/
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_create_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
+
+/**
+ * Get the activate account callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @return The current activate account callback.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_account(const LinphoneAccountCreatorCbs *cbs);
+
+/**
+ * Set the activate account callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @param[in] cb The activate account callback to be used.
+**/
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_activate_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
+
+/**
+ * Get the link phone number with account callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @return The current link phone number with account callback.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_link_phone_number_with_account(const LinphoneAccountCreatorCbs *cbs);
+
+/**
+ * Set the link phone number with account callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @param[in] cb The link phone number with account callback to be used.
+**/
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_link_phone_number_with_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
+
+/**
+ * Get the activate phone number link callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @return The current activate phone number link callback.
+**/
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_activate_phone_number_link(const LinphoneAccountCreatorCbs *cbs);
+
+/**
+ * Set the activate phone number link callback.
+ * @param[in] cbs LinphoneAccountCreatorCbs object.
+ * @param[in] cb The activate phone number link callback to be used.
+**/
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_activate_phone_number_link(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
 
 /**
  * Get the validation tested callback.
  * @param[in] cbs LinphoneAccountCreatorCbs object.
  * @return The current validation tested callback.
 **/
-LINPHONE_PUBLIC LinphoneAccountCreatorCbsValidationTestedCb linphone_account_creator_cbs_get_validation_tested(const LinphoneAccountCreatorCbs *cbs);
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_account_activated(const LinphoneAccountCreatorCbs *cbs);
 
 /**
  * Set the validation tested callback.
  * @param[in] cbs LinphoneAccountCreatorCbs object.
  * @param[in] cb The validation tested callback to be used.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_cbs_set_validation_tested(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsValidationTestedCb cb);
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_account_activated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
 
 /**
- * Get the validated callback.
+ * Get the is phone number used callback.
  * @param[in] cbs LinphoneAccountCreatorCbs object.
- * @return The current validated callback.
+ * @return The current is phone number used callback
 **/
-LINPHONE_PUBLIC LinphoneAccountCreatorCbsValidatedCb linphone_account_creator_cbs_get_validated(const LinphoneAccountCreatorCbs *cbs);
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_is_phone_number_used(const LinphoneAccountCreatorCbs *cbs);
 
 /**
- * Set the validated callback.
+ * Set the is phone number used callback.
  * @param[in] cbs LinphoneAccountCreatorCbs object.
- * @param[in] cb The validated callback to be used.
+ * @param[in] cb is phone number to be used.
 **/
-LINPHONE_PUBLIC void linphone_account_creator_cbs_set_validated(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsValidatedCb cb);
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_is_phone_number_used(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
+
+LINPHONE_PUBLIC void linphone_account_creator_cbs_set_recover_phone_account(LinphoneAccountCreatorCbs *cbs, LinphoneAccountCreatorCbsStatusCb cb);
+LINPHONE_PUBLIC LinphoneAccountCreatorCbsStatusCb linphone_account_creator_cbs_get_recover_phone_account(const LinphoneAccountCreatorCbs *cbs);
 
 /**
  * @}
diff --git a/coreapi/address.c b/coreapi/address.c
index cb2f3cdf2..2b684b5d9 100644
--- a/coreapi/address.c
+++ b/coreapi/address.c
@@ -89,37 +89,42 @@ const char *linphone_address_get_domain(const LinphoneAddress *u){
 /**
  * Sets the display name.
 **/
-void linphone_address_set_display_name(LinphoneAddress *u, const char *display_name){
+int linphone_address_set_display_name(LinphoneAddress *u, const char *display_name){
 	sal_address_set_display_name(u,display_name);
+	return 0;
 }
 
 /**
  * Sets the username.
 **/
-void linphone_address_set_username(LinphoneAddress *uri, const char *username){
+int linphone_address_set_username(LinphoneAddress *uri, const char *username){
 	sal_address_set_username(uri,username);
+	return 0;
 }
 
 /**
  * Sets the domain.
 **/
-void linphone_address_set_domain(LinphoneAddress *uri, const char *host){
+int linphone_address_set_domain(LinphoneAddress *uri, const char *host){
 	sal_address_set_domain(uri,host);
+	return 0;
 }
 
 
 /**
  * Sets the port number.
 **/
-void linphone_address_set_port(LinphoneAddress *uri, int port){
+int linphone_address_set_port(LinphoneAddress *uri, int port){
 	sal_address_set_port(uri,port);
+	return 0;
 }
 
 /**
  * Set a transport.
 **/
-void linphone_address_set_transport(LinphoneAddress *uri, LinphoneTransportType tp){
+int linphone_address_set_transport(LinphoneAddress *uri, LinphoneTransportType tp){
 	sal_address_set_transport(uri,(SalTransport)tp);
+	return 0;
 }
 
 /**
@@ -129,6 +134,20 @@ LinphoneTransportType linphone_address_get_transport(const LinphoneAddress *uri)
 	return (LinphoneTransportType)sal_address_get_transport(uri);
 }
 
+/**
+ * Set the value of the method parameter
+**/
+void linphone_address_set_method_param(LinphoneAddress *addr, const char *method) {
+	sal_address_set_method_param(addr, method);
+}
+
+/**
+ * Get the value of the method parameter
+**/
+const char *linphone_address_get_method_param(const LinphoneAddress *addr) {
+	return sal_address_get_method_param(addr);
+}
+
 /**
  * Removes address's tags and uri headers so that it is displayable to the user.
 **/
@@ -169,7 +188,8 @@ bool_t linphone_address_get_secure(const LinphoneAddress *uri){
 
 /**
  * Make the address refer to a secure location (sips scheme)
- * @param enabled TRUE if address is requested to be secure.
+ * @param[in] addr A #LinphoneAddress object
+ * @param[in] enabled TRUE if address is requested to be secure.
 **/
 void linphone_address_set_secure(LinphoneAddress *addr, bool_t enabled){
 	sal_address_set_secure(addr, enabled);
@@ -279,6 +299,38 @@ void linphone_address_set_header(LinphoneAddress *addr, const char *header_name,
 	sal_address_set_header(addr,header_name,header_value);
 }
 
+bool_t linphone_address_has_param(const LinphoneAddress *addr, const char *name) {
+	return sal_address_has_param(addr, name);
+}
+
+const char * linphone_address_get_param(const LinphoneAddress *addr, const char *name) {
+	return sal_address_get_param(addr, name);
+}
+
+void linphone_address_set_param(LinphoneAddress *addr, const char *name, const char *value) {
+	sal_address_set_param(addr, name, value);
+}
+
+void linphone_address_set_params(LinphoneAddress *addr, const char *params) {
+	sal_address_set_params(addr, params);
+}
+
+void linphone_address_set_uri_param(LinphoneAddress *addr, const char *name, const char *value) {
+	sal_address_set_uri_param(addr, name, value);
+}
+
+void linphone_address_set_uri_params(LinphoneAddress *addr, const char *params) {
+	sal_address_set_uri_params(addr, params);
+}
+
+bool_t linphone_address_has_uri_param(const LinphoneAddress *addr, const char *name) {
+	return sal_address_has_uri_param(addr, name);
+}
+
+const char * linphone_address_get_uri_param(const LinphoneAddress *addr, const char *name) {
+	return sal_address_get_uri_param(addr, name);
+}
+
 LinphoneAddress * linphone_core_create_address(LinphoneCore *lc, const char *address) {
 	return linphone_address_new(address);
 }
diff --git a/coreapi/authentication.c b/coreapi/authentication.c
index f0f5eec2e..ec956f5f1 100644
--- a/coreapi/authentication.c
+++ b/coreapi/authentication.c
@@ -44,151 +44,226 @@ LinphoneAuthInfo *linphone_auth_info_new(const char *username, const char *useri
 
 LinphoneAuthInfo *linphone_auth_info_clone(const LinphoneAuthInfo *ai){
 	LinphoneAuthInfo *obj=ms_new0(LinphoneAuthInfo,1);
-	if (ai->username) obj->username=ms_strdup(ai->username);
-	if (ai->userid) obj->userid=ms_strdup(ai->userid);
-	if (ai->passwd) obj->passwd=ms_strdup(ai->passwd);
-	if (ai->ha1)	obj->ha1=ms_strdup(ai->ha1);
-	if (ai->realm)	obj->realm=ms_strdup(ai->realm);
-	if (ai->domain)	obj->domain=ms_strdup(ai->domain);
+	if (ai->username) 		obj->username = ms_strdup(ai->username);
+	if (ai->userid) 		obj->userid = ms_strdup(ai->userid);
+	if (ai->passwd) 		obj->passwd = ms_strdup(ai->passwd);
+	if (ai->ha1)			obj->ha1 = ms_strdup(ai->ha1);
+	if (ai->realm)			obj->realm = ms_strdup(ai->realm);
+	if (ai->domain)			obj->domain = ms_strdup(ai->domain);
+	if (ai->tls_cert)		obj->tls_cert = ms_strdup(ai->tls_cert);
+	if (ai->tls_key)		obj->tls_key = ms_strdup(ai->tls_key);
+	if (ai->tls_cert_path)	obj->tls_cert_path = ms_strdup(ai->tls_cert_path);
+	if (ai->tls_key_path)	obj->tls_key_path = ms_strdup(ai->tls_key_path);
 	return obj;
 }
 
-const char *linphone_auth_info_get_username(const LinphoneAuthInfo *i){
+const char *linphone_auth_info_get_username(const LinphoneAuthInfo *i) {
 	return i->username;
 }
 
-const char *linphone_auth_info_get_passwd(const LinphoneAuthInfo *i){
+const char *linphone_auth_info_get_passwd(const LinphoneAuthInfo *i) {
 	return i->passwd;
 }
 
-const char *linphone_auth_info_get_userid(const LinphoneAuthInfo *i){
+const char *linphone_auth_info_get_userid(const LinphoneAuthInfo *i) {
 	return i->userid;
 }
 
-const char *linphone_auth_info_get_realm(const LinphoneAuthInfo *i){
+const char *linphone_auth_info_get_realm(const LinphoneAuthInfo *i) {
 	return i->realm;
 }
 
-const char *linphone_auth_info_get_domain(const LinphoneAuthInfo *i){
+const char *linphone_auth_info_get_domain(const LinphoneAuthInfo *i) {
 	return i->domain;
 }
 
-const char *linphone_auth_info_get_ha1(const LinphoneAuthInfo *i){
+const char *linphone_auth_info_get_ha1(const LinphoneAuthInfo *i) {
 	return i->ha1;
 }
 
-void linphone_auth_info_set_passwd(LinphoneAuthInfo *info, const char *passwd){
-	if (info->passwd!=NULL) {
+const char *linphone_auth_info_get_tls_cert(const LinphoneAuthInfo *i) {
+	return i->tls_cert;
+}
+
+const char *linphone_auth_info_get_tls_key(const LinphoneAuthInfo *i) {
+	return i->tls_key;
+}
+
+const char *linphone_auth_info_get_tls_cert_path(const LinphoneAuthInfo *i) {
+	return i->tls_cert_path;
+}
+
+const char *linphone_auth_info_get_tls_key_path(const LinphoneAuthInfo *i) {
+	return i->tls_key_path;
+}
+
+
+void linphone_auth_info_set_passwd(LinphoneAuthInfo *info, const char *passwd) {
+	if (info->passwd) {
 		ms_free(info->passwd);
-		info->passwd=NULL;
+		info->passwd = NULL;
 	}
-	if (passwd!=NULL && (strlen(passwd)>0)) info->passwd=ms_strdup(passwd);
+	if (passwd && strlen(passwd) > 0) info->passwd = ms_strdup(passwd);
 }
 
-void linphone_auth_info_set_username(LinphoneAuthInfo *info, const char *username){
-	if (info->username){
+void linphone_auth_info_set_username(LinphoneAuthInfo *info, const char *username) {
+	if (info->username) {
 		ms_free(info->username);
-		info->username=NULL;
+		info->username = NULL;
 	}
-	if (username && strlen(username)>0) info->username=ms_strdup(username);
+	if (username && strlen(username) > 0) info->username = ms_strdup(username);
 }
 
-void linphone_auth_info_set_userid(LinphoneAuthInfo *info, const char *userid){
-	if (info->userid){
+void linphone_auth_info_set_userid(LinphoneAuthInfo *info, const char *userid) {
+	if (info->userid) {
 		ms_free(info->userid);
-		info->userid=NULL;
+		info->userid = NULL;
 	}
-	if (userid && strlen(userid)>0) info->userid=ms_strdup(userid);
+	if (userid && strlen(userid) > 0) info->userid = ms_strdup(userid);
 }
 
-void linphone_auth_info_set_realm(LinphoneAuthInfo *info, const char *realm){
-	if (info->realm){
+void linphone_auth_info_set_realm(LinphoneAuthInfo *info, const char *realm) {
+	if (info->realm) {
 		ms_free(info->realm);
-		info->realm=NULL;
+		info->realm = NULL;
 	}
-	if (realm && strlen(realm)>0) info->realm=ms_strdup(realm);
+	if (realm && strlen(realm) > 0) info->realm = ms_strdup(realm);
 }
 
-void linphone_auth_info_set_domain(LinphoneAuthInfo *info, const char *domain){
-	if (info->domain){
+void linphone_auth_info_set_domain(LinphoneAuthInfo *info, const char *domain) {
+	if (info->domain) {
 		ms_free(info->domain);
-		info->domain=NULL;
+		info->domain = NULL;
 	}
-	if (domain && strlen(domain)>0) info->domain=ms_strdup(domain);
+	if (domain && strlen(domain) > 0) info->domain = ms_strdup(domain);
 }
 
-void linphone_auth_info_set_ha1(LinphoneAuthInfo *info, const char *ha1){
-	if (info->ha1){
+void linphone_auth_info_set_ha1(LinphoneAuthInfo *info, const char *ha1) {
+	if (info->ha1) {
 		ms_free(info->ha1);
-		info->ha1=NULL;
+		info->ha1 = NULL;
 	}
-	if (ha1 && strlen(ha1)>0) info->ha1=ms_strdup(ha1);
+	if (ha1 && strlen(ha1) > 0) info->ha1 = ms_strdup(ha1);
+}
+
+void linphone_auth_info_set_tls_cert(LinphoneAuthInfo *info, const char *tls_cert) {
+	if (info->tls_cert) {
+		ms_free(info->tls_cert);
+		info->tls_cert = NULL;
+	}
+	if (tls_cert && strlen(tls_cert) > 0) info->tls_cert = ms_strdup(tls_cert);
+}
+
+void linphone_auth_info_set_tls_key(LinphoneAuthInfo *info, const char *tls_key) {
+	if (info->tls_key) {
+		ms_free(info->tls_key);
+		info->tls_key = NULL;
+	}
+	if (tls_key && strlen(tls_key) > 0) info->tls_key = ms_strdup(tls_key);
+}
+
+void linphone_auth_info_set_tls_cert_path(LinphoneAuthInfo *info, const char *tls_cert_path) {
+	if (info->tls_cert_path) {
+		ms_free(info->tls_cert_path);
+		info->tls_cert_path = NULL;
+	}
+	if (tls_cert_path && strlen(tls_cert_path) > 0) info->tls_cert_path = ms_strdup(tls_cert_path);
+}
+
+void linphone_auth_info_set_tls_key_path(LinphoneAuthInfo *info, const char *tls_key_path) {
+	if (info->tls_key_path) {
+		ms_free(info->tls_key_path);
+		info->tls_key_path = NULL;
+	}
+	if (tls_key_path && strlen(tls_key_path) > 0) info->tls_key_path = ms_strdup(tls_key_path);
 }
 
 /**
  * Destroys a LinphoneAuthInfo object.
 **/
 void linphone_auth_info_destroy(LinphoneAuthInfo *obj){
-	if (obj->username!=NULL) ms_free(obj->username);
-	if (obj->userid!=NULL) ms_free(obj->userid);
-	if (obj->passwd!=NULL) ms_free(obj->passwd);
-	if (obj->ha1!=NULL) ms_free(obj->ha1);
-	if (obj->realm!=NULL) ms_free(obj->realm);
-	if (obj->domain!=NULL) ms_free(obj->domain);
+	if (obj->username != NULL) ms_free(obj->username);
+	if (obj->userid != NULL) ms_free(obj->userid);
+	if (obj->passwd != NULL) ms_free(obj->passwd);
+	if (obj->ha1 != NULL) ms_free(obj->ha1);
+	if (obj->realm != NULL) ms_free(obj->realm);
+	if (obj->domain != NULL) ms_free(obj->domain);
+	if (obj->tls_cert != NULL) ms_free(obj->tls_cert);
+	if (obj->tls_key != NULL) ms_free(obj->tls_key);
+	if (obj->tls_cert_path != NULL) ms_free(obj->tls_cert_path);
+	if (obj->tls_key_path != NULL) ms_free(obj->tls_key_path);
 	ms_free(obj);
 }
 
-void linphone_auth_info_write_config(LpConfig *config, LinphoneAuthInfo *obj, int pos)
-{
+void linphone_auth_info_write_config(LpConfig *config, LinphoneAuthInfo *obj, int pos) {
 	char key[50];
-	sprintf(key,"auth_info_%i",pos);
-	lp_config_clean_section(config,key);
+	bool_t store_ha1_passwd = lp_config_get_int(config, "sip", "store_ha1_passwd", 1);
 
-	if (obj==NULL || lp_config_get_int(config, "sip", "store_auth_info", 1) == 0){
+	sprintf(key, "auth_info_%i", pos);
+	lp_config_clean_section(config, key);
+
+	if (obj == NULL || lp_config_get_int(config, "sip", "store_auth_info", 1) == 0) {
 		return;
 	}
-	if (!obj->ha1 && obj->realm && obj->passwd && (obj->username||obj->userid) && lp_config_get_int(config, "sip", "store_ha1_passwd", 1) == 1) {
+	if (!obj->ha1 && obj->realm && obj->passwd && (obj->username || obj->userid) && store_ha1_passwd) {
 		/*compute ha1 to avoid storing clear text password*/
-		obj->ha1=ms_malloc(33);
-		sal_auth_compute_ha1(obj->userid?obj->userid:obj->username,obj->realm,obj->passwd,obj->ha1);
+		obj->ha1 = ms_malloc(33);
+		sal_auth_compute_ha1(obj->userid ? obj->userid : obj->username, obj->realm, obj->passwd, obj->ha1);
 	}
-	if (obj->username!=NULL){
-		lp_config_set_string(config,key,"username",obj->username);
+	if (obj->username != NULL) {
+		lp_config_set_string(config, key, "username", obj->username);
 	}
-	if (obj->userid!=NULL){
-		lp_config_set_string(config,key,"userid",obj->userid);
+	if (obj->userid != NULL) {
+		lp_config_set_string(config, key, "userid", obj->userid);
 	}
-	if (obj->ha1!=NULL){
-		lp_config_set_string(config,key,"ha1",obj->ha1);
-	} else if (obj->passwd!=NULL){ /*only write passwd if no ha1*/
-		lp_config_set_string(config,key,"passwd",obj->passwd);
+	if (obj->ha1 != NULL) {
+		lp_config_set_string(config, key, "ha1", obj->ha1);
 	}
-	if (obj->realm!=NULL){
-		lp_config_set_string(config,key,"realm",obj->realm);
+	if (obj->passwd != NULL) {
+		if (store_ha1_passwd && obj->ha1) {
+			/*if we have our ha1 and store_ha1_passwd set to TRUE, then drop the clear text password for security*/
+			linphone_auth_info_set_passwd(obj, NULL);
+		} else {
+			/*we store clear text password only if store_ha1_passwd is FALSE AND we have an ha1 to store. Otherwise, passwd would simply be removed, which might bring major auth issue*/
+			lp_config_set_string(config, key, "passwd", obj->passwd);
+		}
 	}
-	if (obj->domain!=NULL){
-		lp_config_set_string(config,key,"domain",obj->domain);
+	if (obj->realm != NULL) {
+		lp_config_set_string(config, key, "realm", obj->realm);
+	}
+	if (obj->domain != NULL) {
+		lp_config_set_string(config, key, "domain", obj->domain);
+	}
+	if (obj->tls_cert_path != NULL) {
+		lp_config_set_string(config, key, "client_cert_chain", obj->tls_cert_path);
+	}
+	if (obj->tls_key_path != NULL) {
+		lp_config_set_string(config, key, "client_cert_key", obj->tls_key_path);
 	}
 }
 
 LinphoneAuthInfo *linphone_auth_info_new_from_config_file(LpConfig * config, int pos)
 {
 	char key[50];
-	const char *username,*userid,*passwd,*ha1,*realm,*domain;
+	const char *username,*userid,*passwd,*ha1,*realm,*domain,*tls_cert_path,*tls_key_path;
 	LinphoneAuthInfo *ret;
 
-	sprintf(key,"auth_info_%i",pos);
-	if (!lp_config_has_section(config,key)){
+	sprintf(key, "auth_info_%i", pos);
+	if (!lp_config_has_section(config, key)) {
 		return NULL;
 	}
 
-	username=lp_config_get_string(config,key,"username",NULL);
-	userid=lp_config_get_string(config,key,"userid",NULL);
-	passwd=lp_config_get_string(config,key,"passwd",NULL);
-	ha1=lp_config_get_string(config,key,"ha1",NULL);
-	realm=lp_config_get_string(config,key,"realm",NULL);
-	domain=lp_config_get_string(config,key,"domain",NULL);
-	ret=linphone_auth_info_new(username,userid,passwd,ha1,realm,domain);
+	username = lp_config_get_string(config, key, "username", NULL);
+	userid = lp_config_get_string(config, key, "userid", NULL);
+	passwd = lp_config_get_string(config, key, "passwd", NULL);
+	ha1 = lp_config_get_string(config, key, "ha1", NULL);
+	realm = lp_config_get_string(config, key, "realm", NULL);
+	domain = lp_config_get_string(config, key, "domain", NULL);
+	tls_cert_path = lp_config_get_string(config, key, "client_cert_chain", NULL);
+	tls_key_path = lp_config_get_string(config, key, "client_cert_key", NULL);
+	ret = linphone_auth_info_new(username, userid, passwd, ha1, realm, domain);
+	linphone_auth_info_set_tls_cert_path(ret, tls_cert_path);
+	linphone_auth_info_set_tls_key_path(ret, tls_key_path);
 	return ret;
 }
 
@@ -218,8 +293,8 @@ static bool_t realm_match(const char *realm1, const char *realm2){
 	return FALSE;
 }
 
-static const LinphoneAuthInfo *find_auth_info(LinphoneCore *lc, const char *username, const char *realm, const char *domain){
-	MSList *elem;
+static const LinphoneAuthInfo *find_auth_info(LinphoneCore *lc, const char *username, const char *realm, const char *domain, bool_t ignore_realm){
+	bctbx_list_t *elem;
 	const LinphoneAuthInfo *ret=NULL;
 
 	for (elem=lc->auth_info;elem!=NULL;elem=elem->next) {
@@ -238,9 +313,9 @@ static const LinphoneAuthInfo *find_auth_info(LinphoneCore *lc, const char *user
 					}
 					ret=pinfo;
 				}
-			} else if (domain && pinfo->domain && strcmp(domain,pinfo->domain)==0 && pinfo->ha1==NULL) {
+			} else if (domain && pinfo->domain && strcmp(domain,pinfo->domain)==0 && (pinfo->ha1==NULL || ignore_realm)) {
 				return pinfo;
-			} else if (!domain && pinfo->ha1==NULL) {
+			} else if (!domain && (pinfo->ha1==NULL || ignore_realm)) {
 				return pinfo;
 			}
 		}
@@ -248,39 +323,62 @@ static const LinphoneAuthInfo *find_auth_info(LinphoneCore *lc, const char *user
 	return ret;
 }
 
-/**
- * Find authentication info matching realm, username, domain criteria.
- * First of all, (realm,username) pair are searched. If multiple results (which should not happen because realm are supposed to be unique), then domain is added to the search.
- * @param lc the LinphoneCore
- * @param realm the authentication 'realm' (optional)
- * @param username the SIP username to be authenticated (mandatory)
- * @param domain the SIP domain name (optional)
- * @return a #LinphoneAuthInfo
-**/
-const LinphoneAuthInfo *linphone_core_find_auth_info(LinphoneCore *lc, const char *realm, const char *username, const char *domain){
+const LinphoneAuthInfo *_linphone_core_find_tls_auth_info(LinphoneCore *lc) {
+	bctbx_list_t *elem;
+	for (elem=lc->auth_info;elem!=NULL;elem=elem->next) {
+		LinphoneAuthInfo *pinfo = (LinphoneAuthInfo*)elem->data;
+		if (pinfo->tls_cert && pinfo->tls_key) {
+			return pinfo;
+		} else if (pinfo->tls_cert_path && pinfo->tls_key_path) {
+			return pinfo;
+		}
+	}
+	return NULL;
+}
+
+const LinphoneAuthInfo *_linphone_core_find_auth_info(LinphoneCore *lc, const char *realm, const char *username, const char *domain, bool_t ignore_realm){
 	const LinphoneAuthInfo *ai=NULL;
 	if (realm){
-		ai=find_auth_info(lc,username,realm,NULL);
+		ai=find_auth_info(lc,username,realm,NULL, FALSE);
 		if (ai==NULL && domain){
-			ai=find_auth_info(lc,username,realm,domain);
+			ai=find_auth_info(lc,username,realm,domain, FALSE);
 		}
 	}
 	if (ai == NULL && domain != NULL) {
-		ai=find_auth_info(lc,username,NULL,domain);
+		ai=find_auth_info(lc,username,NULL,domain, ignore_realm);
 	}
 	if (ai==NULL){
-		ai=find_auth_info(lc,username,NULL,NULL);
+		ai=find_auth_info(lc,username,NULL,NULL, ignore_realm);
 	}
-	/*if (ai) ms_message("linphone_core_find_auth_info(): returning auth info username=%s, realm=%s", ai->username, ai->realm);*/
+	if (ai) ms_message("linphone_core_find_auth_info(): returning auth info username=%s, realm=%s", ai->username ? ai->username : "", ai->realm ? ai->realm : "");
 	return ai;
 }
 
+const LinphoneAuthInfo *linphone_core_find_auth_info(LinphoneCore *lc, const char *realm, const char *username, const char *domain){
+	return _linphone_core_find_auth_info(lc, realm, username, domain, TRUE);
+}
+
+/*the auth info is expected to be in the core's list*/
+void linphone_core_write_auth_info(LinphoneCore *lc, LinphoneAuthInfo *ai){
+	int i;
+	bctbx_list_t *elem = lc->auth_info;
+
+	if (!lc->sip_conf.save_auth_info) return;
+
+	for (i=0; elem != NULL; elem = elem->next, i++){
+		if (ai == elem->data){
+			linphone_auth_info_write_config(lc->config, ai, i);
+		}
+	}
+}
+
 static void write_auth_infos(LinphoneCore *lc){
-	MSList *elem;
+	bctbx_list_t *elem;
 	int i;
 
 	if (!linphone_core_ready(lc)) return;
-	for(elem=lc->auth_info,i=0;elem!=NULL;elem=ms_list_next(elem),i++){
+	if (!lc->sip_conf.save_auth_info) return;
+	for(elem=lc->auth_info,i=0;elem!=NULL;elem=bctbx_list_next(elem),i++){
 		LinphoneAuthInfo *ai=(LinphoneAuthInfo*)(elem->data);
 		linphone_auth_info_write_config(lc->config,ai,i);
 	}
@@ -298,40 +396,46 @@ LinphoneAuthInfo * linphone_core_create_auth_info(LinphoneCore *lc, const char *
 **/
 void linphone_core_add_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *info){
 	LinphoneAuthInfo *ai;
-	MSList *elem;
-	MSList *l;
+	bctbx_list_t *elem;
+	bctbx_list_t *l;
 	int restarted_op_count=0;
 	bool_t updating=FALSE;
 
 	if (info->ha1==NULL && info->passwd==NULL){
-		ms_error("linphone_core_add_auth_info(): info supplied with empty password or ha1.");
-		return;
+		ms_warning("linphone_core_add_auth_info(): info supplied with empty password or ha1.");
 	}
 	/* find if we are attempting to modify an existing auth info */
 	ai=(LinphoneAuthInfo*)linphone_core_find_auth_info(lc,info->realm,info->username,info->domain);
 	if (ai!=NULL && ai->domain && info->domain && strcmp(ai->domain, info->domain)==0){
-		lc->auth_info=ms_list_remove(lc->auth_info,ai);
+		lc->auth_info=bctbx_list_remove(lc->auth_info,ai);
 		linphone_auth_info_destroy(ai);
 		updating=TRUE;
 	}
-	lc->auth_info=ms_list_append(lc->auth_info,linphone_auth_info_clone(info));
+	lc->auth_info=bctbx_list_append(lc->auth_info,linphone_auth_info_clone(info));
 
 	/* retry pending authentication operations */
 	for(l=elem=sal_get_pending_auths(lc->sal);elem!=NULL;elem=elem->next){
 		SalOp *op=(SalOp*)elem->data;
 		LinphoneAuthInfo *ai;
 		const SalAuthInfo *req_sai=sal_op_get_auth_requested(op);
-		ai=(LinphoneAuthInfo*)linphone_core_find_auth_info(lc,req_sai->realm,req_sai->username,req_sai->domain);
+		ai=(LinphoneAuthInfo*)_linphone_core_find_auth_info(lc,req_sai->realm,req_sai->username,req_sai->domain, FALSE);
 		if (ai){
 			SalAuthInfo sai;
-			MSList* proxy;
+			bctbx_list_t* proxy;
 			sai.username=ai->username;
 			sai.userid=ai->userid;
 			sai.realm=ai->realm;
 			sai.password=ai->passwd;
 			sai.ha1=ai->ha1;
+			if (ai->tls_cert && ai->tls_key) {
+				sal_certificates_chain_parse(&sai, ai->tls_cert, SAL_CERTIFICATE_RAW_FORMAT_PEM);
+				sal_signing_key_parse(&sai, ai->tls_key, "");
+			} else if (ai->tls_cert_path && ai->tls_key_path) {
+				sal_certificates_chain_parse_file(&sai, ai->tls_cert_path, SAL_CERTIFICATE_RAW_FORMAT_PEM);
+				sal_signing_key_parse_file(&sai, ai->tls_key_path, "");
+			}
 			/*proxy case*/
-			for (proxy=(MSList*)linphone_core_get_proxy_config_list(lc);proxy!=NULL;proxy=proxy->next) {
+			for (proxy=(bctbx_list_t*)linphone_core_get_proxy_config_list(lc);proxy!=NULL;proxy=proxy->next) {
 				if (proxy->data == sal_op_get_user_pointer(op)) {
 					linphone_proxy_config_set_state((LinphoneProxyConfig*)(proxy->data),LinphoneRegistrationProgress,"Authentication...");
 					break;
@@ -352,8 +456,8 @@ void linphone_core_add_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *info)
 			info->realm ? info->realm : "",
 			info->domain ? info->domain : "");
 	}
-	ms_list_free(l);
-	if(lc->sip_conf.save_auth_info) write_auth_infos(lc);
+	bctbx_list_free(l);
+	write_auth_infos(lc);
 }
 
 
@@ -371,9 +475,9 @@ void linphone_core_remove_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *in
 	LinphoneAuthInfo *r;
 	r=(LinphoneAuthInfo*)linphone_core_find_auth_info(lc,info->realm,info->username,info->domain);
 	if (r){
-		lc->auth_info=ms_list_remove(lc->auth_info,r);
+		lc->auth_info=bctbx_list_remove(lc->auth_info,r);
 		linphone_auth_info_destroy(r);
-		if(lc->sip_conf.save_auth_info) write_auth_infos(lc);
+		write_auth_infos(lc);
 	}
 }
 
@@ -382,7 +486,7 @@ void linphone_core_remove_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *in
  * @param[in] lc The LinphoneCore object
  * @return \mslist{LinphoneAuthInfo}
 **/
-const MSList *linphone_core_get_auth_info_list(const LinphoneCore *lc){
+const bctbx_list_t *linphone_core_get_auth_info_list(const LinphoneCore *lc){
 	return lc->auth_info;
 }
 
@@ -390,14 +494,14 @@ const MSList *linphone_core_get_auth_info_list(const LinphoneCore *lc){
  * Clear all authentication information.
 **/
 void linphone_core_clear_all_auth_info(LinphoneCore *lc){
-	MSList *elem;
+	bctbx_list_t *elem;
 	int i;
-	for(i=0,elem=lc->auth_info;elem!=NULL;elem=ms_list_next(elem),i++){
+	for(i=0,elem=lc->auth_info;elem!=NULL;elem=bctbx_list_next(elem),i++){
 		LinphoneAuthInfo *info=(LinphoneAuthInfo*)elem->data;
 		linphone_auth_info_destroy(info);
 		linphone_auth_info_write_config(lc->config,NULL,i);
 	}
-	ms_list_free(lc->auth_info);
+	bctbx_list_free(lc->auth_info);
 	lc->auth_info=NULL;
 }
 
diff --git a/coreapi/bellesip_sal/sal_address_impl.c b/coreapi/bellesip_sal/sal_address_impl.c
index 54df93fd4..3ee8343d7 100644
--- a/coreapi/bellesip_sal/sal_address_impl.c
+++ b/coreapi/bellesip_sal/sal_address_impl.c
@@ -114,6 +114,15 @@ const char* sal_address_get_transport_name(const SalAddress* addr){
 	return NULL;
 }
 
+const char *sal_address_get_method_param(const SalAddress *addr) {
+	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
+	belle_sip_uri_t* uri = belle_sip_header_address_get_uri(header_addr);
+	if (uri) {
+		return belle_sip_uri_get_method_param(uri);
+	}
+	return NULL;
+}
+
 void sal_address_set_display_name(SalAddress *addr, const char *display_name){
 	belle_sip_header_address_t* header_addr = BELLE_SIP_HEADER_ADDRESS(addr);
 	belle_sip_header_address_set_displayname(header_addr,display_name);
@@ -188,17 +197,41 @@ void sal_address_set_param(SalAddress *addr,const char* name,const char* value){
 	return ;
 }
 
+bool_t sal_address_has_param(const SalAddress *addr, const char *name){
+	belle_sip_parameters_t* parameters = BELLE_SIP_PARAMETERS(addr);
+	return belle_sip_parameters_has_parameter(parameters, name);
+}
+
+const char * sal_address_get_param(const SalAddress *addr, const char *name) {
+	belle_sip_parameters_t* parameters = BELLE_SIP_PARAMETERS(addr);
+	return belle_sip_parameters_get_parameter(parameters, name);
+}
 
 void sal_address_set_params(SalAddress *addr, const char *params){
 	belle_sip_parameters_t* parameters = BELLE_SIP_PARAMETERS(addr);
 	belle_sip_parameters_set(parameters,params);
 }
 
+void sal_address_set_uri_param(SalAddress *addr, const char *name, const char *value) {
+	belle_sip_parameters_t* parameters = BELLE_SIP_PARAMETERS(belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(addr)));
+	belle_sip_parameters_set_parameter(parameters, name, value);
+}
+
 void sal_address_set_uri_params(SalAddress *addr, const char *params){
 	belle_sip_parameters_t* parameters = BELLE_SIP_PARAMETERS(belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(addr)));
 	belle_sip_parameters_set(parameters,params);
 }
 
+bool_t sal_address_has_uri_param(const SalAddress *addr, const char *name){
+	belle_sip_parameters_t* parameters = BELLE_SIP_PARAMETERS(belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(addr)));
+	return belle_sip_parameters_has_parameter(parameters, name);
+}
+
+const char * sal_address_get_uri_param(const SalAddress *addr, const char *name) {
+	belle_sip_parameters_t* parameters = BELLE_SIP_PARAMETERS(belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(addr)));
+	return belle_sip_parameters_get_parameter(parameters, name);
+}
+
 void sal_address_set_header(SalAddress *addr, const char *header_name, const char *header_value){
 	belle_sip_uri_set_header(belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(addr)),header_name, header_value);
 }
@@ -213,6 +246,10 @@ void sal_address_set_transport_name(SalAddress* addr,const char *transport){
 	SAL_ADDRESS_SET(addr,transport_param,transport);
 }
 
+void sal_address_set_method_param(SalAddress *addr, const char *method) {
+	SAL_ADDRESS_SET(addr, method_param, method);
+}
+
 SalAddress *sal_address_ref(SalAddress *addr){
 	return (SalAddress*)belle_sip_object_ref(BELLE_SIP_HEADER_ADDRESS(addr));
 }
diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 8bf38740c..8ccde1378 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -62,7 +62,7 @@ void sal_op_set_privacy_from_message(SalOp* op,belle_sip_message_t* msg) {
 }
 static void set_tls_properties(Sal *ctx);
 
-void _belle_sip_log(belle_sip_log_level lev, const char *fmt, va_list args) {
+void _belle_sip_log(const char *domain, belle_sip_log_level lev, const char *fmt, va_list args) {
 	int ortp_level;
 	switch(lev) {
 		case BELLE_SIP_LOG_FATAL:
@@ -82,8 +82,8 @@ void _belle_sip_log(belle_sip_log_level lev, const char *fmt, va_list args) {
 			ortp_level=ORTP_DEBUG;
 			break;
 	}
-	if (ortp_log_level_enabled(ortp_level)){
-		ortp_logv(ortp_level,fmt,args);
+	if (ortp_log_level_enabled("belle-sip", ortp_level)){
+		ortp_logv("belle-sip", ortp_level,fmt,args);
 	}
 }
 
@@ -115,8 +115,8 @@ void sal_set_log_level(OrtpLogLevel level) {
 }
 
 void sal_add_pending_auth(Sal *sal, SalOp *op){
-	if (ms_list_find(sal->pending_auths,op)==NULL){
-		sal->pending_auths=ms_list_append(sal->pending_auths,op);
+	if (bctbx_list_find(sal->pending_auths,op)==NULL){
+		sal->pending_auths=bctbx_list_append(sal->pending_auths,op);
 		op->has_auth_pending=TRUE;
 	}
 }
@@ -124,8 +124,8 @@ void sal_add_pending_auth(Sal *sal, SalOp *op){
 void sal_remove_pending_auth(Sal *sal, SalOp *op){
 	if (op->has_auth_pending){
 		op->has_auth_pending=FALSE;
-		if (ms_list_find(sal->pending_auths,op)){
-			sal->pending_auths=ms_list_remove(sal->pending_auths,op);
+		if (bctbx_list_find(sal->pending_auths,op)){
+			sal->pending_auths=bctbx_list_remove(sal->pending_auths,op);
 		}
 	}
 }
@@ -226,6 +226,7 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
 	belle_sip_header_address_t* address=NULL;
 	belle_sip_header_from_t* from_header;
 	belle_sip_header_to_t* to;
+	belle_sip_header_diversion_t* diversion;
 	belle_sip_response_t* resp;
 	belle_sip_header_t *evh;
 	const char *method=belle_sip_request_get_method(req);
@@ -235,53 +236,75 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
 
 	if (dialog) {
 		op=(SalOp*)belle_sip_dialog_get_application_data(dialog);
+		
+		if (op == NULL  && strcmp("NOTIFY",method) == 0) {
+			/*special case for Dialog created by notify mathing subscribe*/
+			belle_sip_transaction_t * sub_trans = belle_sip_dialog_get_last_transaction(dialog);
+			op = (SalOp*)belle_sip_transaction_get_application_data(sub_trans);
+		}
 		if (op==NULL || op->state==SalOpStateTerminated){
 			ms_warning("Receiving request for null or terminated op [%p], ignored",op);
 			return;
 		}
-	}else if (strcmp("INVITE",method)==0) {
-		op=sal_op_new(sal);
-		op->dir=SalOpDirIncoming;
-		sal_op_call_fill_cbs(op);
-	}else if ((strcmp("SUBSCRIBE",method)==0 || strcmp("NOTIFY",method)==0) && (evh=belle_sip_message_get_header(BELLE_SIP_MESSAGE(req),"Event"))!=NULL) {
-		op=sal_op_new(sal);
-		op->dir=SalOpDirIncoming;
-		if (strncmp(belle_sip_header_get_unparsed_value(evh),"presence",strlen("presence"))==0){
-			sal_op_presence_fill_cbs(op);
-		}else
-			sal_op_subscribe_fill_cbs(op);
-	}else if (strcmp("MESSAGE",method)==0) {
-		op=sal_op_new(sal);
-		op->dir=SalOpDirIncoming;
-		sal_op_message_fill_cbs(op);
-	}else if (strcmp("OPTIONS",method)==0) {
-		resp=belle_sip_response_create_from_request(req,200);
-		belle_sip_provider_send_response(sal->prov,resp);
-		return;
-	}else if (strcmp("INFO",method)==0) {
-		resp=belle_sip_response_create_from_request(req,481);/*INFO out of call dialogs are not allowed*/
-		belle_sip_provider_send_response(sal->prov,resp);
-		return;
-	}else if (strcmp("BYE",method)==0) {
-		resp=belle_sip_response_create_from_request(req,481);/*out of dialog BYE */
-		belle_sip_provider_send_response(sal->prov,resp);
-		return;
-	}else if (strcmp("CANCEL",method)==0) {
-		resp=belle_sip_response_create_from_request(req,481);/*out of dialog CANCEL */
-		belle_sip_provider_send_response(sal->prov,resp);
-		return;
-	}else if (sal->enable_test_features && strcmp("PUBLISH",method)==0) {
-		resp=belle_sip_response_create_from_request(req,200);/*out of dialog BYE */
-		belle_sip_message_add_header((belle_sip_message_t*)resp,belle_sip_header_create("SIP-Etag","4441929FFFZQOA"));
-		belle_sip_provider_send_response(sal->prov,resp);
-		return;
-	}else {
-		ms_error("sal process_request_event not implemented yet for method [%s]",belle_sip_request_get_method(req));
-		resp=belle_sip_response_create_from_request(req,405);
-		belle_sip_message_add_header(BELLE_SIP_MESSAGE(resp)
-									,BELLE_SIP_HEADER(belle_sip_header_allow_create("INVITE, CANCEL, ACK, BYE, SUBSCRIBE, NOTIFY, MESSAGE, OPTIONS, INFO")));
-		belle_sip_provider_send_response(sal->prov,resp);
-		return;
+	}else{
+		/*handle the case where we are receiving a request with to tag but it is not belonging to any dialog*/
+		belle_sip_header_to_t *to = belle_sip_message_get_header_by_type(req, belle_sip_header_to_t);
+		if ((strcmp("INVITE",method)==0 || strcmp("NOTIFY",method)==0) && (belle_sip_header_to_get_tag(to) != NULL)) {
+			ms_warning("Receiving %s with to-tag but no know dialog here. Rejecting.", method);
+			resp=belle_sip_response_create_from_request(req,481);
+			belle_sip_provider_send_response(sal->prov,resp);
+			return;
+		/* by default (eg. when a to-tag is present), out of dialog ACK are automatically
+		handled in lower layers (belle-sip) but in case it misses, it will be forwarded to us */
+		} else if (strcmp("ACK",method)==0 && (belle_sip_header_to_get_tag(to) == NULL)) {
+			ms_warning("Receiving ACK without to-tag but no know dialog here. Ignoring");
+			return;
+		}
+
+		if (strcmp("INVITE",method)==0) {
+			op=sal_op_new(sal);
+			op->dir=SalOpDirIncoming;
+			sal_op_call_fill_cbs(op);
+		}else if ((strcmp("SUBSCRIBE",method)==0 || strcmp("NOTIFY",method)==0) && (evh=belle_sip_message_get_header(BELLE_SIP_MESSAGE(req),"Event"))!=NULL) {
+			op=sal_op_new(sal);
+			op->dir=SalOpDirIncoming;
+			if (strncmp(belle_sip_header_get_unparsed_value(evh),"presence",strlen("presence"))==0){
+				sal_op_presence_fill_cbs(op);
+			}else
+				sal_op_subscribe_fill_cbs(op);
+		}else if (strcmp("MESSAGE",method)==0) {
+			op=sal_op_new(sal);
+			op->dir=SalOpDirIncoming;
+			sal_op_message_fill_cbs(op);
+		}else if (strcmp("OPTIONS",method)==0) {
+			resp=belle_sip_response_create_from_request(req,200);
+			belle_sip_provider_send_response(sal->prov,resp);
+			return;
+		}else if (strcmp("INFO",method)==0) {
+			resp=belle_sip_response_create_from_request(req,481);/*INFO out of call dialogs are not allowed*/
+			belle_sip_provider_send_response(sal->prov,resp);
+			return;
+		}else if (strcmp("BYE",method)==0) {
+			resp=belle_sip_response_create_from_request(req,481);/*out of dialog BYE */
+			belle_sip_provider_send_response(sal->prov,resp);
+			return;
+		}else if (strcmp("CANCEL",method)==0) {
+			resp=belle_sip_response_create_from_request(req,481);/*out of dialog CANCEL */
+			belle_sip_provider_send_response(sal->prov,resp);
+			return;
+		}else if (sal->enable_test_features && strcmp("PUBLISH",method)==0) {
+			resp=belle_sip_response_create_from_request(req,200);/*out of dialog PUBLISH */
+			belle_sip_message_add_header((belle_sip_message_t*)resp,belle_sip_header_create("SIP-Etag","4441929FFFZQOA"));
+			belle_sip_provider_send_response(sal->prov,resp);
+			return;
+		}else {
+			ms_error("sal process_request_event not implemented yet for method [%s]",belle_sip_request_get_method(req));
+			resp=belle_sip_response_create_from_request(req,405);
+			belle_sip_message_add_header(BELLE_SIP_MESSAGE(resp)
+										,BELLE_SIP_HEADER(belle_sip_header_allow_create("INVITE, CANCEL, ACK, BYE, SUBSCRIBE, NOTIFY, MESSAGE, OPTIONS, INFO")));
+			belle_sip_provider_send_response(sal->prov,resp);
+			return;
+		}
 	}
 
 	if (!op->base.from_address)  {
@@ -316,6 +339,24 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
 		belle_sip_object_unref(address);
 	}
 
+	if(!op->base.diversion_address){
+		diversion=belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(req),belle_sip_header_diversion_t);
+		if (diversion) {
+			if (belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(diversion)))
+				address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(diversion))
+						,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(diversion)));
+			else if ((belle_sip_header_address_get_absolute_uri(BELLE_SIP_HEADER_ADDRESS(diversion))))
+				address=belle_sip_header_address_create2(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(diversion))
+						,belle_sip_header_address_get_absolute_uri(BELLE_SIP_HEADER_ADDRESS(diversion)));
+			else
+				ms_warning("Cannot not find diversion header from request [%p]",req);
+			if (address) {
+				sal_op_set_diversion_address(op,(SalAddress*)address);
+				belle_sip_object_unref(address);
+			}
+		}
+	}
+
 	if (!op->base.origin) {
 		/*set origin uri*/
 		origin_address=belle_sip_header_address_create(NULL,belle_sip_request_extract_origin(req));
@@ -456,13 +497,13 @@ static void process_auth_requested(void *sal, belle_sip_auth_event_t *event) {
 	sal_auth_info_delete(auth_info);
 }
 
-Sal * sal_init(){
+Sal * sal_init(MSFactory *factory){
 	belle_sip_listener_callbacks_t listener_callbacks;
 	Sal * sal=ms_new0(Sal,1);
 
 	/*belle_sip_object_enable_marshal_check(TRUE);*/
 	sal->auto_contacts=TRUE;
-
+	sal->factory = factory;
 	/*first create the stack, which initializes the belle-sip object's pool for this thread*/
 	belle_sip_set_log_handler(_belle_sip_log);
 	sal->stack = belle_sip_stack_new(NULL);
@@ -470,6 +511,8 @@ Sal * sal_init(){
 	sal->user_agent=belle_sip_header_user_agent_new();
 #if defined(PACKAGE_NAME) && defined(LIBLINPHONE_VERSION)
 	belle_sip_header_user_agent_add_product(sal->user_agent, PACKAGE_NAME "/" LIBLINPHONE_VERSION);
+#else
+	belle_sip_header_user_agent_add_product(sal->user_agent, "Unknown");
 #endif
 	sal_append_stack_string_to_user_agent(sal);
 	belle_sip_object_ref(sal->user_agent);
@@ -491,6 +534,7 @@ Sal * sal_init(){
 	sal->refresher_retry_after=60000; /*default value in ms*/
 	sal->enable_sip_update=TRUE;
 	sal->pending_trans_checking=TRUE;
+	sal->ssl_config = NULL;
 	return sal;
 }
 
@@ -502,7 +546,7 @@ void *sal_get_user_pointer(const Sal *sal){
 	return sal->up;
 }
 
-static void unimplemented_stub(){
+static void unimplemented_stub(void){
 	ms_warning("Unimplemented SAL callback");
 }
 
@@ -534,8 +578,8 @@ void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs){
 		ctx->callbacks.notify=(SalOnNotify)unimplemented_stub;
 	if (ctx->callbacks.subscribe_received==NULL)
 		ctx->callbacks.subscribe_received=(SalOnSubscribeReceived)unimplemented_stub;
-	if (ctx->callbacks.subscribe_closed==NULL)
-		ctx->callbacks.subscribe_closed=(SalOnSubscribeClosed)unimplemented_stub;
+	if (ctx->callbacks.incoming_subscribe_closed==NULL)
+		ctx->callbacks.incoming_subscribe_closed=(SalOnIncomingSubscribeClosed)unimplemented_stub;
 	if (ctx->callbacks.parse_presence_requested==NULL)
 		ctx->callbacks.parse_presence_requested=(SalOnParsePresenceRequested)unimplemented_stub;
 	if (ctx->callbacks.convert_presence_to_xml_requested==NULL)
@@ -568,9 +612,10 @@ void sal_uninit(Sal* sal){
 	belle_sip_object_unref(sal->stack);
 	belle_sip_object_unref(sal->listener);
 	if (sal->supported) belle_sip_object_unref(sal->supported);
-	ms_list_free_with_data(sal->supported_tags,ms_free);
+	bctbx_list_free_with_data(sal->supported_tags,ms_free);
 	if (sal->uuid) ms_free(sal->uuid);
 	if (sal->root_ca) ms_free(sal->root_ca);
+	if (sal->root_ca_data) ms_free(sal->root_ca_data);
 	ms_free(sal);
 };
 
@@ -587,6 +632,10 @@ int sal_transport_available(Sal *sal, SalTransport t){
 	return FALSE;
 }
 
+bool_t sal_content_encoding_available(Sal *sal, const char *content_encoding) {
+	return (bool_t)belle_sip_stack_content_encoding_available(sal->stack, content_encoding);
+}
+
 static int sal_add_listen_port(Sal *ctx, SalAddress* addr, bool_t is_tunneled){
 	int result;
 	belle_sip_listening_point_t* lp;
@@ -614,7 +663,9 @@ static int sal_add_listen_port(Sal *ctx, SalAddress* addr, bool_t is_tunneled){
 	if (lp) {
 		belle_sip_listening_point_set_keep_alive(lp,ctx->keep_alive);
 		result = belle_sip_provider_add_listening_point(ctx->prov,lp);
-		if (sal_address_get_transport(addr)==SalTransportTLS) set_tls_properties(ctx);
+		if (sal_address_get_transport(addr)==SalTransportTLS) {
+			set_tls_properties(ctx);
+		}
 	} else {
 		return -1;
 	}
@@ -724,25 +775,39 @@ static void set_tls_properties(Sal *ctx){
 	belle_sip_listening_point_t *lp=belle_sip_provider_get_listening_point(ctx->prov,"TLS");
 	if (lp){
 		belle_sip_tls_listening_point_t *tlp=BELLE_SIP_TLS_LISTENING_POINT(lp);
-		int verify_exceptions=0;
-
-		if (!ctx->tls_verify) verify_exceptions=BELLE_SIP_TLS_LISTENING_POINT_BADCERT_ANY_REASON;
-		else if (!ctx->tls_verify_cn) verify_exceptions=BELLE_SIP_TLS_LISTENING_POINT_BADCERT_CN_MISMATCH;
-
-		belle_sip_tls_listening_point_set_root_ca(tlp,ctx->root_ca); /*root_ca might be NULL */
-		belle_sip_tls_listening_point_set_verify_exceptions(tlp,verify_exceptions);
+		belle_tls_crypto_config_t *crypto_config = belle_tls_crypto_config_new();
+		int verify_exceptions = BELLE_TLS_VERIFY_NONE;
+		if (!ctx->tls_verify) verify_exceptions = BELLE_TLS_VERIFY_ANY_REASON;
+		else if (!ctx->tls_verify_cn) verify_exceptions = BELLE_TLS_VERIFY_CN_MISMATCH;
+		belle_tls_crypto_config_set_verify_exceptions(crypto_config, verify_exceptions);
+		if (ctx->root_ca != NULL) belle_tls_crypto_config_set_root_ca(crypto_config, ctx->root_ca);
+		if (ctx->root_ca_data != NULL) belle_tls_crypto_config_set_root_ca_data(crypto_config, ctx->root_ca_data);
+		if (ctx->ssl_config != NULL) belle_tls_crypto_config_set_ssl_config(crypto_config, ctx->ssl_config);
+		belle_sip_tls_listening_point_set_crypto_config(tlp, crypto_config);
+		belle_sip_object_unref(crypto_config);
 	}
 }
 
-void sal_set_root_ca(Sal* ctx, const char* rootCa){
-	if (ctx->root_ca){
+void sal_set_root_ca(Sal* ctx, const char* rootCa) {
+	if (ctx->root_ca) {
 		ms_free(ctx->root_ca);
-		ctx->root_ca=NULL;
+		ctx->root_ca = NULL;
 	}
 	if (rootCa)
-		ctx->root_ca=ms_strdup(rootCa);
+		ctx->root_ca = ms_strdup(rootCa);
 	set_tls_properties(ctx);
-	return ;
+	return;
+}
+
+void sal_set_root_ca_data(Sal* ctx, const char* data) {
+	if (ctx->root_ca_data) {
+		ms_free(ctx->root_ca_data);
+		ctx->root_ca_data = NULL;
+	}
+	if (data)
+		ctx->root_ca_data = ms_strdup(data);
+	set_tls_properties(ctx);
+	return;
 }
 
 void sal_verify_server_certificates(Sal *ctx, bool_t verify){
@@ -757,6 +822,12 @@ void sal_verify_server_cn(Sal *ctx, bool_t verify){
 	return ;
 }
 
+void sal_set_ssl_config(Sal *ctx, void *ssl_config) {
+	ctx->ssl_config = ssl_config;
+	set_tls_properties(ctx);
+	return ;
+}
+
 void sal_use_tcp_tls_keepalive(Sal *ctx, bool_t enabled) {
 	ctx->use_tcp_tls_keep_alive=enabled;
 }
@@ -765,13 +836,10 @@ int sal_iterate(Sal *sal){
 	belle_sip_stack_sleep(sal->stack,0);
 	return 0;
 }
-MSList * sal_get_pending_auths(Sal *sal){
-	return ms_list_copy(sal->pending_auths);
+bctbx_list_t * sal_get_pending_auths(Sal *sal){
+	return bctbx_list_copy(sal->pending_auths);
 }
 
-#define payload_type_set_number(pt,n)	(pt)->user_data=(void*)((long)n);
-#define payload_type_get_number(pt)		((int)(long)(pt)->user_data)
-
 /*misc*/
 void sal_get_default_local_ip(Sal *sal, int address_family, char *ip, size_t iplen){
 	strncpy(ip,address_family==AF_INET6 ? "::1" : "127.0.0.1",iplen);
@@ -809,6 +877,7 @@ bool_t sal_nat_helper_enabled(Sal *sal) {
 void sal_set_dns_timeout(Sal* sal,int timeout) {
 	belle_sip_stack_set_dns_timeout(sal->stack, timeout);
 }
+
 int sal_get_dns_timeout(const Sal* sal)  {
 	return belle_sip_stack_get_dns_timeout(sal->stack);
 }
@@ -816,16 +885,38 @@ int sal_get_dns_timeout(const Sal* sal)  {
 void sal_set_transport_timeout(Sal* sal,int timeout) {
 	belle_sip_stack_set_transport_timeout(sal->stack, timeout);
 }
+
 int sal_get_transport_timeout(const Sal* sal)  {
 	return belle_sip_stack_get_transport_timeout(sal->stack);
 }
+
+void sal_set_dns_servers(Sal *sal, const bctbx_list_t *servers){
+	belle_sip_list_t *l = NULL;
+
+	/*we have to convert the bctbx_list_t into a belle_sip_list_t first*/
+	for (; servers != NULL; servers = servers->next){
+		l = belle_sip_list_append(l, servers->data);
+	}
+	belle_sip_stack_set_dns_servers(sal->stack, l);
+	belle_sip_list_free(l);
+}
+
 void sal_enable_dns_srv(Sal *sal, bool_t enable) {
 	belle_sip_stack_enable_dns_srv(sal->stack, (unsigned char)enable);
 }
+
 bool_t sal_dns_srv_enabled(const Sal *sal) {
 	return (bool_t)belle_sip_stack_dns_srv_enabled(sal->stack);
 }
 
+void sal_enable_dns_search(Sal *sal, bool_t enable) {
+	belle_sip_stack_enable_dns_search(sal->stack, (unsigned char)enable);
+}
+
+bool_t sal_dns_search_enabled(const Sal *sal) {
+	return (bool_t)belle_sip_stack_dns_search_enabled(sal->stack);
+}
+
 void sal_set_dns_user_hosts_file(Sal *sal, const char *hosts_file) {
 	belle_sip_stack_set_dns_user_hosts_file(sal->stack, hosts_file);
 }
@@ -917,6 +1008,40 @@ const SalCustomHeader *sal_op_get_recv_custom_header(SalOp *op){
 	return b->recv_custom_headers;
 }
 
+SalCustomSdpAttribute * sal_custom_sdp_attribute_append(SalCustomSdpAttribute *csa, const char *name, const char *value) {
+	belle_sdp_session_description_t *desc = (belle_sdp_session_description_t *)csa;
+	belle_sdp_attribute_t *attr;
+
+	if (desc == NULL) {
+		desc = (belle_sdp_session_description_t *)belle_sdp_session_description_new();
+		belle_sip_object_ref(desc);
+	}
+	attr = BELLE_SDP_ATTRIBUTE(belle_sdp_raw_attribute_create(name, value));
+	if (attr == NULL) {
+		belle_sip_error("Fail to create custom SDP attribute.");
+		return (SalCustomSdpAttribute*)desc;
+	}
+	belle_sdp_session_description_add_attribute(desc, attr);
+	return (SalCustomSdpAttribute *)desc;
+}
+
+const char * sal_custom_sdp_attribute_find(const SalCustomSdpAttribute *csa, const char *name) {
+	if (csa) {
+		return belle_sdp_session_description_get_attribute_value((belle_sdp_session_description_t *)csa, name);
+	}
+	return NULL;
+}
+
+void sal_custom_sdp_attribute_free(SalCustomSdpAttribute *csa) {
+	if (csa == NULL) return;
+	belle_sip_object_unref((belle_sdp_session_description_t *)csa);
+}
+
+SalCustomSdpAttribute * sal_custom_sdp_attribute_clone(const SalCustomSdpAttribute *csa) {
+	if (csa == NULL) return NULL;
+	return (SalCustomSdpAttribute *)belle_sip_object_ref((belle_sdp_session_description_t *)csa);
+}
+
 void sal_set_uuid(Sal *sal, const char *uuid){
 	if (sal->uuid){
 		ms_free(sal->uuid);
@@ -935,8 +1060,7 @@ typedef struct {
 	unsigned char node[6];
 } sal_uuid_t;
 
-
-int sal_create_uuid(Sal*ctx, char *uuid, size_t len){
+int sal_generate_uuid(char *uuid, size_t len) {
 	sal_uuid_t uuid_struct;
 	int i;
 	int written;
@@ -952,19 +1076,26 @@ int sal_create_uuid(Sal*ctx, char *uuid, size_t len){
 	written=snprintf(uuid,len,"%8.8x-%4.4x-%4.4x-%2.2x%2.2x-", uuid_struct.time_low, uuid_struct.time_mid,
 			uuid_struct.time_hi_and_version, uuid_struct.clock_seq_hi_and_reserved,
 			uuid_struct.clock_seq_low);
-	if (written>len+13){
+	if ((written < 0) || ((size_t)written > (len +13))) {
 		ms_error("sal_create_uuid(): buffer is too short !");
 		return -1;
 	}
 	for (i = 0; i < 6; i++)
 		written+=snprintf(uuid+written,len-written,"%2.2x", uuid_struct.node[i]);
 	uuid[len-1]='\0';
-	sal_set_uuid(ctx,uuid);
 	return 0;
 }
 
+int sal_create_uuid(Sal*ctx, char *uuid, size_t len) {
+	if (sal_generate_uuid(uuid, len) == 0) {
+		sal_set_uuid(ctx, uuid);
+		return 0;
+	}
+	return -1;
+}
+
 static void make_supported_header(Sal *sal){
-	MSList *it;
+	bctbx_list_t *it;
 	char *alltags=NULL;
 	size_t buflen=64;
 	size_t written=0;
@@ -977,7 +1108,7 @@ static void make_supported_header(Sal *sal){
 		const char *tag=(const char*)it->data;
 		size_t taglen=strlen(tag);
 		if (alltags==NULL || (written+taglen+1>=buflen)) alltags=ms_realloc(alltags,(buflen=buflen*2));
-		snprintf(alltags+written,buflen-written,it->next ? "%s, " : "%s",tag);
+		written+=snprintf(alltags+written,buflen-written,it->next ? "%s, " : "%s",tag);
 	}
 	if (alltags){
 		sal->supported=belle_sip_header_create("Supported",alltags);
@@ -989,7 +1120,7 @@ static void make_supported_header(Sal *sal){
 }
 
 void sal_set_supported_tags(Sal *ctx, const char* tags){
-	ctx->supported_tags=ms_list_free_with_data(ctx->supported_tags,ms_free);
+	ctx->supported_tags=bctbx_list_free_with_data(ctx->supported_tags,ms_free);
 	if (tags){
 		char *iter;
 		char *buffer=ms_strdup(tags);
@@ -998,7 +1129,7 @@ void sal_set_supported_tags(Sal *ctx, const char* tags){
 		iter=buffer;
 		while((tag=strtok_r(iter,", ",&context))!=NULL){
 			iter=NULL;
-			ctx->supported_tags=ms_list_append(ctx->supported_tags,ms_strdup(tag));
+			ctx->supported_tags=bctbx_list_append(ctx->supported_tags,ms_strdup(tag));
 		}
 		ms_free(buffer);
 	}
@@ -1013,19 +1144,19 @@ const char *sal_get_supported_tags(Sal *ctx){
 }
 
 void sal_add_supported_tag(Sal *ctx, const char* tag){
-	MSList *elem=ms_list_find_custom(ctx->supported_tags,(MSCompareFunc)strcasecmp,tag);
+	bctbx_list_t *elem=bctbx_list_find_custom(ctx->supported_tags,(bctbx_compare_func)strcasecmp,tag);
 	if (!elem){
-		ctx->supported_tags=ms_list_append(ctx->supported_tags,ms_strdup(tag));
+		ctx->supported_tags=bctbx_list_append(ctx->supported_tags,ms_strdup(tag));
 		make_supported_header(ctx);
 	}
 
 }
 
 void sal_remove_supported_tag(Sal *ctx, const char* tag){
-	MSList *elem=ms_list_find_custom(ctx->supported_tags,(MSCompareFunc)strcasecmp,tag);
+	bctbx_list_t *elem=bctbx_list_find_custom(ctx->supported_tags,(bctbx_compare_func)strcasecmp,tag);
 	if (elem){
 		ms_free(elem->data);
-		ctx->supported_tags=ms_list_remove_link(ctx->supported_tags,elem);
+		ctx->supported_tags=bctbx_list_erase_link(ctx->supported_tags,elem);
 		make_supported_header(ctx);
 	}
 }
@@ -1063,11 +1194,14 @@ SalResolverContext * sal_resolve_a(Sal* sal, const char *name, int port, int fam
 	return (SalResolverContext*)belle_sip_stack_resolve_a(sal->stack,name,port,family,(belle_sip_resolver_callback_t)cb,data);
 }
 
-/*
-void sal_resolve_cancel(Sal *sal, SalResolverContext* ctx){
-	belle_sip_stack_resolve_cancel(sal->stack,ctx);
+SalResolverContext * sal_resolve(Sal *sal, const char *service, const char *transport, const char *name, int port, int family, SalResolverCallback cb, void *data) {
+	return (SalResolverContext *)belle_sip_stack_resolve(sal->stack, service, transport, name, port, family, (belle_sip_resolver_callback_t)cb, data);
 }
-*/
+
+void sal_resolve_cancel(SalResolverContext* ctx){
+	belle_sip_resolver_context_cancel((belle_sip_resolver_context_t*)ctx);
+}
+
 
 void sal_enable_unconditional_answer(Sal *sal,int value) {
 	belle_sip_provider_enable_unconditional_answer(sal->prov,value);
@@ -1079,7 +1213,7 @@ void sal_enable_unconditional_answer(Sal *sal,int value) {
  * @param format either PEM or DER
  */
 void sal_certificates_chain_parse_file(SalAuthInfo* auth_info, const char* path, SalCertificateRawFormat format) {
-	auth_info->certificates = (SalCertificatesChain*) belle_sip_certificates_chain_parse_file(path, (belle_sip_certificate_raw_format_t)format); //
+	auth_info->certificates = (SalCertificatesChain*) belle_sip_certificates_chain_parse_file(path, (belle_sip_certificate_raw_format_t)format);
 	if (auth_info->certificates) belle_sip_object_ref((belle_sip_object_t *) auth_info->certificates);
 }
 
@@ -1093,6 +1227,28 @@ void sal_signing_key_parse_file(SalAuthInfo* auth_info, const char* path, const
 	if (auth_info->key) belle_sip_object_ref((belle_sip_object_t *) auth_info->key);
 }
 
+/** Parse a buffer containing either a certificate chain order in PEM format or a single DER cert
+ * @param auth_info structure where to store the result of parsing
+ * @param buffer the buffer to parse
+ * @param format either PEM or DER
+ */
+void sal_certificates_chain_parse(SalAuthInfo* auth_info, const char* buffer, SalCertificateRawFormat format) {
+	size_t len = buffer != NULL ? strlen(buffer) : 0;
+	auth_info->certificates = (SalCertificatesChain*) belle_sip_certificates_chain_parse(buffer, len, (belle_sip_certificate_raw_format_t)format);
+	if (auth_info->certificates) belle_sip_object_ref((belle_sip_object_t *) auth_info->certificates);
+}
+
+/**
+ * Parse a buffer containing either a private or public rsa key
+ * @param auth_info structure where to store the result of parsing
+ * @param passwd password (optionnal)
+ */
+void sal_signing_key_parse(SalAuthInfo* auth_info, const char* buffer, const char *passwd) {
+	size_t len = buffer != NULL ? strlen(buffer) : 0;
+	auth_info->key = (SalSigningKey *) belle_sip_signing_key_parse(buffer, len, passwd);
+	if (auth_info->key) belle_sip_object_ref((belle_sip_object_t *) auth_info->key);
+}
+
 /**
  * Parse a directory to get a certificate with the given subject common name
  *
@@ -1182,3 +1338,153 @@ int sal_enable_pending_trans_checking(Sal *sal, bool_t value) {
 	sal->pending_trans_checking = value;
 	return 0;
 }
+void sal_set_http_proxy_host(Sal *sal, const char *host) {
+	belle_sip_stack_set_http_proxy_host(sal->stack, host);
+}
+
+void sal_set_http_proxy_port(Sal *sal, int port) {
+	belle_sip_stack_set_http_proxy_port(sal->stack, port);
+}
+const char *sal_get_http_proxy_host(const Sal *sal) {
+	return belle_sip_stack_get_http_proxy_host(sal->stack);
+}
+
+int sal_get_http_proxy_port(const Sal *sal) {
+	return belle_sip_stack_get_http_proxy_port(sal->stack);
+}
+
+static belle_sip_header_t * sal_body_handler_find_header(const SalBodyHandler *body_handler, const char *header_name) {
+	belle_sip_body_handler_t *bsbh = BELLE_SIP_BODY_HANDLER(body_handler);
+	const belle_sip_list_t *l = belle_sip_body_handler_get_headers(bsbh);
+	for (; l != NULL; l = l->next) {
+		belle_sip_header_t *header = BELLE_SIP_HEADER(l->data);
+		if (strcmp(belle_sip_header_get_name(header), header_name) == 0) {
+			return header;
+		}
+	}
+	return NULL;
+}
+
+SalBodyHandler * sal_body_handler_new(void) {
+	belle_sip_memory_body_handler_t *body_handler = belle_sip_memory_body_handler_new(NULL, NULL);
+	return (SalBodyHandler *)BELLE_SIP_BODY_HANDLER(body_handler);
+}
+
+SalBodyHandler * sal_body_handler_ref(SalBodyHandler *body_handler) {
+	return (SalBodyHandler *)belle_sip_object_ref(BELLE_SIP_OBJECT(body_handler));
+}
+
+void sal_body_handler_unref(SalBodyHandler *body_handler) {
+	belle_sip_object_unref(BELLE_SIP_OBJECT(body_handler));
+}
+
+const char * sal_body_handler_get_type(const SalBodyHandler *body_handler) {
+	belle_sip_header_content_type_t *content_type = BELLE_SIP_HEADER_CONTENT_TYPE(sal_body_handler_find_header(body_handler, "Content-Type"));
+	if (content_type != NULL) {
+		return belle_sip_header_content_type_get_type(content_type);
+	}
+	return NULL;
+}
+
+void sal_body_handler_set_type(SalBodyHandler *body_handler, const char *type) {
+	belle_sip_header_content_type_t *content_type = BELLE_SIP_HEADER_CONTENT_TYPE(sal_body_handler_find_header(body_handler, "Content-Type"));
+	if (content_type == NULL) {
+		content_type = belle_sip_header_content_type_new();
+		belle_sip_body_handler_add_header(BELLE_SIP_BODY_HANDLER(body_handler), BELLE_SIP_HEADER(content_type));
+	}
+	belle_sip_header_content_type_set_type(content_type, type);
+}
+
+const char * sal_body_handler_get_subtype(const SalBodyHandler *body_handler) {
+	belle_sip_header_content_type_t *content_type = BELLE_SIP_HEADER_CONTENT_TYPE(sal_body_handler_find_header(body_handler, "Content-Type"));
+	if (content_type != NULL) {
+		return belle_sip_header_content_type_get_subtype(content_type);
+	}
+	return NULL;
+}
+
+void sal_body_handler_set_subtype(SalBodyHandler *body_handler, const char *subtype) {
+	belle_sip_header_content_type_t *content_type = BELLE_SIP_HEADER_CONTENT_TYPE(sal_body_handler_find_header(body_handler, "Content-Type"));
+	if (content_type == NULL) {
+		content_type = belle_sip_header_content_type_new();
+		belle_sip_body_handler_add_header(BELLE_SIP_BODY_HANDLER(body_handler), BELLE_SIP_HEADER(content_type));
+	}
+	belle_sip_header_content_type_set_subtype(content_type, subtype);
+}
+
+const char * sal_body_handler_get_encoding(const SalBodyHandler *body_handler) {
+	belle_sip_header_t *content_encoding = sal_body_handler_find_header(body_handler, "Content-Encoding");
+	if (content_encoding != NULL) {
+		return belle_sip_header_get_unparsed_value(content_encoding);
+	}
+	return NULL;
+}
+
+void sal_body_handler_set_encoding(SalBodyHandler *body_handler, const char *encoding) {
+	belle_sip_header_t *content_encoding = sal_body_handler_find_header(body_handler, "Content-Encoding");
+	if (content_encoding != NULL) {
+		belle_sip_body_handler_remove_header_from_ptr(BELLE_SIP_BODY_HANDLER(body_handler), content_encoding);
+	}
+	belle_sip_body_handler_add_header(BELLE_SIP_BODY_HANDLER(body_handler), belle_sip_header_create("Content-Encoding", encoding));
+}
+
+void * sal_body_handler_get_data(const SalBodyHandler *body_handler) {
+	return belle_sip_memory_body_handler_get_buffer(BELLE_SIP_MEMORY_BODY_HANDLER(body_handler));
+}
+
+void sal_body_handler_set_data(SalBodyHandler *body_handler, void *data) {
+	belle_sip_memory_body_handler_set_buffer(BELLE_SIP_MEMORY_BODY_HANDLER(body_handler), data);
+}
+
+size_t sal_body_handler_get_size(const SalBodyHandler *body_handler) {
+	return belle_sip_body_handler_get_size(BELLE_SIP_BODY_HANDLER(body_handler));
+}
+
+void sal_body_handler_set_size(SalBodyHandler *body_handler, size_t size) {
+	belle_sip_header_content_length_t *content_length = BELLE_SIP_HEADER_CONTENT_LENGTH(sal_body_handler_find_header(body_handler, "Content-Length"));
+	if (content_length == NULL) {
+		content_length = belle_sip_header_content_length_new();
+		belle_sip_body_handler_add_header(BELLE_SIP_BODY_HANDLER(body_handler), BELLE_SIP_HEADER(content_length));
+	}
+	belle_sip_header_content_length_set_content_length(content_length, size);
+	belle_sip_body_handler_set_size(BELLE_SIP_BODY_HANDLER(body_handler), size);
+}
+
+bool_t sal_body_handler_is_multipart(const SalBodyHandler *body_handler) {
+	if (BELLE_SIP_IS_INSTANCE_OF(body_handler, belle_sip_multipart_body_handler_t)) return TRUE;
+	return FALSE;
+}
+
+SalBodyHandler * sal_body_handler_get_part(const SalBodyHandler *body_handler, int idx) {
+	const belle_sip_list_t *l = belle_sip_multipart_body_handler_get_parts(BELLE_SIP_MULTIPART_BODY_HANDLER(body_handler));
+	return (SalBodyHandler *)belle_sip_list_nth_data(l, idx);
+}
+
+SalBodyHandler * sal_body_handler_find_part_by_header(const SalBodyHandler *body_handler, const char *header_name, const char *header_value) {
+	const belle_sip_list_t *l = belle_sip_multipart_body_handler_get_parts(BELLE_SIP_MULTIPART_BODY_HANDLER(body_handler));
+	for (; l != NULL; l = l->next) {
+		belle_sip_body_handler_t *bsbh = BELLE_SIP_BODY_HANDLER(l->data);
+		const belle_sip_list_t *headers = belle_sip_body_handler_get_headers(bsbh);
+		for (; headers != NULL; headers = headers->next) {
+			belle_sip_header_t *header = BELLE_SIP_HEADER(headers->data);
+			if ((strcmp(belle_sip_header_get_name(header), header_name) == 0) && (strcmp(belle_sip_header_get_unparsed_value(header), header_value) == 0)) {
+				return (SalBodyHandler *)bsbh;
+			}
+		}
+	}
+	return NULL;
+}
+
+const char * sal_body_handler_get_header(const SalBodyHandler *body_handler, const char *header_name) {
+	belle_sip_header_t *header = sal_body_handler_find_header(body_handler, header_name);
+	if (header != NULL) {
+		return belle_sip_header_get_unparsed_value(header);
+	}
+	return NULL;
+}
+
+void *sal_get_stack_impl(Sal *sal) {
+	return sal->stack;
+}
+
+
diff --git a/coreapi/bellesip_sal/sal_impl.h b/coreapi/bellesip_sal/sal_impl.h
index 1ca8e058f..174d2b435 100644
--- a/coreapi/bellesip_sal/sal_impl.h
+++ b/coreapi/bellesip_sal/sal_impl.h
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "belle-sip/belle-sdp.h"
 
 struct Sal{
+	MSFactory *factory;
 	SalCallbacks callbacks;
 	MSList *pending_auths;/*MSList of SalOp */
 	belle_sip_stack_t* stack;
@@ -36,6 +37,7 @@ struct Sal{
 	int session_expires;
 	unsigned int keep_alive;
 	char *root_ca;
+	char *root_ca_data;
 	char *uuid;
 	int refresher_retry_after; /*retry after value for refresher*/
 	MSList *supported_tags;/*list of char * */
@@ -52,6 +54,7 @@ struct Sal{
 	bool_t enable_sip_update; /*true by default*/
 	SalOpSDPHandling default_sdp_handling;
 	bool_t pending_trans_checking; /*testing purpose*/
+	void *ssl_config;
 };
 
 typedef enum SalOpState {
@@ -99,7 +102,7 @@ struct SalOp{
 	int ref;
 	SalOpType type;
 	SalPrivacyMask privacy;
-	belle_sip_header_t *event; /*used by SalOpSubscribe kinds*/
+	belle_sip_header_event_t *event; /*used by SalOpSubscribe kinds*/
 	SalOpSDPHandling sdp_handling;
 	int auth_requests; /*number of auth requested for this op*/
 	bool_t cnx_ip_to_0000_if_sendonly_enabled;
@@ -109,6 +112,7 @@ struct SalOp{
 	bool_t manual_refresher;
 	bool_t has_auth_pending;
 	bool_t supports_session_timers;
+	bool_t op_released;
 };
 
 
@@ -126,6 +130,7 @@ SalOp* sal_op_ref(SalOp* op);
 void* sal_op_unref(SalOp* op);
 void sal_op_release_impl(SalOp *op);
 
+void sal_op_set_replaces(SalOp* op,belle_sip_header_replaces_t* replaces);
 void sal_op_set_remote_ua(SalOp*op,belle_sip_message_t* message);
 int sal_op_send_request(SalOp* op, belle_sip_request_t* request);
 int sal_op_send_request_with_expires(SalOp* op, belle_sip_request_t* request,int expires);
@@ -165,11 +170,12 @@ belle_sip_response_t *sal_create_response_from_request(Sal *sal, belle_sip_reque
 
 void sal_op_assign_recv_headers(SalOp *op, belle_sip_message_t *incoming);
 
-void sal_op_add_body(SalOp *op, belle_sip_message_t *req, const SalBody *body);
-bool_t sal_op_get_body(SalOp *op, belle_sip_message_t *msg, SalBody *salbody);
+SalBodyHandler * sal_op_get_body_handler(SalOp *op, belle_sip_message_t *msg);
 
-SalReason sal_reason_to_sip_code(SalReason r);
+int sal_reason_to_sip_code(SalReason r);
 
 void _sal_op_add_custom_headers(SalOp *op, belle_sip_message_t *msg);
 
+SalSubscribeStatus belle_sip_message_get_subscription_state(const belle_sip_message_t *msg);
+
 #endif /* SAL_IMPL_H_ */
diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 85b2a125f..d393dc1af 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -32,8 +32,9 @@ static void call_set_released(SalOp* op){
 	}
 }
 
-static void call_set_error(SalOp* op,belle_sip_response_t* response){
+static void call_set_error(SalOp* op,belle_sip_response_t* response, bool_t fatal){
 	sal_op_set_error_info_from_response(op,response);
+	if (fatal) op->state = SalOpStateTerminating;
 	op->base.root->callbacks.call_failure(op);
 }
 static void set_addr_to_0000(char value[]) {
@@ -56,20 +57,21 @@ static void sdp_process(SalOp *h){
 
 	h->result=sal_media_description_new();
 	if (h->sdp_offering){
-		offer_answer_initiate_outgoing(h->base.local_media,h->base.remote_media,h->result);
+		offer_answer_initiate_outgoing(h->base.root->factory, h->base.local_media,h->base.remote_media,h->result);
 	}else{
 		int i;
 		if (h->sdp_answer){
 			belle_sip_object_unref(h->sdp_answer);
 		}
-		offer_answer_initiate_incoming(h->base.local_media,h->base.remote_media,h->result,h->base.root->one_matching_codec);
+		offer_answer_initiate_incoming(h->base.root->factory, h->base.local_media,h->base.remote_media,h->result,h->base.root->one_matching_codec);
 		/*for backward compatibility purpose*/
 		if(h->cnx_ip_to_0000_if_sendonly_enabled && sal_media_description_has_dir(h->result,SalStreamSendOnly)) {
 			set_addr_to_0000(h->result->addr);
-			for(i=0;i<h->result->nb_streams;++i){
-				if (h->result->streams[i].dir == SalStreamSendOnly)
-						set_addr_to_0000(h->result->streams[i].rtp_addr);
-						set_addr_to_0000(h->result->streams[i].rtcp_addr);
+			for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
+				if (h->result->streams[i].dir == SalStreamSendOnly) {
+					set_addr_to_0000(h->result->streams[i].rtp_addr);
+					set_addr_to_0000(h->result->streams[i].rtcp_addr);
+				}
 			}
 		}
 		h->sdp_answer=(belle_sdp_session_description_t *)belle_sip_object_ref(media_description_to_sdp(h->result));
@@ -78,7 +80,7 @@ static void sdp_process(SalOp *h){
 		strcpy(h->result->addr,h->base.remote_media->addr);
 		h->result->bandwidth=h->base.remote_media->bandwidth;
 
-		for(i=0;i<h->result->nb_streams;++i){
+		for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
 			/*copy back parameters from remote description that we need in our result description*/
 			if (h->result->streams[i].rtp_port!=0){ /*if stream was accepted*/
 				strcpy(h->result->streams[i].rtp_addr,h->base.remote_media->streams[i].rtp_addr);
@@ -88,7 +90,7 @@ static void sdp_process(SalOp *h){
 				strcpy(h->result->streams[i].rtcp_addr,h->base.remote_media->streams[i].rtcp_addr);
 				h->result->streams[i].rtcp_port=h->base.remote_media->streams[i].rtcp_port;
 
-				if ((h->result->streams[i].proto == SalProtoRtpSavpf) || (h->result->streams[i].proto == SalProtoRtpSavp)) {
+				if (sal_stream_description_has_srtp(&h->result->streams[i])) {
 					h->result->streams[i].crypto[0] = h->base.remote_media->streams[i].crypto[0];
 				}
 			}
@@ -149,6 +151,7 @@ static void call_process_io_error(void *user_ctx, const belle_sip_io_error_event
 		/*call terminated very early*/
 		sal_error_info_set(&op->error_info,SalReasonIOError,503,"IO error",NULL);
 		op->base.root->callbacks.call_failure(op);
+		op->state = SalOpStateTerminating;
 		call_set_released(op);
 	} else {
 		/*dialog will terminated shortly, nothing to do*/
@@ -162,6 +165,14 @@ static void process_dialog_terminated(void *ctx, const belle_sip_dialog_terminat
 		ms_message("Dialog [%p] terminated for op [%p]",belle_sip_dialog_terminated_event_get_dialog(event),op);
 
 		switch(belle_sip_dialog_get_previous_state(op->dialog)) {
+			case BELLE_SIP_DIALOG_EARLY:
+			case BELLE_SIP_DIALOG_NULL:
+				if (op->state!=SalOpStateTerminated && op->state!=SalOpStateTerminating) {
+					/*this is an early termination due to incorrect response received*/
+					op->base.root->callbacks.call_failure(op);
+					op->state=SalOpStateTerminating;
+				}
+			break;
 			case BELLE_SIP_DIALOG_CONFIRMED:
 				if (op->state!=SalOpStateTerminated && op->state!=SalOpStateTerminating) {
 					/*this is probably a normal termination from a BYE*/
@@ -197,11 +208,31 @@ static void handle_sdp_from_response(SalOp* op,belle_sip_response_t* response) {
 	if (op->base.local_media) sdp_process(op);
 }
 
-static void cancelling_invite(SalOp* op ){
+void sal_call_cancel_invite(SalOp* op) {
 	belle_sip_request_t* cancel;
 	ms_message("Cancelling INVITE request from [%s] to [%s] ",sal_op_get_from(op), sal_op_get_to(op));
 	cancel = belle_sip_client_transaction_create_cancel(op->pending_client_trans);
-	sal_op_send_request(op,cancel);
+	if (cancel){
+		sal_op_send_request(op,cancel);
+	}else if (op->dialog){
+		belle_sip_dialog_state_t state = belle_sip_dialog_get_state(op->dialog);;
+		/*case where the response received is invalid (could not establish a dialog), but the transaction is not cancellable 
+		 * because already terminated*/
+		switch(state){
+			case BELLE_SIP_DIALOG_EARLY:
+			case BELLE_SIP_DIALOG_NULL:
+				/*force kill the dialog*/
+				ms_warning("op [%p]: force kill of dialog [%p]", op, op->dialog);
+				belle_sip_dialog_delete(op->dialog);
+			break;
+			default:
+			break;
+		}
+	}
+}
+
+static void cancelling_invite(SalOp *op) {
+	sal_call_cancel_invite(op);
 	op->state=SalOpStateTerminating;
 }
 
@@ -263,12 +294,12 @@ static void call_process_response(void *op_base, const belle_sip_response_event_
 					}
 					belle_sip_object_data_set(BELLE_SIP_OBJECT(dialog),"early_response",belle_sip_object_ref(response),belle_sip_object_unref);
 				} else if (code>=300){
-					call_set_error(op,response);
+					call_set_error(op, response, TRUE);
 					if (op->dialog==NULL) call_set_released(op);
 				}
 			} else if (code >=200
 						&& code<300
-						&& strcmp("UPDATE",belle_sip_request_get_method(req))==0) {
+						&& strcmp("UPDATE",method)==0) {
 					handle_sdp_from_response(op,response);
 					op->base.root->callbacks.call_accepted(op);
 			}
@@ -282,7 +313,7 @@ static void call_process_response(void *op_base, const belle_sip_response_event_
 						if (code >=200 && code<300) {
 							handle_sdp_from_response(op,response);
 							ack=belle_sip_dialog_create_ack(op->dialog,belle_sip_dialog_get_local_seq_number(op->dialog));
-							if (ack==NULL) {
+							if (ack == NULL) {
 								ms_error("This call has been already terminated.");
 								return ;
 							}
@@ -291,18 +322,19 @@ static void call_process_response(void *op_base, const belle_sip_response_event_
 								belle_sip_object_unref(op->sdp_answer);
 								op->sdp_answer=NULL;
 							}
+							belle_sip_message_add_header(BELLE_SIP_MESSAGE(ack),BELLE_SIP_HEADER(op->base.root->user_agent));
 							belle_sip_dialog_send_ack(op->dialog,ack);
 							op->base.root->callbacks.call_accepted(op); /*INVITE*/
 							op->state=SalOpStateActive;
 						}else if (code >= 300){
-							call_set_error(op,response);
+							call_set_error(op,response, FALSE);
 						}
 					}else if (strcmp("INFO",method)==0){
 						if (code == 491
 							&& (header_content_type = belle_sip_message_get_header_by_type(req,belle_sip_header_content_type_t))
 							&& strcmp("application",belle_sip_header_content_type_get_type(header_content_type))==0
 							&& strcmp("media_control+xml",belle_sip_header_content_type_get_subtype(header_content_type))==0) {
-							unsigned int retry_in =1000*((float)rand()/RAND_MAX);
+							unsigned int retry_in = (unsigned int)(1000*((float)rand()/RAND_MAX));
 							belle_sip_source_t *s=sal_create_timer(op->base.root,vfu_retry,sal_op_ref(op), retry_in, "vfu request retry");
 							ms_message("Rejected vfu request on op [%p], just retry in [%ui] ms",op,retry_in);
 							belle_sip_object_unref(s);
@@ -311,6 +343,8 @@ static void call_process_response(void *op_base, const belle_sip_response_event_
 						}
 					}else if (strcmp("UPDATE",method)==0){
 						op->base.root->callbacks.call_accepted(op); /*INVITE*/
+					}else if (strcmp("CANCEL",method)==0){
+						op->base.root->callbacks.call_cancel_done(op);
 					}
 				break;
 				case SalOpStateTerminating:
@@ -324,7 +358,7 @@ static void call_process_response(void *op_base, const belle_sip_response_event_
 		break;
 		case BELLE_SIP_DIALOG_TERMINATED: {
 			if (strcmp("INVITE",method)==0 && code >= 300){
-				call_set_error(op,response);
+				call_set_error(op,response, TRUE);
 			}
 		}
 		break;
@@ -345,6 +379,7 @@ static void call_process_timeout(void *user_ctx, const belle_sip_timeout_event_t
 		/*call terminated very early*/
 		sal_error_info_set(&op->error_info,SalReasonRequestTimeout,408,"Request timeout",NULL);
 		op->base.root->callbacks.call_failure(op);
+		op->state = SalOpStateTerminating;
 		call_set_released(op);
 	} else {
 		/*dialog will terminated shortly, nothing to do*/
@@ -357,6 +392,7 @@ static void call_process_transaction_terminated(void *user_ctx, const belle_sip_
 	belle_sip_server_transaction_t *server_transaction=belle_sip_transaction_terminated_event_get_server_transaction(event);
 	belle_sip_request_t* req;
 	belle_sip_response_t* resp;
+	int code = 0;
 	bool_t release_call=FALSE;
 
 	if (client_transaction) {
@@ -366,12 +402,20 @@ static void call_process_transaction_terminated(void *user_ctx, const belle_sip_
 		req=belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(server_transaction));
 		resp=belle_sip_transaction_get_response(BELLE_SIP_TRANSACTION(server_transaction));
 	}
-	if (op->state ==SalOpStateTerminating
+	if (resp) code = belle_sip_response_get_status_code(resp);
+	
+	if (op->state == SalOpStateTerminating
 			&& strcmp("BYE",belle_sip_request_get_method(req))==0
-			&& (!resp || (belle_sip_response_get_status_code(resp) !=401
-			&& belle_sip_response_get_status_code(resp) !=407))
+			&& (!resp || (belle_sip_response_get_status_code(resp) != 401
+			&& belle_sip_response_get_status_code(resp) != 407))
 			&& op->dialog==NULL) {
 		release_call=TRUE;
+	}else if (op->state == SalOpStateEarly && code < 200){
+		/*call terminated early*/
+		sal_error_info_set(&op->error_info,SalReasonIOError,503,"I/O error",NULL);
+		op->state = SalOpStateTerminating;
+		op->base.root->callbacks.call_failure(op);
+		release_call=TRUE;
 	}
 	if (server_transaction){
 		if (op->pending_server_trans==server_transaction){
@@ -388,6 +432,7 @@ static void call_process_transaction_terminated(void *user_ctx, const belle_sip_
 
 static void call_terminated(SalOp* op,belle_sip_server_transaction_t* server_transaction, belle_sip_request_t* request,int status_code) {
 	belle_sip_response_t* resp;
+	op->state = SalOpStateTerminating;
 	op->base.root->callbacks.call_terminated(op,op->dir==SalOpDirIncoming?sal_op_get_from(op):sal_op_get_to(op));
 	resp=sal_op_create_response_from_request(op,request,status_code);
 	belle_sip_server_transaction_send_response(server_transaction,resp);
@@ -457,6 +502,7 @@ static int process_sdp_for_invite(SalOp* op,belle_sip_request_t* invite) {
 	belle_sdp_session_description_t* sdp;
 	int err=0;
 	SalReason reason;
+
 	if (extract_sdp(op,BELLE_SIP_MESSAGE(invite),&sdp,&reason)==0) {
 		if (sdp){
 			op->sdp_offering=FALSE;
@@ -497,8 +543,9 @@ static void process_request_event(void *op_base, const belle_sip_request_event_t
 	belle_sip_header_t* call_info;
 	const char *method=belle_sip_request_get_method(req);
 	bool_t is_update=FALSE;
+	bool_t drop_op = FALSE;
 
-	if (strcmp("ACK",method)!=0){  /*ACK does'nt create srv transaction*/
+	if (strcmp("ACK",method)!=0){  /*ACK doesn't create a server transaction*/
 		server_transaction = belle_sip_provider_create_server_transaction(op->base.root->prov,belle_sip_request_event_get_request(event));
 		belle_sip_object_ref(server_transaction);
 		belle_sip_transaction_set_application_data(BELLE_SIP_TRANSACTION(server_transaction),sal_op_ref(op));
@@ -540,12 +587,14 @@ static void process_request_event(void *op_base, const belle_sip_request_event_t
 					}
 				}
 				op->base.root->callbacks.call_received(op);
+			}else{
+				/*the INVITE was declined by process_sdp_for_invite(). As we are not inside an established dialog, we can drop the op immediately*/
+				drop_op = TRUE;
 			}
 			break;
-		} /* else same behavior as for EARLY state*/
+		} /* else same behavior as for EARLY state, thus NO BREAK*/
 	}
 	case BELLE_SIP_DIALOG_EARLY: {
-		//hmm probably a cancel
 		if (strcmp("CANCEL",method)==0) {
 			if(belle_sip_request_event_get_server_transaction(event)) {
 				/*first answer 200 ok to cancel*/
@@ -629,15 +678,19 @@ static void process_request_event(void *op_base, const belle_sip_request_event_t
 
 				}
 			}else{
-				SalBody salbody;
-				if (sal_op_get_body(op,(belle_sip_message_t*)req,&salbody)) {
-					if (sal_body_has_type(&salbody,"application","dtmf-relay")){
+				belle_sip_message_t *msg = BELLE_SIP_MESSAGE(req);
+				belle_sip_body_handler_t *body_handler = BELLE_SIP_BODY_HANDLER(sal_op_get_body_handler(op, msg));
+				if (body_handler) {
+					belle_sip_header_content_type_t *content_type = belle_sip_message_get_header_by_type(msg, belle_sip_header_content_type_t);
+					if (content_type
+						&& (strcmp(belle_sip_header_content_type_get_type(content_type), "application") == 0)
+						&& (strcmp(belle_sip_header_content_type_get_subtype(content_type), "dtmf-relay") == 0)) {
 						char tmp[10];
-						if (sal_lines_get_value(salbody.data, "Signal",tmp, sizeof(tmp))){
+						if (sal_lines_get_value(belle_sip_message_get_body(msg), "Signal",tmp, sizeof(tmp))){
 							op->base.root->callbacks.dtmf_received(op,tmp[0]);
 						}
 					}else
-						op->base.root->callbacks.info_received(op,&salbody);
+						op->base.root->callbacks.info_received(op, (SalBodyHandler *)body_handler);
 				} else {
 					op->base.root->callbacks.info_received(op,NULL);
 				}
@@ -667,7 +720,7 @@ static void process_request_event(void *op_base, const belle_sip_request_event_t
 	}
 
 	if (server_transaction) belle_sip_object_unref(server_transaction);
-
+	if (drop_op) sal_op_release(op);
 }
 
 
@@ -832,9 +885,9 @@ int sal_call_accept(SalOp*h){
 		return -1;
 	}
 	ms_message("Accepting server transaction [%p] on op [%p]", transaction, h);
+
 	/* sends a 200 OK */
 	response = sal_op_create_response_from_request(h,belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(transaction)),200);
-
 	if (response==NULL){
 		ms_error("Fail to build answer for call");
 		return -1;
@@ -860,6 +913,9 @@ int sal_call_accept(SalOp*h){
 		belle_sip_object_unref(h->pending_update_server_trans);
 		h->pending_update_server_trans=NULL;
 	}
+	if (h->state == SalOpStateEarly){
+		h->state = SalOpStateActive;
+	}
 	return 0;
 }
 
@@ -936,7 +992,7 @@ int sal_call_send_dtmf(SalOp *h, char dtmf){
 	if (h->dialog && (belle_sip_dialog_get_state(h->dialog) == BELLE_SIP_DIALOG_CONFIRMED || belle_sip_dialog_get_state(h->dialog) == BELLE_SIP_DIALOG_EARLY)){
 		belle_sip_request_t *req=belle_sip_dialog_create_queued_request(h->dialog,"INFO");
 		if (req){
-			int bodylen;
+			size_t bodylen;
 			char dtmf_body[128]={0};
 
 			snprintf(dtmf_body, sizeof(dtmf_body)-1, "Signal=%c\r\nDuration=250\r\n", dtmf);
@@ -1037,6 +1093,24 @@ int sal_call_is_offerer(const SalOp *h){
 	return h->sdp_offering;
 }
 
+bool_t sal_call_compare_op(const SalOp *op1, const SalOp *op2) {
+	if (strcmp(op1->base.call_id, op2->base.call_id) == 0) return TRUE;
+	return FALSE;
+}
 
+bool_t sal_call_dialog_request_pending(const SalOp *op) {
+	return belle_sip_dialog_request_pending(op->dialog) ? TRUE : FALSE;
+}
 
+const char * sal_call_get_local_tag(SalOp *op) {
+	return belle_sip_dialog_get_local_tag(op->dialog);
+}
 
+const char * sal_call_get_remote_tag(SalOp *op) {
+	return belle_sip_dialog_get_remote_tag(op->dialog);
+}
+
+void sal_call_set_replaces(SalOp *op, const char *call_id, const char *from_tag, const char *to_tag) {
+	belle_sip_header_replaces_t *replaces = belle_sip_header_replaces_create(call_id, from_tag, to_tag);
+	sal_op_set_replaces(op, replaces);
+}
diff --git a/coreapi/bellesip_sal/sal_op_call_transfer.c b/coreapi/bellesip_sal/sal_op_call_transfer.c
index ad9da3d5d..8adb8564f 100644
--- a/coreapi/bellesip_sal/sal_op_call_transfer.c
+++ b/coreapi/bellesip_sal/sal_op_call_transfer.c
@@ -22,13 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
 /*call transfer*/
-static void sal_op_set_replaces(SalOp* op,belle_sip_header_replaces_t* replaces) {
-	if (op->replaces){
-		belle_sip_object_unref(op->replaces);
-	}
-	op->replaces=replaces;
-	belle_sip_object_ref(op->replaces);
-}
 static void sal_op_set_referred_by(SalOp* op,belle_sip_header_referred_by_t* referred_by) {
 	if (op->referred_by){
 		belle_sip_object_unref(op->referred_by);
@@ -40,7 +33,7 @@ static void sal_op_set_referred_by(SalOp* op,belle_sip_header_referred_by_t* ref
 
 int sal_call_refer_to(SalOp *op, belle_sip_header_refer_to_t* refer_to, belle_sip_header_referred_by_t* referred_by){
 	char* tmp;
-	belle_sip_request_t* req=op->dialog?belle_sip_dialog_create_request(op->dialog,"REFER"):NULL; /*cannot create request if dialog not set yet*/
+	belle_sip_request_t* req=op->dialog?belle_sip_dialog_create_request(op->dialog,"REFER"):sal_op_build_request(op, "REFER");
 	if (!req) {
 		tmp=belle_sip_uri_to_string(belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(refer_to)));
 		ms_error("Cannot refer to [%s] for op [%p]",tmp,op);
@@ -88,14 +81,19 @@ int sal_call_refer_with_replaces(SalOp *op, SalOp *other_call_op){
 
 	refer_to=belle_sip_header_refer_to_create(belle_sip_dialog_get_remote_party(other_call_op->dialog));
 	belle_sip_parameters_clean(BELLE_SIP_PARAMETERS(refer_to));
-	if (belle_sip_dialog_is_server(other_call_op->dialog)) {
-		to_tag=belle_sip_dialog_get_local_tag(other_call_op->dialog);
-		from_tag=belle_sip_dialog_get_remote_tag(other_call_op->dialog);;
-
-	} else {
-		from_tag=belle_sip_dialog_get_local_tag(other_call_op->dialog);
-		to_tag=belle_sip_dialog_get_remote_tag(other_call_op->dialog);;
-	}
+	/*rfc3891
+	 ...
+	 4.  User Agent Client Behavior: Sending a Replaces Header
+	 
+	 A User Agent that wishes to replace a single existing early or
+	 confirmed dialog with a new dialog of its own, MAY send the target
+	 User Agent an INVITE request containing a Replaces header field.  The
+	 User Agent Client (UAC) places the Call-ID, to-tag, and from-tag
+	 information for the target dialog in a single Replaces header field
+	 and sends the new INVITE to the target.*/
+	from_tag=belle_sip_dialog_get_local_tag(other_call_op->dialog);
+	to_tag=belle_sip_dialog_get_remote_tag(other_call_op->dialog);
+	
 	replaces=belle_sip_header_replaces_create(belle_sip_header_call_id_get_call_id(belle_sip_dialog_get_call_id(other_call_op->dialog))
 											,from_tag,to_tag);
 	escaped_replaces=belle_sip_header_replaces_value_to_escaped_string(replaces);
@@ -121,11 +119,30 @@ int sal_call_set_referer(SalOp *h, SalOp *refered_call){
 /* returns the SalOp of a call that should be replaced by h, if any */
 SalOp *sal_call_get_replaces(SalOp *op){
 	if (op && op->replaces){
+		/*rfc3891
+		 3.  User Agent Server Behavior: Receiving a Replaces Header
+			
+		 The Replaces header contains information used to match an existing
+		 SIP dialog (call-id, to-tag, and from-tag).  Upon receiving an INVITE
+		 with a Replaces header, the User Agent (UA) attempts to match this
+		 information with a confirmed or early dialog.  The User Agent Server
+		 (UAS) matches the to-tag and from-tag parameters as if they were tags
+		 present in an incoming request.  In other words, the to-tag parameter
+		 is compared to the local tag, and the from-tag parameter is compared
+		 to the remote tag.
+		 */
 		belle_sip_dialog_t* dialog=belle_sip_provider_find_dialog(op->base.root->prov
 								,belle_sip_header_replaces_get_call_id(op->replaces)
-								,belle_sip_header_replaces_get_from_tag(op->replaces)
-								,belle_sip_header_replaces_get_to_tag(op->replaces));
+								,belle_sip_header_replaces_get_to_tag(op->replaces)
+								,belle_sip_header_replaces_get_from_tag(op->replaces));
 
+		if (!dialog) {
+			/*for backward compatibility with liblinphone <= 3.10.2-243 */
+			dialog=belle_sip_provider_find_dialog(op->base.root->prov
+												  ,belle_sip_header_replaces_get_call_id(op->replaces)
+												  ,belle_sip_header_replaces_get_from_tag(op->replaces)
+												  ,belle_sip_header_replaces_get_to_tag(op->replaces));
+		}
 		if (dialog) {
 			return (SalOp*)belle_sip_dialog_get_application_data(dialog);
 		}
diff --git a/coreapi/bellesip_sal/sal_op_events.c b/coreapi/bellesip_sal/sal_op_events.c
index e6b456042..1d03c09a5 100644
--- a/coreapi/bellesip_sal/sal_op_events.c
+++ b/coreapi/bellesip_sal/sal_op_events.c
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 #include "sal_impl.h"
 
-SalSubscribeStatus get_subscription_state(belle_sip_message_t *msg){
+SalSubscribeStatus belle_sip_message_get_subscription_state(const belle_sip_message_t *msg){
 	belle_sip_header_subscription_state_t* subscription_state_header=belle_sip_message_get_header_by_type(msg,belle_sip_header_subscription_state_t);
 	SalSubscribeStatus sss=SalSubscribeNone;
 	if (subscription_state_header){
@@ -35,7 +35,7 @@ SalSubscribeStatus get_subscription_state(belle_sip_message_t *msg){
 static void subscribe_refresher_listener (belle_sip_refresher_t* refresher
 		,void* user_pointer
 		,unsigned int status_code
-		,const char* reason_phrase) {
+		,const char* reason_phrase, int will_retry) {
 	SalOp* op = (SalOp*)user_pointer;
 	belle_sip_transaction_t *tr=BELLE_SIP_TRANSACTION(belle_sip_refresher_get_transaction(refresher));
 	/*belle_sip_response_t* response=belle_sip_transaction_get_response(tr);*/
@@ -46,10 +46,14 @@ static void subscribe_refresher_listener (belle_sip_refresher_t* refresher
 		if (status_code==200) sss=SalSubscribeActive;
 		else if (status_code==202) sss=SalSubscribePending;
 		set_or_update_dialog(op,belle_sip_transaction_get_dialog(tr));
-	}
-	if (status_code>=200){
-		sal_error_info_set(&op->error_info,SalReasonUnknown,status_code,reason_phrase,NULL);
-		op->base.root->callbacks.subscribe_response(op,sss);
+		op->base.root->callbacks.subscribe_response(op,sss, will_retry);
+	} else if (status_code >= 300) {
+		SalReason reason = SalReasonUnknown;
+		if (status_code == 503) { /*refresher returns 503 for IO error*/
+			reason = SalReasonIOError;
+		}
+		sal_error_info_set(&op->error_info,reason,status_code,reason_phrase,NULL);
+		op->base.root->callbacks.subscribe_response(op,sss, will_retry);
 	}else if (status_code==0){
 		op->base.root->callbacks.on_expire(op);
 	}
@@ -57,27 +61,86 @@ static void subscribe_refresher_listener (belle_sip_refresher_t* refresher
 }
 
 static void subscribe_process_io_error(void *user_ctx, const belle_sip_io_error_event_t *event){
-	ms_error("subscribe_process_io_error not implemented yet");
+	SalOp *op = (SalOp*)user_ctx;
+	belle_sip_object_t *src = belle_sip_io_error_event_get_source(event);
+	if (BELLE_SIP_OBJECT_IS_INSTANCE_OF(src, belle_sip_client_transaction_t)){
+		belle_sip_client_transaction_t *tr = BELLE_SIP_CLIENT_TRANSACTION(src);
+		belle_sip_request_t* req = belle_sip_transaction_get_request((belle_sip_transaction_t*)tr);
+		const char *method=belle_sip_request_get_method(req);
+	
+		if (!op->dialog) {
+			/*this is handling outgoing out-of-dialog notifies*/
+			if (strcmp(method,"NOTIFY")==0){
+				SalErrorInfo *ei=&op->error_info;
+				sal_error_info_set(ei,SalReasonIOError,0,NULL,NULL);
+				op->base.root->callbacks.on_notify_response(op);
+			}
+		}
+	}
 }
 
 static void subscribe_process_dialog_terminated(void *ctx, const belle_sip_dialog_terminated_event_t *event) {
+	belle_sip_dialog_t *dialog = belle_sip_dialog_terminated_event_get_dialog(event);
 	SalOp* op= (SalOp*)ctx;
 	if (op->dialog) {
-		op->dialog=NULL;
-		sal_op_unref(op);
+		if (belle_sip_dialog_terminated_event_is_expired(event)){
+			if (!belle_sip_dialog_is_server(dialog)){
+				/*notify the app that our subscription is dead*/
+				const char *eventname = NULL;
+				if (op->event){
+					eventname = belle_sip_header_event_get_package_name(op->event);
+				}
+				op->base.root->callbacks.notify(op, SalSubscribeTerminated, eventname, NULL);
+			}else{
+				op->base.root->callbacks.incoming_subscribe_closed(op);
+			}
+		}
+		set_or_update_dialog(op, NULL);
 	}
 }
 
 static void subscribe_response_event(void *op_base, const belle_sip_response_event_t *event){
+	SalOp *op = (SalOp*)op_base;
+	belle_sip_request_t * req;
+	const char *method;
+	belle_sip_client_transaction_t *tr =  belle_sip_response_event_get_client_transaction(event);
+
+	if (!tr) return;
+	req = belle_sip_transaction_get_request((belle_sip_transaction_t*)tr);
+	method = belle_sip_request_get_method(req);
+	
+	if (!op->dialog) {
+		if (strcmp(method,"NOTIFY")==0){
+			sal_op_set_error_info_from_response(op,belle_sip_response_event_get_response(event));
+			op->base.root->callbacks.on_notify_response(op);
+		}
+	}
 }
 
 static void subscribe_process_timeout(void *user_ctx, const belle_sip_timeout_event_t *event) {
+	SalOp *op = (SalOp*)user_ctx;
+	belle_sip_request_t * req;
+	const char *method;
+	belle_sip_client_transaction_t *tr =  belle_sip_timeout_event_get_client_transaction(event);
+
+	if (!tr) return;
+	req = belle_sip_transaction_get_request((belle_sip_transaction_t*)tr);
+	method = belle_sip_request_get_method(req);
+	
+	if (!op->dialog) {
+		/*this is handling outgoing out-of-dialog notifies*/
+		if (strcmp(method,"NOTIFY")==0){
+			SalErrorInfo *ei=&op->error_info;
+			sal_error_info_set(ei,SalReasonRequestTimeout,0,NULL,NULL);
+			op->base.root->callbacks.on_notify_response(op);
+		}
+	}
 }
 
 static void subscribe_process_transaction_terminated(void *user_ctx, const belle_sip_transaction_terminated_event_t *event) {
 }
 
-static void handle_notify(SalOp *op, belle_sip_request_t *req, const char *eventname, SalBody * body){
+static void handle_notify(SalOp *op, belle_sip_request_t *req, const char *eventname, SalBodyHandler* body_handler){
 	SalSubscribeStatus sub_state;
 	belle_sip_header_subscription_state_t* subscription_state_header=belle_sip_message_get_header_by_type(req,belle_sip_header_subscription_state_t);
 	belle_sip_response_t* resp;
@@ -89,7 +152,7 @@ static void handle_notify(SalOp *op, belle_sip_request_t *req, const char *event
 	} else
 		sub_state=SalSubscribeActive;
 	sal_op_ref(op);
-	op->base.root->callbacks.notify(op,sub_state,eventname,body);
+	op->base.root->callbacks.notify(op,sub_state,eventname,body_handler);
 	resp=sal_op_create_response_from_request(op,req,200);
 	belle_sip_server_transaction_send_response(server_transaction,resp);
 	sal_op_unref(op);
@@ -101,39 +164,46 @@ static void subscribe_process_request_event(void *op_base, const belle_sip_reque
 	belle_sip_request_t* req = belle_sip_request_event_get_request(event);
 	belle_sip_dialog_state_t dialog_state;
 	belle_sip_header_expires_t* expires = belle_sip_message_get_header_by_type(req,belle_sip_header_expires_t);
-	belle_sip_header_t *event_header;
-	SalBody body;
+	belle_sip_header_event_t *event_header;
+	belle_sip_body_handler_t *body_handler;
 	belle_sip_response_t* resp;
 	const char *eventname=NULL;
 	const char *method=belle_sip_request_get_method(req);
+	belle_sip_dialog_t *dialog = NULL;
 	
 	belle_sip_object_ref(server_transaction);
 	if (op->pending_server_trans)  belle_sip_object_unref(op->pending_server_trans);
 	op->pending_server_trans=server_transaction;
 
-	event_header=belle_sip_message_get_header((belle_sip_message_t*)req,"Event");
-	sal_op_get_body(op,(belle_sip_message_t*)req,&body);
+	event_header=belle_sip_message_get_header_by_type(req,belle_sip_header_event_t);
+	body_handler = BELLE_SIP_BODY_HANDLER(sal_op_get_body_handler(op, BELLE_SIP_MESSAGE(req)));
 	
 	if (event_header==NULL){
 		ms_warning("No event header in incoming SUBSCRIBE.");
 		resp=sal_op_create_response_from_request(op,req,400);
 		belle_sip_server_transaction_send_response(server_transaction,resp);
+		if (!op->dialog) sal_op_release(op);
 		return;
 	}
 	if (op->event==NULL) {
 		op->event=event_header;
 		belle_sip_object_ref(op->event);
 	}
-	eventname=belle_sip_header_get_unparsed_value(event_header);
+	eventname=belle_sip_header_event_get_package_name(event_header);
 	
 	if (!op->dialog) {
 		if (strcmp(method,"SUBSCRIBE")==0){
-			op->dialog=belle_sip_provider_create_dialog(op->base.root->prov,BELLE_SIP_TRANSACTION(server_transaction));
-			belle_sip_dialog_set_application_data(op->dialog,op);
-			sal_op_ref(op);
+			dialog = belle_sip_provider_create_dialog(op->base.root->prov,BELLE_SIP_TRANSACTION(server_transaction));
+			if (!dialog){
+				resp=sal_op_create_response_from_request(op,req,481);
+				belle_sip_server_transaction_send_response(server_transaction,resp);
+				sal_op_release(op);
+				return;
+			}
+			set_or_update_dialog(op, dialog);
 			ms_message("new incoming subscription from [%s] to [%s]",sal_op_get_from(op),sal_op_get_to(op));
 		}else{ /*this is a NOTIFY*/
-			handle_notify(op,req,eventname,&body);
+			handle_notify(op, req, eventname, (SalBodyHandler *)body_handler);
 			return;
 		}
 	}
@@ -141,7 +211,10 @@ static void subscribe_process_request_event(void *op_base, const belle_sip_reque
 	switch(dialog_state) {
 
 	case BELLE_SIP_DIALOG_NULL: {
-		op->base.root->callbacks.subscribe_received(op,eventname,body.type ? &body : NULL);
+		const char *type = NULL;
+		belle_sip_header_content_type_t *content_type = belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(req), belle_sip_header_content_type_t);
+		if (content_type) type = belle_sip_header_content_type_get_type(content_type);
+		op->base.root->callbacks.subscribe_received(op, eventname, type ? (SalBodyHandler *)body_handler : NULL);
 		break;
 	}
 	case BELLE_SIP_DIALOG_EARLY:
@@ -150,7 +223,7 @@ static void subscribe_process_request_event(void *op_base, const belle_sip_reque
 
 	case BELLE_SIP_DIALOG_CONFIRMED:
 		if (strcmp("NOTIFY",method)==0) {
-			handle_notify(op,req,eventname,&body);
+			handle_notify(op, req, eventname, (SalBodyHandler *)body_handler);
 		} else if (strcmp("SUBSCRIBE",method)==0) {
 			/*either a refresh of an unsubscribe*/
 			if (expires && belle_sip_header_expires_get_expires(expires)>0) {
@@ -160,7 +233,7 @@ static void subscribe_process_request_event(void *op_base, const belle_sip_reque
 				ms_message("Unsubscribe received from [%s]",sal_op_get_from(op));
 				resp=sal_op_create_response_from_request(op,req,200);
 				belle_sip_server_transaction_send_response(server_transaction,resp);
-				op->base.root->callbacks.subscribe_closed(op);
+				op->base.root->callbacks.incoming_subscribe_closed(op);
 			}
 		}
 		break;
@@ -172,6 +245,18 @@ static void subscribe_process_request_event(void *op_base, const belle_sip_reque
 
 static belle_sip_listener_callbacks_t op_subscribe_callbacks={ 0 };
 
+/*Invoke when sal_op_release is called by upper layer*/
+static void sal_op_release_cb(struct SalOpBase* op_base) {
+	SalOp *op =(SalOp*)op_base;
+	if(op->refresher) {
+		belle_sip_refresher_stop(op->refresher);
+		belle_sip_object_unref(op->refresher);
+		op->refresher=NULL;
+		set_or_update_dialog(op,NULL); /*only if we have refresher. else dialog terminated event will remove association*/
+	}
+	
+}
+
 void sal_op_subscribe_fill_cbs(SalOp*op) {
 	if (op_subscribe_callbacks.process_io_error==NULL){
 		op_subscribe_callbacks.process_io_error=subscribe_process_io_error;
@@ -183,10 +268,11 @@ void sal_op_subscribe_fill_cbs(SalOp*op) {
 	}
 	op->callbacks=&op_subscribe_callbacks;
 	op->type=SalOpSubscribe;
+	op->base.release_cb=sal_op_release_cb;
 }
 
 
-int sal_subscribe(SalOp *op, const char *from, const char *to, const char *eventname, int expires, const SalBody *body){
+int sal_subscribe(SalOp *op, const char *from, const char *to, const char *eventname, int expires, const SalBodyHandler *body_handler){
 	belle_sip_request_t *req=NULL;
 	
 	if (from)
@@ -196,25 +282,20 @@ int sal_subscribe(SalOp *op, const char *from, const char *to, const char *event
 	
 	if (!op->dialog){
 		sal_op_subscribe_fill_cbs(op);
-		/*???sal_exosip_fix_route(op); make sure to ha ;lr*/
 		req=sal_op_build_request(op,"SUBSCRIBE");
 		if( req == NULL ) {
 			return -1;
 		}
-		if (eventname){
-			if (op->event) belle_sip_object_unref(op->event);
-			op->event=belle_sip_header_create("Event",eventname);
-			belle_sip_object_ref(op->event);
-		}
-		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),op->event);
+		sal_op_set_event(op, eventname);
+		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(op->event));
 		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_expires_create(expires)));
-		sal_op_add_body(op,(belle_sip_message_t*)req,body);
+		belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(req), BELLE_SIP_BODY_HANDLER(body_handler));
 		return sal_op_send_and_create_refresher(op,req,expires,subscribe_refresher_listener);
 	}else if (op->refresher){
 		const belle_sip_transaction_t *tr=(const belle_sip_transaction_t*) belle_sip_refresher_get_transaction(op->refresher);
 		belle_sip_request_t *last_req=belle_sip_transaction_get_request(tr);
 		/* modify last request to update body*/
-		sal_op_add_body(op,(belle_sip_message_t*)last_req,body);
+		belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(last_req), BELLE_SIP_BODY_HANDLER(body_handler));
 		return belle_sip_refresher_refresh(op->refresher,expires);
 	}
 	ms_warning("sal_subscribe(): no dialog and no refresher ?");
@@ -225,7 +306,7 @@ int sal_unsubscribe(SalOp *op){
 	if (op->refresher){
 		const belle_sip_transaction_t *tr=(const belle_sip_transaction_t*) belle_sip_refresher_get_transaction(op->refresher);
 		belle_sip_request_t *last_req=belle_sip_transaction_get_request(tr);
-		sal_op_add_body(op,(belle_sip_message_t*)last_req,NULL);
+		belle_sip_message_set_body(BELLE_SIP_MESSAGE(last_req), NULL, 0);
 		belle_sip_refresher_refresh(op->refresher,0);
 		return 0;
 	}
@@ -241,6 +322,29 @@ int sal_subscribe_accept(SalOp *op){
 	return 0;
 }
 
+int sal_notify_pending_state(SalOp *op){
+	
+	if (op->dialog != NULL && op->pending_server_trans) {
+		belle_sip_request_t* notify;
+		belle_sip_header_subscription_state_t* sub_state;
+		ms_message("Sending NOTIFY with subscription state pending for op [%p]",op);
+		if (!(notify=belle_sip_dialog_create_request(op->dialog,"NOTIFY"))) {
+			ms_error("Cannot create NOTIFY on op [%p]",op);
+			return -1;
+		}
+		if (op->event) belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify),BELLE_SIP_HEADER(op->event));
+		sub_state=belle_sip_header_subscription_state_new();
+		belle_sip_header_subscription_state_set_state(sub_state,BELLE_SIP_SUBSCRIPTION_STATE_PENDING);
+		belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify), BELLE_SIP_HEADER(sub_state));
+		return sal_op_send_request(op,notify);
+	} else {
+		ms_warning("NOTIFY with subscription state pending for op [%p] not implemented in this case (either dialog pending trans does not exist",op);
+	}
+	
+	return 0;
+}
+
+
 int sal_subscribe_decline(SalOp *op, SalReason reason){
 	belle_sip_response_t*  resp = belle_sip_response_create_from_request(belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(op->pending_server_trans)),
 									   sal_reason_to_sip_code(reason));
@@ -248,19 +352,24 @@ int sal_subscribe_decline(SalOp *op, SalReason reason){
 	return 0;
 }
 
-int sal_notify(SalOp *op, const SalBody *body){
+int sal_notify(SalOp *op, const SalBodyHandler *body_handler){
 	belle_sip_request_t* notify;
 	
-	if (!op->dialog) return -1;
-	
-	if (!(notify=belle_sip_dialog_create_queued_request(op->dialog,"NOTIFY"))) return -1;
+	if (op->dialog){
+		if (!(notify=belle_sip_dialog_create_queued_request(op->dialog,"NOTIFY"))) return -1;
+	}else{
+		sal_op_subscribe_fill_cbs(op);
+		notify = sal_op_build_request(op, "NOTIFY");
+	}
 
-	if (op->event) belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify),op->event);
+	if (op->event) belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify),BELLE_SIP_HEADER(op->event));
 
 	belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify)
-			,BELLE_SIP_HEADER(belle_sip_header_subscription_state_create(BELLE_SIP_SUBSCRIPTION_STATE_ACTIVE,600)));
-	
-	sal_op_add_body(op,(belle_sip_message_t*)notify, body);
+			,op->dialog ? 
+				BELLE_SIP_HEADER(belle_sip_header_subscription_state_create(BELLE_SIP_SUBSCRIPTION_STATE_ACTIVE,600)) :
+				BELLE_SIP_HEADER(belle_sip_header_subscription_state_create(BELLE_SIP_SUBSCRIPTION_STATE_TERMINATED,0))
+				);
+	belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(notify), BELLE_SIP_BODY_HANDLER(body_handler));
 	return sal_op_send_request(op,notify);
 }
 
@@ -268,7 +377,7 @@ int sal_notify_close(SalOp *op){
 	belle_sip_request_t* notify;
 	if (!op->dialog) return -1;
 	if (!(notify=belle_sip_dialog_create_queued_request(op->dialog,"NOTIFY"))) return -1;
-	if (op->event) belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify),op->event);
+	if (op->event) belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify),BELLE_SIP_HEADER(op->event));
 	belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify)
 		,BELLE_SIP_HEADER(belle_sip_header_subscription_state_create(BELLE_SIP_SUBSCRIPTION_STATE_TERMINATED,-1)));
 	return sal_op_send_request(op,notify);
diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index 41413637c..634bd22fb 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -30,14 +30,22 @@ SalOp * sal_op_new(Sal *sal){
 	return op;
 }
 
+void sal_op_kill_dialog(SalOp *op) {
+	ms_warning("op [%p]: force kill of dialog [%p]", op, op->dialog);
+	belle_sip_dialog_delete(op->dialog);
+}
+
 void sal_op_release(SalOp *op){
 	/*if in terminating state, keep this state because it means we are waiting for a response to be able to terminate the operation.*/
 	if (op->state!=SalOpStateTerminating)
 		op->state=SalOpStateTerminated;
 	sal_op_set_user_pointer(op,NULL);/*mandatory because releasing op doesn't not mean freeing op. Make sure back pointer will not be used later*/
+	if (op->base.release_cb)
+		op->base.release_cb(&op->base);
 	if (op->refresher) {
 		belle_sip_refresher_stop(op->refresher);
 	}
+	op->op_released = TRUE;
 	sal_op_unref(op);
 }
 
@@ -72,7 +80,7 @@ void sal_op_authenticate(SalOp *op, const SalAuthInfo *info){
 		/*Registration authenticate is just about registering again*/
 		sal_register_refresh(op,-1);
 	}else {
-		/*for sure auth info will be accesible from the provider*/
+		/*for sure auth info will be accessible from the provider*/
 		sal_process_authentication(op);
 	}
 	return ;
@@ -162,7 +170,7 @@ belle_sip_request_t* sal_op_build_request(SalOp *op,const char* method) {
 		ms_error("No To: address, cannot build request");
 		return NULL;
 	}
-	
+
 	to_uri = belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(to_address));
 	if( to_uri == NULL ){
 		ms_error("To: address is invalid, cannot build request");
@@ -232,6 +240,14 @@ int sal_ping(SalOp *op, const char *from, const char *to){
 	return sal_op_send_request(op,sal_op_build_request(op,"OPTIONS"));
 }
 
+void sal_op_set_replaces(SalOp* op,belle_sip_header_replaces_t* replaces) {
+	if (op->replaces){
+		belle_sip_object_unref(op->replaces);
+	}
+	op->replaces=replaces;
+	belle_sip_object_ref(op->replaces);
+}
+
 void sal_op_set_remote_ua(SalOp*op,belle_sip_message_t* message) {
 	belle_sip_header_user_agent_t* user_agent=belle_sip_message_get_header_by_type(message,belle_sip_header_user_agent_t);
 	char user_agent_string[256];
@@ -339,6 +355,9 @@ static int _sal_op_send_request_with_contact(SalOp* op, belle_sip_request_t* req
 			}
 #endif
 		}
+		/*because in case of tunnel, transport can be changed*/
+		transport=belle_sip_uri_get_transport_param(next_hop_uri);
+		
 		if ((strcmp(method,"REGISTER")==0 || strcmp(method,"SUBSCRIBE")==0) && transport &&
 			(strcasecmp(transport,"TCP")==0 || strcasecmp(transport,"TLS")==0)){
 			/*RFC 5923: add 'alias' parameter to tell the server that we want it to keep the connection for future requests*/
@@ -392,7 +411,7 @@ int sal_op_send_request(SalOp* op, belle_sip_request_t* request)  {
 	return _sal_op_send_request_with_contact(op, request,need_contact);
 }
 
-SalReason sal_reason_to_sip_code(SalReason r){
+int sal_reason_to_sip_code(SalReason r){
 	int ret=500;
 	switch(r){
 		case SalReasonNone:
@@ -517,14 +536,14 @@ SalReason _sal_reason_from_sip_code(int code) {
 		return SalReasonNotImplemented;
 	case 502:
 		return SalReasonBadGateway;
+	case 503:
+		return SalReasonServiceUnavailable;
 	case 504:
 		return SalReasonServerTimeout;
 	case 600:
 		return SalReasonDoNotDisturb;
 	case 603:
 		return SalReasonDeclined;
-	case 503:
-		return SalReasonServiceUnavailable;
 	default:
 		return SalReasonUnknown;
 	}
@@ -700,55 +719,21 @@ void sal_op_assign_recv_headers(SalOp *op, belle_sip_message_t *incoming){
 const char *sal_op_get_remote_contact(const SalOp *op){
 	/*
 	 * remote contact is filled in process_response
-	 * return sal_custom_header_find(op->base.recv_custom_headers,"Contact");
 	 */
 	return op->base.remote_contact;
 }
 
-void sal_op_add_body(SalOp *op, belle_sip_message_t *req, const SalBody *body){
-	belle_sip_message_remove_header((belle_sip_message_t*)req,"Content-type");
-	belle_sip_message_remove_header((belle_sip_message_t*)req,"Content-length");
-	belle_sip_message_remove_header((belle_sip_message_t*)req,"Content-encoding");
-	belle_sip_message_set_body((belle_sip_message_t*)req,NULL,0);
-	if (body && body->type && body->subtype && body->data){
-		belle_sip_message_add_header((belle_sip_message_t*)req,
-			(belle_sip_header_t*)belle_sip_header_content_type_create(body->type,body->subtype));
-		belle_sip_message_add_header((belle_sip_message_t*)req,
-			(belle_sip_header_t*)belle_sip_header_content_length_create(body->size));
-		belle_sip_message_set_body((belle_sip_message_t*)req,(const char*)body->data,body->size);
-		if (body->encoding){
-			belle_sip_message_add_header((belle_sip_message_t*)req,(belle_sip_header_t*)
-				belle_sip_header_create("Content-encoding",body->encoding));
-		}
+SalBodyHandler * sal_op_get_body_handler(SalOp *op, belle_sip_message_t *msg) {
+	belle_sip_body_handler_t *body_handler = belle_sip_message_get_body_handler(msg);
+	if (body_handler != NULL) {
+		belle_sip_header_content_type_t *content_type = belle_sip_message_get_header_by_type(msg, belle_sip_header_content_type_t);
+		belle_sip_header_content_length_t *content_length = belle_sip_message_get_header_by_type(msg, belle_sip_header_content_length_t);
+		belle_sip_header_t *content_encoding = belle_sip_message_get_header(msg, "Content-Encoding");
+		if (content_type != NULL) belle_sip_body_handler_add_header(body_handler, BELLE_SIP_HEADER(content_type));
+		if (content_length != NULL) belle_sip_body_handler_add_header(body_handler, BELLE_SIP_HEADER(content_length));
+		if (content_encoding != NULL) belle_sip_body_handler_add_header(body_handler, content_encoding);
 	}
-}
-
-
-bool_t sal_op_get_body(SalOp *op, belle_sip_message_t *msg, SalBody *salbody){
-	const char *body = NULL;
-	belle_sip_header_content_type_t *content_type;
-	belle_sip_header_content_length_t *clen=NULL;
-	belle_sip_header_t *content_encoding;
-
-	content_type=belle_sip_message_get_header_by_type(msg,belle_sip_header_content_type_t);
-	if (content_type){
-		body=belle_sip_message_get_body(msg);
-		clen=belle_sip_message_get_header_by_type(msg,belle_sip_header_content_length_t);
-	}
-	content_encoding=belle_sip_message_get_header(msg,"Content-encoding");
-
-	memset(salbody,0,sizeof(SalBody));
-
-	if (content_type && body && clen) {
-		salbody->type=belle_sip_header_content_type_get_type(content_type);
-		salbody->subtype=belle_sip_header_content_type_get_subtype(content_type);
-		salbody->data=body;
-		salbody->size=belle_sip_header_content_length_get_content_length(clen);
-		if (content_encoding)
-			salbody->encoding=belle_sip_header_get_unparsed_value(content_encoding);
-		return TRUE;
-	}
-	return FALSE;
+	return (SalBodyHandler *)body_handler;
 }
 
 void sal_op_set_privacy(SalOp* op,SalPrivacyMask privacy) {
@@ -769,10 +754,10 @@ void sal_op_set_manual_refresher_mode(SalOp *op, bool_t enabled){
 	op->manual_refresher=enabled;
 }
 
-bool_t sal_op_is_ipv6(SalOp *op){
+int sal_op_get_address_family(SalOp *op){
 	belle_sip_transaction_t *tr=NULL;
 	belle_sip_header_address_t *contact;
-	belle_sip_request_t *req;
+	
 
 	if (op->refresher)
 		tr=(belle_sip_transaction_t *)belle_sip_refresher_get_transaction(op->refresher);
@@ -781,17 +766,29 @@ bool_t sal_op_is_ipv6(SalOp *op){
 		tr=(belle_sip_transaction_t *)op->pending_client_trans;
 	if (tr==NULL)
 		tr=(belle_sip_transaction_t *)op->pending_server_trans;
-
+	
 	if (tr==NULL){
 		ms_error("Unable to determine IP version from signaling operation.");
-		return FALSE;
+		return AF_UNSPEC;
 	}
-	req=belle_sip_transaction_get_request(tr);
-	contact=(belle_sip_header_address_t*)belle_sip_message_get_header_by_type(req,belle_sip_header_contact_t);
-	if (!contact){
-		ms_error("Unable to determine IP version from signaling operation, no contact header found.");
+	
+	
+	if (op->refresher) {
+		belle_sip_response_t *resp = belle_sip_transaction_get_response(tr);
+		belle_sip_header_via_t *via = resp ?belle_sip_message_get_header_by_type(resp,belle_sip_header_via_t):NULL;
+		if (!via){
+			ms_error("Unable to determine IP version from signaling operation, no via header found.");
+			return AF_UNSPEC;
+		}
+		return (strchr(belle_sip_header_via_get_host(via),':') != NULL) ? AF_INET6 : AF_INET;
+	} else {
+		belle_sip_request_t *req = belle_sip_transaction_get_request(tr);
+		contact=(belle_sip_header_address_t*)belle_sip_message_get_header_by_type(req,belle_sip_header_contact_t);
+		if (!contact){
+			ms_error("Unable to determine IP version from signaling operation, no contact header found.");
+		}
+		return sal_address_is_ipv6((SalAddress*)contact) ? AF_INET6 : AF_INET;
 	}
-	return sal_address_is_ipv6((SalAddress*)contact);
 }
 
 bool_t sal_op_is_idle(SalOp *op){
@@ -814,6 +811,52 @@ void sal_call_set_sdp_handling(SalOp *h, SalOpSDPHandling handling)  {
 void sal_op_cnx_ip_to_0000_if_sendonly_enable(SalOp *op,bool_t yesno) {
 	op->cnx_ip_to_0000_if_sendonly_enabled = yesno;
 }
+
 bool_t sal_op_cnx_ip_to_0000_if_sendonly_enabled(SalOp *op) {
 	return op->cnx_ip_to_0000_if_sendonly_enabled;
 }
+
+bool_t sal_op_is_forked_of(const SalOp *op1, const SalOp *op2){
+	return op1->base.call_id && op2->base.call_id && strcmp(op1->base.call_id, op2->base.call_id) == 0;
+}
+int sal_op_refresh(SalOp *op) {
+	if (op->refresher) {
+		belle_sip_refresher_refresh(op->refresher,belle_sip_refresher_get_expires(op->refresher));
+		return 0;
+	}
+	ms_warning("sal_refresh on op [%p] of type [%s] no refresher",op,sal_op_type_to_string(op->type));
+	return -1;
+}
+
+void sal_op_set_event(SalOp *op, const char *eventname){
+	belle_sip_header_event_t *header = NULL;
+	if (op->event) belle_sip_object_unref(op->event);
+	if (eventname){
+		header = belle_sip_header_event_create(eventname);
+		belle_sip_object_ref(header);
+	}
+	op->event = header;
+}
+
+const char* sal_op_get_public_address(SalOp *op, int *port) {
+	if (op && op->refresher) {
+		return belle_sip_refresher_get_public_address(op->refresher, port);
+	}
+	return NULL;
+}
+
+const char* sal_op_get_local_address(SalOp *op, int *port) {
+	if (op && op->refresher) {
+		return belle_sip_refresher_get_local_address(op->refresher, port);
+	}
+	return NULL;
+}
+
+char* sal_op_get_dialog_id(const SalOp *op) {
+	if (op->dialog != NULL) {
+		return ms_strdup_printf("%s;to-tag=%s;from-tag=%s", ((SalOpBase*)op)->call_id,
+			belle_sip_dialog_get_remote_tag(op->dialog), belle_sip_dialog_get_local_tag(op->dialog));
+	}
+	return NULL;
+}
+
diff --git a/coreapi/bellesip_sal/sal_op_info.c b/coreapi/bellesip_sal/sal_op_info.c
index 7892dd6ec..2e2eb3e49 100644
--- a/coreapi/bellesip_sal/sal_op_info.c
+++ b/coreapi/bellesip_sal/sal_op_info.c
@@ -19,12 +19,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sal_impl.h"
 
 
-int sal_send_info(SalOp *op, const char *from, const char *to, const SalBody *body){
+int sal_send_info(SalOp *op, const char *from, const char *to, const SalBodyHandler *body_handler){
 	if (op->dialog){
 		belle_sip_request_t *req;
 		belle_sip_dialog_enable_pending_trans_checking(op->dialog,op->base.root->pending_trans_checking);
 		req=belle_sip_dialog_create_queued_request(op->dialog,"INFO");
-		sal_op_add_body(op,(belle_sip_message_t*)req,body);
+		belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(req), BELLE_SIP_BODY_HANDLER(body_handler));
 		return sal_op_send_request(op,req);
 	}
 	return -1;
diff --git a/coreapi/bellesip_sal/sal_op_message.c b/coreapi/bellesip_sal/sal_op_message.c
index a60febf7a..533453da4 100644
--- a/coreapi/bellesip_sal/sal_op_message.c
+++ b/coreapi/bellesip_sal/sal_op_message.c
@@ -110,122 +110,127 @@ void sal_process_incoming_message(SalOp *op,const belle_sip_request_event_t *eve
 
 	from_header=belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(req),belle_sip_header_from_t);
 	content_type=belle_sip_message_get_header_by_type(BELLE_SIP_MESSAGE(req),belle_sip_header_content_type_t);
-	/* check if we have a xml/cipher message to be decrypted */
-	if (content_type && (cipher_xml=is_cipher_xml(content_type))) {
-		/* access the zrtp cache to get keys needed to decipher the message */
-		LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
-		FILE *CACHEFD = fopen(lc->zrtp_secrets_cache, "rb+");
-		if (CACHEFD == NULL) {
-			ms_warning("Unable to access ZRTP ZID cache to decrypt message");
-			goto error;
-		} else {
-			size_t cacheSize;
-			char *cacheString;
-			int retval;
-			xmlDocPtr cacheXml;
-			
-			cacheString=ms_load_file_content(CACHEFD, &cacheSize);
-			if (!cacheString){
-				ms_warning("Unable to load content of ZRTP ZID cache to decrypt message");
-				goto error;
-			}
-			cacheString[cacheSize] = '\0';
-			cacheSize += 1;
-			fclose(CACHEFD);
-			cacheXml = xmlParseDoc((xmlChar*)cacheString);
-			ms_free(cacheString);
-			retval = lime_decryptMultipartMessage(cacheXml, (uint8_t *)belle_sip_message_get_body(BELLE_SIP_MESSAGE(req)), &decryptedMessage);
-			if (retval != 0) {
-				ms_warning("Unable to decrypt message, reason : %s - op [%p]", lime_error_code_to_string(retval), op);
-				free(decryptedMessage);
-				xmlFreeDoc(cacheXml);
-				errcode = 488;
+	
+	if (content_type){
+	
+		/* check if we have a xml/cipher message to be decrypted */
+		if ((cipher_xml=is_cipher_xml(content_type))) {
+			/* access the zrtp cache to get keys needed to decipher the message */
+			LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
+			FILE *CACHEFD = NULL;
+			if (lc->zrtp_secrets_cache != NULL) CACHEFD = fopen(lc->zrtp_secrets_cache, "rb+");
+			if (CACHEFD == NULL) {
+				ms_warning("Unable to access ZRTP ZID cache to decrypt message");
 				goto error;
 			} else {
-				/* dump updated cache to a string */
-				xmlChar *xmlStringOutput;
-				int xmlStringLength;
-				xmlDocDumpFormatMemoryEnc(cacheXml, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
-				/* write it to the cache file */
-				CACHEFD = fopen(lc->zrtp_secrets_cache, "wb+");
-				if (fwrite(xmlStringOutput, 1, xmlStringLength, CACHEFD)<=0){
-					ms_warning("Fail to write cache");
+				size_t cacheSize;
+				char *cacheString;
+				int retval;
+				xmlDocPtr cacheXml;
+				
+				cacheString=ms_load_file_content(CACHEFD, &cacheSize);
+				if (!cacheString){
+					ms_warning("Unable to load content of ZRTP ZID cache to decrypt message");
+					goto error;
 				}
-				xmlFree(xmlStringOutput);
+				cacheString[cacheSize] = '\0';
+				cacheSize += 1;
 				fclose(CACHEFD);
+				cacheXml = xmlParseDoc((xmlChar*)cacheString);
+				ms_free(cacheString);
+				retval = lime_decryptMultipartMessage(cacheXml, (uint8_t *)belle_sip_message_get_body(BELLE_SIP_MESSAGE(req)), &decryptedMessage);
+				if (retval != 0) {
+					ms_warning("Unable to decrypt message, reason : %s - op [%p]", lime_error_code_to_string(retval), op);
+					free(decryptedMessage);
+					xmlFreeDoc(cacheXml);
+					errcode = 488;
+					goto error;
+				} else {
+					/* dump updated cache to a string */
+					xmlChar *xmlStringOutput;
+					int xmlStringLength;
+					xmlDocDumpFormatMemoryEnc(cacheXml, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
+					/* write it to the cache file */
+					CACHEFD = fopen(lc->zrtp_secrets_cache, "wb+");
+					if (fwrite(xmlStringOutput, 1, xmlStringLength, CACHEFD)<=0){
+						ms_warning("Fail to write cache");
+					}
+					xmlFree(xmlStringOutput);
+					fclose(CACHEFD);
+				}
+
+				xmlFreeDoc(cacheXml);
 			}
 
-			xmlFreeDoc(cacheXml);
 		}
-
-	}
-
-	rcs_filetransfer=is_rcs_filetransfer(content_type);
-	if (content_type && ((plain_text=is_plain_text(content_type))
-						|| (external_body=is_external_body(content_type))
-						|| (decryptedMessage!=NULL) 
-						|| rcs_filetransfer)) {
-		SalMessage salmsg;
-		char message_id[256]={0};
+		external_body=is_external_body(content_type);
+		plain_text=is_plain_text(content_type);
+		rcs_filetransfer = is_rcs_filetransfer(content_type);
 	
-		if (op->pending_server_trans) belle_sip_object_unref(op->pending_server_trans);
-		op->pending_server_trans=server_transaction;
-		belle_sip_object_ref(op->pending_server_trans);
-	
-		address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(from_header))
-				,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(from_header)));
-		from=belle_sip_object_to_string(BELLE_SIP_OBJECT(address));
-		snprintf(message_id,sizeof(message_id)-1,"%s%i"
-				,belle_sip_header_call_id_get_call_id(call_id)
-				,belle_sip_header_cseq_get_seq_number(cseq));
-		salmsg.from=from;
-		/* if we just deciphered a message, use the deciphered part(which can be a rcs xml body pointing to the file to retreive from server)*/
-		if (cipher_xml) {
-			salmsg.text = (char *)decryptedMessage;
-		} else { /* message body wasn't ciphered */
-			salmsg.text=(plain_text||rcs_filetransfer)?belle_sip_message_get_body(BELLE_SIP_MESSAGE(req)):NULL;
-		}
-		salmsg.url=NULL;
-		salmsg.content_type = NULL;
-		if (rcs_filetransfer) { /* if we have a rcs file transfer, set the type, message body (stored in salmsg.text) contains all needed information to retrieve the file */
-			salmsg.content_type = "application/vnd.gsma.rcs-ft-http+xml";
-		}
-		if (external_body && belle_sip_parameters_get_parameter(BELLE_SIP_PARAMETERS(content_type),"URL")) {
-			size_t url_length=strlen(belle_sip_parameters_get_parameter(BELLE_SIP_PARAMETERS(content_type),"URL"));
-			salmsg.url = ms_strdup(belle_sip_parameters_get_parameter(BELLE_SIP_PARAMETERS(content_type),"URL")+1); /* skip first "*/
-			((char*)salmsg.url)[url_length-2]='\0'; /*remove trailing "*/
-		}
-		salmsg.message_id=message_id;
-		salmsg.time=date ? belle_sip_header_date_get_time(date) : time(NULL);
-		op->base.root->callbacks.text_received(op,&salmsg);
+		if (external_body || plain_text || rcs_filetransfer || decryptedMessage!=NULL) {
+			SalMessage salmsg;
+			char message_id[256]={0};
+		
+			if (op->pending_server_trans) belle_sip_object_unref(op->pending_server_trans);
+			op->pending_server_trans=server_transaction;
+			belle_sip_object_ref(op->pending_server_trans);
+		
+			address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(from_header))
+					,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(from_header)));
+			from=belle_sip_object_to_string(BELLE_SIP_OBJECT(address));
+			snprintf(message_id,sizeof(message_id)-1,"%s%i"
+					,belle_sip_header_call_id_get_call_id(call_id)
+					,belle_sip_header_cseq_get_seq_number(cseq));
+			salmsg.from=from;
+			/* if we just deciphered a message, use the deciphered part(which can be a rcs xml body pointing to the file to retreive from server)*/
+			if (cipher_xml) {
+				salmsg.text = (char *)decryptedMessage;
+			} else { /* message body wasn't ciphered */
+				salmsg.text=(plain_text||rcs_filetransfer)?belle_sip_message_get_body(BELLE_SIP_MESSAGE(req)):NULL;
+			}
+			salmsg.url=NULL;
+			salmsg.content_type = NULL;
+			if (rcs_filetransfer) { /* if we have a rcs file transfer, set the type, message body (stored in salmsg.text) contains all needed information to retrieve the file */
+				salmsg.content_type = "application/vnd.gsma.rcs-ft-http+xml";
+			}
+			if (external_body && belle_sip_parameters_get_parameter(BELLE_SIP_PARAMETERS(content_type),"URL")) {
+				size_t url_length=strlen(belle_sip_parameters_get_parameter(BELLE_SIP_PARAMETERS(content_type),"URL"));
+				salmsg.url = ms_strdup(belle_sip_parameters_get_parameter(BELLE_SIP_PARAMETERS(content_type),"URL")+1); /* skip first "*/
+				((char*)salmsg.url)[url_length-2]='\0'; /*remove trailing "*/
+			}
+			salmsg.message_id=message_id;
+			salmsg.time=date ? belle_sip_header_date_get_time(date) : time(NULL);
+			op->base.root->callbacks.text_received(op,&salmsg);
 
-		free(decryptedMessage);
-		belle_sip_object_unref(address);
-		belle_sip_free(from);
-		if (salmsg.url) ms_free((char*)salmsg.url);
-	} else if (content_type && is_im_iscomposing(content_type)) {
-		SalIsComposing saliscomposing;
-		address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(from_header))
-				,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(from_header)));
-		from=belle_sip_object_to_string(BELLE_SIP_OBJECT(address));
-		saliscomposing.from=from;
-		saliscomposing.text=belle_sip_message_get_body(BELLE_SIP_MESSAGE(req));
-		op->base.root->callbacks.is_composing_received(op,&saliscomposing);
-		resp = belle_sip_response_create_from_request(req,200);
-		belle_sip_server_transaction_send_response(server_transaction,resp);
-		belle_sip_object_unref(address);
-		belle_sip_free(from);
-	} else {
-		ms_error("Unsupported MESSAGE (content-type not recognized)");
-		resp = belle_sip_response_create_from_request(req,415);
-		add_message_accept((belle_sip_message_t*)resp);
-		belle_sip_server_transaction_send_response(server_transaction,resp);
-		sal_op_release(op);
-		return;
+			free(decryptedMessage);
+			belle_sip_object_unref(address);
+			belle_sip_free(from);
+			if (salmsg.url) ms_free((char*)salmsg.url);
+		} else if (is_im_iscomposing(content_type)) {
+			SalIsComposing saliscomposing;
+			address=belle_sip_header_address_create(belle_sip_header_address_get_displayname(BELLE_SIP_HEADER_ADDRESS(from_header))
+					,belle_sip_header_address_get_uri(BELLE_SIP_HEADER_ADDRESS(from_header)));
+			from=belle_sip_object_to_string(BELLE_SIP_OBJECT(address));
+			saliscomposing.from=from;
+			saliscomposing.text=belle_sip_message_get_body(BELLE_SIP_MESSAGE(req));
+			op->base.root->callbacks.is_composing_received(op,&saliscomposing);
+			resp = belle_sip_response_create_from_request(req,200);
+			belle_sip_server_transaction_send_response(server_transaction,resp);
+			belle_sip_object_unref(address);
+			belle_sip_free(from);
+		}else{
+			ms_error("Unsupported MESSAGE (content-type not recognized)");
+			errcode = 415;
+			goto error;
+		}
+	}else {
+		ms_error("Unsupported MESSAGE (no Content-Type)");
+		goto error;
 	}
 	return;
 error:
 	resp = belle_sip_response_create_from_request(req, errcode);
+	add_message_accept((belle_sip_message_t*)resp);
 	belle_sip_server_transaction_send_response(server_transaction,resp);
 	sal_op_release(op);
 }
@@ -239,8 +244,9 @@ int sal_message_send(SalOp *op, const char *from, const char *to, const char* co
 	belle_sip_request_t* req;
 	char content_type_raw[256];
 	size_t content_length = msg?strlen(msg):0;
-	time_t curtime=time(NULL);
+	time_t curtime = ms_time(NULL);
 	uint8_t *multipartEncryptedMessage = NULL;
+	const char *body;
 	int retval;
 	
 	if (op->dialog){
@@ -321,7 +327,11 @@ int sal_message_send(SalOp *op, const char *from, const char *to, const char* co
 	belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_content_type_parse(content_type_raw)));
 	belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_content_length_create(content_length)));
 	belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_date_create_from_time(&curtime)));
-	belle_sip_message_set_body(BELLE_SIP_MESSAGE(req),(multipartEncryptedMessage==NULL)?msg:(const char *)multipartEncryptedMessage,content_length);
+	body = (multipartEncryptedMessage==NULL) ? msg : (char*) multipartEncryptedMessage;
+	if (body){
+		/*don't call set_body() with null argument because it resets content type and content length*/
+		belle_sip_message_set_body(BELLE_SIP_MESSAGE(req), body, content_length);
+	}
 	retval = sal_op_send_request(op,req);
 	free(multipartEncryptedMessage);
 
diff --git a/coreapi/bellesip_sal/sal_op_presence.c b/coreapi/bellesip_sal/sal_op_presence.c
index e60ac3423..7dc9d75bf 100644
--- a/coreapi/bellesip_sal/sal_op_presence.c
+++ b/coreapi/bellesip_sal/sal_op_presence.c
@@ -47,41 +47,66 @@ void sal_add_presence_info(SalOp *op, belle_sip_message_t *notify, SalPresenceMo
 }
 
 static void presence_process_io_error(void *user_ctx, const belle_sip_io_error_event_t *event){
-	ms_error("presence_process_io_error not implemented yet");
+	SalOp* op = (SalOp*)user_ctx;
+	belle_sip_request_t* request;
+	belle_sip_client_transaction_t* client_transaction = NULL;
+	
+	if (BELLE_SIP_OBJECT_IS_INSTANCE_OF(belle_sip_io_error_event_get_source(event),
+		belle_sip_client_transaction_t)){
+		 client_transaction = (belle_sip_client_transaction_t*)belle_sip_io_error_event_get_source(event);
+	}
+	
+	if (!client_transaction) return;
+	
+	request = belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(client_transaction));
+	
+	if (strcmp("SUBSCRIBE",belle_sip_request_get_method(request))==0){
+		if (op->refresher){
+			ms_warning("presence_process_io_error() refresher is present, should not happen");
+			return;
+		}
+		ms_message("subscription to [%s] io error",sal_op_get_to(op));
+		if (!op->op_released){
+			op->base.root->callbacks.notify_presence(op,SalSubscribeTerminated, NULL,NULL); /*NULL = offline*/
+		}
+	}
 }
 
 static void presence_process_dialog_terminated(void *ctx, const belle_sip_dialog_terminated_event_t *event) {
 	SalOp* op= (SalOp*)ctx;
-	if (op->dialog) {
-		sal_op_unref(op);
-		op->dialog=NULL;
-	}
+	if (op->dialog && belle_sip_dialog_is_server(op->dialog)) {
+			ms_message("Incoming subscribtion from [%s] terminated",sal_op_get_from(op));
+			if (!op->op_released){
+				op->base.root->callbacks.subscribe_presence_closed(op, sal_op_get_from(op));
+			}
+			set_or_update_dialog(op, NULL);
+	}/* else client dialog is managed by refresher*/
 }
 
-static void presence_refresher_listener(belle_sip_refresher_t* refresher, void* user_pointer, unsigned int status_code, const char* reason_phrase){
+static void presence_refresher_listener(belle_sip_refresher_t* refresher, void* user_pointer, unsigned int status_code, const char* reason_phrase, int will_retry){
 	SalOp* op = (SalOp*)user_pointer;
-	switch(status_code){
-		case 481: {
+	if (status_code >= 300) {
+		ms_message("The SUBSCRIBE dialog no longer works. Let's restart a new one.");
+		belle_sip_refresher_stop(op->refresher);
+		if (op->dialog) { /*delete previous dialog if any*/
+			set_or_update_dialog(op, NULL);
+		}
 
-			ms_message("The server or remote ua lost the SUBSCRIBE dialog context. Let's restart a new one.");
-			belle_sip_refresher_stop(op->refresher);
-			if (op->dialog) { /*delete previous dialog if any*/
-				belle_sip_dialog_set_application_data(op->dialog,NULL);
-				belle_sip_object_unref(op->dialog);
-				op->dialog=NULL;
-			}
-
-			if (sal_op_get_contact_address(op)) {
-				/*contact is also probably not good*/
-				SalAddress* contact=sal_address_clone(sal_op_get_contact_address(op));
-				sal_address_set_port(contact,-1);
-				sal_address_set_domain(contact,NULL);
-				sal_op_set_contact_address(op,contact);
-				sal_address_destroy(contact);
-			}
-
-			sal_subscribe_presence(op,NULL,NULL,-1);
-		break;
+		if (sal_op_get_contact_address(op)) {
+			/*contact is also probably not good*/
+			SalAddress* contact=sal_address_clone(sal_op_get_contact_address(op));
+			sal_address_set_port(contact,-1);
+			sal_address_set_domain(contact,NULL);
+			sal_op_set_contact_address(op,contact);
+			sal_address_destroy(contact);
+		}
+		/*send a new SUBSCRIBE, that will attempt to establish a new dialog*/
+		sal_subscribe_presence(op,NULL,NULL,-1);
+	}
+	if (status_code == 0 || status_code == 503){
+		/*timeout or io error: the remote doesn't seem reachable.*/
+		if (!op->op_released){
+			op->base.root->callbacks.notify_presence(op,SalSubscribeActive, NULL,NULL); /*NULL = offline*/
 		}
 	}
 }
@@ -99,9 +124,13 @@ static void presence_response_event(void *op_base, const belle_sip_response_even
 	sal_op_set_error_info_from_response(op,response);
 
 	if (code>=300) {
-		ms_message("subscription to [%s] rejected",sal_op_get_to(op));
-		op->base.root->callbacks.notify_presence(op,SalSubscribeTerminated, NULL,NULL); /*NULL = offline*/
-		return;
+		if (strcmp("SUBSCRIBE",belle_sip_request_get_method(request))==0){
+			ms_message("subscription to [%s] rejected",sal_op_get_to(op));
+			if (!op->op_released){
+				op->base.root->callbacks.notify_presence(op,SalSubscribeTerminated, NULL,NULL); /*NULL = offline*/
+			}
+			return;
+		}
 	}
 	set_or_update_dialog(op_base,belle_sip_response_event_get_dialog(event));
 	if (!op->dialog) {
@@ -124,7 +153,7 @@ static void presence_response_event(void *op_base, const belle_sip_response_even
 					belle_sip_object_unref(op->refresher);
 					op->refresher=NULL;
 				}
-				if (expires>0){
+				if ((expires != NULL) && (belle_sip_header_expires_get_expires(expires) > 0)) {
 					op->refresher=belle_sip_client_transaction_create_refresher(client_transaction);
 					belle_sip_refresher_set_listener(op->refresher,presence_refresher_listener,op);
 					belle_sip_refresher_set_realm(op->refresher,op->base.realm);
@@ -132,23 +161,28 @@ static void presence_response_event(void *op_base, const belle_sip_response_even
 			}
 			break;
 		}
-		case BELLE_SIP_DIALOG_TERMINATED:
-			if (op->refresher) {
-				belle_sip_refresher_stop(op->refresher);
-				belle_sip_object_unref(op->refresher);
-				op->refresher=NULL;
-			}
-		break;
 		default: {
 			ms_error("presence op [%p] receive answer [%i] not implemented",op,code);
 		}
 		/* no break */
 	}
-
-
 }
+
 static void presence_process_timeout(void *user_ctx, const belle_sip_timeout_event_t *event) {
-	ms_error("presence_process_timeout not implemented yet");
+	SalOp* op = (SalOp*)user_ctx;
+	belle_sip_client_transaction_t* client_transaction = belle_sip_timeout_event_get_client_transaction(event);
+	belle_sip_request_t* request;
+	
+	if (!client_transaction) return;
+	
+	request = belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(client_transaction));
+	
+	if (strcmp("SUBSCRIBE",belle_sip_request_get_method(request))==0){
+		ms_message("subscription to [%s] timeout",sal_op_get_to(op));
+		if (!op->op_released){
+			op->base.root->callbacks.notify_presence(op,SalSubscribeTerminated, NULL,NULL); /*NULL = offline*/
+		}
+	}
 }
 
 static void presence_process_transaction_terminated(void *user_ctx, const belle_sip_transaction_terminated_event_t *event) {
@@ -167,37 +201,44 @@ static SalPresenceModel * process_presence_notification(SalOp *op, belle_sip_req
 		return NULL;
 
 	if (body==NULL) return NULL;
-
-	op->base.root->callbacks.parse_presence_requested(op,
+	if (!op->op_released){
+		op->base.root->callbacks.parse_presence_requested(op,
 							  belle_sip_header_content_type_get_type(content_type),
 							  belle_sip_header_content_type_get_subtype(content_type),
 							  body,
 							  &result);
+	}
 
 	return result;
 }
 
-static void handle_notify(SalOp *op, belle_sip_request_t *req){
+static void handle_notify(SalOp *op, belle_sip_request_t *req, belle_sip_dialog_t *dialog){
 	belle_sip_response_t* resp=NULL;
 	belle_sip_server_transaction_t* server_transaction=op->pending_server_trans;
 	belle_sip_header_subscription_state_t* subscription_state_header=belle_sip_message_get_header_by_type(req,belle_sip_header_subscription_state_t);
 	SalSubscribeStatus sub_state;
-
+	
 	if (strcmp("NOTIFY",belle_sip_request_get_method(req))==0) {
 		SalPresenceModel *presence_model = NULL;
 		const char* body = belle_sip_message_get_body(BELLE_SIP_MESSAGE(req));
+		
+		if (op->dialog !=NULL && dialog != op->dialog){
+			ms_warning("Receiving a NOTIFY from a dialog we haven't stored (op->dialog=%p dialog=%p)", op->dialog, dialog);
+		}
 		if (!subscription_state_header || strcasecmp(BELLE_SIP_SUBSCRIPTION_STATE_TERMINATED,belle_sip_header_subscription_state_get_state(subscription_state_header)) ==0) {
 			sub_state=SalSubscribeTerminated;
 			ms_message("Outgoing subscription terminated by remote [%s]",sal_op_get_to(op));
 		} else {
-			sub_state=SalSubscribeActive;
+			sub_state=belle_sip_message_get_subscription_state(BELLE_SIP_MESSAGE(req));
 		}
 		presence_model = process_presence_notification(op, req);
 		if (presence_model != NULL || body==NULL) {
 			/* Presence notification body parsed successfully. */
 
 			resp = sal_op_create_response_from_request(op, req, 200); /*create first because the op may be destroyed by notify_presence */
-			op->base.root->callbacks.notify_presence(op, sub_state, presence_model, NULL);
+			if (!op->op_released){
+				op->base.root->callbacks.notify_presence(op, sub_state, presence_model, NULL);
+			}
 		} else if (body){
 			/* Formatting error in presence notification body. */
 			ms_warning("Wrongly formatted presence document.");
@@ -212,31 +253,55 @@ static void presence_process_request_event(void *op_base, const belle_sip_reques
 	belle_sip_server_transaction_t* server_transaction = belle_sip_provider_create_server_transaction(op->base.root->prov,belle_sip_request_event_get_request(event));
 	belle_sip_request_t* req = belle_sip_request_event_get_request(event);
 	belle_sip_dialog_state_t dialog_state;
-	belle_sip_header_expires_t* expires = belle_sip_message_get_header_by_type(req,belle_sip_header_expires_t);
 	belle_sip_response_t* resp;
 	const char *method=belle_sip_request_get_method(req);
-
+	belle_sip_header_event_t *event_header;
 	belle_sip_object_ref(server_transaction);
 	if (op->pending_server_trans)  belle_sip_object_unref(op->pending_server_trans);
 	op->pending_server_trans=server_transaction;
+	event_header=belle_sip_message_get_header_by_type(req,belle_sip_header_event_t);
+	
+	if (event_header==NULL){
+		ms_warning("No event header in incoming SUBSCRIBE.");
+		resp=sal_op_create_response_from_request(op,req,400);
+		belle_sip_server_transaction_send_response(server_transaction,resp);
+		if (!op->dialog) sal_op_release(op);
+		return;
+	}
+	if (op->event==NULL) {
+		op->event=event_header;
+		belle_sip_object_ref(op->event);
+	}
 
 
 	if (!op->dialog) {
 		if (strcmp(method,"SUBSCRIBE")==0){
-			op->dialog=belle_sip_provider_create_dialog(op->base.root->prov,BELLE_SIP_TRANSACTION(server_transaction));
-			belle_sip_dialog_set_application_data(op->dialog,op);
-			sal_op_ref(op);
+			belle_sip_dialog_t *dialog = belle_sip_provider_create_dialog(op->base.root->prov,BELLE_SIP_TRANSACTION(server_transaction));
+			if (!dialog){
+				resp=sal_op_create_response_from_request(op,req,481);
+				belle_sip_server_transaction_send_response(server_transaction,resp);
+				sal_op_release(op);
+				return;
+			}
+			set_or_update_dialog(op, dialog);
 			ms_message("new incoming subscription from [%s] to [%s]",sal_op_get_from(op),sal_op_get_to(op));
-		}else{ /* this is a NOTIFY */
+		}else if (strcmp(method,"NOTIFY")==0 && belle_sip_request_event_get_dialog(event)) {
+			/*special case of dialog created by notify matching subscribe*/
+			set_or_update_dialog(op, belle_sip_request_event_get_dialog(event));
+		} else {/* this is a NOTIFY */
 			ms_message("Receiving out of dialog notify");
-			handle_notify(op,req);
+			handle_notify(op, req, belle_sip_request_event_get_dialog(event));
 			return;
 		}
 	}
 	dialog_state=belle_sip_dialog_get_state(op->dialog);
 	switch(dialog_state) {
 		case BELLE_SIP_DIALOG_NULL: {
-			op->base.root->callbacks.subscribe_presence_received(op,sal_op_get_from(op));
+			if (strcmp("NOTIFY",method)==0) {
+				handle_notify(op, req, belle_sip_request_event_get_dialog(event));
+			} else if (strcmp("SUBSCRIBE",method)==0) {
+				op->base.root->callbacks.subscribe_presence_received(op,sal_op_get_from(op));
+			}
 			break;
 		}
 		case BELLE_SIP_DIALOG_EARLY:
@@ -245,16 +310,13 @@ static void presence_process_request_event(void *op_base, const belle_sip_reques
 
 		case BELLE_SIP_DIALOG_CONFIRMED:
 			if (strcmp("NOTIFY",method)==0) {
-				handle_notify(op,req);
+				handle_notify(op, req, belle_sip_request_event_get_dialog(event));
 			} else if (strcmp("SUBSCRIBE",method)==0) {
-				/*either a refresh or an unsubscribe*/
-				if (expires && belle_sip_header_expires_get_expires(expires)>0) {
-					op->base.root->callbacks.subscribe_presence_received(op,sal_op_get_from(op));
-				} else if(expires) {
-					ms_message("Unsubscribe received from [%s]",sal_op_get_from(op));
-					resp=sal_op_create_response_from_request(op,req,200);
-					belle_sip_server_transaction_send_response(server_transaction,resp);
-				}
+				/*either a refresh or an unsubscribe.
+				 If it is a refresh there is nothing to notify to the app. If it is an unSUBSCRIBE, then the dialog
+				 will be terminated shortly, and this will be notified to the app through the dialog_terminated callback.*/
+				resp=sal_op_create_response_from_request(op,req,200);
+				belle_sip_server_transaction_send_response(server_transaction,resp);
 			}
 			break;
 		default:
@@ -265,6 +327,17 @@ static void presence_process_request_event(void *op_base, const belle_sip_reques
 
 static belle_sip_listener_callbacks_t op_presence_callbacks={0};
 
+/*Invoke when sal_op_release is called by upper layer*/
+static void sal_op_release_cb(struct SalOpBase* op_base) {
+	SalOp *op =(SalOp*)op_base;
+	if(op->refresher) {
+		belle_sip_refresher_stop(op->refresher);
+		belle_sip_object_unref(op->refresher);
+		op->refresher=NULL;
+		set_or_update_dialog(op,NULL); /*only if we have refresher. else dialog terminated event will remove association*/
+	}
+	
+}
 void sal_op_presence_fill_cbs(SalOp*op) {
 	if (op_presence_callbacks.process_request_event==NULL){
 		op_presence_callbacks.process_io_error=presence_process_io_error;
@@ -276,6 +349,7 @@ void sal_op_presence_fill_cbs(SalOp*op) {
 	}
 	op->callbacks=&op_presence_callbacks;
 	op->type=SalOpPresence;
+	op->base.release_cb=sal_op_release_cb;
 }
 
 
@@ -300,14 +374,14 @@ int sal_subscribe_presence(SalOp *op, const char *from, const char *to, int expi
 		}
 	}
 	if (!op->event){
-		op->event=belle_sip_header_create("Event","presence");
+		op->event=belle_sip_header_event_create("presence");
 		belle_sip_object_ref(op->event);
 	}
 	belle_sip_parameters_remove_parameter(BELLE_SIP_PARAMETERS(op->base.from_address),"tag");
 	belle_sip_parameters_remove_parameter(BELLE_SIP_PARAMETERS(op->base.to_address),"tag");
 	req=sal_op_build_request(op,"SUBSCRIBE");
 	if( req ){
-		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),op->event);
+		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(op->event));
 		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_expires_create(expires)));
 	}
 
@@ -330,8 +404,8 @@ static int sal_op_check_dialog_state(SalOp *op) {
 		return -1;
 	} else
 		return 0;
-
 }
+
 int sal_notify_presence(SalOp *op, SalPresenceModel *presence){
 	belle_sip_request_t* notify=NULL;
 	if (sal_op_check_dialog_state(op)) {
@@ -348,6 +422,7 @@ int sal_notify_presence(SalOp *op, SalPresenceModel *presence){
 
 int sal_notify_presence_close(SalOp *op){
 	belle_sip_request_t* notify=NULL;
+	int status;
 	if (sal_op_check_dialog_state(op)) {
 		return -1;
 	}
@@ -357,7 +432,9 @@ int sal_notify_presence_close(SalOp *op){
 	sal_add_presence_info(op,BELLE_SIP_MESSAGE(notify),NULL); /*FIXME, what about expires ??*/
 	belle_sip_message_add_header(BELLE_SIP_MESSAGE(notify)
 		,BELLE_SIP_HEADER(belle_sip_header_subscription_state_create(BELLE_SIP_SUBSCRIPTION_STATE_TERMINATED,-1)));
-	return sal_op_send_request(op,notify);
+	status = sal_op_send_request(op,notify);
+	set_or_update_dialog(op,NULL);  /*because we may be chalanged for the notify, so we must release dialog right now*/
+	return status;
 }
 
 
diff --git a/coreapi/bellesip_sal/sal_op_publish.c b/coreapi/bellesip_sal/sal_op_publish.c
index b2f17c27e..7e832c6bb 100644
--- a/coreapi/bellesip_sal/sal_op_publish.c
+++ b/coreapi/bellesip_sal/sal_op_publish.c
@@ -22,20 +22,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 static void publish_refresher_listener (belle_sip_refresher_t* refresher
 		,void* user_pointer
 		,unsigned int status_code
-		,const char* reason_phrase) {
+		,const char* reason_phrase, int will_retry) {
 	SalOp* op = (SalOp*)user_pointer;
 	const belle_sip_client_transaction_t* last_publish_trans=belle_sip_refresher_get_transaction(op->refresher);
-	belle_sip_request_t* last_publish=belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(last_publish_trans));
 	belle_sip_response_t *response=belle_sip_transaction_get_response(BELLE_SIP_TRANSACTION(last_publish_trans));
-	/*belle_sip_response_t* response=belle_sip_transaction_get_response(BELLE_SIP_TRANSACTION(belle_sip_refresher_get_transaction(refresher)));*/
 	ms_message("Publish refresher  [%i] reason [%s] for proxy [%s]",status_code,reason_phrase?reason_phrase:"none",sal_op_get_proxy(op));
-	if (status_code==412){
-		/*resubmit the request after removing the SIP-If-Match*/
-		belle_sip_message_remove_header((belle_sip_message_t*)last_publish,"SIP-If-Match");
-		belle_sip_refresher_refresh(op->refresher,BELLE_SIP_REFRESHER_REUSE_EXPIRES);
-	}else if (status_code==0){
+	if (status_code==0){
 		op->base.root->callbacks.on_expire(op);
 	}else if (status_code>=200){
+		belle_sip_header_t *sip_etag;
+		const char *sip_etag_string = NULL;
+		if (response && (sip_etag = belle_sip_message_get_header(BELLE_SIP_MESSAGE(response), "SIP-ETag"))) {
+			sip_etag_string = belle_sip_header_get_unparsed_value(sip_etag);
+		}
+		sal_op_set_entity_tag(op, sip_etag_string);
 		sal_error_info_set(&op->error_info,SalReasonUnknown,status_code,reason_phrase,NULL);
 		sal_op_assign_recv_headers(op,(belle_sip_message_t*)response);
 		op->base.root->callbacks.on_publish_response(op);
@@ -60,43 +60,7 @@ void sal_op_publish_fill_cbs(SalOp *op) {
 	op->type=SalOpPublish;
 }
 
-/*
- * Sending a publish with 0 expires removes the event state and such request shall not contain a body.
- * See RFC3903, section 4.5
- */
-
-/*presence publish */
-int sal_publish_presence(SalOp *op, const char *from, const char *to, int expires, SalPresenceModel *presence){
-	belle_sip_request_t *req=NULL;
-	if(!op->refresher || !belle_sip_refresher_get_transaction(op->refresher)) {
-		if (from)
-			sal_op_set_from(op,from);
-		if (to)
-			sal_op_set_to(op,to);
-
-		op->type=SalOpPublish;
-		req=sal_op_build_request(op,"PUBLISH");
-		
-		if( req == NULL ){
-			return -1;
-		}
-
-		if (sal_op_get_contact_address(op)){
-			belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(sal_op_create_contact(op)));
-		}
-		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),belle_sip_header_create("Event","presence"));
-		sal_add_presence_info(op,BELLE_SIP_MESSAGE(req),presence);
-		return sal_op_send_and_create_refresher(op,req,expires,publish_refresher_listener);
-	} else {
-		/*update presence status*/
-		const belle_sip_client_transaction_t* last_publish_trans=belle_sip_refresher_get_transaction(op->refresher);
-		belle_sip_request_t* last_publish=belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(last_publish_trans));
-		sal_add_presence_info(op,BELLE_SIP_MESSAGE(last_publish),expires!=0 ? presence : NULL);
-		return belle_sip_refresher_refresh(op->refresher,expires);
-	}
-}
-
-int sal_publish(SalOp *op, const char *from, const char *to, const char *eventname, int expires, const SalBody *body){
+int sal_publish(SalOp *op, const char *from, const char *to, const char *eventname, int expires, const SalBodyHandler *body_handler){
 	belle_sip_request_t *req=NULL;
 	if(!op->refresher || !belle_sip_refresher_get_transaction(op->refresher)) {
 		if (from)
@@ -109,12 +73,16 @@ int sal_publish(SalOp *op, const char *from, const char *to, const char *eventna
 		if( req == NULL ){
 			return -1;
 		}
-
+		
+		if (sal_op_get_entity_tag(op)) {
+			belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),belle_sip_header_create("SIP-If-Match", sal_op_get_entity_tag(op)));
+		}
+		
 		if (sal_op_get_contact_address(op)){
 			belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(sal_op_create_contact(op)));
 		}
 		belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),belle_sip_header_create("Event",eventname));
-		sal_op_add_body(op,BELLE_SIP_MESSAGE(req),body);
+		belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(req), BELLE_SIP_BODY_HANDLER(body_handler));
 		if (expires!=-1)
 			return sal_op_send_and_create_refresher(op,req,expires,publish_refresher_listener);
 		else return sal_op_send_request(op,req);
@@ -123,7 +91,22 @@ int sal_publish(SalOp *op, const char *from, const char *to, const char *eventna
 		const belle_sip_client_transaction_t* last_publish_trans=belle_sip_refresher_get_transaction(op->refresher);
 		belle_sip_request_t* last_publish=belle_sip_transaction_get_request(BELLE_SIP_TRANSACTION(last_publish_trans));
 		/*update body*/
-		sal_op_add_body(op,BELLE_SIP_MESSAGE(last_publish),expires!=0 ? body : NULL);
+		if (expires == 0) {
+			belle_sip_message_set_body(BELLE_SIP_MESSAGE(last_publish), NULL, 0);
+		} else {
+			belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(last_publish), BELLE_SIP_BODY_HANDLER(body_handler));
+		}
 		return belle_sip_refresher_refresh(op->refresher,expires==-1 ? BELLE_SIP_REFRESHER_REUSE_EXPIRES : expires);
 	}
 }
+
+int sal_op_unpublish(SalOp *op){
+	if (op->refresher){
+		const belle_sip_transaction_t *tr=(const belle_sip_transaction_t*) belle_sip_refresher_get_transaction(op->refresher);
+		belle_sip_request_t *last_req=belle_sip_transaction_get_request(tr);
+		belle_sip_message_set_body(BELLE_SIP_MESSAGE(last_req), NULL, 0);
+		belle_sip_refresher_refresh(op->refresher,0);
+		return 0;
+	}
+	return -1;
+}
diff --git a/coreapi/bellesip_sal/sal_op_registration.c b/coreapi/bellesip_sal/sal_op_registration.c
index 480ee08ad..72b57b773 100644
--- a/coreapi/bellesip_sal/sal_op_registration.c
+++ b/coreapi/bellesip_sal/sal_op_registration.c
@@ -22,11 +22,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 static void register_refresher_listener (belle_sip_refresher_t* refresher
 		,void* user_pointer
 		,unsigned int status_code
-		,const char* reason_phrase) {
+		,const char* reason_phrase, int will_retry) {
 	SalOp* op = (SalOp*)user_pointer;
 	belle_sip_response_t* response=belle_sip_transaction_get_response(BELLE_SIP_TRANSACTION(belle_sip_refresher_get_transaction(refresher)));
-	ms_message("Register refresher  [%i] reason [%s] for proxy [%s]",status_code,reason_phrase,sal_op_get_proxy(op));
-	
+	ms_message("Register refresher [%i] reason [%s] for proxy [%s]",status_code,reason_phrase,sal_op_get_proxy(op));
+
 	if (belle_sip_refresher_get_auth_events(refresher)) {
 		if (op->auth_info) sal_auth_info_delete(op->auth_info);
 		/*only take first one for now*/
@@ -46,7 +46,7 @@ static void register_refresher_listener (belle_sip_refresher_t* refresher
 		}
 		sal_op_set_service_route(op,(const SalAddress*)service_route_address);
 		if (service_route_address) belle_sip_object_unref(service_route_address);
-		
+
 		sal_remove_pending_auth(op->base.root,op); /*just in case*/
 		if (contact) {
 			sal_op_set_contact_address(op,(SalAddress*)(BELLE_SIP_HEADER_ADDRESS(contact))); /*update contact with real value*/
@@ -79,13 +79,13 @@ int sal_register(SalOp *op, const char *proxy, const char *from, int expires,Sal
 	belle_sip_request_t *req;
 	belle_sip_uri_t* req_uri;
 	belle_sip_header_t* accept_header;
-	
+
 	if (op->refresher){
 		belle_sip_refresher_stop(op->refresher);
 		belle_sip_object_unref(op->refresher);
 		op->refresher=NULL;
 	}
-	
+
 	op->type=SalOpRegister;
 	sal_op_set_from(op,from);
 	sal_op_set_to(op,from);
diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c
index 69a28a8e9..590f7a440 100644
--- a/coreapi/bellesip_sal/sal_sdp.c
+++ b/coreapi/bellesip_sal/sal_sdp.c
@@ -1,3 +1,4 @@
+
 /*
 linphone
 Copyright (C) 2012  Belledonne Communications, Grenoble, France
@@ -69,7 +70,7 @@ static void add_ice_remote_candidates(belle_sdp_media_description_t *md, const S
 }
 
 static bool_t is_rtcp_fb_trr_int_the_same_for_all_payloads(const SalStreamDescription *stream, uint16_t *trr_int) {
-	MSList *pt_it;
+	bctbx_list_t *pt_it;
 	bool_t first = TRUE;
 	for (pt_it = stream->payloads; pt_it != NULL; pt_it = pt_it->next) {
 		PayloadType *pt = (PayloadType *)pt_it->data;
@@ -118,14 +119,14 @@ static void add_rtcp_fb_ccm_attribute(belle_sdp_media_description_t *media_desc,
 }
 
 static void add_rtcp_fb_attributes(belle_sdp_media_description_t *media_desc, const SalMediaDescription *md, const SalStreamDescription *stream) {
-	MSList *pt_it;
+	bctbx_list_t *pt_it;
 	PayloadType *pt;
 	PayloadTypeAvpfParams avpf_params;
 	bool_t general_trr_int;
 	uint16_t trr_int = 0;
 
 	general_trr_int = is_rtcp_fb_trr_int_the_same_for_all_payloads(stream, &trr_int);
-	if (general_trr_int == TRUE) {
+	if (general_trr_int == TRUE && trr_int != 0) {
 		add_rtcp_fb_trr_int_attribute(media_desc, -1, trr_int);
 	}
 	if (stream->rtcp_fb.generic_nack_enabled == TRUE) {
@@ -143,7 +144,7 @@ static void add_rtcp_fb_attributes(belle_sdp_media_description_t *media_desc, co
 		avpf_params = payload_type_get_avpf_params(pt);
 
 		/* Add trr-int if not set generally. */
-		if (general_trr_int != TRUE) {
+		if (general_trr_int != TRUE && trr_int != 0) {
 			add_rtcp_fb_trr_int_attribute(media_desc, payload_type_get_number(pt), avpf_params.trr_interval);
 		}
 
@@ -190,7 +191,7 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 	belle_sdp_mime_parameter_t* mime_param;
 	belle_sdp_media_description_t* media_desc;
 	int j;
-	MSList* pt_it;
+	bctbx_list_t* pt_it;
 	PayloadType* pt;
 	char buffer[1024];
 	char* dir=NULL;
@@ -250,7 +251,7 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 	if ( stream->bandwidth>0 )
 		belle_sdp_media_description_set_bandwidth ( media_desc,"AS",stream->bandwidth );
 
-	if ((stream->proto == SalProtoRtpSavpf) || (stream->proto == SalProtoRtpSavp)) {
+	if (sal_stream_description_has_srtp(stream)) {
 		/* add crypto lines */
 		for ( j=0; j<SAL_CRYPTO_ALGO_MAX; j++ ) {
 			MSCryptoSuiteNameParams desc;
@@ -287,6 +288,11 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 		ms_free(ssrc_attribute);
 	}
 
+	/* insert zrtp-hash attribute if needed */
+	if (stream->haveZrtpHash == 1) {
+		belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("zrtp-hash", (const char *)(stream->zrtphash)));
+	}
+
 	switch ( stream->dir ) {
 		case SalStreamSendRecv:
 			/*dir="sendrecv";*/
@@ -304,6 +310,10 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 	}
 	if ( dir ) belle_sdp_media_description_add_attribute ( media_desc,belle_sdp_attribute_create ( dir,NULL ) );
 	
+	if (stream->rtcp_mux){
+		belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create ("rtcp-mux",NULL ) );
+	}
+	
 	if (rtp_port != 0) {
 		different_rtp_and_rtcp_addr = (rtcp_addr[0] != '\0') && (strcmp(rtp_addr, rtcp_addr) != 0);
 		if ((rtcp_port != (rtp_port + 1)) || (different_rtp_and_rtcp_addr == TRUE)) {
@@ -315,7 +325,7 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 			belle_sdp_media_description_add_attribute(media_desc,belle_sdp_attribute_create ("rtcp",buffer));
 		}
 	}
-	if (stream->ice_completed == TRUE) {
+	if (stream->set_nortpproxy == TRUE) {
 		belle_sdp_media_description_add_attribute(media_desc,belle_sdp_attribute_create ("nortpproxy","yes"));
 	}
 	if (stream->ice_mismatch == TRUE) {
@@ -331,7 +341,7 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 		}
 	}
 
-	if ((rtp_port != 0) && ((stream->proto == SalProtoRtpAvpf) || (stream->proto == SalProtoRtpSavpf))) {
+	if ((rtp_port != 0) && (sal_stream_description_has_avpf(stream) || sal_stream_description_has_implicit_avpf(stream))) {
 		add_rtcp_fb_attributes(media_desc, md, stream);
 	}
 
@@ -355,6 +365,16 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session
 			belle_sip_object_unref((belle_sip_object_t*)media_attribute);
 		}
 	}
+
+	if (stream->custom_sdp_attributes) {
+		belle_sdp_session_description_t *custom_desc = (belle_sdp_session_description_t *)stream->custom_sdp_attributes;
+		belle_sip_list_t *l = belle_sdp_session_description_get_attributes(custom_desc);
+		belle_sip_list_t *elem;
+		for (elem = l; elem != NULL; elem = elem->next) {
+			belle_sdp_media_description_add_attribute(media_desc, (belle_sdp_attribute_t *)elem->data);
+		}
+	}
+
 	/*
 	 * rfc5576
 	 * 4.1.  The "ssrc" Media Attribute
@@ -408,13 +428,21 @@ belle_sdp_session_description_t * media_description_to_sdp ( const SalMediaDescr
 		belle_sdp_session_description_set_bandwidth ( session_desc,"AS",desc->bandwidth );
 	}
 	
-	if (desc->ice_completed == TRUE) belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("nortpproxy","yes"));
+	if (desc->set_nortpproxy == TRUE) belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("nortpproxy","yes"));
 	if (desc->ice_pwd[0] != '\0') belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("ice-pwd",desc->ice_pwd));
 	if (desc->ice_ufrag[0] != '\0') belle_sdp_session_description_add_attribute(session_desc, belle_sdp_attribute_create("ice-ufrag",desc->ice_ufrag));
 
 	if (desc->rtcp_xr.enabled == TRUE) {
 		belle_sdp_session_description_add_attribute(session_desc, create_rtcp_xr_attribute(&desc->rtcp_xr));
 	}
+	if (desc->custom_sdp_attributes) {
+		belle_sdp_session_description_t *custom_desc = (belle_sdp_session_description_t *)desc->custom_sdp_attributes;
+		belle_sip_list_t *l = belle_sdp_session_description_get_attributes(custom_desc);
+		belle_sip_list_t *elem;
+		for (elem = l; elem != NULL; elem = elem->next) {
+			belle_sdp_session_description_add_attribute(session_desc, (belle_sdp_attribute_t *)elem->data);
+		}
+	}
 
 	for ( i=0; i<desc->nb_streams; i++ ) {
 		stream_description_to_sdp(session_desc, desc, &desc->streams[i]);
@@ -442,7 +470,7 @@ static void sdp_parse_payload_types(belle_sdp_media_description_t *media_desc, S
 		pt->channels=belle_sdp_mime_parameter_get_channel_count ( mime_param );
 		payload_type_set_send_fmtp ( pt,belle_sdp_mime_parameter_get_parameters ( mime_param ) );
 		payload_type_set_avpf_params(pt, avpf_params);
-		stream->payloads=ms_list_append ( stream->payloads,pt );
+		stream->payloads=bctbx_list_append ( stream->payloads,pt );
 		stream->ptime=belle_sdp_mime_parameter_get_ptime ( mime_param );
 		ms_message ( "Found payload %s/%i fmtp=%s",pt->mime_type,pt->clock_rate,
 						pt->send_fmtp ? pt->send_fmtp : "" );
@@ -511,7 +539,7 @@ static void sdp_parse_media_ice_parameters(belle_sdp_media_description_t *media_
 		att_name = belle_sdp_attribute_get_name(attribute);
 		value = belle_sdp_attribute_get_value(attribute);
 
-		if (	(nb_ice_candidates < sizeof (stream->ice_candidates)/sizeof(SalIceCandidate))
+		if ((nb_ice_candidates < (int)(sizeof(stream->ice_candidates)/sizeof(SalIceCandidate)))
 				&& (keywordcmp("candidate", att_name) == 0)
 				&& (value != NULL)) {
 			SalIceCandidate *candidate = &stream->ice_candidates[nb_ice_candidates];
@@ -520,7 +548,10 @@ static void sdp_parse_media_ice_parameters(belle_sdp_media_description_t *media_
 				candidate->foundation, &candidate->componentID, proto, &candidate->priority, candidate->addr, &candidate->port,
 				candidate->type, candidate->raddr, &candidate->rport);
 			if (strcasecmp("udp",proto)==0 && ((nb == 7) || (nb == 9))) nb_ice_candidates++;
-			else memset(candidate, 0, sizeof(*candidate));
+			else {
+				ms_error("ice: Failed parsing a=candidate SDP attribute");
+				memset(candidate, 0, sizeof(*candidate));
+			}
 		} else if ((keywordcmp("remote-candidates", att_name) == 0) && (value != NULL)) {
 			SalIceRemoteCandidate candidate;
 			unsigned int componentID;
@@ -549,7 +580,7 @@ static void sdp_parse_media_ice_parameters(belle_sdp_media_description_t *media_
 }
 
 static void enable_avpf_for_stream(SalStreamDescription *stream) {
-	MSList *pt_it;
+	bctbx_list_t *pt_it;
 	for (pt_it = stream->payloads; pt_it != NULL; pt_it = pt_it->next) {
 		PayloadType *pt = (PayloadType *)pt_it->data;
 		payload_type_set_flag(pt, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED);
@@ -607,14 +638,15 @@ static void apply_rtcp_fb_attribute_to_payload(belle_sdp_rtcp_fb_attribute_t *fb
 	payload_type_set_avpf_params(pt, avpf_params);
 }
 
-static void sdp_parse_rtcp_fb_parameters(belle_sdp_media_description_t *media_desc, SalStreamDescription *stream) {
+static bool_t sdp_parse_rtcp_fb_parameters(belle_sdp_media_description_t *media_desc, SalStreamDescription *stream) {
 	belle_sip_list_t *it;
 	belle_sdp_attribute_t *attribute;
 	belle_sdp_rtcp_fb_attribute_t *fb_attribute;
-	MSList *pt_it;
+	bctbx_list_t *pt_it;
 	PayloadType *pt;
 	int8_t pt_num;
-
+	bool_t retval = FALSE;
+    
 	/* Handle rtcp-fb attributes that concern all payload types. */
 	for (it = belle_sdp_media_description_get_attributes(media_desc); it != NULL; it = it->next) {
 		attribute = BELLE_SDP_ATTRIBUTE(it->data);
@@ -624,6 +656,7 @@ static void sdp_parse_rtcp_fb_parameters(belle_sdp_media_description_t *media_de
 				for (pt_it = stream->payloads; pt_it != NULL; pt_it = pt_it->next) {
 					pt = (PayloadType *)pt_it->data;
 					apply_rtcp_fb_attribute_to_payload(fb_attribute, stream, pt);
+					retval = TRUE;
 				}
 			}
 		}
@@ -637,12 +670,14 @@ static void sdp_parse_rtcp_fb_parameters(belle_sdp_media_description_t *media_de
 			pt_num = belle_sdp_rtcp_fb_attribute_get_id(fb_attribute);
 			for (pt_it = stream->payloads; pt_it != NULL; pt_it = pt_it->next) {
 				pt = (PayloadType *)pt_it->data;
+				retval = TRUE;
 				if (payload_type_get_number(pt) == (int)pt_num) {
 					apply_rtcp_fb_attribute_to_payload(fb_attribute, stream, pt);
 				}
 			}
 		}
 	}
+	return retval;
 }
 
 static void sal_init_rtcp_xr_description(OrtpRtcpXrConfiguration *config) {
@@ -702,8 +737,10 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 	belle_sdp_connection_t* cnx;
 	belle_sdp_media_t* media;
 	belle_sdp_attribute_t* attribute;
+	belle_sip_list_t *custom_attribute_it;
 	const char* value;
 	const char *mtype,*proto;
+	bool_t has_avpf_attributes;
 
 	stream=&md->streams[md->nb_streams];
 	media=belle_sdp_media_description_get_media ( media_desc );
@@ -739,6 +776,8 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 		stream->type=SalAudio;
 	} else if ( strcasecmp ( "video", mtype ) == 0 ) {
 		stream->type=SalVideo;
+	} else if ( strcasecmp ( "text", mtype ) == 0 ) {
+		stream->type=SalText;
 	} else {
 		stream->type=SalOther;
 		strncpy ( stream->typeother,mtype,sizeof ( stream->typeother )-1 );
@@ -760,6 +799,8 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 		stream->dir=md->dir; /*takes default value if not present*/
 	}
 
+	stream->rtcp_mux = belle_sdp_media_description_get_attribute(media_desc, "rtcp-mux") != NULL;
+	
 	/* Get media payload types */
 	sdp_parse_payload_types(media_desc, stream);
 
@@ -797,23 +838,41 @@ static SalStreamDescription * sdp_to_stream_description(SalMediaDescription *md,
 	}
 
 	/* Read crypto lines if any */
-	if ((stream->proto == SalProtoRtpSavpf) || (stream->proto == SalProtoRtpSavp)) {
+	if (sal_stream_description_has_srtp(stream)) {
 		sdp_parse_media_crypto_parameters(media_desc, stream);
 	}
 
+	/* Read zrtp-hash attribute */
+	if ((attribute=belle_sdp_media_description_get_attribute(media_desc,"zrtp-hash"))!=NULL) {
+		if ((value=belle_sdp_attribute_get_value(attribute))!=NULL) {
+			strncpy((char *)(stream->zrtphash), belle_sdp_attribute_get_value(attribute),sizeof(stream->zrtphash));
+			stream->haveZrtpHash = 1;
+		}
+	}
+
 	/* Get ICE candidate attributes if any */
 	sdp_parse_media_ice_parameters(media_desc, stream);
+    
+	has_avpf_attributes = sdp_parse_rtcp_fb_parameters(media_desc, stream);
 
 	/* Get RTCP-FB attributes if any */
-	if ((stream->proto == SalProtoRtpAvpf) || (stream->proto == SalProtoRtpSavpf)) {
+	if (sal_stream_description_has_avpf(stream)) {
 		enable_avpf_for_stream(stream);
-		sdp_parse_rtcp_fb_parameters(media_desc, stream);
+	}else if (has_avpf_attributes ){
+		enable_avpf_for_stream(stream);
+		stream->implicit_rtcp_fb = TRUE;
 	}
 
 	/* Get RTCP-XR attributes if any */
 	stream->rtcp_xr = md->rtcp_xr;	// Use session parameters if no stream parameters are defined
 	sdp_parse_media_rtcp_xr_parameters(media_desc, &stream->rtcp_xr);
 
+	/* Get the custom attributes */
+	for (custom_attribute_it = belle_sdp_media_description_get_attributes(media_desc); custom_attribute_it != NULL; custom_attribute_it = custom_attribute_it->next) {
+		belle_sdp_attribute_t *attr = (belle_sdp_attribute_t *)custom_attribute_it->data;
+		stream->custom_sdp_attributes = sal_custom_sdp_attribute_append(stream->custom_sdp_attributes, belle_sdp_attribute_get_name(attr), belle_sdp_attribute_get_value(attr));
+	}
+
 	md->nb_streams++;
 	return stream;
 }
@@ -824,6 +883,7 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 	belle_sip_list_t* media_desc_it;
 	belle_sdp_media_description_t* media_desc;
 	belle_sdp_session_name_t *sname;
+	belle_sip_list_t *custom_attribute_it;
 	const char* value;
 	SalDtlsRole session_role=SalDtlsRoleInvalid;
 	int i;
@@ -885,6 +945,12 @@ int sdp_to_media_description ( belle_sdp_session_description_t  *session_desc, S
 	/* Get session RTCP-XR attributes if any */
 	sdp_parse_session_rtcp_xr_parameters(session_desc, &desc->rtcp_xr);
 
+	/* Get the custom attributes */
+	for (custom_attribute_it = belle_sdp_session_description_get_attributes(session_desc); custom_attribute_it != NULL; custom_attribute_it = custom_attribute_it->next) {
+		belle_sdp_attribute_t *attr = (belle_sdp_attribute_t *)custom_attribute_it->data;
+		desc->custom_sdp_attributes = sal_custom_sdp_attribute_append(desc->custom_sdp_attributes, belle_sdp_attribute_get_name(attr), belle_sdp_attribute_get_value(attr));
+	}
+
 	for ( media_desc_it=belle_sdp_session_description_get_media_descriptions ( session_desc )
 						; media_desc_it!=NULL
 			; media_desc_it=media_desc_it->next ) {
diff --git a/coreapi/buffer.h b/coreapi/buffer.h
index 718b577a1..8bc9d6b85 100644
--- a/coreapi/buffer.h
+++ b/coreapi/buffer.h
@@ -144,4 +144,4 @@ LINPHONE_PUBLIC bool_t linphone_buffer_is_empty(const LinphoneBuffer *buffer);
 }
 #endif
 
-#endif /* LINPHONE_CONTENT_H_ */
+#endif /* LINPHONE_BUFFER_H_ */
diff --git a/coreapi/call_log.c b/coreapi/call_log.c
index 7109e2557..a5150e9bd 100644
--- a/coreapi/call_log.c
+++ b/coreapi/call_log.c
@@ -22,6 +22,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <time.h>
 #include "private.h"
 
+#ifdef SQLITE_STORAGE_ENABLED
+#ifndef _WIN32
+#if !defined(ANDROID) && !defined(__QNXNTO__)
+#	include <langinfo.h>
+#	include <iconv.h>
+#	include <string.h>
+#endif
+#else
+#include <Windows.h>
+#endif
+
+#define MAX_PATH_SIZE 1024
+#include "sqlite3.h"
+#endif
 
 /*******************************************************************************
  * Internal functions                                                          *
@@ -60,13 +74,15 @@ static void set_call_log_date(LinphoneCallLog *cl, time_t start_time){
  ******************************************************************************/
 
 void call_logs_write_to_config_file(LinphoneCore *lc){
-	MSList *elem;
+	bctbx_list_t *elem;
 	char logsection[32];
 	int i;
 	char *tmp;
 	LpConfig *cfg=lc->config;
 
 	if (linphone_core_get_global_state (lc)==LinphoneGlobalStartup) return;
+	
+	if (lc->max_call_logs == LINPHONE_MAX_CALL_HISTORY_UNLIMITED) return;
 
 	for(i=0,elem=lc->call_logs;elem!=NULL;elem=elem->next,++i){
 		LinphoneCallLog *cl=(LinphoneCallLog*)elem->data;
@@ -133,7 +149,7 @@ void call_logs_read_from_config_file(LinphoneCore *lc){
 			cl->video_enabled=lp_config_get_int(cfg,logsection,"video_enabled",0);
 			tmp=lp_config_get_string(cfg,logsection,"call_id",NULL);
 			if (tmp) cl->call_id=ms_strdup(tmp);
-			lc->call_logs=ms_list_append(lc->call_logs,cl);
+			lc->call_logs=bctbx_list_append(lc->call_logs,cl);
 		}else break;
 	}
 }
@@ -234,6 +250,10 @@ bool_t linphone_call_log_video_enabled(LinphoneCallLog *cl) {
 	return cl->video_enabled;
 }
 
+bool_t linphone_call_log_was_conference(LinphoneCallLog *cl) {
+	return cl->was_conference;
+}
+
 
 /*******************************************************************************
  * Reference and user data handling functions                                  *
@@ -260,16 +280,17 @@ void linphone_call_log_unref(LinphoneCallLog *cl) {
  * Constructor and destructor functions                                        *
  ******************************************************************************/
 
-static void _linphone_call_log_destroy(LinphoneCallLog *cl){
+static void _linphone_call_log_destroy(LinphoneCallLog *cl) {
 	if (cl->from!=NULL) linphone_address_destroy(cl->from);
 	if (cl->to!=NULL) linphone_address_destroy(cl->to);
 	if (cl->refkey!=NULL) ms_free(cl->refkey);
 	if (cl->call_id) ms_free(cl->call_id);
 	if (cl->reporting.reports[LINPHONE_CALL_STATS_AUDIO]!=NULL) linphone_reporting_destroy(cl->reporting.reports[LINPHONE_CALL_STATS_AUDIO]);
 	if (cl->reporting.reports[LINPHONE_CALL_STATS_VIDEO]!=NULL) linphone_reporting_destroy(cl->reporting.reports[LINPHONE_CALL_STATS_VIDEO]);
+	if (cl->reporting.reports[LINPHONE_CALL_STATS_TEXT]!=NULL) linphone_reporting_destroy(cl->reporting.reports[LINPHONE_CALL_STATS_TEXT]);
 }
 
-LinphoneCallLog * linphone_call_log_new(LinphoneCallDir dir, LinphoneAddress *from, LinphoneAddress *to){
+LinphoneCallLog * linphone_call_log_new(LinphoneCallDir dir, LinphoneAddress *from, LinphoneAddress *to) {
 	LinphoneCallLog *cl=belle_sip_object_new(LinphoneCallLog);
 	cl->dir=dir;
 	cl->start_date_time=time(NULL);
@@ -278,9 +299,11 @@ LinphoneCallLog * linphone_call_log_new(LinphoneCallDir dir, LinphoneAddress *fr
 	cl->to=to;
 	cl->status=LinphoneCallAborted; /*default status*/
 	cl->quality=-1;
+	cl->storage_id=0;
 
 	cl->reporting.reports[LINPHONE_CALL_STATS_AUDIO]=linphone_reporting_new();
 	cl->reporting.reports[LINPHONE_CALL_STATS_VIDEO]=linphone_reporting_new();
+	cl->reporting.reports[LINPHONE_CALL_STATS_TEXT]=linphone_reporting_new();
 	cl->connected_date_time=0;
 	return cl;
 }
@@ -298,3 +321,408 @@ BELLE_SIP_INSTANCIATE_VPTR(LinphoneCallLog, belle_sip_object_t,
 	NULL, // marshal
 	FALSE
 );
+
+
+/*******************************************************************************
+ * SQL storage related functions                                               *
+ ******************************************************************************/
+
+#ifdef SQLITE_STORAGE_ENABLED
+
+static void linphone_create_table(sqlite3* db) {
+	char* errmsg=NULL;
+	int ret;
+	ret=sqlite3_exec(db,"CREATE TABLE IF NOT EXISTS call_history ("
+							 "id             INTEGER PRIMARY KEY AUTOINCREMENT,"
+							 "caller         TEXT NOT NULL," // Can't name a field "from"...
+							 "callee         TEXT NOT NULL,"
+							 "direction      INTEGER,"
+							 "duration       INTEGER,"
+							 "start_time     TEXT NOT NULL,"
+							 "connected_time TEXT NOT NULL,"
+							 "status         INTEGER,"
+							 "videoEnabled   INTEGER,"
+							 "quality        REAL"
+						");",
+			0,0,&errmsg);
+	if(ret != SQLITE_OK) {
+		ms_error("Error in creation: %s.\n", errmsg);
+		sqlite3_free(errmsg);
+	}
+}
+
+static void linphone_update_call_log_table(sqlite3* db) {
+	char* errmsg=NULL;
+	int ret;
+
+	// for image url storage
+	ret=sqlite3_exec(db,"ALTER TABLE call_history ADD COLUMN call_id TEXT;",NULL,NULL,&errmsg);
+	if(ret != SQLITE_OK) {
+		ms_message("Table already up to date: %s.", errmsg);
+		sqlite3_free(errmsg);
+	} else {
+		ret=sqlite3_exec(db,"ALTER TABLE call_history ADD COLUMN refkey TEXT;",NULL,NULL,&errmsg);
+		if(ret != SQLITE_OK) {
+			ms_message("Table already up to date: %s.", errmsg);
+			sqlite3_free(errmsg);
+		} else {
+			ms_debug("Table call_history updated successfully for call_id and refkey.");
+		}
+	}
+}
+
+void linphone_core_call_log_storage_init(LinphoneCore *lc) {
+	int ret;
+	const char *errmsg;
+	sqlite3 *db;
+
+	linphone_core_call_log_storage_close(lc);
+
+	ret=_linphone_sqlite3_open(lc->logs_db_file, &db);
+	if(ret != SQLITE_OK) {
+		errmsg = sqlite3_errmsg(db);
+		ms_error("Error in the opening: %s.\n", errmsg);
+		sqlite3_close(db);
+		return;
+	}
+
+	linphone_create_table(db);
+	linphone_update_call_log_table(db);
+	lc->logs_db = db;
+
+	// Load the existing call logs
+	linphone_core_get_call_history(lc);
+}
+
+void linphone_core_call_log_storage_close(LinphoneCore *lc) {
+	if (lc->logs_db){
+		sqlite3_close(lc->logs_db);
+		lc->logs_db = NULL;
+	}
+}
+
+/* DB layout:
+ * | 0  | storage_id
+ * | 1  | from
+ * | 2  | to
+ * | 3  | direction flag
+ * | 4  | duration
+ * | 5  | start date time (time_t)
+ * | 6  | connected date time (time_t)
+ * | 7  | status
+ * | 8  | video enabled (1 or 0)
+ * | 9  | quality
+ * | 10 | call_id
+ * | 11 | refkey
+ */
+static int create_call_log(void *data, int argc, char **argv, char **colName) {
+	bctbx_list_t **list = (bctbx_list_t **)data;
+	LinphoneAddress *from;
+	LinphoneAddress *to;
+	LinphoneCallDir dir;
+	LinphoneCallLog *log;
+
+	unsigned int storage_id = (unsigned int)atoi(argv[0]);
+	from = linphone_address_new(argv[1]);
+	to = linphone_address_new(argv[2]);
+	
+	if (from == NULL || to == NULL) goto error;
+	
+	dir = (LinphoneCallDir) atoi(argv[3]);
+	log = linphone_call_log_new(dir, from, to);
+
+	log->storage_id = storage_id;
+	log->duration = atoi(argv[4]);
+	log->start_date_time = (time_t)atol(argv[5]);
+	set_call_log_date(log,log->start_date_time);
+	log->connected_date_time = (time_t)atol(argv[6]);
+	log->status = (LinphoneCallStatus) atoi(argv[7]);
+	log->video_enabled = atoi(argv[8]) == 1;
+	log->quality = (float)atof(argv[9]);
+
+	if (argc > 10) {
+		if (argv[10] != NULL) {
+			log->call_id = ms_strdup(argv[10]);
+		}
+		if (argv[10] != NULL) {
+			log->refkey = ms_strdup(argv[11]);
+		}
+	}
+
+	*list = bctbx_list_append(*list, log);
+	return 0;
+	
+error:
+	if (from){
+		linphone_address_destroy(from);
+	}
+	if (to){
+		linphone_address_destroy(to);
+	}
+	ms_error("Bad call log at storage_id %u", storage_id);
+	return 0;
+}
+
+static void linphone_sql_request_call_log(sqlite3 *db, const char *stmt, bctbx_list_t **list) {
+	char* errmsg = NULL;
+	int ret;
+	ret = sqlite3_exec(db, stmt, create_call_log, list, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("linphone_sql_request: statement %s -> error sqlite3_exec(): %s.", stmt, errmsg);
+		sqlite3_free(errmsg);
+	}
+}
+
+static int linphone_sql_request_generic(sqlite3* db, const char *stmt) {
+	char* errmsg = NULL;
+	int ret;
+	ret = sqlite3_exec(db, stmt, NULL, NULL, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("linphone_sql_request: statement %s -> error sqlite3_exec(): %s.", stmt, errmsg);
+		sqlite3_free(errmsg);
+	}
+	return ret;
+}
+
+void linphone_core_store_call_log(LinphoneCore *lc, LinphoneCallLog *log) {
+	if (lc && lc->logs_db){
+		char *from, *to;
+		char *buf;
+
+		from = linphone_address_as_string(log->from);
+		to = linphone_address_as_string(log->to);
+		buf = sqlite3_mprintf("INSERT INTO call_history VALUES(NULL,%Q,%Q,%i,%i,%lld,%lld,%i,%i,%f,%Q,%Q);",
+						from,
+						to,
+						log->dir,
+						log->duration,
+						(int64_t)log->start_date_time,
+						(int64_t)log->connected_date_time,
+						log->status,
+						log->video_enabled ? 1 : 0,
+						log->quality,
+						log->call_id,
+						log->refkey
+					);
+		linphone_sql_request_generic(lc->logs_db, buf);
+		sqlite3_free(buf);
+		ms_free(from);
+		ms_free(to);
+
+		log->storage_id = (unsigned int)sqlite3_last_insert_rowid(lc->logs_db);
+	}
+
+	if (lc) {
+		lc->call_logs = bctbx_list_prepend(lc->call_logs, linphone_call_log_ref(log));
+	}
+}
+
+static void copy_user_data_from_existing_log(bctbx_list_t *existing_logs, LinphoneCallLog *log) {
+	while (existing_logs) {
+		LinphoneCallLog *existing_log = (LinphoneCallLog *)existing_logs->data;
+		if (existing_log->storage_id == log->storage_id) {
+			log->user_data = existing_log->user_data;
+			break;
+		}
+		existing_logs = bctbx_list_next(existing_logs);
+	}
+}
+
+static void copy_user_data_from_existing_logs(bctbx_list_t *existing_logs, bctbx_list_t *new_logs) {
+	while (new_logs) {
+		LinphoneCallLog *new_log = (LinphoneCallLog *)new_logs->data;
+		copy_user_data_from_existing_log(existing_logs, new_log);
+		new_logs = bctbx_list_next(new_logs);
+	}
+}
+
+const bctbx_list_t *linphone_core_get_call_history(LinphoneCore *lc) {
+	char *buf;
+	uint64_t begin,end;
+	bctbx_list_t *result = NULL;
+
+	if (!lc || lc->logs_db == NULL) return NULL;
+
+	if (lc->max_call_logs != LINPHONE_MAX_CALL_HISTORY_UNLIMITED){
+		buf = sqlite3_mprintf("SELECT * FROM call_history ORDER BY id DESC LIMIT %i", lc->max_call_logs);
+	}else{
+		buf = sqlite3_mprintf("SELECT * FROM call_history ORDER BY id DESC");
+	}
+
+	begin = ortp_get_cur_time_ms();
+	linphone_sql_request_call_log(lc->logs_db, buf, &result);
+	end = ortp_get_cur_time_ms();
+	ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+	sqlite3_free(buf);
+
+	if (lc->call_logs) {
+		copy_user_data_from_existing_logs(lc->call_logs, result);
+	}
+
+	lc->call_logs = bctbx_list_free_with_data(lc->call_logs, (void (*)(void*))linphone_call_log_unref);
+	lc->call_logs = result;
+
+	return lc->call_logs;
+}
+
+void linphone_core_delete_call_history(LinphoneCore *lc) {
+	char *buf;
+
+	if (!lc || lc->logs_db == NULL) return ;
+
+	buf = sqlite3_mprintf("DELETE FROM call_history");
+	linphone_sql_request_generic(lc->logs_db, buf);
+	sqlite3_free(buf);
+}
+
+void linphone_core_delete_call_log(LinphoneCore *lc, LinphoneCallLog *log) {
+	char *buf;
+
+	if (!lc || lc->logs_db == NULL) return ;
+
+	buf = sqlite3_mprintf("DELETE FROM call_history WHERE id = %u", log->storage_id);
+	linphone_sql_request_generic(lc->logs_db, buf);
+	sqlite3_free(buf);
+}
+
+int linphone_core_get_call_history_size(LinphoneCore *lc) {
+	int numrows = 0;
+	char *buf;
+	sqlite3_stmt *selectStatement;
+	int returnValue;
+
+	if (!lc || lc->logs_db == NULL) return 0;
+
+	buf = sqlite3_mprintf("SELECT count(*) FROM call_history");
+	returnValue = sqlite3_prepare_v2(lc->logs_db, buf, -1, &selectStatement, NULL);
+	if (returnValue == SQLITE_OK){
+		if(sqlite3_step(selectStatement) == SQLITE_ROW){
+			numrows = sqlite3_column_int(selectStatement, 0);
+		}
+	}
+	sqlite3_finalize(selectStatement);
+	sqlite3_free(buf);
+
+	return numrows;
+}
+
+bctbx_list_t * linphone_core_get_call_history_for_address(LinphoneCore *lc, const LinphoneAddress *addr) {
+	char *buf;
+	char *sipAddress;
+	uint64_t begin,end;
+	bctbx_list_t *result = NULL;
+
+	if (!lc || lc->logs_db == NULL || addr == NULL) return NULL;
+
+	/*since we want to append query parameters depending on arguments given, we use malloc instead of sqlite3_mprintf*/
+	sipAddress = linphone_address_as_string_uri_only(addr);
+	buf = sqlite3_mprintf("SELECT * FROM call_history WHERE caller LIKE '%%%q%%' OR callee LIKE '%%%q%%' ORDER BY id DESC", sipAddress, sipAddress); // The '%%%q%%' takes care of the eventual presence of a display name
+
+	begin = ortp_get_cur_time_ms();
+	linphone_sql_request_call_log(lc->logs_db, buf, &result);
+	end = ortp_get_cur_time_ms();
+	ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+	sqlite3_free(buf);
+	ms_free(sipAddress);
+
+	if (lc->call_logs) {
+		copy_user_data_from_existing_logs(lc->call_logs, result);
+	}
+
+	return result;
+}
+
+LinphoneCallLog * linphone_core_get_last_outgoing_call_log(LinphoneCore *lc) {
+	char *buf;
+	uint64_t begin,end;
+	bctbx_list_t *list = NULL;
+	LinphoneCallLog* result = NULL;
+
+	if (!lc || lc->logs_db == NULL) return NULL;
+
+	/*since we want to append query parameters depending on arguments given, we use malloc instead of sqlite3_mprintf*/
+	buf = sqlite3_mprintf("SELECT * FROM call_history WHERE direction = 0 ORDER BY id DESC LIMIT 1");
+
+	begin = ortp_get_cur_time_ms();
+	linphone_sql_request_call_log(lc->logs_db, buf, &list);
+	end = ortp_get_cur_time_ms();
+	ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+	sqlite3_free(buf);
+
+	if (list) {
+		result = (LinphoneCallLog*)list->data;
+	}
+
+	if (lc->call_logs && result) {
+		copy_user_data_from_existing_log(lc->call_logs, result);
+	}
+
+	return result;
+}
+
+LinphoneCallLog * linphone_core_find_call_log_from_call_id(LinphoneCore *lc, const char *call_id) {
+	char *buf;
+	uint64_t begin,end;
+	bctbx_list_t *list = NULL;
+	LinphoneCallLog* result = NULL;
+
+	if (!lc || lc->logs_db == NULL) return NULL;
+
+	/*since we want to append query parameters depending on arguments given, we use malloc instead of sqlite3_mprintf*/
+	buf = sqlite3_mprintf("SELECT * FROM call_history WHERE call_id = '%q' ORDER BY id DESC LIMIT 1", call_id);
+
+	begin = ortp_get_cur_time_ms();
+	linphone_sql_request_call_log(lc->logs_db, buf, &list);
+	end = ortp_get_cur_time_ms();
+	ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+	sqlite3_free(buf);
+
+	if (list) {
+		result = (LinphoneCallLog*)list->data;
+	}
+
+	if (lc->call_logs && result) {
+		copy_user_data_from_existing_log(lc->call_logs, result);
+	}
+
+	return result;
+}
+
+#else
+
+void linphone_core_call_log_storage_init(LinphoneCore *lc) {
+}
+
+void linphone_core_call_log_storage_close(LinphoneCore *lc) {
+}
+
+void linphone_core_store_call_log(LinphoneCore *lc, LinphoneCallLog *log) {
+}
+
+const bctbx_list_t *linphone_core_get_call_history(LinphoneCore *lc) {
+	return NULL;
+}
+
+void linphone_core_delete_call_history(LinphoneCore *lc) {
+}
+
+void linphone_core_delete_call_log(LinphoneCore *lc, LinphoneCallLog *log) {
+}
+
+int linphone_core_get_call_history_size(LinphoneCore *lc) {
+	return 0;
+}
+
+bctbx_list_t * linphone_core_get_call_history_for_address(LinphoneCore *lc, const LinphoneAddress *addr) {
+	return NULL;
+}
+
+LinphoneCallLog * linphone_core_get_last_outgoing_call_log(LinphoneCore *lc) {
+	return NULL;
+}
+
+LinphoneCallLog * linphone_core_find_call_log_from_call_id(LinphoneCore *lc, const char *call_id) {
+	return NULL;
+}
+
+#endif
diff --git a/coreapi/call_log.h b/coreapi/call_log.h
index da9cdfb6b..50301487a 100644
--- a/coreapi/call_log.h
+++ b/coreapi/call_log.h
@@ -179,6 +179,13 @@ LINPHONE_PUBLIC bool_t linphone_call_log_video_enabled(LinphoneCallLog *cl);
 **/
 LINPHONE_PUBLIC char * linphone_call_log_to_str(LinphoneCallLog *cl);
 
+/**
+ * Tells whether that call was a call to a conference server
+ * @param[in] cl #LinphoneCallLog object
+ * @return TRUE if the call was a call to a conference server
+ */
+LINPHONE_PUBLIC bool_t linphone_call_log_was_conference(LinphoneCallLog *cl);
+
 
 /*******************************************************************************
  * Reference and user data handling functions                                  *
diff --git a/coreapi/call_params.c b/coreapi/call_params.c
index 5bd95550e..cffc6d8dc 100644
--- a/coreapi/call_params.c
+++ b/coreapi/call_params.c
@@ -72,6 +72,36 @@ SalStreamDir get_video_dir_from_call_params(const LinphoneCallParams *params) {
 	return sal_dir_from_call_params_dir(linphone_call_params_get_video_direction(params));
 }
 
+void linphone_call_params_set_custom_headers(LinphoneCallParams *params, const SalCustomHeader *ch){
+	if (params->custom_headers){
+		sal_custom_header_free(params->custom_headers);
+		params->custom_headers = NULL;
+	}
+	if (ch){
+		params->custom_headers = sal_custom_header_clone(ch);
+	}
+}
+
+void linphone_call_params_set_custom_sdp_attributes(LinphoneCallParams *params, const SalCustomSdpAttribute *csa) {
+	if (params->custom_sdp_attributes) {
+		sal_custom_sdp_attribute_free(params->custom_sdp_attributes);
+		params->custom_sdp_attributes = NULL;
+	}
+	if (csa) {
+		params->custom_sdp_attributes = sal_custom_sdp_attribute_clone(csa);
+	}
+}
+
+void linphone_call_params_set_custom_sdp_media_attributes(LinphoneCallParams *params, LinphoneStreamType type, const SalCustomSdpAttribute *csa) {
+	if (params->custom_sdp_media_attributes[type]) {
+		sal_custom_sdp_attribute_free(params->custom_sdp_media_attributes[type]);
+		params->custom_sdp_media_attributes[type] = NULL;
+	}
+	if (csa) {
+		params->custom_sdp_media_attributes[type] = sal_custom_sdp_attribute_clone(csa);
+	}
+}
+
 
 /*******************************************************************************
  * Public functions                                                            *
@@ -81,7 +111,24 @@ void linphone_call_params_add_custom_header(LinphoneCallParams *params, const ch
 	params->custom_headers=sal_custom_header_append(params->custom_headers,header_name,header_value);
 }
 
+void linphone_call_params_add_custom_sdp_attribute(LinphoneCallParams *params, const char *attribute_name, const char *attribute_value) {
+	params->custom_sdp_attributes = sal_custom_sdp_attribute_append(params->custom_sdp_attributes, attribute_name, attribute_value);
+}
+
+void linphone_call_params_add_custom_sdp_media_attribute(LinphoneCallParams *params, LinphoneStreamType type, const char *attribute_name, const char *attribute_value) {
+	params->custom_sdp_media_attributes[type] = sal_custom_sdp_attribute_append(params->custom_sdp_media_attributes[type], attribute_name, attribute_value);
+}
+
+void linphone_call_params_clear_custom_sdp_attributes(LinphoneCallParams *params) {
+	linphone_call_params_set_custom_sdp_attributes(params, NULL);
+}
+
+void linphone_call_params_clear_custom_sdp_media_attributes(LinphoneCallParams *params, LinphoneStreamType type) {
+	linphone_call_params_set_custom_sdp_media_attributes(params, type, NULL);
+}
+
 LinphoneCallParams * linphone_call_params_copy(const LinphoneCallParams *cp){
+	unsigned int i;
 	LinphoneCallParams *ncp=linphone_call_params_new();
 	memcpy(ncp,cp,sizeof(LinphoneCallParams));
 	if (cp->record_file) ncp->record_file=ms_strdup(cp->record_file);
@@ -90,6 +137,10 @@ LinphoneCallParams * linphone_call_params_copy(const LinphoneCallParams *cp){
 	 * The management of the custom headers is not optimal. We copy everything while ref counting would be more efficient.
 	 */
 	if (cp->custom_headers) ncp->custom_headers=sal_custom_header_clone(cp->custom_headers);
+	if (cp->custom_sdp_attributes) ncp->custom_sdp_attributes = sal_custom_sdp_attribute_clone(cp->custom_sdp_attributes);
+	for (i = 0; i < (unsigned int)LinphoneStreamTypeUnknown; i++) {
+		if (cp->custom_sdp_media_attributes[i]) ncp->custom_sdp_media_attributes[i] = sal_custom_sdp_attribute_clone(cp->custom_sdp_media_attributes[i]);
+	}
 
 	return ncp;
 }
@@ -106,6 +157,17 @@ void linphone_call_params_enable_low_bandwidth(LinphoneCallParams *cp, bool_t en
 	cp->low_bandwidth=enabled;
 }
 
+void linphone_call_params_enable_audio(LinphoneCallParams *cp, bool_t enabled){
+	cp->has_audio=enabled;
+	if (enabled && cp->audio_dir==LinphoneMediaDirectionInactive)
+		cp->audio_dir=LinphoneMediaDirectionSendRecv;
+}
+
+int linphone_call_params_enable_realtime_text(LinphoneCallParams *params, bool_t yesno) {
+	params->realtimetext_enabled=yesno;
+	return 0;
+}
+
 void linphone_call_params_enable_video(LinphoneCallParams *cp, bool_t enabled){
 	cp->has_video=enabled;
 	if (enabled && cp->video_dir==LinphoneMediaDirectionInactive)
@@ -116,6 +178,14 @@ const char *linphone_call_params_get_custom_header(const LinphoneCallParams *par
 	return sal_custom_header_find(params->custom_headers,header_name);
 }
 
+const char * linphone_call_params_get_custom_sdp_attribute(const LinphoneCallParams *params, const char *attribute_name) {
+	return sal_custom_sdp_attribute_find(params->custom_sdp_attributes, attribute_name);
+}
+
+const char * linphone_call_params_get_custom_sdp_media_attribute(const LinphoneCallParams *params, LinphoneStreamType type, const char *attribute_name) {
+	return sal_custom_sdp_attribute_find(params->custom_sdp_media_attributes[type], attribute_name);
+}
+
 bool_t linphone_call_params_get_local_conference_mode(const LinphoneCallParams *cp){
 	return cp->in_conference;
 }
@@ -164,6 +234,11 @@ const LinphonePayloadType* linphone_call_params_get_used_video_codec(const Linph
 	return cp->video_codec;
 }
 
+const LinphonePayloadType* linphone_call_params_get_used_text_codec(const LinphoneCallParams *cp) {
+	return cp->text_codec;
+}
+
+
 bool_t linphone_call_params_low_bandwidth_enabled(const LinphoneCallParams *cp) {
 	return cp->low_bandwidth;
 }
@@ -196,6 +271,14 @@ void linphone_call_params_set_session_name(LinphoneCallParams *cp, const char *n
 	if (name) cp->session_name=ms_strdup(name);
 }
 
+bool_t linphone_call_params_audio_enabled(const LinphoneCallParams *cp){
+	return cp->has_audio;
+}
+
+bool_t linphone_call_params_realtime_text_enabled(const LinphoneCallParams *params) {
+	return params->realtimetext_enabled;
+}
+
 bool_t linphone_call_params_video_enabled(const LinphoneCallParams *cp){
 	return cp->has_video;
 }
@@ -258,14 +341,22 @@ bool_t linphone_call_params_video_multicast_enabled(const LinphoneCallParams *pa
  ******************************************************************************/
 
 static void _linphone_call_params_destroy(LinphoneCallParams *cp){
+	unsigned int i;
 	if (cp->record_file) ms_free(cp->record_file);
 	if (cp->custom_headers) sal_custom_header_free(cp->custom_headers);
+	if (cp->custom_sdp_attributes) sal_custom_sdp_attribute_free(cp->custom_sdp_attributes);
+	for (i = 0; i < (unsigned int)LinphoneStreamTypeUnknown; i++) {
+		if (cp->custom_sdp_media_attributes[i]) sal_custom_sdp_attribute_free(cp->custom_sdp_media_attributes[i]);
+	}
+	if (cp->session_name) ms_free(cp->session_name);
 }
 
 LinphoneCallParams * linphone_call_params_new(void) {
 	LinphoneCallParams *cp=belle_sip_object_new(LinphoneCallParams);
 	cp->audio_dir=LinphoneMediaDirectionSendRecv;
 	cp->video_dir=LinphoneMediaDirectionSendRecv;
+	cp->has_audio=TRUE;
+	cp->realtimetext_enabled = FALSE;
 	return cp;
 }
 
diff --git a/coreapi/call_params.h b/coreapi/call_params.h
index 08f0c9d5f..84bef3f3f 100644
--- a/coreapi/call_params.h
+++ b/coreapi/call_params.h
@@ -101,6 +101,13 @@ LINPHONE_PUBLIC void linphone_call_params_enable_early_media_sending(LinphoneCal
 **/
 LINPHONE_PUBLIC void linphone_call_params_enable_low_bandwidth(LinphoneCallParams *cp, bool_t enabled);
 
+/**
+ * Enable audio stream.
+ * @param[in] cp LinphoneCallParams object
+ * @param[in] enabled A boolean value telling whether to enable audio or not.
+**/
+LINPHONE_PUBLIC void linphone_call_params_enable_audio(LinphoneCallParams *cp, bool_t enabled);
+
 /**
  * Enable video stream.
  * @param[in] cp LinphoneCallParams object
@@ -118,6 +125,10 @@ LINPHONE_PUBLIC const char *linphone_call_params_get_custom_header(const Linphon
 
 /**
  * Tell whether the call is part of the locally managed conference.
+ * @warning If a conference server is used to manage conferences,
+ * that function does not return TRUE even if the conference is running.<br/>
+ * If you want to test whether the conference is running, you should test
+ * whether linphone_core_get_conference() return a non-null pointer.
  * @param[in] cp LinphoneCallParams object
  * @return A boolean value telling whether the call is part of the locally managed conference.
 **/
@@ -201,6 +212,13 @@ LINPHONE_PUBLIC const LinphonePayloadType* linphone_call_params_get_used_audio_c
 **/
 LINPHONE_PUBLIC const LinphonePayloadType* linphone_call_params_get_used_video_codec(const LinphoneCallParams *cp);
 
+/**
+ * Get the text codec used in the call, described as a LinphonePayloadType structure.
+ * @param[in] cp LinphoneCallParams object
+ * @return The LinphonePayloadType object corresponding to the text codec being used in the call.
+**/
+LINPHONE_PUBLIC const LinphonePayloadType* linphone_call_params_get_used_text_codec(const LinphoneCallParams *cp);
+
 /**
  * Tell whether the call has been configured in low bandwidth mode or not.
  * This mode can be automatically discovered thanks to a stun server when activate_edge_workarounds=1 in section [net] of configuration file.
@@ -233,7 +251,7 @@ LINPHONE_PUBLIC void linphone_call_params_set_media_encryption(LinphoneCallParam
  * @param[in] cp LinphoneCallParams object
  * @param[in] privacy The privacy mode to used for the call.
 **/
-LINPHONE_PUBLIC void linphone_call_params_set_privacy(LinphoneCallParams *params, LinphonePrivacyMask privacy);
+LINPHONE_PUBLIC void linphone_call_params_set_privacy(LinphoneCallParams *cp, LinphonePrivacyMask privacy);
 
 /**
  * Enable recording of the call.
@@ -254,6 +272,13 @@ LINPHONE_PUBLIC void linphone_call_params_set_record_file(LinphoneCallParams *cp
 **/
 LINPHONE_PUBLIC void linphone_call_params_set_session_name(LinphoneCallParams *cp, const char *name);
 
+/**
+ * Tell whether audio is enabled or not.
+ * @param[in] cp LinphoneCallParams object
+ * @return A boolean value telling whether audio is enabled or not.
+**/
+LINPHONE_PUBLIC bool_t linphone_call_params_audio_enabled(const LinphoneCallParams *cp);
+
 /**
  * Tell whether video is enabled or not.
  * @param[in] cp LinphoneCallParams object
@@ -263,29 +288,29 @@ LINPHONE_PUBLIC bool_t linphone_call_params_video_enabled(const LinphoneCallPara
 
 /**
  * Get the audio stream direction.
- * @param[in] cl LinphoneCallParams object
+ * @param[in] cp LinphoneCallParams object
  * @return The audio stream direction associated with the call params.
 **/
 LINPHONE_PUBLIC  LinphoneMediaDirection linphone_call_params_get_audio_direction(const LinphoneCallParams *cp);
 
 /**
  * Get the video stream direction.
- * @param[in] cl LinphoneCallParams object
+ * @param[in] cp LinphoneCallParams object
  * @return The video stream direction associated with the call params.
 **/
 LINPHONE_PUBLIC  LinphoneMediaDirection linphone_call_params_get_video_direction(const LinphoneCallParams *cp);
 
 /**
- * Set the audio stream direction. Only relevant for multicast
- * @param[in] cl LinphoneCallParams object
- * @param[in] The audio stream direction associated with this call params.
+ * Set the audio stream direction.
+ * @param[in] cp LinphoneCallParams object
+ * @param[in] dir The audio stream direction associated with this call params.
 **/
 LINPHONE_PUBLIC void linphone_call_params_set_audio_direction(LinphoneCallParams *cp, LinphoneMediaDirection dir);
 
 /**
- * Set the video stream direction. Only relevant for multicast
- * @param[in] cl LinphoneCallParams object
- * @param[in] The video stream direction associated with this call params.
+ * Set the video stream direction.
+ * @param[in] cp LinphoneCallParams object
+ * @param[in] dir The video stream direction associated with this call params.
 **/
 LINPHONE_PUBLIC void linphone_call_params_set_video_direction(LinphoneCallParams *cp, LinphoneMediaDirection dir);
 
@@ -296,28 +321,28 @@ LINPHONE_PUBLIC void linphone_call_params_set_video_direction(LinphoneCallParams
 
 /**
  * Get the user data associated with the call params.
- * @param[in] cl LinphoneCallParams object
+ * @param[in] cp LinphoneCallParams object
  * @return The user data associated with the call params.
 **/
 LINPHONE_PUBLIC void *linphone_call_params_get_user_data(const LinphoneCallParams *cp);
 
 /**
  * Assign a user data to the call params.
- * @param[in] cl LinphoneCallParams object
+ * @param[in] cp LinphoneCallParams object
  * @param[in] ud The user data to associate with the call params.
 **/
 LINPHONE_PUBLIC void linphone_call_params_set_user_data(LinphoneCallParams *cp, void *ud);
 
 /**
  * Acquire a reference to the call params.
- * @param[in] cl LinphoneCallParams object
+ * @param[in] cp LinphoneCallParams object
  * @return The same LinphoneCallParams object
 **/
 LINPHONE_PUBLIC LinphoneCallParams * linphone_call_params_ref(LinphoneCallParams *cp);
 
 /**
  * Release a reference to the call params.
- * @param[in] cl LinphoneCallParams object
+ * @param[in] cp LinphoneCallParams object
 **/
 LINPHONE_PUBLIC void linphone_call_params_unref(LinphoneCallParams *cp);
 
@@ -326,36 +351,107 @@ LINPHONE_PUBLIC void linphone_call_params_unref(LinphoneCallParams *cp);
  * Use to enable multicast rtp for audio stream.
  * * If enabled, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into audio cline. In case of outgoing call audio stream is sent to this multicast address.
  * <br> For incoming calls behavior is unchanged.
- * @param core #LinphoneCallParams
+ * @param params #LinphoneCallParams
  * @param yesno if yes, subsequent calls will propose multicast ip set by #linphone_core_set_audio_multicast_addr
  * @ingroup media_parameters
 **/
-LINPHONE_PUBLIC void linphone_call_params_enable_audio_multicast(LinphoneCallParams *param, bool_t yesno);
+LINPHONE_PUBLIC void linphone_call_params_enable_audio_multicast(LinphoneCallParams *params, bool_t yesno);
 
 /**
  * Use to get multicast state of audio stream.
- * @param core #LinphoneCallParams
+ * @param params #LinphoneCallParams
  * @return true if  subsequent calls will propose multicast ip set by #linphone_core_set_audio_multicast_addr
  * @ingroup media_parameters
 **/
-LINPHONE_PUBLIC bool_t linphone_call_params_audio_multicast_enabled(const LinphoneCallParams *param);
+LINPHONE_PUBLIC bool_t linphone_call_params_audio_multicast_enabled(const LinphoneCallParams *params);
 
 /**
  * Use to enable multicast rtp for video stream.
  * If enabled, outgoing calls put a multicast address from #linphone_core_get_video_multicast_addr into video cline. In case of outgoing call video stream is sent to this  multicast address.
  * <br> For incoming calls behavior is unchanged.
- * @param core #LinphoneCallParams
+ * @param params #LinphoneCallParams
  * @param yesno if yes, subsequent outgoing calls will propose multicast ip set by #linphone_core_set_video_multicast_addr
  * @ingroup media_parameters
 **/
-LINPHONE_PUBLIC void linphone_call_params_enable_video_multicast(LinphoneCallParams *param, bool_t yesno);
+LINPHONE_PUBLIC void linphone_call_params_enable_video_multicast(LinphoneCallParams *params, bool_t yesno);
+
 /**
  * Use to get multicast state of video stream.
- * @param core #LinphoneCallParams
+ * @param params #LinphoneCallParams
  * @return true if  subsequent calls will propose multicast ip set by #linphone_core_set_video_multicast_addr
  * @ingroup media_parameters
 **/
-LINPHONE_PUBLIC bool_t linphone_call_params_video_multicast_enabled(const LinphoneCallParams *param);
+LINPHONE_PUBLIC bool_t linphone_call_params_video_multicast_enabled(const LinphoneCallParams *params);
+
+/**
+ * Use to enable real time text following rfc4103.
+ * If enabled, outgoing calls put a m=text line in SDP offer .
+ * @param params #LinphoneCallParams
+ * @param yesno if yes, subsequent outgoing calls will propose rtt
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC int linphone_call_params_enable_realtime_text(LinphoneCallParams *params, bool_t yesno);
+
+/**
+ * Use to get real time text following rfc4103.
+ * @param params #LinphoneCallParams
+ * @returns returns true if call rtt is activated.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC bool_t linphone_call_params_realtime_text_enabled(const LinphoneCallParams *params);
+
+/**
+ * Add a custom attribute related to all the streams in the SDP exchanged within SIP messages during a call.
+ * @param[in] params The #LinphoneCallParams to add a custom SDP attribute to.
+ * @param[in] attribute_name The name of the attribute to add.
+ * @param[in] attribute_value The content value of the attribute to add.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_call_params_add_custom_sdp_attribute(LinphoneCallParams *params, const char *attribute_name, const char *attribute_value);
+
+/**
+ * Add a custom attribute related to a specific stream in the SDP exchanged within SIP messages during a call.
+ * @param[in] params The #LinphoneCallParams to add a custom SDP attribute to.
+ * @param[in] type The type of the stream to add a custom SDP attribute to.
+ * @param[in] attribute_name The name of the attribute to add.
+ * @param[in] attribute_value The content value of the attribute to add.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_call_params_add_custom_sdp_media_attribute(LinphoneCallParams *params, LinphoneStreamType type, const char *attribute_name, const char *attribute_value);
+
+/**
+ * Get a custom SDP attribute that is related to all the streams.
+ * @param[in] params The #LinphoneCallParams to get the custom SDP attribute from.
+ * @param[in] attribute_name The name of the attribute to get.
+ * @return The content value of the attribute or NULL if not found.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC const char * linphone_call_params_get_custom_sdp_attribute(const LinphoneCallParams *params, const char *attribute_name);
+
+/**
+ * Get a custom SDP attribute that is related to a specific stream.
+ * @param[in] params The #LinphoneCallParams to get the custom SDP attribute from.
+ * @param[in] type The type of the stream to add a custom SDP attribute to.
+ * @param[in] attribute_name The name of the attribute to get.
+ * @return The content value of the attribute or NULL if not found.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC const char * linphone_call_params_get_custom_sdp_media_attribute(const LinphoneCallParams *params, LinphoneStreamType type, const char *attribute_name);
+
+/**
+ * Clear the custom SDP attributes related to all the streams in the SDP exchanged within SIP messages during a call.
+ * @param[in] params The #LinphoneCallParams to clear the custom SDP attributes from.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_call_params_clear_custom_sdp_attributes(LinphoneCallParams *params);
+
+/**
+ * Clear the custom SDP attributes related to a specific stream in the SDP exchanged within SIP messages during a call.
+ * @param[in] params The #LinphoneCallParams to clear the custom SDP attributes from.
+ * @param[in] type The type of the stream to clear the custom SDP attributes from.
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC void linphone_call_params_clear_custom_sdp_media_attributes(LinphoneCallParams *params, LinphoneStreamType type);
 
 
 /*******************************************************************************
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 339c0a905..9e6e359fb 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -36,10 +36,17 @@ static void register_failure(SalOp *op);
 
 static int media_parameters_changed(LinphoneCall *call, SalMediaDescription *oldmd, SalMediaDescription *newmd) {
 	int result=0;
+	int otherdesc_changed;
+	char *tmp1=NULL;
+	char *tmp2=NULL;
 	if (call->params->in_conference != call->current_params->in_conference) return SAL_MEDIA_DESCRIPTION_FORCE_STREAM_RECONSTRUCTION;
 	if (call->up_bw != linphone_core_get_upload_bandwidth(call->core)) return SAL_MEDIA_DESCRIPTION_FORCE_STREAM_RECONSTRUCTION;
-	if (call->localdesc_changed) ms_message("Local description has changed: %i", call->localdesc_changed);
-	result = call->localdesc_changed | sal_media_description_equals(oldmd, newmd);
+	if (call->localdesc_changed) ms_message("Local description has changed: %s", tmp1 = sal_media_description_print_differences(call->localdesc_changed));
+	otherdesc_changed = sal_media_description_equals(oldmd, newmd);
+	if (otherdesc_changed) ms_message("Other description has changed: %s", tmp2 = sal_media_description_print_differences(otherdesc_changed));
+	result = call->localdesc_changed | otherdesc_changed;
+	if (tmp1) ms_free(tmp1);
+	if (tmp2) ms_free(tmp2);
 	return result;
 }
 
@@ -49,7 +56,7 @@ void linphone_core_update_streams_destinations(LinphoneCore *lc, LinphoneCall *c
 	char *rtp_addr, *rtcp_addr;
 	int i;
 
-	for (i = 0; i < new_md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&new_md->streams[i])) continue;
 		if (new_md->streams[i].type == SalAudio) {
 			new_audiodesc = &new_md->streams[i];
@@ -104,12 +111,12 @@ void linphone_call_update_frozen_payloads(LinphoneCall *call, SalMediaDescriptio
 	SalMediaDescription *local=call->localdesc;
 	int i;
 	for(i=0;i<result_desc->nb_streams;++i){
-		MSList *elem;
+		bctbx_list_t *elem;
 		for (elem=result_desc->streams[i].payloads;elem!=NULL;elem=elem->next){
 			PayloadType *pt=(PayloadType*)elem->data;
 			if (is_payload_type_number_available(local->streams[i].already_assigned_payloads, payload_type_get_number(pt), NULL)){
 				/*new codec, needs to be added to the list*/
-				local->streams[i].already_assigned_payloads=ms_list_append(local->streams[i].already_assigned_payloads, payload_type_clone(pt));
+				local->streams[i].already_assigned_payloads=bctbx_list_append(local->streams[i].already_assigned_payloads, payload_type_clone(pt));
 				ms_message("LinphoneCall[%p] : payload type %i %s/%i fmtp=%s added to frozen list.",
 					   call, payload_type_get_number(pt), pt->mime_type, pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : "");
 			}
@@ -129,18 +136,7 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 		ms_error("linphone_core_update_streams() called with null media description");
 		return;
 	}
-	if (call->biggestdesc==NULL || new_md->nb_streams>call->biggestdesc->nb_streams){
-		/*we have been offered and now are ready to proceed, or we added a new stream*/
-		/*store the media description to remember the mapping of calls*/
-		if (call->biggestdesc){
-			sal_media_description_unref(call->biggestdesc);
-			call->biggestdesc=NULL;
-		}
-		if (sal_call_is_offerer(call->op))
-			call->biggestdesc=sal_media_description_ref(call->localdesc);
-		else
-			call->biggestdesc=sal_media_description_ref(sal_call_get_remote_media_description(call->op));
-	}
+	linphone_call_update_biggest_desc(call, call->localdesc);
 	sal_media_description_ref(new_md);
 	call->resultdesc=new_md;
 	if ((call->audiostream && call->audiostream->ms.state==MSStreamStarted) || (call->videostream && call->videostream->ms.state==MSStreamStarted)){
@@ -152,6 +148,7 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 			if ((md_changed & (	SAL_MEDIA_DESCRIPTION_CODEC_CHANGED
 								|SAL_MEDIA_DESCRIPTION_STREAMS_CHANGED
 								|SAL_MEDIA_DESCRIPTION_NETWORK_XXXCAST_CHANGED
+								|SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED
 								|SAL_MEDIA_DESCRIPTION_FORCE_STREAM_RECONSTRUCTION ))){
 				ms_message("Media descriptions are different, need to restart the streams.");
 			} else if ( call->playing_ringbacktone) {
@@ -161,12 +158,12 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 					if (call->all_muted){
 						ms_message("Early media finished, unmuting inputs...");
 						/*we were in early media, now we want to enable real media */
-						linphone_call_enable_camera (call,linphone_call_camera_enabled (call));
+						call->all_muted = FALSE;
 						if (call->audiostream)
 							linphone_core_enable_mic(lc, linphone_core_mic_enabled(lc));
 #ifdef VIDEO_ENABLED
 						if (call->videostream && call->camera_enabled)
-							video_stream_change_camera(call->videostream,linphone_call_get_video_device(call));
+							linphone_call_enable_camera(call, linphone_call_camera_enabled(call));
 #endif
 					}
 					/*FIXME ZRTP, might be restarted in any cases ? */
@@ -188,8 +185,9 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 		linphone_call_stop_media_streams (call);
 		if (md_changed & SAL_MEDIA_DESCRIPTION_NETWORK_XXXCAST_CHANGED){
 			ms_message("Media ip type has changed, destroying sessions context on call [%p]",call);
-			ms_media_stream_sessions_uninit(&call->sessions[0]);
-			ms_media_stream_sessions_uninit(&call->sessions[1]);
+			ms_media_stream_sessions_uninit(&call->sessions[call->main_audio_stream_index]);
+			ms_media_stream_sessions_uninit(&call->sessions[call->main_video_stream_index]);
+			ms_media_stream_sessions_uninit(&call->sessions[call->main_text_stream_index]);
 		}
 		linphone_call_init_media_streams (call);
 	}
@@ -198,12 +196,12 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 		/*this happens after pausing the call locally. The streams are destroyed and then we wait the 200Ok to recreate them*/
 		linphone_call_init_media_streams (call);
 	}
-	
+
 	if (call->params->real_early_media && call->state==LinphoneCallOutgoingEarlyMedia){
 		prepare_early_media_forking(call);
 	}
 	linphone_call_start_media_streams(call, target_state);
-	if (call->state==LinphoneCallPausing && call->paused_by_app && ms_list_size(lc->calls)==1){
+	if (call->state==LinphoneCallPausing && call->paused_by_app && bctbx_list_size(lc->calls)==1){
 		linphone_core_play_named_tone(lc,LinphoneToneCallOnHold);
 	}
 	linphone_call_update_frozen_payloads(call, new_md);
@@ -214,7 +212,7 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 }
 #if 0
 static bool_t is_duplicate_call(LinphoneCore *lc, const LinphoneAddress *from, const LinphoneAddress *to){
-	MSList *elem;
+	bctbx_list_t *elem;
 	for(elem=lc->calls;elem!=NULL;elem=elem->next){
 		LinphoneCall *call=(LinphoneCall*)elem->data;
 		if (linphone_address_weak_equal(call->log->from,from) &&
@@ -227,7 +225,7 @@ static bool_t is_duplicate_call(LinphoneCore *lc, const LinphoneAddress *from, c
 #endif
 
 static bool_t already_a_call_with_remote_address(const LinphoneCore *lc, const LinphoneAddress *remote) {
-	MSList *elem;
+	bctbx_list_t *elem;
 	ms_message("Searching for already_a_call_with_remote_address.");
 
 	for(elem=lc->calls;elem!=NULL;elem=elem->next){
@@ -242,9 +240,28 @@ static bool_t already_a_call_with_remote_address(const LinphoneCore *lc, const L
 }
 
 
+static LinphoneCall * look_for_broken_call_to_replace(SalOp *h, LinphoneCore *lc) {
+	const bctbx_list_t *calls = linphone_core_get_calls(lc);
+	const bctbx_list_t *it = calls;
+	while (it != NULL) {
+		LinphoneCall *replaced_call = NULL;
+		LinphoneCall *call = (LinphoneCall *)bctbx_list_get_data(it);
+		SalOp *replaced_op = sal_call_get_replaces(h);
+		if (replaced_op) replaced_call = (LinphoneCall*)sal_op_get_user_pointer(replaced_op);
+		if ((call->broken && sal_call_compare_op(h, call->op))
+			|| ((replaced_call == call) && (strcmp(sal_op_get_from(h), sal_op_get_from(replaced_op)) == 0) && (strcmp(sal_op_get_to(h), sal_op_get_to(replaced_op)) == 0))) {
+			return call;
+		}
+		it = bctbx_list_next(it);
+	}
+	
+	return NULL;
+}
+
 static void call_received(SalOp *h){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(h));
 	LinphoneCall *call;
+	LinphoneCall *replaced_call;
 	char *alt_contact;
 	LinphoneAddress *from_addr=NULL;
 	LinphoneAddress  *to_addr=NULL;
@@ -252,31 +269,30 @@ static void call_received(SalOp *h){
 	SalMediaDescription *md;
 	const char * p_asserted_id;
 
+	/* Look if this INVITE is for a call that has already been notified but broken because of network failure */
+	replaced_call = look_for_broken_call_to_replace(h, lc);
+	if (replaced_call != NULL) {
+		linphone_call_replace_op(replaced_call, h);
+		return;
+	}
+
 	/* first check if we can answer successfully to this invite */
 	if (linphone_presence_model_get_basic_status(lc->presence_model) == LinphonePresenceBasicStatusClosed) {
 		LinphonePresenceActivity *activity = linphone_presence_model_get_activity(lc->presence_model);
 		switch (linphone_presence_activity_get_type(activity)) {
-			case LinphonePresenceActivityBusy:
-				sal_call_decline(h,SalReasonBusy,NULL);
-				break;
-			case LinphonePresenceActivityAppointment:
-			case LinphonePresenceActivityMeeting:
-			case LinphonePresenceActivityOffline:
-			case LinphonePresenceActivityWorship:
-				sal_call_decline(h,SalReasonTemporarilyUnavailable,NULL);
-				break;
 			case LinphonePresenceActivityPermanentAbsence:
 				alt_contact = linphone_presence_model_get_contact(lc->presence_model);
 				if (alt_contact != NULL) {
 					sal_call_decline(h,SalReasonRedirect,alt_contact);
 					ms_free(alt_contact);
+					sal_op_release(h);
+					return;
 				}
 				break;
 			default:
+				/*nothing special to be done*/
 				break;
 		}
-		sal_op_release(h);
-		return;
 	}
 
 	if (!linphone_core_can_we_add_call(lc)){/*busy*/
@@ -346,7 +362,7 @@ static void call_received(SalOp *h){
 
 	call->bg_task_id=sal_begin_background_task("liblinphone call notification", NULL, NULL);
 
-	if ((linphone_core_get_firewall_policy(lc) == LinphonePolicyUseIce) && (call->ice_session != NULL)) {
+	if (call->defer_notify_incoming) {
 		/* Defer ringing until the end of the ICE candidates gathering process. */
 		ms_message("Defer ringing to gather ICE candidates");
 		return;
@@ -368,7 +384,7 @@ static void try_early_media_forking(LinphoneCall *call, SalMediaDescription *md)
 	SalStreamDescription *ref_stream,*new_stream;
 	ms_message("Early media response received from another branch, checking if media can be forked to this new destination.");
 
-	for (i=0;i<cur_md->nb_streams;++i){
+	for (i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
 		if (!sal_stream_description_active(&cur_md->streams[i])) continue;
 		ref_stream=&cur_md->streams[i];
 		new_stream=&md->streams[i];
@@ -407,7 +423,7 @@ static void start_remote_ring(LinphoneCore *lc, LinphoneCall *call) {
 		if (call->audiostream)
 			audio_stream_unprepare_sound(call->audiostream);
 		if( lc->sound_conf.remote_ring ){
-			lc->ringstream=ring_start(lc->sound_conf.remote_ring,2000,ringcard);
+			lc->ringstream=ring_start(lc->factory, lc->sound_conf.remote_ring,2000,ringcard);
 		}
 	}
 }
@@ -431,12 +447,13 @@ static void call_ringing(SalOp *h){
 			/*already doing early media */
 			return;
 		}
-		if (lc->ringstream!=NULL) return;/*already ringing !*/
-		start_remote_ring(lc, call);
+		if (lc->ringstream == NULL) start_remote_ring(lc, call);
 		ms_message("Remote ringing...");
 		linphone_core_notify_display_status(lc,_("Remote ringing..."));
 		linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing");
 	}else{
+		/*initialize the remote call params by invoking linphone_call_get_remote_params(). This is useful as the SDP may not be present in the 200Ok*/
+		linphone_call_get_remote_params(call);
 		/*accept early media */
 		if ((call->audiostream && audio_stream_started(call->audiostream))
 #ifdef VIDEO_ENABLED
@@ -476,7 +493,7 @@ static void process_call_accepted(LinphoneCore *lc, LinphoneCall *call, SalOp *o
 	LinphoneCallState next_state = LinphoneCallIdle;
 	const char *next_state_str = NULL;
 	LinphoneTaskList tl;
-	
+
 	switch (call->state){/*immediately notify the connected state, even if errors occur after*/
 		case LinphoneCallOutgoingProgress:
 		case LinphoneCallOutgoingRinging:
@@ -494,7 +511,7 @@ static void process_call_accepted(LinphoneCore *lc, LinphoneCall *call, SalOp *o
 		default:
 		break;
 	}
-	
+
 	linphone_task_list_init(&tl);
 	rmd=sal_call_get_remote_media_description(op);
 	/*set privacy*/
@@ -503,10 +520,7 @@ static void process_call_accepted(LinphoneCore *lc, LinphoneCall *call, SalOp *o
 	if (call->params->internal_call_update)
 		call->params->internal_call_update = FALSE;
 
-	/* Handle remote ICE attributes if any. */
-	if (call->ice_session != NULL && rmd) {
-		linphone_call_update_ice_from_remote_media_description(call, rmd);
-	}
+
 #ifdef BUILD_UPNP
 	if (call->upnp_session != NULL && rmd) {
 		linphone_core_update_upnp_from_remote_media_description(call, rmd);
@@ -522,6 +536,12 @@ static void process_call_accepted(LinphoneCore *lc, LinphoneCall *call, SalOp *o
 		md = NULL;
 	}
 	if (md){ /*there is a valid SDP in the response, either offer or answer, and we're able to start/update the streams*/
+
+		/* Handle remote ICE attributes if any. */
+		if (call->ice_session != NULL && rmd) {
+			linphone_call_update_ice_from_remote_media_description(call, rmd, FALSE);
+		}
+
 		switch (call->state){
 			case LinphoneCallResuming:
 				linphone_core_notify_display_status(lc,_("Call resumed."));
@@ -537,7 +557,7 @@ static void process_call_accepted(LinphoneCore *lc, LinphoneCall *call, SalOp *o
 					next_state = LinphoneCallPausedByRemote;
 					next_state_str = "Call paused by remote";
 				}else{
-					if (!call->current_params->in_conference)
+					if (!call->params->in_conference)
 						lc->current_call=call;
 					next_state = LinphoneCallStreamsRunning;
 					next_state_str = "Streams running";
@@ -559,12 +579,12 @@ static void process_call_accepted(LinphoneCore *lc, LinphoneCall *call, SalOp *o
 				ms_error("call_accepted(): don't know what to do in state [%s]", linphone_call_state_to_string(call->state));
 			break;
 		}
-		
+
 		if (next_state != LinphoneCallIdle){
 			linphone_call_update_remote_session_id_and_ver(call);
 			linphone_core_update_ice_state_in_call_stats(call);
 			linphone_core_update_streams(lc, call, md, next_state);
-			linphone_call_fix_call_parameters(call);
+			linphone_call_fix_call_parameters(call, rmd);
 			linphone_call_set_state(call, next_state, next_state_str);
 		}else{
 			ms_error("BUG: next_state is not set in call_accepted(), current state is %s", linphone_call_state_to_string(call->state));
@@ -600,7 +620,7 @@ static void process_call_accepted(LinphoneCore *lc, LinphoneCall *call, SalOp *o
 static void call_accepted(SalOp *op){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
 	LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
-	
+
 	if (call == NULL){
 		ms_warning("call_accepted: call does no longer exist.");
 		return ;
@@ -626,23 +646,36 @@ static void call_paused_by_remote(LinphoneCore *lc, LinphoneCall *call){
 	linphone_call_params_unref(params);
 }
 
+static void call_updated_by_remote(LinphoneCore *lc, LinphoneCall *call){
+	linphone_core_notify_display_status(lc,_("Call is updated by remote."));
+	linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
+	if (call->defer_update == FALSE){
+		if (call->state == LinphoneCallUpdatedByRemote){
+			linphone_core_accept_call_update(lc,call,NULL);
+		}else{
+			/*otherwise it means that the app responded by linphone_core_accept_call_update
+			 * within the callback, so job is already done.*/
+		}
+	}else{
+		if (call->state == LinphoneCallUpdatedByRemote){
+			ms_message("LinphoneCall [%p]: UpdatedByRemoted was signaled but defered. LinphoneCore expects the application to call "
+				"linphone_core_accept_call_update() later.", call);
+		}
+	}
+}
+
 /* this callback is called when an incoming re-INVITE/ SIP UPDATE modifies the session*/
 static void call_updated(LinphoneCore *lc, LinphoneCall *call, SalOp *op, bool_t is_update){
 	SalMediaDescription *rmd=sal_call_get_remote_media_description(op);
-	
+
 	call->defer_update = lp_config_get_int(lc->config, "sip", "defer_update_default", FALSE);
-	
+
 	switch(call->state){
 		case LinphoneCallPausedByRemote:
 			if (sal_media_description_has_dir(rmd,SalStreamSendRecv) || sal_media_description_has_dir(rmd,SalStreamRecvOnly)){
 				call_resumed(lc,call);
 			}else{
-				/*we are staying in PausedByRemote*/
-				linphone_core_notify_display_status(lc,_("Call is updated by remote."));
-				linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
-				if (call->defer_update == FALSE){
-					linphone_core_accept_call_update(lc,call,NULL);
-				}
+				call_updated_by_remote(lc, call);
 			}
 		break;
 		/*SIP UPDATE CASE*/
@@ -656,14 +689,11 @@ static void call_updated(LinphoneCore *lc, LinphoneCall *call, SalOp *op, bool_t
 			break;
 		case LinphoneCallStreamsRunning:
 		case LinphoneCallConnected:
+		case LinphoneCallUpdatedByRemote: // Can happen on UAC connectivity loss
 			if (sal_media_description_has_dir(rmd,SalStreamSendOnly) || sal_media_description_has_dir(rmd,SalStreamInactive)){
 				call_paused_by_remote(lc,call);
 			}else{
-				linphone_core_notify_display_status(lc,_("Call is updated by remote."));
-				linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
-				if (call->defer_update == FALSE){
-					linphone_core_accept_call_update(lc,call,NULL);
-				}
+				call_updated_by_remote(lc, call);
 			}
 		break;
 		case LinphoneCallPaused:
@@ -673,7 +703,6 @@ static void call_updated(LinphoneCore *lc, LinphoneCall *call, SalOp *op, bool_t
 		case LinphoneCallUpdating:
 		case LinphoneCallPausing:
 		case LinphoneCallResuming:
-		case LinphoneCallUpdatedByRemote:
 			sal_call_decline(call->op,SalReasonInternalError,NULL);
 			/*no break*/
 		case LinphoneCallIdle:
@@ -701,8 +730,15 @@ static void call_updating(SalOp *op, bool_t is_update){
 		ms_error("call_updating(): call doesn't exist anymore");
 		return ;
 	}
+	linphone_call_fix_call_parameters(call, rmd);
 	if (call->state!=LinphoneCallPaused){
 		/*Refresh the local description, but in paused state, we don't change anything.*/
+		if (rmd == NULL && lp_config_get_int(call->core->config,"sip","sdp_200_ack_follow_video_policy",0)) {
+			LinphoneCallParams *p=linphone_core_create_call_params(lc, NULL);
+			ms_message("Applying default policy for offering SDP on call [%p]",call);
+			linphone_call_set_new_params(call, p);
+			linphone_call_params_destroy(p);
+		}
 		linphone_call_make_local_media_description(call);
 		sal_call_set_local_media_description(call->op,call->localdesc);
 	}
@@ -714,9 +750,9 @@ static void call_updating(SalOp *op, bool_t is_update){
 	}else {
 		SalMediaDescription *md;
 		SalMediaDescription *prev_result_desc=call->resultdesc;
-		
+
 		call->expect_media_in_ack = FALSE;
-		
+
 		md=sal_call_get_final_media_description(call->op);
 		if (md && (sal_media_description_empty(md) || linphone_core_incompatible_security(lc,md))){
 			sal_call_decline(call->op,SalReasonNotAcceptable,NULL);
@@ -738,7 +774,7 @@ static void call_updating(SalOp *op, bool_t is_update){
 static void call_ack(SalOp *op){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
 	LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
-	
+
 	if (call == NULL){
 		ms_warning("call_ack(): no call for which an ack is expected");
 		return;
@@ -780,7 +816,7 @@ static void call_terminated(SalOp *op, const char *from){
 		linphone_core_start_refered_call(lc,call,NULL);
 	}
 	//we stop the call only if we have this current call or if we are in call
-	if (lc->ringstream!=NULL && ( (ms_list_size(lc->calls)  == 1) || linphone_core_in_call(lc) )) {
+	if ((bctbx_list_size(lc->calls)  == 1) || linphone_core_in_call(lc)) {
 		linphone_core_stop_ringing(lc);
 	}
 	linphone_call_stop_media_streams(call);
@@ -921,9 +957,11 @@ static void call_failure(SalOp *op){
 	case LinphoneCallUpdating:
 	case LinphoneCallPausing:
 	case LinphoneCallResuming:
-		ms_message("Call error on state [%s], restoring previous state",linphone_call_state_to_string(call->prevstate));
-		linphone_call_set_state(call, call->prevstate,ei->full_string);
-		return;
+		if (ei->reason != SalReasonNoMatch){
+			ms_message("Call error on state [%s], restoring previous state",linphone_call_state_to_string(call->prevstate));
+			linphone_call_set_state(call, call->prevstate,ei->full_string);
+			return;
+		}
 	default:
 		break; /*nothing to do*/
 	}
@@ -939,7 +977,11 @@ static void call_failure(SalOp *op){
 		if (ei->reason==SalReasonDeclined){
 			linphone_call_set_state(call,LinphoneCallEnd,"Call declined.");
 		}else{
-			linphone_call_set_state(call,LinphoneCallError,ei->full_string);
+			if (linphone_call_state_is_early(call->state)){
+				linphone_call_set_state(call,LinphoneCallError,ei->full_string);
+			}else{
+				linphone_call_set_state(call, LinphoneCallEnd, ei->full_string);
+			}
 		}
 		if (ei->reason!=SalReasonNone) linphone_core_play_call_error_tone(lc,linphone_reason_from_sal(ei->reason));
 	}
@@ -963,20 +1005,31 @@ static void call_released(SalOp *op){
 	}
 }
 
+static void call_cancel_done(SalOp *op) {
+	LinphoneCall *call = (LinphoneCall *)sal_op_get_user_pointer(op);
+	if (call->reinvite_on_cancel_response_requested == TRUE) {
+		call->reinvite_on_cancel_response_requested = FALSE;
+		linphone_call_reinvite_to_recover_from_connection_loss(call);
+	}
+}
+
 static void auth_failure(SalOp *op, SalAuthInfo* info) {
-	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
-	LinphoneAuthInfo *ai=NULL;
-
-	if( info != NULL ){
-		ai = (LinphoneAuthInfo*)linphone_core_find_auth_info(lc,info->realm,info->username,info->domain);
+	LinphoneCore *lc = (LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
+	LinphoneAuthInfo *ai = NULL;
 
+	if (info != NULL) {
+		ai = (LinphoneAuthInfo*)_linphone_core_find_auth_info(lc, info->realm, info->username, info->domain, TRUE);
 		if (ai){
-			ms_message("%s/%s/%s authentication fails.",info->realm,info->username,info->domain);
+			LinphoneAuthMethod method = info->mode == SalAuthModeHttpDigest ? LinphoneAuthHttpDigest : LinphoneAuthTls;
+			LinphoneAuthInfo *auth_info = linphone_core_create_auth_info(lc, info->username, NULL, NULL, NULL, info->realm, info->domain);
+			ms_message("%s/%s/%s/%s authentication fails.", info->realm, info->username, info->domain, info->mode == SalAuthModeHttpDigest ? "HttpDigest" : "Tls");
 			/*ask again for password if auth info was already supplied but apparently not working*/
-			linphone_core_notify_auth_info_requested(lc,info->realm,info->username,info->domain);
+			linphone_core_notify_authentication_requested(lc, auth_info, method);
+			linphone_auth_info_destroy(auth_info);
+			// Deprecated
+			linphone_core_notify_auth_info_requested(lc, info->realm, info->username, info->domain);
 		}
 	}
-
 }
 
 static void register_success(SalOp *op, bool_t registered){
@@ -1024,10 +1077,11 @@ static void register_failure(SalOp *op){
 	} else {
 		linphone_proxy_config_set_state(cfg,LinphoneRegistrationFailed,details);
 	}
-	if (cfg->publish_op){
+	if (cfg->long_term_event){
 		/*prevent publish to be sent now until registration gets successful*/
-		sal_op_release(cfg->publish_op);
-		cfg->publish_op=NULL;
+		linphone_event_terminate(cfg->long_term_event);
+		linphone_event_unref(cfg->long_term_event);
+		cfg->long_term_event=NULL;
 		cfg->send_publish=cfg->publish;
 	}
 }
@@ -1047,13 +1101,22 @@ static void vfu_request(SalOp *op){
 static void dtmf_received(SalOp *op, char dtmf){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
 	LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
+	if (!call) return;
 	linphone_core_notify_dtmf_received(lc, call, dtmf);
 }
 
 static void refer_received(Sal *sal, SalOp *op, const char *referto){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal);
 	LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
-	if (call){
+	LinphoneAddress *refer_to_addr = linphone_address_new(referto);
+	char method[20] = "";
+
+	if(refer_to_addr) {
+		const char *tmp = linphone_address_get_method_param(refer_to_addr);
+		if(tmp) strncpy(method, tmp, sizeof(method));
+		linphone_address_destroy(refer_to_addr);
+	}
+	if (call && (strlen(method) == 0 || strcmp(method, "INVITE") == 0)) {
 		if (call->refer_to!=NULL){
 			ms_free(call->refer_to);
 		}
@@ -1072,8 +1135,8 @@ static void refer_received(Sal *sal, SalOp *op, const char *referto){
 }
 
 static bool_t is_duplicate_msg(LinphoneCore *lc, const char *msg_id){
-	MSList *elem=lc->last_recv_msg_ids;
-	MSList *tail=NULL;
+	bctbx_list_t *elem=lc->last_recv_msg_ids;
+	bctbx_list_t *tail=NULL;
 	int i;
 	bool_t is_duplicate=FALSE;
 	for(i=0;elem!=NULL;elem=elem->next,i++){
@@ -1083,11 +1146,11 @@ static bool_t is_duplicate_msg(LinphoneCore *lc, const char *msg_id){
 		tail=elem;
 	}
 	if (!is_duplicate){
-		lc->last_recv_msg_ids=ms_list_prepend(lc->last_recv_msg_ids,ms_strdup(msg_id));
+		lc->last_recv_msg_ids=bctbx_list_prepend(lc->last_recv_msg_ids,ms_strdup(msg_id));
 	}
 	if (i>=10){
 		ms_free(tail->data);
-		lc->last_recv_msg_ids=ms_list_remove_link(lc->last_recv_msg_ids,tail);
+		lc->last_recv_msg_ids=bctbx_list_erase_link(lc->last_recv_msg_ids,tail);
 	}
 	return is_duplicate;
 }
@@ -1110,11 +1173,18 @@ static void is_composing_received(SalOp *op, const SalIsComposing *is_composing)
 }
 
 static void parse_presence_requested(SalOp *op, const char *content_type, const char *content_subtype, const char *body, SalPresenceModel **result) {
-	linphone_notify_parse_presence(op, content_type, content_subtype, body, result);
+	linphone_notify_parse_presence(content_type, content_subtype, body, result);
 }
 
 static void convert_presence_to_xml_requested(SalOp *op, SalPresenceModel *presence, const char *contact, char **content) {
-	linphone_notify_convert_presence_to_xml(op, presence, contact, content);
+	/*for backward compatibility because still used by notify. No loguer used for publish*/
+
+	if(linphone_presence_model_get_presentity((LinphonePresenceModel*)presence) == NULL) {
+		LinphoneAddress * presentity = linphone_address_new(contact);
+		linphone_presence_model_set_presentity((LinphonePresenceModel*)presence, presentity);
+		linphone_address_unref(presentity);
+	}
+	*content = linphone_presence_model_to_xml((LinphonePresenceModel*)presence);
 }
 
 static void notify_presence(SalOp *op, SalSubscribeStatus ss, SalPresenceModel *model, const char *msg){
@@ -1148,57 +1218,82 @@ static void ping_reply(SalOp *op){
 }
 
 static bool_t fill_auth_info_with_client_certificate(LinphoneCore *lc, SalAuthInfo* sai) {
-	const char *chain_file = lp_config_get_string(lc->config,"sip","client_cert_chain", 0);
-	const char *key_file = lp_config_get_string(lc->config,"sip","client_cert_key", 0);;
+	const char *chain_file = linphone_core_get_tls_cert_path(lc);
+	const char *key_file = linphone_core_get_tls_key_path(lc);
 
+	if (key_file && chain_file) {
 #ifndef _WIN32
-	{
-	// optinal check for files
-	struct stat st;
-	if (stat(key_file,&st)) {
-		ms_warning("No client certificate key found in %s", key_file);
-		return FALSE;
-	}
-	if (stat(chain_file,&st)) {
-		ms_warning("No client certificate chain found in %s", chain_file);
-		return FALSE;
-	}
-	}
+		// optinal check for files
+		struct stat st;
+		if (stat(key_file, &st)) {
+			ms_warning("No client certificate key found in %s", key_file);
+			return FALSE;
+		}
+		if (stat(chain_file, &st)) {
+			ms_warning("No client certificate chain found in %s", chain_file);
+			return FALSE;
+		}
 #endif
-
-	sal_certificates_chain_parse_file(sai, chain_file, SAL_CERTIFICATE_RAW_FORMAT_PEM );
-	sal_signing_key_parse_file(sai, key_file, "");
+		sal_certificates_chain_parse_file(sai, chain_file, SAL_CERTIFICATE_RAW_FORMAT_PEM);
+		sal_signing_key_parse_file(sai, key_file, "");
+	} else if (lc->tls_cert && lc->tls_key) {
+		sal_certificates_chain_parse(sai, lc->tls_cert, SAL_CERTIFICATE_RAW_FORMAT_PEM);
+		sal_signing_key_parse(sai, lc->tls_key, "");
+	}
 	return sai->certificates && sai->key;
 }
 
 static bool_t fill_auth_info(LinphoneCore *lc, SalAuthInfo* sai) {
-	LinphoneAuthInfo *ai=(LinphoneAuthInfo*)linphone_core_find_auth_info(lc,sai->realm,sai->username,sai->domain);
+	LinphoneAuthInfo *ai = NULL;
+	if (sai->mode == SalAuthModeTls) {
+		ai = (LinphoneAuthInfo*)_linphone_core_find_tls_auth_info(lc);
+	} else {
+		ai = (LinphoneAuthInfo*)_linphone_core_find_auth_info(lc,sai->realm,sai->username,sai->domain, FALSE);
+	}
 	if (ai) {
-		sai->userid=ms_strdup(ai->userid?ai->userid:ai->username);
-		sai->password=ai->passwd?ms_strdup(ai->passwd):NULL;
-		sai->ha1=ai->ha1?ms_strdup(ai->ha1):NULL;
+		if (sai->mode == SalAuthModeHttpDigest) {
+			sai->userid = ms_strdup(ai->userid ? ai->userid : ai->username);
+			sai->password = ai->passwd?ms_strdup(ai->passwd) : NULL;
+			sai->ha1 = ai->ha1 ? ms_strdup(ai->ha1) : NULL;
+		} else if (sai->mode == SalAuthModeTls) {
+			if (ai->tls_cert && ai->tls_key) {
+				sal_certificates_chain_parse(sai, ai->tls_cert, SAL_CERTIFICATE_RAW_FORMAT_PEM);
+				sal_signing_key_parse(sai, ai->tls_key, "");
+			} else if (ai->tls_cert_path && ai->tls_key_path) {
+				sal_certificates_chain_parse_file(sai, ai->tls_cert_path, SAL_CERTIFICATE_RAW_FORMAT_PEM);
+				sal_signing_key_parse_file(sai, ai->tls_key_path, "");
+			} else {
+				fill_auth_info_with_client_certificate(lc, sai);
+			}
+		}
+		
+		if (sai->realm && !ai->realm){
+			/*if realm was not known, then set it so that ha1 may eventually be calculated and clear text password dropped*/
+			linphone_auth_info_set_realm(ai, sai->realm);
+			linphone_core_write_auth_info(lc, ai);
+		}
 		return TRUE;
 	} else {
+		if (sai->mode == SalAuthModeTls) {
+			return fill_auth_info_with_client_certificate(lc, sai);
+		}
 		return FALSE;
 	}
 }
 static bool_t auth_requested(Sal* sal, SalAuthInfo* sai) {
-	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal);
-	if (sai->mode == SalAuthModeHttpDigest) {
-		if (fill_auth_info(lc,sai)) {
-			return TRUE;
-		} else {
-			{
-				linphone_core_notify_auth_info_requested(lc,sai->realm,sai->username,sai->domain);
-				if (fill_auth_info(lc,sai)) {
-					return TRUE;
-				}
-			}
-			return FALSE;
-		}
-	} else if (sai->mode == SalAuthModeTls) {
-		return fill_auth_info_with_client_certificate(lc,sai);
+	LinphoneCore *lc = (LinphoneCore *)sal_get_user_pointer(sal);
+	if (fill_auth_info(lc,sai)) {
+		return TRUE;
 	} else {
+		LinphoneAuthMethod method = sai->mode == SalAuthModeHttpDigest ? LinphoneAuthHttpDigest : LinphoneAuthTls;
+		LinphoneAuthInfo *ai = linphone_core_create_auth_info(lc, sai->username, NULL, NULL, NULL, sai->realm, sai->domain);
+		linphone_core_notify_authentication_requested(lc, ai, method);
+		linphone_auth_info_destroy(ai);
+		// Deprecated
+		linphone_core_notify_auth_info_requested(lc, sai->realm, sai->username, sai->domain);
+		if (fill_auth_info(lc, sai)) {
+			return TRUE;
+		}
 		return FALSE;
 	}
 }
@@ -1250,32 +1345,22 @@ static void text_delivery_update(SalOp *op, SalTextDeliveryStatus status){
 		// Do not handle delivery status for isComposing messages.
 		return;
 	}
-
-	chat_msg->state=chatStatusSal2Linphone(status);
-	linphone_chat_message_update_state(chat_msg);
-
-	if (chat_msg && (chat_msg->cb || (chat_msg->callbacks && linphone_chat_message_cbs_get_msg_state_changed(chat_msg->callbacks)))) {
-		ms_message("Notifying text delivery with status %s",linphone_chat_message_state_to_string(chat_msg->state));
-		if (chat_msg->callbacks && linphone_chat_message_cbs_get_msg_state_changed(chat_msg->callbacks)) {
-			linphone_chat_message_cbs_get_msg_state_changed(chat_msg->callbacks)(chat_msg, chat_msg->state);
-		} else {
-			/* Legacy */
-			chat_msg->cb(chat_msg,chat_msg->state,chat_msg->cb_ud);
-		}
+	// check that the message does not belong to an already destroyed chat room - if so, do not invoke callbacks
+	if (chat_msg->chat_room != NULL) {
+		linphone_chat_message_update_state(chat_msg, chatStatusSal2Linphone(status));
 	}
 	if (status != SalTextDeliveryInProgress) { /*only release op if not in progress*/
 		linphone_chat_message_destroy(chat_msg);
 	}
 }
 
-static void info_received(SalOp *op, const SalBody *body){
+static void info_received(SalOp *op, SalBodyHandler *body_handler){
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
-	linphone_core_notify_info_message(lc,op,body);
+	linphone_core_notify_info_message(lc,op,body_handler);
 }
 
-static void subscribe_response(SalOp *op, SalSubscribeStatus status){
+static void subscribe_response(SalOp *op, SalSubscribeStatus status, int will_retry){
 	LinphoneEvent *lev=(LinphoneEvent*)sal_op_get_user_pointer(op);
-	const SalErrorInfo *ei=sal_op_get_error_info(op);
 
 	if (lev==NULL) return;
 
@@ -1284,31 +1369,37 @@ static void subscribe_response(SalOp *op, SalSubscribeStatus status){
 	}else if (status==SalSubscribePending){
 		linphone_event_set_state(lev,LinphoneSubscriptionPending);
 	}else{
-		if (lev->subscription_state==LinphoneSubscriptionActive && ei->reason==SalReasonIOError){
+		if (will_retry){
 			linphone_event_set_state(lev,LinphoneSubscriptionOutgoingProgress);
 		}
 		else linphone_event_set_state(lev,LinphoneSubscriptionError);
 	}
 }
 
-static void notify(SalOp *op, SalSubscribeStatus st, const char *eventname, const SalBody *body){
+static void notify(SalOp *op, SalSubscribeStatus st, const char *eventname, SalBodyHandler *body_handler){
 	LinphoneEvent *lev=(LinphoneEvent*)sal_op_get_user_pointer(op);
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
-
-	if (lev==NULL) {
-		/*out of subscribe notify */
-		lev=linphone_event_new_with_out_of_dialog_op(lc,op,LinphoneSubscriptionOutgoing,eventname);
+	bool_t out_of_dialog = (lev==NULL);
+	if (out_of_dialog) {
+		/*out of dialog notify */
+		lev = linphone_event_new_with_out_of_dialog_op(lc,op,LinphoneSubscriptionOutgoing,eventname);
 	}
 	{
-		LinphoneContent *ct=linphone_content_from_sal_body(body);
-		if (ct) linphone_core_notify_notify_received(lc,lev,eventname,ct);
+		LinphoneContent *ct=linphone_content_from_sal_body_handler(body_handler);
+		if (ct) {
+			linphone_core_notify_notify_received(lc,lev,eventname,ct);
+			linphone_content_unref(ct);
+		}
 	}
-	if (st!=SalSubscribeNone){
+	if (out_of_dialog){
+		/*out of dialog NOTIFY do not create an implicit subscription*/
+		linphone_event_set_state(lev, LinphoneSubscriptionTerminated);
+	}else if (st!=SalSubscribeNone){ 
 		linphone_event_set_state(lev,linphone_subscription_state_from_sal(st));
 	}
 }
 
-static void subscribe_received(SalOp *op, const char *eventname, const SalBody *body){
+static void subscribe_received(SalOp *op, const char *eventname, const SalBodyHandler *body_handler){
 	LinphoneEvent *lev=(LinphoneEvent*)sal_op_get_user_pointer(op);
 	LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
 
@@ -1321,7 +1412,7 @@ static void subscribe_received(SalOp *op, const char *eventname, const SalBody *
 
 }
 
-static void subscribe_closed(SalOp *op){
+static void incoming_subscribe_closed(SalOp *op){
 	LinphoneEvent *lev=(LinphoneEvent*)sal_op_get_user_pointer(op);
 
 	linphone_event_set_state(lev,LinphoneSubscriptionTerminated);
@@ -1346,6 +1437,7 @@ static void on_publish_response(SalOp* op){
 	}
 }
 
+
 static void on_expire(SalOp *op){
 	LinphoneEvent *lev=(LinphoneEvent*)sal_op_get_user_pointer(op);
 
@@ -1358,6 +1450,25 @@ static void on_expire(SalOp *op){
 	}
 }
 
+static void on_notify_response(SalOp *op){
+	LinphoneEvent *lev=(LinphoneEvent*)sal_op_get_user_pointer(op);
+
+	if (lev==NULL) return;
+	/*this is actually handling out of dialogs notify - for the moment*/
+	if (!lev->is_out_of_dialog_op) return;
+	switch (linphone_event_get_subscription_state(lev)){
+		case LinphoneSubscriptionIncomingReceived:
+			if (sal_op_get_error_info(op)->reason == SalReasonNone){
+				linphone_event_set_state(lev, LinphoneSubscriptionTerminated);
+			}else{
+				linphone_event_set_state(lev, LinphoneSubscriptionError);
+			}
+		break;
+		default:
+			ms_warning("Unhandled on_notify_response() case %s", linphone_subscription_state_to_string(linphone_event_get_subscription_state(lev)));
+	}
+}
+
 SalCallbacks linphone_sal_callbacks={
 	call_received,
 	call_ringing,
@@ -1367,6 +1478,7 @@ SalCallbacks linphone_sal_callbacks={
 	call_terminated,
 	call_failure,
 	call_released,
+	call_cancel_done,
 	auth_failure,
 	register_success,
 	register_failure,
@@ -1378,7 +1490,7 @@ SalCallbacks linphone_sal_callbacks={
 	is_composing_received,
 	notify_refer,
 	subscribe_received,
-	subscribe_closed,
+	incoming_subscribe_closed,
 	subscribe_response,
 	notify,
 	subscribe_presence_received,
@@ -1390,7 +1502,8 @@ SalCallbacks linphone_sal_callbacks={
 	auth_requested,
 	info_received,
 	on_publish_response,
-	on_expire
+	on_expire,
+	on_notify_response
 };
 
 
diff --git a/coreapi/carddav.c b/coreapi/carddav.c
new file mode 100644
index 000000000..b07bb60ba
--- /dev/null
+++ b/coreapi/carddav.c
@@ -0,0 +1,767 @@
+/*
+carddav.c
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "linphonecore.h"
+#include "private.h"
+
+LinphoneCardDavContext* linphone_carddav_context_new(LinphoneFriendList *lfl) {
+	LinphoneCardDavContext *carddav_context = NULL;
+
+	if (!linphone_core_vcard_supported()) {
+		ms_error("[carddav] vCard isn't available (maybe it wasn't compiled), can't do CardDAV sync");
+		return NULL;
+	}
+	if (!lfl || !lfl->uri) {
+		return NULL;
+	}
+
+	carddav_context = (LinphoneCardDavContext *)ms_new0(LinphoneCardDavContext, 1);
+	carddav_context->friend_list = linphone_friend_list_ref(lfl);
+	return carddav_context;
+}
+
+void linphone_carddav_context_destroy(LinphoneCardDavContext *cdc) {
+	if (cdc) {
+		if (cdc->friend_list) {
+			linphone_friend_list_unref(cdc->friend_list);
+			cdc->friend_list = NULL;
+		}
+		if (cdc->auth_info) {
+			linphone_auth_info_destroy(cdc->auth_info);
+			cdc->auth_info = NULL;
+		}
+		ms_free(cdc);
+	}
+}
+
+void linphone_carddav_set_user_data(LinphoneCardDavContext *cdc, void *ud) {
+	cdc->user_data = ud;
+}
+
+void* linphone_carddav_get_user_data(LinphoneCardDavContext *cdc) {
+	return cdc->user_data;
+}
+
+void linphone_carddav_synchronize(LinphoneCardDavContext *cdc) {
+	cdc->ctag = cdc->friend_list->revision;
+	linphone_carddav_get_current_ctag(cdc);
+}
+
+static void linphone_carddav_client_to_server_sync_done(LinphoneCardDavContext *cdc, bool_t success, const char *msg) {
+	if (!success) {
+		ms_error("[carddav] CardDAV client to server sync failure: %s", msg);
+	}
+	
+	if (cdc->sync_done_cb) {
+		cdc->sync_done_cb(cdc, success, msg);
+	}
+}
+
+static void linphone_carddav_server_to_client_sync_done(LinphoneCardDavContext *cdc, bool_t success, const char *msg) {
+	if (success) {
+		ms_debug("CardDAV sync successful, saving new cTag: %i", cdc->ctag);
+		linphone_friend_list_update_revision(cdc->friend_list, cdc->ctag);
+	} else {
+		ms_error("[carddav] CardDAV server to client sync failure: %s", msg);
+	}
+	
+	if (cdc->sync_done_cb) {
+		cdc->sync_done_cb(cdc, success, msg);
+	}
+}
+
+static int find_matching_friend(LinphoneFriend *lf1, LinphoneFriend *lf2) {
+	LinphoneVcard *lvc1 = linphone_friend_get_vcard(lf1);
+	LinphoneVcard *lvc2 = linphone_friend_get_vcard(lf2);
+	const char *uid1 = NULL, *uid2 = NULL;
+	if (!lvc1 || !lvc2) {
+		return 1;
+	}
+	uid1 = linphone_vcard_get_uid(lvc1);
+	uid2 = linphone_vcard_get_uid(lvc2);
+	if (!uid1 || !uid2) {
+		return 1;
+	}
+	return strcmp(uid1, uid2);
+}
+
+static void linphone_carddav_response_free(LinphoneCardDavResponse *response) {
+	if (response->etag) ms_free(response->etag);
+	if (response->url) ms_free(response->url);
+	if (response->vcard) ms_free(response->vcard);
+	ms_free(response);
+}
+
+static void linphone_carddav_vcards_pulled(LinphoneCardDavContext *cdc, bctbx_list_t *vCards) {
+	bctbx_list_t *vCards_remember = vCards;
+	if (vCards != NULL && bctbx_list_size(vCards) > 0) {
+		bctbx_list_t *friends = cdc->friend_list->friends;
+		while (vCards) {
+			LinphoneCardDavResponse *vCard = (LinphoneCardDavResponse *)vCards->data;
+			if (vCard) {
+				LinphoneVcard *lvc = linphone_vcard_context_get_vcard_from_buffer(cdc->friend_list->lc->vcard_context, vCard->vcard);
+				LinphoneFriend *lf = NULL;
+				bctbx_list_t *local_friend = NULL;
+				
+				if (lvc) {
+					// Compute downloaded vCards' URL and save it (+ eTag)
+					char *vCard_name = strrchr(vCard->url, '/');
+					char full_url[300];
+					snprintf(full_url, sizeof(full_url), "%s%s", cdc->friend_list->uri, vCard_name);
+					linphone_vcard_set_url(lvc, full_url);
+					linphone_vcard_set_etag(lvc, vCard->etag);
+					ms_debug("Downloaded vCard etag/url are %s and %s", vCard->etag, full_url);
+
+					lf = linphone_friend_new_from_vcard(lvc);
+					if (lf) {
+						local_friend = bctbx_list_find_custom(friends, (int (*)(const void*, const void*))find_matching_friend, lf);
+						
+						if (local_friend) {
+							LinphoneFriend *lf2 = (LinphoneFriend *)local_friend->data;
+							lf->storage_id = lf2->storage_id;
+							lf->pol = lf2->pol;
+							lf->subscribe = lf2->subscribe;
+							lf->refkey = ms_strdup(lf2->refkey);
+							lf->presence_received = lf2->presence_received;
+							lf->lc = lf2->lc;
+							lf->friend_list = lf2->friend_list;
+							
+							if (cdc->contact_updated_cb) {
+								ms_debug("Contact updated: %s", linphone_friend_get_name(lf));
+								cdc->contact_updated_cb(cdc, lf, lf2);
+							}
+						} else {
+							if (cdc->contact_created_cb) {
+								ms_debug("Contact created: %s", linphone_friend_get_name(lf));
+								cdc->contact_created_cb(cdc, lf);
+							}
+						}
+						linphone_friend_unref(lf);
+					} else {
+						ms_error("[carddav] Couldn't create a friend from vCard");
+					}
+				} else {
+					ms_error("[carddav] Couldn't parse vCard %s", vCard->vcard);
+				}
+			}
+			vCards = bctbx_list_next(vCards);
+		}
+		bctbx_list_free_with_data(vCards_remember, (void (*)(void *))linphone_carddav_response_free);
+	}
+	linphone_carddav_server_to_client_sync_done(cdc, TRUE, NULL);
+}
+
+static bctbx_list_t* parse_vcards_from_xml_response(const char *body) {
+	bctbx_list_t *result = NULL;
+	xmlparsing_context_t *xml_ctx = linphone_xmlparsing_context_new();
+	xmlSetGenericErrorFunc(xml_ctx, linphone_xmlparsing_genericxml_error);
+	xml_ctx->doc = xmlReadDoc((const unsigned char*)body, 0, NULL, 0);
+	if (xml_ctx->doc != NULL) {
+		if (linphone_create_xml_xpath_context(xml_ctx) < 0) goto end;
+		linphone_xml_xpath_context_init_carddav_ns(xml_ctx);
+		{
+			xmlXPathObjectPtr responses = linphone_get_xml_xpath_object_for_node_list(xml_ctx, "/d:multistatus/d:response");
+			if (responses != NULL && responses->nodesetval != NULL) {
+				xmlNodeSetPtr responses_nodes = responses->nodesetval;
+				if (responses_nodes->nodeNr >= 1) {
+					int i;
+					for (i = 0; i < responses_nodes->nodeNr; i++) {
+						xmlNodePtr response_node = responses_nodes->nodeTab[i];
+						xml_ctx->xpath_ctx->node = response_node;
+						{
+							char *etag = linphone_get_xml_text_content(xml_ctx, "d:propstat/d:prop/d:getetag");
+							char *url =  linphone_get_xml_text_content(xml_ctx, "d:href");
+							char *vcard = linphone_get_xml_text_content(xml_ctx, "d:propstat/d:prop/card:address-data");
+							LinphoneCardDavResponse *response = ms_new0(LinphoneCardDavResponse, 1);
+							response->etag = ms_strdup(etag);
+							response->url = ms_strdup(url);
+							response->vcard = ms_strdup(vcard);
+							result = bctbx_list_append(result, response);
+							ms_debug("Added vCard object with eTag %s, URL %s and vCard %s", etag, url, vcard);
+							linphone_free_xml_text_content(etag);
+							linphone_free_xml_text_content(url);
+							linphone_free_xml_text_content(vcard);
+						}
+					}
+				}
+				xmlXPathFreeObject(responses);
+			}
+		}
+	}
+end:
+	linphone_xmlparsing_context_destroy(xml_ctx);
+	return result;
+}
+
+static int find_matching_vcard(LinphoneCardDavResponse *response, LinphoneFriend *lf) {
+	if (!response->url || !lf || !lf->vcard || !linphone_vcard_get_url(lf->vcard)) {
+		return 1;
+	}
+	return strcmp(response->url, linphone_vcard_get_url(lf->vcard));
+}
+
+static void linphone_carddav_vcards_fetched(LinphoneCardDavContext *cdc, bctbx_list_t *vCards) {
+	if (vCards != NULL && bctbx_list_size(vCards) > 0) {
+		bctbx_list_t *friends = cdc->friend_list->friends;
+		bctbx_list_t *friends_to_remove = NULL;
+		bctbx_list_t *temp_list = NULL;
+		
+		while (friends) {
+			LinphoneFriend *lf = (LinphoneFriend *)friends->data;
+			if (lf) {
+				bctbx_list_t *vCard = bctbx_list_find_custom(vCards, (int (*)(const void*, const void*))find_matching_vcard, lf);
+				if (!vCard) {
+					ms_debug("Local friend %s isn't in the remote vCard list, delete it", linphone_friend_get_name(lf));
+					temp_list = bctbx_list_append(temp_list, linphone_friend_ref(lf));
+				} else {
+					LinphoneCardDavResponse *response = (LinphoneCardDavResponse *)vCard->data;
+					ms_debug("Local friend %s is in the remote vCard list, check eTag", linphone_friend_get_name(lf));
+					if (response) {
+						LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+						const char *etag = linphone_vcard_get_etag(lvc);
+						ms_debug("Local friend eTag is %s, remote vCard eTag is %s", etag, response->etag);
+						if (lvc && etag && strcmp(etag, response->etag) == 0) {
+							bctbx_list_remove(vCards, vCard);
+							linphone_carddav_response_free(response);
+						}
+					}
+				}
+			}
+			friends = bctbx_list_next(friends);
+		}
+		friends_to_remove = temp_list;
+		while(friends_to_remove) {
+			LinphoneFriend *lf = (LinphoneFriend *)friends_to_remove->data;
+			if (lf) {
+				if (cdc->contact_removed_cb) {
+					ms_debug("Contact removed: %s", linphone_friend_get_name(lf));
+					cdc->contact_removed_cb(cdc, lf);
+				}
+			}
+			friends_to_remove = bctbx_list_next(friends_to_remove);
+		}
+		temp_list = bctbx_list_free_with_data(temp_list, (void (*)(void *))linphone_friend_unref);
+		
+		linphone_carddav_pull_vcards(cdc, vCards);
+		bctbx_list_free_with_data(vCards, (void (*)(void *))linphone_carddav_response_free);
+	}
+}
+
+static bctbx_list_t* parse_vcards_etags_from_xml_response(const char *body) {
+	bctbx_list_t *result = NULL;
+	xmlparsing_context_t *xml_ctx = linphone_xmlparsing_context_new();
+	xmlSetGenericErrorFunc(xml_ctx, linphone_xmlparsing_genericxml_error);
+	xml_ctx->doc = xmlReadDoc((const unsigned char*)body, 0, NULL, 0);
+	if (xml_ctx->doc != NULL) {
+		if (linphone_create_xml_xpath_context(xml_ctx) < 0) goto end;
+		linphone_xml_xpath_context_init_carddav_ns(xml_ctx);
+		{
+			xmlXPathObjectPtr responses = linphone_get_xml_xpath_object_for_node_list(xml_ctx, "/d:multistatus/d:response");
+			if (responses != NULL && responses->nodesetval != NULL) {
+				xmlNodeSetPtr responses_nodes = responses->nodesetval;
+				if (responses_nodes->nodeNr >= 1) {
+					int i;
+					for (i = 0; i < responses_nodes->nodeNr; i++) {
+						xmlNodePtr response_node = responses_nodes->nodeTab[i];
+						xml_ctx->xpath_ctx->node = response_node;
+						{
+							char *etag = linphone_get_xml_text_content(xml_ctx, "d:propstat/d:prop/d:getetag");
+							char *url =  linphone_get_xml_text_content(xml_ctx, "d:href");
+							LinphoneCardDavResponse *response = ms_new0(LinphoneCardDavResponse, 1);
+							response->etag = ms_strdup(etag);
+							response->url = ms_strdup(url);
+							result = bctbx_list_append(result, response);
+							ms_debug("Added vCard object with eTag %s and URL %s", etag, url);
+							linphone_free_xml_text_content(etag);
+							linphone_free_xml_text_content(url);
+						}
+					}
+				}
+				xmlXPathFreeObject(responses);
+			}
+		}
+	}
+end:
+	linphone_xmlparsing_context_destroy(xml_ctx);
+	return result;
+}
+
+static void linphone_carddav_ctag_fetched(LinphoneCardDavContext *cdc, int ctag) {
+	ms_debug("Remote cTag for CardDAV addressbook is %i, local one is %i", ctag, cdc->ctag);
+	if (ctag == -1 || ctag > cdc->ctag) {
+		cdc->ctag = ctag;
+		linphone_carddav_fetch_vcards(cdc);
+	} else {
+		ms_message("No changes found on server, skipping sync");
+		linphone_carddav_server_to_client_sync_done(cdc, TRUE, "Synchronization skipped because cTag already up to date");
+	}
+}
+
+static int parse_ctag_value_from_xml_response(const char *body) {
+	int result = -1;
+	xmlparsing_context_t *xml_ctx = linphone_xmlparsing_context_new();
+	xmlSetGenericErrorFunc(xml_ctx, linphone_xmlparsing_genericxml_error);
+	xml_ctx->doc = xmlReadDoc((const unsigned char*)body, 0, NULL, 0);
+	if (xml_ctx->doc != NULL) {
+		char *response = NULL;
+		if (linphone_create_xml_xpath_context(xml_ctx) < 0) goto end;
+		linphone_xml_xpath_context_init_carddav_ns(xml_ctx);
+		response = linphone_get_xml_text_content(xml_ctx, "/d:multistatus/d:response/d:propstat/d:prop/x1:getctag");
+		if (response) {
+			result = atoi(response);
+			linphone_free_xml_text_content(response);
+		}
+	}
+end:
+	linphone_xmlparsing_context_destroy(xml_ctx);
+	return result;
+}
+
+static void linphone_carddav_query_free(LinphoneCardDavQuery *query) {
+	if (!query) {
+		return;
+	}
+	
+	if (query->http_request_listener) {
+		belle_sip_object_unref(query->http_request_listener);
+		query->http_request_listener = NULL;
+	}
+	
+	// Context will be freed later (in sync_done)
+	query->context = NULL;
+	
+	if (query->url) {
+		ms_free(query->url);
+	}
+	if (query->body) {
+		ms_free(query->body);
+	}
+	
+	ms_free(query);
+}
+
+static bool_t is_query_client_to_server_sync(LinphoneCardDavQuery *query) {
+	if (!query) {
+		ms_error("[carddav] query is NULL...");
+		return FALSE;
+	}
+	switch(query->type) {
+		case LinphoneCardDavQueryTypePropfind:
+		case LinphoneCardDavQueryTypeAddressbookQuery:
+		case LinphoneCardDavQueryTypeAddressbookMultiget:
+			return FALSE;
+		case LinphoneCardDavQueryTypePut:
+		case LinphoneCardDavQueryTypeDelete:
+			return TRUE;
+		default:
+			ms_error("[carddav] Unknown request: %i", query->type);
+	}
+	return FALSE;
+}
+
+static void process_response_from_carddav_request(void *data, const belle_http_response_event_t *event) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)data;
+	
+	if (event->response) {
+		int code = belle_http_response_get_status_code(event->response);
+		if (code == 207 || code == 200 || code == 201 || code == 204) {
+			const char *body = belle_sip_message_get_body((belle_sip_message_t *)event->response);
+			switch(query->type) {
+			case LinphoneCardDavQueryTypePropfind:
+				linphone_carddav_ctag_fetched(query->context, parse_ctag_value_from_xml_response(body));
+				break;
+			case LinphoneCardDavQueryTypeAddressbookQuery:
+				linphone_carddav_vcards_fetched(query->context, parse_vcards_etags_from_xml_response(body));
+				break;
+			case LinphoneCardDavQueryTypeAddressbookMultiget:
+				linphone_carddav_vcards_pulled(query->context, parse_vcards_from_xml_response(body));
+				break;
+			case LinphoneCardDavQueryTypePut:
+				{
+					belle_sip_header_t *header = belle_sip_message_get_header((belle_sip_message_t *)event->response, "ETag");
+					LinphoneFriend *lf = (LinphoneFriend *)query->user_data;
+					LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+					if (lf && lvc) {
+						if (header) {
+							const char *etag = belle_sip_header_get_unparsed_value(header);
+							if (!linphone_vcard_get_etag(lvc)) {
+								ms_debug("eTag for newly created vCard is: %s", etag);
+							} else {
+								ms_debug("eTag for updated vCard is: %s", etag);
+							}
+							linphone_vcard_set_etag(lvc, etag);
+
+							linphone_carddav_client_to_server_sync_done(query->context, TRUE, NULL);
+							linphone_friend_unref(lf);
+						} else {
+							// For some reason, server didn't return the eTag of the updated/created vCard
+							// We need to do a GET on the vCard to get the correct one
+							bctbx_list_t *vcard = NULL;
+							LinphoneCardDavResponse *response = (LinphoneCardDavResponse *)ms_new0(LinphoneCardDavResponse, 1);
+							response->url = ms_strdup(linphone_vcard_get_url(lvc));
+							vcard = bctbx_list_append(vcard, response);
+							linphone_carddav_pull_vcards(query->context, vcard);
+							bctbx_list_free_with_data(vcard, (void (*)(void *))linphone_carddav_response_free);
+						}
+					}
+					else {
+						linphone_carddav_client_to_server_sync_done(query->context, FALSE, "No LinphoneFriend found in user_data field of query");
+					}
+				}
+				break;
+			case LinphoneCardDavQueryTypeDelete:
+				linphone_carddav_client_to_server_sync_done(query->context, TRUE, NULL);
+				break;
+			default:
+				ms_error("[carddav] Unknown request: %i", query->type);
+				break;
+			}
+		} else {
+			char msg[100];
+			snprintf(msg, sizeof(msg), "Unexpected HTTP response code: %i", code);
+			if (is_query_client_to_server_sync(query)) {
+				linphone_carddav_client_to_server_sync_done(query->context, FALSE, msg);
+			} else {
+				linphone_carddav_server_to_client_sync_done(query->context, FALSE, msg);
+			}
+		}
+	} else {
+		if (is_query_client_to_server_sync(query)) {
+			linphone_carddav_client_to_server_sync_done(query->context, FALSE, "No response found");
+		} else {
+			linphone_carddav_server_to_client_sync_done(query->context, FALSE, "No response found");
+		}
+	}
+	linphone_carddav_query_free(query);
+}
+
+static void process_io_error_from_carddav_request(void *data, const belle_sip_io_error_event_t *event) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)data;
+	ms_error("[carddav] I/O error during CardDAV request sending");
+	if (is_query_client_to_server_sync(query)) {
+		linphone_carddav_client_to_server_sync_done(query->context, FALSE, "I/O error during CardDAV request sending");
+	} else {
+		linphone_carddav_server_to_client_sync_done(query->context, FALSE, "I/O error during CardDAV request sending");
+	}
+	linphone_carddav_query_free(query);
+}
+
+static void process_auth_requested_from_carddav_request(void *data, belle_sip_auth_event_t *event) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)data;
+	LinphoneCardDavContext *cdc = query->context;
+	const char *realm = belle_sip_auth_event_get_realm(event);
+	belle_generic_uri_t *uri = belle_generic_uri_parse(query->url);
+	const char *domain = belle_generic_uri_get_host(uri);
+	
+	if (cdc->auth_info) {
+		belle_sip_auth_event_set_username(event, cdc->auth_info->username);
+		belle_sip_auth_event_set_passwd(event, cdc->auth_info->passwd);
+		belle_sip_auth_event_set_ha1(event, cdc->auth_info->ha1);
+	} else {
+		LinphoneCore *lc = cdc->friend_list->lc;
+		const bctbx_list_t *auth_infos = linphone_core_get_auth_info_list(lc);
+		
+		ms_debug("Looking for auth info for domain %s and realm %s", domain, realm);
+		while (auth_infos) {
+			LinphoneAuthInfo *auth_info = (LinphoneAuthInfo *)auth_infos->data;
+			if (auth_info->domain && strcmp(domain, auth_info->domain) == 0) {
+				if (!auth_info->realm || strcmp(realm, auth_info->realm) == 0) {
+					belle_sip_auth_event_set_username(event, auth_info->username);
+					belle_sip_auth_event_set_passwd(event, auth_info->passwd);
+					belle_sip_auth_event_set_ha1(event, auth_info->ha1);
+					cdc->auth_info = linphone_auth_info_clone(auth_info);
+					break;
+				}
+			}
+			auth_infos = bctbx_list_next(auth_infos);
+		}
+	
+		if (!auth_infos) {
+			ms_error("[carddav] Authentication requested during CardDAV request sending, and username/password weren't provided");
+			if (is_query_client_to_server_sync(query)) {
+				linphone_carddav_client_to_server_sync_done(query->context, FALSE, "Authentication requested during CardDAV request sending, and username/password weren't provided");
+			} else {
+				linphone_carddav_server_to_client_sync_done(query->context, FALSE, "Authentication requested during CardDAV request sending, and username/password weren't provided");
+			}
+			linphone_carddav_query_free(query);
+		}
+	}
+}
+
+static void linphone_carddav_send_query(LinphoneCardDavQuery *query) {
+	belle_http_request_listener_callbacks_t cbs = { 0 };
+	belle_generic_uri_t *uri = NULL;
+	belle_http_request_t *req = NULL;
+	belle_sip_memory_body_handler_t *bh = NULL;
+	LinphoneCardDavContext *cdc = query->context;
+	char* ua = NULL;
+
+	uri = belle_generic_uri_parse(query->url);
+	if (!uri) {
+		if (cdc && cdc->sync_done_cb) {
+			cdc->sync_done_cb(cdc, FALSE, "Could not send request, URL is invalid");
+		}
+		belle_sip_error("Could not send request, URL %s is invalid", query->url);
+		linphone_carddav_query_free(query);
+		return;
+	}
+	req = belle_http_request_create(query->method, uri, belle_sip_header_content_type_create("application", "xml; charset=utf-8"), NULL);
+	
+	if (!req) {
+		if (cdc && cdc->sync_done_cb) {
+			cdc->sync_done_cb(cdc, FALSE, "Could not create belle_http_request_t");
+		}
+		belle_sip_object_unref(uri);
+		belle_sip_error("Could not create belle_http_request_t");
+		linphone_carddav_query_free(query);
+		return;
+	}
+	
+	ua = ms_strdup_printf("%s/%s", linphone_core_get_user_agent(cdc->friend_list->lc), linphone_core_get_version());
+	belle_sip_message_add_header((belle_sip_message_t *)req, belle_sip_header_create("User-Agent", ua));
+	ms_free(ua);
+	if (query->depth) {
+		belle_sip_message_add_header((belle_sip_message_t *)req, belle_sip_header_create("Depth", query->depth));
+	} else if (query->ifmatch) {
+		belle_sip_message_add_header((belle_sip_message_t *)req, belle_sip_header_create("If-Match", query->ifmatch));
+	} else if (strcmp(query->method, "PUT")) {
+		belle_sip_message_add_header((belle_sip_message_t *)req, belle_sip_header_create("If-None-Match", "*"));
+	}
+	
+	if (query->body) {
+		bh = belle_sip_memory_body_handler_new_copy_from_buffer(query->body, strlen(query->body), NULL, NULL);
+		belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(req), bh ? BELLE_SIP_BODY_HANDLER(bh) : NULL);
+	}
+	
+	cbs.process_response = process_response_from_carddav_request;
+	cbs.process_io_error = process_io_error_from_carddav_request;
+	cbs.process_auth_requested = process_auth_requested_from_carddav_request;
+	query->http_request_listener = belle_http_request_listener_create_from_callbacks(&cbs, query);
+	belle_http_provider_send_request(query->context->friend_list->lc->http_provider, req, query->http_request_listener);
+}
+
+static LinphoneCardDavQuery* linphone_carddav_create_put_query(LinphoneCardDavContext *cdc, LinphoneVcard *lvc) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)ms_new0(LinphoneCardDavQuery, 1);
+	query->context = cdc;
+	query->depth = NULL;
+	query->ifmatch = linphone_vcard_get_etag(lvc);
+	query->body = ms_strdup(linphone_vcard_as_vcard4_string(lvc));
+	query->method = "PUT";
+	query->url = ms_strdup(linphone_vcard_get_url(lvc));
+	query->type = LinphoneCardDavQueryTypePut;
+	return query;
+}
+
+static char* generate_url_from_server_address_and_uid(const char *server_url) {
+	char *result = NULL;
+	if (server_url) {
+		char *uuid = ms_malloc(64);
+		if (sal_generate_uuid(uuid, 64) == 0) {
+			char *url = ms_malloc(300);
+			snprintf(url, 300, "%s/linphone-%s.vcf", server_url, uuid);
+			ms_debug("Generated url is %s", url);
+			result = ms_strdup(url);
+			ms_free(url);
+		}
+		ms_free(uuid);
+	}
+	return result;
+}
+
+void linphone_carddav_put_vcard(LinphoneCardDavContext *cdc, LinphoneFriend *lf) {
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc) {
+		LinphoneCardDavQuery *query = NULL;
+		if (!linphone_vcard_get_uid(lvc)) {
+			linphone_vcard_generate_unique_id(lvc);
+		}
+		
+		if (!linphone_vcard_get_url(lvc)) {
+			char *url = generate_url_from_server_address_and_uid(cdc->friend_list->uri);
+			if (url) {
+				linphone_vcard_set_url(lvc, url);
+				ms_free(url);
+			} else {
+				const char *msg = "vCard doesn't have an URL, and friendlist doesn't have a CardDAV server set either, can't push it";
+				ms_warning("%s", msg);
+				if (cdc && cdc->sync_done_cb) {
+					cdc->sync_done_cb(cdc, FALSE, msg);
+				}
+				return;
+			}
+		}
+		
+		query = linphone_carddav_create_put_query(cdc, lvc);
+		query->user_data = linphone_friend_ref(lf);
+		linphone_carddav_send_query(query);
+	} else {
+		const char *msg = NULL;
+		if (!lvc) {
+			msg = "LinphoneVcard is NULL";
+		} else {
+			msg = "Unknown error";
+		}
+		
+		if (msg) {
+			ms_error("[carddav] %s", msg);
+		}
+		
+		if (cdc && cdc->sync_done_cb) {
+			cdc->sync_done_cb(cdc, FALSE, msg);
+		}
+	}
+}
+
+static LinphoneCardDavQuery* linphone_carddav_create_delete_query(LinphoneCardDavContext *cdc, LinphoneVcard *lvc) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)ms_new0(LinphoneCardDavQuery, 1);
+	query->context = cdc;
+	query->depth = NULL;
+	query->ifmatch = linphone_vcard_get_etag(lvc);
+	query->body = NULL;
+	query->method = "DELETE";
+	query->url = ms_strdup(linphone_vcard_get_url(lvc));
+	query->type = LinphoneCardDavQueryTypeDelete;
+	return query;
+}
+
+void linphone_carddav_delete_vcard(LinphoneCardDavContext *cdc, LinphoneFriend *lf) {
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc && linphone_vcard_get_uid(lvc) && linphone_vcard_get_etag(lvc)) {
+		LinphoneCardDavQuery *query = NULL;
+		
+		if (!linphone_vcard_get_url(lvc)) {
+			char *url = generate_url_from_server_address_and_uid(cdc->friend_list->uri);
+			if (url) {
+				linphone_vcard_set_url(lvc, url);
+				ms_free(url);
+			} else {
+				const char *msg = "vCard doesn't have an URL, and friendlist doesn't have a CardDAV server set either, can't delete it";
+				ms_warning("%s", msg);
+				if (cdc && cdc->sync_done_cb) {
+					cdc->sync_done_cb(cdc, FALSE, msg);
+				}
+				return;
+			}
+		}
+		
+		query = linphone_carddav_create_delete_query(cdc, lvc);
+		linphone_carddav_send_query(query);
+	} else {
+		const char *msg = NULL;
+		if (!lvc) {
+			msg = "LinphoneVcard is NULL";
+		} else if (!linphone_vcard_get_uid(lvc)) {
+			msg = "LinphoneVcard doesn't have an UID";
+		} else if (!linphone_vcard_get_etag(lvc)) {
+			msg = "LinphoneVcard doesn't have an eTag";
+		}
+		
+		if (msg) {
+			ms_error("[carddav] %s", msg);
+		}
+		
+		if (cdc && cdc->sync_done_cb) {
+			cdc->sync_done_cb(cdc, FALSE, msg);
+		}
+	}
+}
+
+void linphone_carddav_set_synchronization_done_callback(LinphoneCardDavContext *cdc, LinphoneCardDavSynchronizationDoneCb cb) {
+	cdc->sync_done_cb = cb;
+}
+
+void linphone_carddav_set_new_contact_callback(LinphoneCardDavContext *cdc, LinphoneCardDavContactCreatedCb cb) {
+	cdc->contact_created_cb = cb;
+}
+
+void linphone_carddav_set_updated_contact_callback(LinphoneCardDavContext *cdc, LinphoneCardDavContactUpdatedCb cb) {
+	cdc->contact_updated_cb = cb;
+}
+
+void linphone_carddav_set_removed_contact_callback(LinphoneCardDavContext *cdc, LinphoneCardDavContactRemovedCb cb) {
+	cdc->contact_removed_cb = cb;
+}
+
+static LinphoneCardDavQuery* linphone_carddav_create_propfind_query(LinphoneCardDavContext *cdc) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)ms_new0(LinphoneCardDavQuery, 1);
+	query->context = cdc;
+	query->depth = "0";
+	query->ifmatch = NULL;
+	query->body = ms_strdup("<d:propfind xmlns:d=\"DAV:\" xmlns:cs=\"http://calendarserver.org/ns/\"><d:prop><cs:getctag /></d:prop></d:propfind>");
+	query->method = "PROPFIND";
+	query->url = ms_strdup(cdc->friend_list->uri);
+	query->type = LinphoneCardDavQueryTypePropfind;
+	return query;
+}
+
+void linphone_carddav_get_current_ctag(LinphoneCardDavContext *cdc) {
+	LinphoneCardDavQuery *query = linphone_carddav_create_propfind_query(cdc);
+	linphone_carddav_send_query(query);
+}
+
+static LinphoneCardDavQuery* linphone_carddav_create_addressbook_query(LinphoneCardDavContext *cdc) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)ms_new0(LinphoneCardDavQuery, 1);
+	query->context = cdc;
+	query->depth = "1";
+	query->ifmatch = NULL;
+	query->body = ms_strdup("<card:addressbook-query xmlns:d=\"DAV:\" xmlns:card=\"urn:ietf:params:xml:ns:carddav\"><d:prop><d:getetag /></d:prop><card:filter></card:filter></card:addressbook-query>");
+	query->method = "REPORT";
+	query->url = ms_strdup(cdc->friend_list->uri);
+	query->type = LinphoneCardDavQueryTypeAddressbookQuery;
+	return query;
+}
+
+void linphone_carddav_fetch_vcards(LinphoneCardDavContext *cdc) {
+	LinphoneCardDavQuery *query = linphone_carddav_create_addressbook_query(cdc);
+	linphone_carddav_send_query(query);
+}
+
+static LinphoneCardDavQuery* linphone_carddav_create_addressbook_multiget_query(LinphoneCardDavContext *cdc, bctbx_list_t *vcards) {
+	LinphoneCardDavQuery *query = (LinphoneCardDavQuery *)ms_new0(LinphoneCardDavQuery, 1);
+	char *body = (char *)ms_malloc((bctbx_list_size(vcards) + 1) * 300 * sizeof(char));
+	bctbx_list_t *iterator = vcards;
+	
+	query->context = cdc;
+	query->depth = "1";
+	query->ifmatch = NULL;
+	query->method = "REPORT";
+	query->url = ms_strdup(cdc->friend_list->uri);
+	query->type = LinphoneCardDavQueryTypeAddressbookMultiget;
+
+	sprintf(body, "%s", "<card:addressbook-multiget xmlns:d=\"DAV:\" xmlns:card=\"urn:ietf:params:xml:ns:carddav\"><d:prop><d:getetag /><card:address-data content-type='text/vcard' version='4.0'/></d:prop>");
+	while (iterator) {
+		LinphoneCardDavResponse *response = (LinphoneCardDavResponse *)iterator->data;
+		if (response) {
+			char temp_body[300];
+			snprintf(temp_body, sizeof(temp_body), "<d:href>%s</d:href>", response->url);
+			strcat(body, temp_body);
+			iterator = bctbx_list_next(iterator);
+		}
+	}
+	strcat(body, "</card:addressbook-multiget>");
+	query->body = ms_strdup(body);
+	ms_free(body);
+	
+	return query;
+}
+
+void linphone_carddav_pull_vcards(LinphoneCardDavContext *cdc, bctbx_list_t *vcards_to_pull) {
+	LinphoneCardDavQuery *query = linphone_carddav_create_addressbook_multiget_query(cdc, vcards_to_pull);
+	linphone_carddav_send_query(query);
+}
\ No newline at end of file
diff --git a/coreapi/carddav.h b/coreapi/carddav.h
new file mode 100644
index 000000000..79237632c
--- /dev/null
+++ b/coreapi/carddav.h
@@ -0,0 +1,170 @@
+/*
+carddav.h
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef LINPHONE_CARDDAV_H
+#define LINPHONE_CARDDAV_H
+
+#include "linphonecore.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup carddav_vcard
+ * @{
+ */
+	
+typedef struct _LinphoneCardDavContext LinphoneCardDavContext;
+
+typedef enum _LinphoneCardDavQueryType {
+	LinphoneCardDavQueryTypePropfind,
+	LinphoneCardDavQueryTypeAddressbookQuery,
+	LinphoneCardDavQueryTypeAddressbookMultiget,
+	LinphoneCardDavQueryTypePut,
+	LinphoneCardDavQueryTypeDelete
+} LinphoneCardDavQueryType;
+
+typedef struct _LinphoneCardDavQuery LinphoneCardDavQuery;
+
+typedef struct _LinphoneCardDavResponse LinphoneCardDavResponse;
+
+/**
+ * Callback used to notify a new contact has been created on the CardDAV server
+**/
+typedef void (*LinphoneCardDavContactCreatedCb)(LinphoneCardDavContext *cdc, LinphoneFriend *lf);
+
+/**
+ * Callback used to notify a contact has been updated on the CardDAV server
+**/
+typedef void (*LinphoneCardDavContactUpdatedCb)(LinphoneCardDavContext *cdc, LinphoneFriend *new_friend, LinphoneFriend *old_friend);
+
+/**
+ * Callback used to notify a contact has been removed on the CardDAV server
+**/
+typedef void (*LinphoneCardDavContactRemovedCb)(LinphoneCardDavContext *cdc, LinphoneFriend *lf);
+
+/**
+ * Callback used to notify a contact has been removed on the CardDAV server
+**/
+typedef void (*LinphoneCardDavSynchronizationDoneCb)(LinphoneCardDavContext *cdc, bool_t success, const char *message);
+
+/**
+ * Creates a CardDAV context for all related operations
+ * @param lfl LinphoneFriendList object
+ * @return LinphoneCardDavContext object if vCard support is enabled and server URL is available, NULL otherwise
+ */
+LINPHONE_PUBLIC LinphoneCardDavContext* linphone_carddav_context_new(LinphoneFriendList *lfl);
+
+/**
+ * Deletes a LinphoneCardDavContext object
+ * @param cdc LinphoneCardDavContext object
+ */
+LINPHONE_PUBLIC void linphone_carddav_context_destroy(LinphoneCardDavContext *cdc);
+
+/**
+ * Sets a user pointer to the LinphoneCardDAVContext object
+ * @param cdc LinphoneCardDavContext object
+ * @param ud The user data pointer
+ */
+LINPHONE_PUBLIC void linphone_carddav_set_user_data(LinphoneCardDavContext *cdc, void *ud);
+
+/**
+ * Gets the user pointer set in the LinphoneCardDAVContext object
+ * @param cdc LinphoneCardDavContext object
+ * @return The user data pointer if set, NULL otherwise
+ */
+LINPHONE_PUBLIC void* linphone_carddav_get_user_data(LinphoneCardDavContext *cdc);
+
+/**
+ * Starts a synchronization with the remote server to update local friends with server changes
+ * @param cdc LinphoneCardDavContext object
+ */
+LINPHONE_PUBLIC void linphone_carddav_synchronize(LinphoneCardDavContext *cdc);
+
+/**
+ * Sends a LinphoneFriend to the CardDAV server for update or creation
+ * @param cdc LinphoneCardDavContext object
+ * @param lf a LinphoneFriend object to update/create on the server
+ */
+LINPHONE_PUBLIC void linphone_carddav_put_vcard(LinphoneCardDavContext *cdc, LinphoneFriend *lf);
+
+/**
+ * Deletes a LinphoneFriend on the CardDAV server 
+ * @param cdc LinphoneCardDavContext object
+ * @param lf a LinphoneFriend object to delete on the server
+ */
+LINPHONE_PUBLIC void linphone_carddav_delete_vcard(LinphoneCardDavContext *cdc, LinphoneFriend *lf);
+
+/**
+ * Set the synchronization done callback.
+ * @param cdc LinphoneCardDavContext object
+ * @param cb The synchronization done callback to be used.
+ */
+LINPHONE_PUBLIC void linphone_carddav_set_synchronization_done_callback(LinphoneCardDavContext *cdc, LinphoneCardDavSynchronizationDoneCb cb);
+
+/**
+ * Set the new contact callback.
+ * @param cdc LinphoneCardDavContext object
+ * @param cb The new contact callback to be used.
+ */
+LINPHONE_PUBLIC void linphone_carddav_set_new_contact_callback(LinphoneCardDavContext *cdc, LinphoneCardDavContactCreatedCb cb);
+
+/**
+ * Set the updated contact callback.
+ * @param cdc LinphoneCardDavContext object
+ * @param cb The updated contact callback to be used.
+ */
+LINPHONE_PUBLIC void linphone_carddav_set_updated_contact_callback(LinphoneCardDavContext *cdc, LinphoneCardDavContactUpdatedCb cb);
+
+/**
+ * Set the removed contact callback.
+ * @param cdc LinphoneCardDavContext object
+ * @param cb The removed contact callback to be used.
+ */
+LINPHONE_PUBLIC void linphone_carddav_set_removed_contact_callback(LinphoneCardDavContext *cdc, LinphoneCardDavContactRemovedCb cb);
+
+/**
+ * Retrieves the current cTag value for the remote server
+ * @param cdc LinphoneCardDavContext object
+ */
+void linphone_carddav_get_current_ctag(LinphoneCardDavContext *cdc);
+
+/**
+ * Retrieves a list of all the vCards on server side to be able to detect changes
+ * @param cdc LinphoneCardDavContext object
+ */
+void linphone_carddav_fetch_vcards(LinphoneCardDavContext *cdc);
+
+/**
+ * Download asked vCards from the server
+ * @param cdc LinphoneCardDavContext object
+ * @param vcards_to_pull a MSList of LinphoneCardDavResponse objects with at least the url field filled
+ */
+void linphone_carddav_pull_vcards(LinphoneCardDavContext *cdc, MSList *vcards_to_pull);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/coreapi/chat.c b/coreapi/chat.c
index 990f06998..933909121 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -26,8 +26,8 @@
 #include "private.h"
 #include "lpconfig.h"
 #include "belle-sip/belle-sip.h"
-#include "lime.h"
 #include "ortp/b64.h"
+#include "lime.h"
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -37,25 +37,25 @@
 #define COMPOSING_DEFAULT_REFRESH_TIMEOUT 60
 #define COMPOSING_DEFAULT_REMOTE_REFRESH_TIMEOUT 120
 
-#define FILE_TRANSFER_KEY_SIZE 32
-
-
 static void linphone_chat_message_release(LinphoneChatMessage *msg);
-
-static LinphoneChatMessageCbs * linphone_chat_message_cbs_new(void) {
-	return belle_sip_object_new(LinphoneChatMessageCbs);
-}
+static void linphone_chat_room_delete_composing_idle_timer(LinphoneChatRoom *cr);
+static void linphone_chat_room_delete_composing_refresh_timer(LinphoneChatRoom *cr);
+static void linphone_chat_room_delete_remote_composing_refresh_timer(LinphoneChatRoom *cr);
+static void _linphone_chat_message_destroy(LinphoneChatMessage *msg);
 
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneChatMessageCbs);
 
 BELLE_SIP_INSTANCIATE_VPTR(LinphoneChatMessageCbs, belle_sip_object_t,
-	NULL, // destroy
-	NULL, // clone
-	NULL, // marshal
-	FALSE
-);
+						   NULL, // destroy
+						   NULL, // clone
+						   NULL, // marshal
+						   FALSE);
 
-LinphoneChatMessageCbs * linphone_chat_message_cbs_ref(LinphoneChatMessageCbs *cbs) {
+LinphoneChatMessageCbs *linphone_chat_message_cbs_new(void) {
+	return belle_sip_object_new(LinphoneChatMessageCbs);
+}
+
+LinphoneChatMessageCbs *linphone_chat_message_cbs_ref(LinphoneChatMessageCbs *cbs) {
 	belle_sip_object_ref(cbs);
 	return cbs;
 }
@@ -72,11 +72,13 @@ void linphone_chat_message_cbs_set_user_data(LinphoneChatMessageCbs *cbs, void *
 	cbs->user_data = ud;
 }
 
-LinphoneChatMessageCbsMsgStateChangedCb linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs) {
+LinphoneChatMessageCbsMsgStateChangedCb
+linphone_chat_message_cbs_get_msg_state_changed(const LinphoneChatMessageCbs *cbs) {
 	return cbs->msg_state_changed;
 }
 
-void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsMsgStateChangedCb cb) {
+void linphone_chat_message_cbs_set_msg_state_changed(LinphoneChatMessageCbs *cbs,
+													 LinphoneChatMessageCbsMsgStateChangedCb cb) {
 	cbs->msg_state_changed = cb;
 }
 
@@ -84,7 +86,8 @@ LinphoneChatMessageCbsFileTransferRecvCb linphone_chat_message_cbs_get_file_tran
 	return cbs->file_transfer_recv;
 }
 
-void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferRecvCb cb) {
+void linphone_chat_message_cbs_set_file_transfer_recv(LinphoneChatMessageCbs *cbs,
+													  LinphoneChatMessageCbsFileTransferRecvCb cb) {
 	cbs->file_transfer_recv = cb;
 }
 
@@ -92,311 +95,118 @@ LinphoneChatMessageCbsFileTransferSendCb linphone_chat_message_cbs_get_file_tran
 	return cbs->file_transfer_send;
 }
 
-void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferSendCb cb) {
+void linphone_chat_message_cbs_set_file_transfer_send(LinphoneChatMessageCbs *cbs,
+													  LinphoneChatMessageCbsFileTransferSendCb cb) {
 	cbs->file_transfer_send = cb;
 }
 
-LinphoneChatMessageCbsFileTransferProgressIndicationCb linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs) {
+LinphoneChatMessageCbsFileTransferProgressIndicationCb
+linphone_chat_message_cbs_get_file_transfer_progress_indication(const LinphoneChatMessageCbs *cbs) {
 	return cbs->file_transfer_progress_indication;
 }
 
-void linphone_chat_message_cbs_set_file_transfer_progress_indication(LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferProgressIndicationCb cb) {
+void linphone_chat_message_cbs_set_file_transfer_progress_indication(
+	LinphoneChatMessageCbs *cbs, LinphoneChatMessageCbsFileTransferProgressIndicationCb cb) {
 	cbs->file_transfer_progress_indication = cb;
 }
 
 
-static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatMessage* msg);
-
-static void process_io_error_upload(void *data, const belle_sip_io_error_event_t *event){
-	LinphoneChatMessage* msg=(LinphoneChatMessage *)data;
-	ms_error("I/O Error during file upload to %s - msg [%p] chat room[%p]", linphone_core_get_file_transfer_server(msg->chat_room->lc), msg, msg->chat_room);
-	linphone_chat_message_cancel_file_transfer(msg);
-}
-static void process_auth_requested_upload(void *data, belle_sip_auth_event_t *event){
-	LinphoneChatMessage* msg=(LinphoneChatMessage *)data;
-	ms_error("Error during file upload: auth requested to connect %s - msg [%p] chat room[%p]", linphone_core_get_file_transfer_server(msg->chat_room->lc), msg, msg->chat_room);
-	linphone_chat_message_cancel_file_transfer(msg);
-}
-
-static void process_io_error_download(void *data, const belle_sip_io_error_event_t *event){
-	LinphoneChatMessage* msg=(LinphoneChatMessage *)data;
-	ms_error("I/O Error during file download %s - msg [%p] chat room[%p]", msg->external_body_url, msg, msg->chat_room);
-	msg->state = LinphoneChatMessageStateFileTransferError;
-	if (msg->cb) {
-		msg->cb(msg, msg->state, msg->cb_ud);
-	}
-	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
-		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, msg->state);
-	}
-}
-static void process_auth_requested_download(void *data, belle_sip_auth_event_t *event){
-	LinphoneChatMessage* msg=(LinphoneChatMessage *)data;
-	msg->state = LinphoneChatMessageStateFileTransferError;
-	ms_error("Error during file download : auth requested to get %s - msg [%p] chat room[%p]", msg->external_body_url, msg, msg->chat_room);
-	if (msg->cb) {
-		msg->cb(msg, msg->state, msg->cb_ud);
-	}
-	if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
-		linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, msg->state);
-	}
-}
-
-static void linphone_chat_message_file_transfer_on_progress(belle_sip_body_handler_t *bh, belle_sip_message_t *msg, void *data, size_t offset, size_t total){
-	LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data;
-	if (!chatMsg->http_request || belle_http_request_is_cancelled(chatMsg->http_request)) {
-		ms_warning("Cancelled request for msg [%p], ignoring %s", chatMsg, __FUNCTION__);
-		return;
-	}
-	if (linphone_chat_message_cbs_get_file_transfer_progress_indication(chatMsg->callbacks)) {
-		linphone_chat_message_cbs_get_file_transfer_progress_indication(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, offset, total);
-	} else {
-		/* Legacy: call back given by application level */
-		linphone_core_notify_file_transfer_progress_indication(chatMsg->chat_room->lc, chatMsg, chatMsg->file_transfer_information, offset, total);
-	}
-}
-
-static int linphone_chat_message_file_transfer_on_send_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t *msg, void *data, size_t offset, uint8_t *buffer, size_t *size){
-	LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data;
-	LinphoneCore *lc = chatMsg->chat_room->lc;
-	char *buf = (char *)buffer;
-
-	if (!chatMsg->http_request || belle_http_request_is_cancelled(chatMsg->http_request)) {
-		ms_warning("Cancelled request for msg [%p], ignoring %s", chatMsg, __FUNCTION__);
-		return BELLE_SIP_STOP;
-	}
-
-	/* if we've not reach the end of file yet, ask for more data*/
-	if (offset<linphone_content_get_size(chatMsg->file_transfer_information)){
-		char *plainBuffer = NULL;
-
-		if (linphone_content_get_key(chatMsg->file_transfer_information) != NULL) { /* if we have a key to cipher the message, use it! */
-			/* if this chunk is not the last one, the lenght must be a multiple of block cipher size(16 bytes)*/
-			if (offset+*size < linphone_content_get_size(chatMsg->file_transfer_information)) {
-				*size -=(*size%16);
-			}
-			plainBuffer = (char *)malloc(*size);
-		}
-
-		/* get data from call back */
-		if (linphone_chat_message_cbs_get_file_transfer_send(chatMsg->callbacks)) {
-			LinphoneBuffer *lb = linphone_chat_message_cbs_get_file_transfer_send(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, offset, *size);
-			if (lb == NULL) {
-				*size = 0;
-			} else {
-				*size = linphone_buffer_get_size(lb);
-				memcpy(plainBuffer?plainBuffer:buf, linphone_buffer_get_content(lb), *size);
-				linphone_buffer_unref(lb);
-			}
-		} else {
-			/* Legacy */
-			linphone_core_notify_file_transfer_send(lc, chatMsg, chatMsg->file_transfer_information, plainBuffer?plainBuffer:buf, size);
-		}
-
-		if (linphone_content_get_key(chatMsg->file_transfer_information) != NULL) { /* if we have a key to cipher the message, use it! */
-			lime_encryptFile(linphone_content_get_cryptoContext_address(chatMsg->file_transfer_information), (unsigned char *)linphone_content_get_key(chatMsg->file_transfer_information), *size, plainBuffer, (char*)buffer);
-			free(plainBuffer);
-			/* check if we reach the end of file */
-			if (offset+*size >= linphone_content_get_size(chatMsg->file_transfer_information)) {
-				/* conclude file ciphering by calling it context with a zero size */
-				lime_encryptFile(linphone_content_get_cryptoContext_address(chatMsg->file_transfer_information), NULL, 0, NULL, NULL);
-			}
-		}
-	}
-
-	return BELLE_SIP_CONTINUE;
-}
-
-static void linphone_chat_message_process_response_from_post_file(void *data, const belle_http_response_event_t *event){
-	LinphoneChatMessage* msg=(LinphoneChatMessage *)data;
-
-	/* check the answer code */
-	if (event->response){
-		int code=belle_http_response_get_status_code(event->response);
-		if (code == 204) { /* this is the reply to the first post to the server - an empty message */
-			/* start uploading the file */
-			belle_http_request_listener_callbacks_t cbs={0};
-			belle_http_request_listener_t *l;
-			belle_generic_uri_t *uri;
-			belle_sip_multipart_body_handler_t *bh;
-			char* ua;
-			char *first_part_header;
-			belle_sip_body_handler_t *first_part_bh;
-
-			/* shall we encrypt the file */
-			if (linphone_core_lime_for_file_sharing_enabled(msg->chat_room->lc)) {
-				char keyBuffer[FILE_TRANSFER_KEY_SIZE]; /* temporary storage of generated key: 192 bits of key + 64 bits of initial vector */
-				/* generate a random 192 bits key + 64 bits of initial vector and store it into the file_transfer_information->key field of the message */
-				sal_get_random_bytes((unsigned char *)keyBuffer, FILE_TRANSFER_KEY_SIZE);
-				linphone_content_set_key(msg->file_transfer_information, keyBuffer, FILE_TRANSFER_KEY_SIZE); /* key is duplicated in the content private structure */
-				/* temporary storage for the Content-disposition header value : use a generic filename to not leak it
-				 * Actual filename stored in msg->file_transfer_information->name will be set in encrypted message sended to the  */
-				first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"filename.txt\"");
-			} else {
-				/* temporary storage for the Content-disposition header value */
-				first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"%s\"", linphone_content_get_name(msg->file_transfer_information));
-			}
-
-			/* create a user body handler to take care of the file and add the content disposition and content-type headers */
-			if (msg->file_transfer_filepath != NULL) {
-				first_part_bh=(belle_sip_body_handler_t *)belle_sip_file_body_handler_new(msg->file_transfer_filepath,NULL,msg);
-			} else if (linphone_content_get_buffer(msg->file_transfer_information) != NULL) {
-				first_part_bh=(belle_sip_body_handler_t *)belle_sip_memory_body_handler_new_from_buffer(
-					linphone_content_get_buffer(msg->file_transfer_information),
-					linphone_content_get_size(msg->file_transfer_information),
-					NULL,msg);
-			} else {
-				first_part_bh=(belle_sip_body_handler_t *)belle_sip_user_body_handler_new(linphone_content_get_size(msg->file_transfer_information),NULL,NULL,linphone_chat_message_file_transfer_on_send_body,msg);
-			}
-			belle_sip_body_handler_add_header(first_part_bh, belle_sip_header_create("Content-disposition", first_part_header));
-			belle_sip_free(first_part_header);
-			belle_sip_body_handler_add_header(first_part_bh, (belle_sip_header_t *)belle_sip_header_content_type_create(linphone_content_get_type(msg->file_transfer_information), linphone_content_get_subtype(msg->file_transfer_information)));
-
-			/* insert it in a multipart body handler which will manage the boundaries of multipart message */
-			bh=belle_sip_multipart_body_handler_new(linphone_chat_message_file_transfer_on_progress, msg, first_part_bh);
-
-			/* create the http request: do not include the message header at this point, it is done by bellesip when setting the multipart body handler in the message */
-			ua = ms_strdup_printf("%s/%s", linphone_core_get_user_agent_name(), linphone_core_get_user_agent_version());
-			uri=belle_generic_uri_parse(linphone_core_get_file_transfer_server(msg->chat_room->lc));
-			if (msg->http_request) belle_sip_object_unref(msg->http_request);
-			msg->http_request=belle_http_request_create("POST",
-										  uri,
-										  belle_sip_header_create("User-Agent",ua),
-										  NULL);
-			belle_sip_object_ref(msg->http_request);	/* keep a reference to the http request to be able to cancel it during upload */
-			ms_free(ua);
-			belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(msg->http_request),BELLE_SIP_BODY_HANDLER(bh));
-			cbs.process_response=linphone_chat_message_process_response_from_post_file;
-			cbs.process_io_error=process_io_error_upload;
-			cbs.process_auth_requested=process_auth_requested_upload;
-			l=belle_http_request_listener_create_from_callbacks(&cbs,msg);
-			belle_http_provider_send_request(msg->chat_room->lc->http_provider,msg->http_request,l);
-		}
-
-		if (code == 200 ) { /* file has been uplaoded correctly, get server reply and send it */
-			const char *body = belle_sip_message_get_body((belle_sip_message_t *)event->response);
-			belle_sip_object_unref(msg->http_request);
-			msg->http_request = NULL;
-
-			/* if we have an encryption key for the file, we must insert it into the message and restore the correct filename */
-			if (linphone_content_get_key(msg->file_transfer_information) != NULL) {
-				/* parse the message body */
-				xmlDocPtr xmlMessageBody = xmlParseDoc((const xmlChar *)body);
-
-				xmlNodePtr cur = xmlDocGetRootElement(xmlMessageBody);
-				if (cur != NULL) {
-					cur = cur->xmlChildrenNode;
-					while (cur!=NULL) {
-						if (!xmlStrcmp(cur->name, (const xmlChar *)"file-info")) { /* we found a file info node, check it has a type="file" attribute */
-							xmlChar *typeAttribute = xmlGetProp(cur, (const xmlChar *)"type");
-							if(!xmlStrcmp(typeAttribute, (const xmlChar *)"file")) { /* this is the node we are looking for : add a file-key children node */
-								xmlNodePtr fileInfoNodeChildren = cur->xmlChildrenNode; /* need to parse the children node to update the file-name one */
-								/* convert key to base64 */
-								int b64Size =  b64_encode(NULL, FILE_TRANSFER_KEY_SIZE, NULL, 0);
-								char *keyb64 = (char *)malloc(b64Size+1);
-								int xmlStringLength;
-
-								b64Size = b64_encode(linphone_content_get_key(msg->file_transfer_information), FILE_TRANSFER_KEY_SIZE, keyb64, b64Size);
-								keyb64[b64Size] = '\0'; /* libxml need a null terminated string */
-
-								/* add the node containing the key to the file-info node */
-								xmlNewTextChild(cur, NULL, (const xmlChar *)"file-key", (const xmlChar *)keyb64);
-								xmlFree(typeAttribute);
-								free(keyb64);
-
-								/* look for the file-name node and update its content */
-								while (fileInfoNodeChildren!=NULL) {
-									if (!xmlStrcmp(fileInfoNodeChildren->name, (const xmlChar *)"file-name")) { /* we found a the file-name node, update its content with the real filename */
-										/* update node content */
-										xmlNodeSetContent(fileInfoNodeChildren, (const xmlChar *)(linphone_content_get_name(msg->file_transfer_information)));
-										break;
-									}
-									fileInfoNodeChildren = fileInfoNodeChildren->next;
-								}
-
-
-								/* dump the xml into msg->message */
-								xmlDocDumpFormatMemoryEnc(xmlMessageBody, (xmlChar **)&msg->message, &xmlStringLength, "UTF-8", 0);
-
-								break;
-							}
-							xmlFree(typeAttribute);
-						}
-						cur = cur->next;
-					}
-				}
-				xmlFreeDoc(xmlMessageBody);
-
-			} else { /* no encryption key, transfer in plain, just copy the message sent by server */
-				msg->message = ms_strdup(body);
-			}
-
-			msg->content_type = ms_strdup("application/vnd.gsma.rcs-ft-http+xml");
-			msg->state = LinphoneChatMessageStateFileTransferDone;
-			if (msg->cb) {
-				msg->cb(msg, msg->state, msg->cb_ud);
-			}
-			if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
-				linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, msg->state);
-			}
-			_linphone_chat_room_send_message(msg->chat_room, msg);
-		}
-	}
-}
-
-
-static void _linphone_chat_message_destroy(LinphoneChatMessage* msg);
-
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneChatMessage);
 
-BELLE_SIP_INSTANCIATE_VPTR(LinphoneChatMessage,belle_sip_object_t,
-	(belle_sip_object_destroy_t)_linphone_chat_message_destroy,
-	NULL, // clone
-	NULL, // marshal
-	FALSE
-);
-
-void linphone_core_disable_chat(LinphoneCore *lc, LinphoneReason deny_reason){
-	lc->chat_deny_code=deny_reason;
+static void _linphone_chat_room_destroy(LinphoneChatRoom *cr) {
+	bctbx_list_free_with_data(cr->transient_messages, (void (*)(void *))linphone_chat_message_release);
+	linphone_chat_room_delete_composing_idle_timer(cr);
+	linphone_chat_room_delete_composing_refresh_timer(cr);
+	linphone_chat_room_delete_remote_composing_refresh_timer(cr);
+	if (cr->lc != NULL) {
+		if (bctbx_list_find(cr->lc->chatrooms, cr)) {
+			ms_error("LinphoneChatRoom[%p] is destroyed while still being used by the LinphoneCore. This is abnormal."
+					 " linphone_core_get_chat_room() doesn't give a reference, there is no need to call "
+					 "linphone_chat_room_unref(). "
+					 "In order to remove a chat room from the core, use linphone_core_delete_chat_room().",
+					 cr);
+			cr->lc->chatrooms = bctbx_list_remove(cr->lc->chatrooms, cr);
+		}
+	}
+	linphone_address_destroy(cr->peer_url);
+	if (cr->pending_message)
+		linphone_chat_message_destroy(cr->pending_message);
+	ms_free(cr->peer);
 }
 
-void linphone_core_enable_chat(LinphoneCore *lc){
-	lc->chat_deny_code=LinphoneReasonNone;
+void linphone_chat_message_set_state(LinphoneChatMessage *msg, LinphoneChatMessageState state) {
+	/* do not invoke callbacks on orphan messages */
+	if (state != msg->state && msg->chat_room != NULL) {
+		ms_message("Chat message %p: moving from state %s to %s", msg, linphone_chat_message_state_to_string(msg->state),
+				   linphone_chat_message_state_to_string(state));
+		msg->state = state;
+		if (msg->message_state_changed_cb) {
+			msg->message_state_changed_cb(msg, msg->state, msg->message_state_changed_user_data);
+		}
+		if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
+			linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, msg->state);
+		}
+	}
 }
 
-bool_t linphone_core_chat_enabled(const LinphoneCore *lc){
-	return lc->chat_deny_code!=LinphoneReasonNone;
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneChatMessage, belle_sip_object_t,
+						   (belle_sip_object_destroy_t)_linphone_chat_message_destroy,
+						   NULL, // clone
+						   NULL, // marshal
+						   FALSE);
+
+void linphone_core_disable_chat(LinphoneCore *lc, LinphoneReason deny_reason) {
+	lc->chat_deny_code = deny_reason;
 }
 
-const MSList* linphone_core_get_chat_rooms(LinphoneCore *lc) {
+void linphone_core_enable_chat(LinphoneCore *lc) {
+	lc->chat_deny_code = LinphoneReasonNone;
+}
+
+bool_t linphone_core_chat_enabled(const LinphoneCore *lc) {
+	return lc->chat_deny_code != LinphoneReasonNone;
+}
+
+const bctbx_list_t *linphone_core_get_chat_rooms(LinphoneCore *lc) {
 	return lc->chatrooms;
 }
 
-static bool_t linphone_chat_room_matches(LinphoneChatRoom *cr, const LinphoneAddress *from){
-	return linphone_address_weak_equal(cr->peer_url,from);
+static bool_t linphone_chat_room_matches(LinphoneChatRoom *cr, const LinphoneAddress *from) {
+	return linphone_address_weak_equal(cr->peer_url, from);
 }
 
-static void _linphone_chat_room_destroy(LinphoneChatRoom *obj);
-
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneChatRoom);
 
 BELLE_SIP_INSTANCIATE_VPTR(LinphoneChatRoom, belle_sip_object_t,
-	(belle_sip_object_destroy_t)_linphone_chat_room_destroy,
-	NULL, // clone
-	NULL, // marshal
-	FALSE
-);
+						   (belle_sip_object_destroy_t)_linphone_chat_room_destroy,
+						   NULL, // clone
+						   NULL, // marshal
+						   FALSE);
 
-static LinphoneChatRoom * _linphone_core_create_chat_room(LinphoneCore *lc, LinphoneAddress *addr) {
+static LinphoneChatRoom *_linphone_core_create_chat_room_base(LinphoneCore *lc, LinphoneAddress *addr){
 	LinphoneChatRoom *cr = belle_sip_object_new(LinphoneChatRoom);
 	cr->lc = lc;
 	cr->peer = linphone_address_as_string(addr);
 	cr->peer_url = addr;
 	cr->unread_count = -1;
-	lc->chatrooms = ms_list_append(lc->chatrooms, (void *)cr);
+	cr->received_rtt_characters = NULL;
 	return cr;
 }
 
-static LinphoneChatRoom * _linphone_core_create_chat_room_from_url(LinphoneCore *lc, const char *to) {
+static LinphoneChatRoom *_linphone_core_create_chat_room(LinphoneCore *lc, LinphoneAddress *addr) {
+	LinphoneChatRoom *cr = _linphone_core_create_chat_room_base(lc, addr);
+	lc->chatrooms = bctbx_list_append(lc->chatrooms, (void *)cr);
+	return cr;
+}
+
+LinphoneChatRoom *_linphone_core_create_chat_room_from_call(LinphoneCall *call){
+	LinphoneChatRoom *cr = _linphone_core_create_chat_room_base(call->core,
+		linphone_address_clone(linphone_call_get_remote_address(call)));
+	cr->call = call;
+	return cr;
+}
+
+static LinphoneChatRoom *_linphone_core_create_chat_room_from_url(LinphoneCore *lc, const char *to) {
 	LinphoneAddress *parsed_url = NULL;
 	if ((parsed_url = linphone_core_interpret_url(lc, to)) != NULL) {
 		return _linphone_core_create_chat_room(lc, parsed_url);
@@ -404,36 +214,36 @@ static LinphoneChatRoom * _linphone_core_create_chat_room_from_url(LinphoneCore
 	return NULL;
 }
 
-LinphoneChatRoom * _linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAddress *addr){
-	LinphoneChatRoom *cr=NULL;
-	MSList *elem;
-	for(elem=lc->chatrooms;elem!=NULL;elem=ms_list_next(elem)){
-		cr=(LinphoneChatRoom*)elem->data;
-		if (linphone_chat_room_matches(cr,addr)){
+LinphoneChatRoom *_linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAddress *addr) {
+	LinphoneChatRoom *cr = NULL;
+	bctbx_list_t *elem;
+	for (elem = lc->chatrooms; elem != NULL; elem = bctbx_list_next(elem)) {
+		cr = (LinphoneChatRoom *)elem->data;
+		if (linphone_chat_room_matches(cr, addr)) {
 			break;
 		}
-		cr=NULL;
+		cr = NULL;
 	}
 	return cr;
 }
 
-static LinphoneChatRoom * _linphone_core_get_or_create_chat_room(LinphoneCore* lc, const char* to) {
-	LinphoneAddress *to_addr=linphone_core_interpret_url(lc,to);
+static LinphoneChatRoom *_linphone_core_get_or_create_chat_room(LinphoneCore *lc, const char *to) {
+	LinphoneAddress *to_addr = linphone_core_interpret_url(lc, to);
 	LinphoneChatRoom *ret;
 
-	if (to_addr==NULL){
-		ms_error("linphone_core_get_or_create_chat_room(): Cannot make a valid address with %s",to);
+	if (to_addr == NULL) {
+		ms_error("linphone_core_get_or_create_chat_room(): Cannot make a valid address with %s", to);
 		return NULL;
 	}
-	ret=_linphone_core_get_chat_room(lc,to_addr);
+	ret = _linphone_core_get_chat_room(lc, to_addr);
 	linphone_address_destroy(to_addr);
-	if (!ret){
-		ret=_linphone_core_create_chat_room_from_url(lc,to);
+	if (!ret) {
+		ret = _linphone_core_create_chat_room_from_url(lc, to);
 	}
 	return ret;
 }
 
-LinphoneChatRoom *linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAddress *addr){
+LinphoneChatRoom *linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAddress *addr) {
 	LinphoneChatRoom *ret = _linphone_core_get_chat_room(lc, addr);
 	if (!ret) {
 		ret = _linphone_core_create_chat_room(lc, linphone_address_clone(addr));
@@ -441,25 +251,67 @@ LinphoneChatRoom *linphone_core_get_chat_room(LinphoneCore *lc, const LinphoneAd
 	return ret;
 }
 
-void linphone_core_delete_chat_room(LinphoneCore *lc, LinphoneChatRoom *cr){
-	if (ms_list_find(lc->chatrooms, cr)){
-		lc->chatrooms = ms_list_remove(cr->lc->chatrooms, cr);
+void linphone_core_delete_chat_room(LinphoneCore *lc, LinphoneChatRoom *cr) {
+	if (bctbx_list_find(lc->chatrooms, cr)) {
+		lc->chatrooms = bctbx_list_remove(cr->lc->chatrooms, cr);
 		linphone_chat_room_delete_history(cr);
 		linphone_chat_room_unref(cr);
-	}else{
-		ms_error("linphone_core_delete_chat_room(): chatroom [%p] isn't part of LinphoneCore.",
-			 cr);
+	} else {
+		ms_error("linphone_core_delete_chat_room(): chatroom [%p] isn't part of LinphoneCore.", cr);
 	}
-	
 }
 
-LinphoneChatRoom * linphone_core_get_chat_room_from_uri(LinphoneCore *lc, const char *to) {
+LinphoneChatRoom *linphone_core_get_chat_room_from_uri(LinphoneCore *lc, const char *to) {
 	return _linphone_core_get_or_create_chat_room(lc, to);
 }
 
+bool_t linphone_chat_room_lime_available(LinphoneChatRoom *cr) {
+	if (cr) {
+		switch (linphone_core_lime_enabled(cr->lc)) {
+			case LinphoneLimeDisabled: return FALSE;
+			case LinphoneLimeMandatory: return TRUE;
+			case LinphoneLimePreferred: {
+				FILE *CACHEFD = NULL;
+				if (cr->lc->zrtp_secrets_cache != NULL) {
+					CACHEFD = fopen(cr->lc->zrtp_secrets_cache, "rb+");
+					if (CACHEFD) {
+						size_t cacheSize;
+						xmlDocPtr cacheXml;
+						char *cacheString=ms_load_file_content(CACHEFD, &cacheSize);
+						if (!cacheString){
+							ms_warning("Unable to load content of ZRTP ZID cache to decrypt message");
+							return FALSE;
+						}
+						cacheString[cacheSize] = '\0';
+						cacheSize += 1;
+						fclose(CACHEFD);
+						cacheXml = xmlParseDoc((xmlChar*)cacheString);
+						ms_free(cacheString);
+						if (cacheXml) {
+							bool_t res;
+							limeURIKeys_t associatedKeys;
+							/* retrieve keys associated to the peer URI */
+							associatedKeys.peerURI = (uint8_t *)malloc(strlen(cr->peer)+1);
+							strcpy((char *)(associatedKeys.peerURI), cr->peer);
+							associatedKeys.associatedZIDNumber  = 0;
+							associatedKeys.peerKeys = NULL;
+
+							res = (lime_getCachedSndKeysByURI(cacheXml, &associatedKeys) == 0 && associatedKeys.associatedZIDNumber != 0);
+							lime_freeKeys(&associatedKeys);
+							xmlFreeDoc(cacheXml);
+							return res;
+						}
+					}
+				}
+			}
+		}
+	}
+	return FALSE;
+}
+
 static void linphone_chat_room_delete_composing_idle_timer(LinphoneChatRoom *cr) {
 	if (cr->composing_idle_timer) {
-		if(cr-> lc && cr->lc->sal)
+		if (cr->lc && cr->lc->sal)
 			sal_cancel_timer(cr->lc->sal, cr->composing_idle_timer);
 		belle_sip_object_unref(cr->composing_idle_timer);
 		cr->composing_idle_timer = NULL;
@@ -468,7 +320,7 @@ static void linphone_chat_room_delete_composing_idle_timer(LinphoneChatRoom *cr)
 
 static void linphone_chat_room_delete_composing_refresh_timer(LinphoneChatRoom *cr) {
 	if (cr->composing_refresh_timer) {
-		if(cr->lc && cr->lc->sal)
+		if (cr->lc && cr->lc->sal)
 			sal_cancel_timer(cr->lc->sal, cr->composing_refresh_timer);
 		belle_sip_object_unref(cr->composing_refresh_timer);
 		cr->composing_refresh_timer = NULL;
@@ -477,32 +329,17 @@ static void linphone_chat_room_delete_composing_refresh_timer(LinphoneChatRoom *
 
 static void linphone_chat_room_delete_remote_composing_refresh_timer(LinphoneChatRoom *cr) {
 	if (cr->remote_composing_refresh_timer) {
-		if(cr->lc && cr->lc->sal)
+		if (cr->lc && cr->lc->sal)
 			sal_cancel_timer(cr->lc->sal, cr->remote_composing_refresh_timer);
 		belle_sip_object_unref(cr->remote_composing_refresh_timer);
 		cr->remote_composing_refresh_timer = NULL;
 	}
 }
 
-static void _linphone_chat_room_destroy(LinphoneChatRoom *cr){
-	ms_list_free_with_data(cr->transient_messages, (void (*)(void*))linphone_chat_message_release);
-	linphone_chat_room_delete_composing_idle_timer(cr);
-	linphone_chat_room_delete_composing_refresh_timer(cr);
-	linphone_chat_room_delete_remote_composing_refresh_timer(cr);
-	if (cr->lc != NULL) {
-		if (ms_list_find(cr->lc->chatrooms, cr)){
-			ms_error("LinphoneChatRoom[%p] is destroyed while still being used by the LinphoneCore. This is abnormal."
-			" linphone_core_get_chat_room() doesn't give a reference, there is no need to call linphone_chat_room_unref(). "
-			"In order to remove a chat room from the core, use linphone_core_delete_chat_room().",
-				cr);
-		}
-		cr->lc->chatrooms=ms_list_remove(cr->lc->chatrooms, cr);
-	}
-	linphone_address_destroy(cr->peer_url);
-	ms_free(cr->peer);
-}
-
 void linphone_chat_room_destroy(LinphoneChatRoom *cr) {
+	if (cr->received_rtt_characters) {
+		cr->received_rtt_characters = bctbx_list_free(cr->received_rtt_characters);
+	}
 	linphone_chat_room_unref(cr);
 }
 
@@ -511,7 +348,7 @@ void linphone_chat_room_release(LinphoneChatRoom *cr) {
 	linphone_chat_room_unref(cr);
 }
 
-LinphoneChatRoom * linphone_chat_room_ref(LinphoneChatRoom *cr) {
+LinphoneChatRoom *linphone_chat_room_ref(LinphoneChatRoom *cr) {
 	belle_sip_object_ref(cr);
 	return cr;
 }
@@ -520,7 +357,7 @@ void linphone_chat_room_unref(LinphoneChatRoom *cr) {
 	belle_sip_object_unref(cr);
 }
 
-void * linphone_chat_room_get_user_data(const LinphoneChatRoom *cr) {
+void *linphone_chat_room_get_user_data(const LinphoneChatRoom *cr) {
 	return cr->user_data;
 }
 
@@ -528,194 +365,210 @@ void linphone_chat_room_set_user_data(LinphoneChatRoom *cr, void *ud) {
 	cr->user_data = ud;
 }
 
-
-static void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatMessage* msg){
-	SalOp *op=NULL;
-	LinphoneCall *call;
-	char* content_type;
-	const char *identity=NULL;
-	time_t t=time(NULL);
-	linphone_chat_message_ref(msg);
-	/* Check if we shall upload a file to a server */
-	if (msg->file_transfer_information != NULL && msg->content_type == NULL) {
-		/* open a transaction with the server and send an empty request(RCS5.1 section 3.5.4.8.3.1) */
-		belle_http_request_listener_callbacks_t cbs={0};
-		belle_http_request_listener_t *l;
-		belle_generic_uri_t *uri;
-		const char *transfer_server = linphone_core_get_file_transfer_server(cr->lc);
-
-		if (transfer_server == NULL) {
-			ms_warning("Cannot send file transfer message: no file transfer server configured.");
-			return;
-		}
-		uri=belle_generic_uri_parse(transfer_server);
-
-		msg->http_request=belle_http_request_create("POST",
-				uri,
-				NULL,
-				NULL,
-				NULL);
-		belle_sip_object_ref(msg->http_request);	/* keep a reference on the request to be able to cancel it */
-		cbs.process_response=linphone_chat_message_process_response_from_post_file;
-		cbs.process_io_error=process_io_error_upload;
-		cbs.process_auth_requested=process_auth_requested_upload;
-		l=belle_http_request_listener_create_from_callbacks(&cbs,msg); /* give msg to listener to be able to start the actual file upload when server answer a 204 No content */
-		belle_http_provider_send_request(cr->lc->http_provider,msg->http_request,l);
+void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg) {
+	/*stubed rtt text*/
+	if (cr->call && linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(cr->call))) {
+		uint32_t new_line = 0x2028;
+		linphone_chat_message_put_char(msg, new_line); // New Line
 		linphone_chat_message_unref(msg);
 		return;
 	}
 
-	if (lp_config_get_int(cr->lc->config,"sip","chat_use_call_dialogs",0)){
-		if((call = linphone_core_get_call_by_remote_address(cr->lc,cr->peer))!=NULL){
-			if (call->state==LinphoneCallConnected ||
-			call->state==LinphoneCallStreamsRunning ||
-			call->state==LinphoneCallPaused ||
-			call->state==LinphoneCallPausing ||
-			call->state==LinphoneCallPausedByRemote){
-				ms_message("send SIP message through the existing call.");
-				op = call->op;
-				identity=linphone_core_find_best_identity(cr->lc,linphone_call_get_remote_address(call));
-			}
+	msg->dir = LinphoneChatMessageOutgoing;
+
+
+	/* Check if we shall upload a file to a server */
+	if (msg->file_transfer_information != NULL && msg->content_type == NULL) {
+		/* open a transaction with the server and send an empty request(RCS5.1 section 3.5.4.8.3.1) */
+		if (linphone_chat_room_upload_file(msg) == 0) {
+			// add to transient list only if message is going out
+			cr->transient_messages = bctbx_list_append(cr->transient_messages, linphone_chat_message_ref(msg));
+		} else {
+			linphone_chat_message_unref(msg);
+			return;
 		}
-	}
-	msg->time=t;
-	if (op==NULL){
-		LinphoneProxyConfig *proxy=linphone_core_lookup_known_proxy(cr->lc,cr->peer_url);
-		if (proxy){
-			identity=linphone_proxy_config_get_identity(proxy);
-		}else identity=linphone_core_get_primary_contact(cr->lc);
-		/*sending out of calls*/
-		msg->op = op = sal_op_new(cr->lc->sal);
-		linphone_configure_op(cr->lc,op,cr->peer_url,msg->custom_headers,lp_config_get_int(cr->lc->config,"sip","chat_msg_with_contact",0));
-		sal_op_set_user_pointer(op, msg); /*if out of call, directly store msg*/
-	}
-
-
-	if (msg->external_body_url) {
-		content_type=ms_strdup_printf("message/external-body; access-type=URL; URL=\"%s\"",msg->external_body_url);
-		sal_message_send(op,identity,cr->peer,content_type, NULL, NULL);
-		ms_free(content_type);
 	} else {
-		char *peer_uri = linphone_address_as_string_uri_only(linphone_chat_room_get_peer_address(cr));
-		const char * content_type;
-
-		if (linphone_core_lime_enabled(cr->lc)) {
-			linphone_chat_message_ref(msg);  /* ref the message or it may be destroyed by callback if the encryption failed */
-			if (msg->content_type && strcmp(msg->content_type, "application/vnd.gsma.rcs-ft-http+xml") == 0) {
-				content_type = "application/cipher.vnd.gsma.rcs-ft-http+xml"; /* it's a file transfer, content type shall be set to application/cipher.vnd.gsma.rcs-ft-http+xml*/
-			} else {
-				content_type = "xml/cipher";
+		SalOp *op = NULL;
+		LinphoneCall *call=NULL;
+		char *content_type;
+		const char *identity = NULL;
+		// add to transient list
+		cr->transient_messages = bctbx_list_append(cr->transient_messages, linphone_chat_message_ref(msg));
+		msg->time = ms_time(0);
+		if (lp_config_get_int(cr->lc->config, "sip", "chat_use_call_dialogs", 0) != 0) {
+			if ((call = linphone_core_get_call_by_remote_address(cr->lc, cr->peer)) != NULL) {
+				if (call->state == LinphoneCallConnected || call->state == LinphoneCallStreamsRunning ||
+					call->state == LinphoneCallPaused || call->state == LinphoneCallPausing ||
+					call->state == LinphoneCallPausedByRemote) {
+					ms_message("send SIP msg through the existing call.");
+					op = call->op;
+					identity = linphone_core_find_best_identity(cr->lc, linphone_call_get_remote_address(call));
+				}
 			}
-		} else {
-			content_type = msg->content_type;
+		}
+		if (op == NULL) {
+			LinphoneProxyConfig *proxy = linphone_core_lookup_known_proxy(cr->lc, cr->peer_url);
+			if (proxy) {
+				identity = linphone_proxy_config_get_identity(proxy);
+			} else
+				identity = linphone_core_get_primary_contact(cr->lc);
+			/*sending out of calls*/
+			msg->op = op = sal_op_new(cr->lc->sal);
+			linphone_configure_op(cr->lc, op, cr->peer_url, msg->custom_headers,
+								  lp_config_get_int(cr->lc->config, "sip", "chat_msg_with_contact", 0));
+			sal_op_set_user_pointer(op, msg); /*if out of call, directly store msg*/
 		}
 
-		if (content_type == NULL) {
-			sal_text_send(op, identity, cr->peer,msg->message);
+		if (msg->external_body_url) {
+			content_type = ms_strdup_printf("message/external-body; access-type=URL; URL=\"%s\"", msg->external_body_url);
+			sal_message_send(op, identity, cr->peer, content_type, NULL, NULL);
+			ms_free(content_type);
 		} else {
-			sal_message_send(op, identity, cr->peer, content_type, msg->message, peer_uri);
+			char *peer_uri = linphone_address_as_string_uri_only(linphone_chat_room_get_peer_address(cr));
+			const char *content_type;
+
+			if (linphone_chat_room_lime_available(cr)) {
+				/* ref the msg or it may be destroyed by callback if the encryption failed */
+				if (msg->content_type && strcmp(msg->content_type, "application/vnd.gsma.rcs-ft-http+xml") == 0) {
+					/* it's a file transfer, content type shall be set to
+					application/cipher.vnd.gsma.rcs-ft-http+xml*/
+					content_type = "application/cipher.vnd.gsma.rcs-ft-http+xml";
+				} else {
+					content_type = "xml/cipher";
+				}
+			} else {
+				content_type = msg->content_type;
+			}
+
+			if (content_type == NULL) {
+				sal_text_send(op, identity, cr->peer, msg->message);
+			} else {
+				sal_message_send(op, identity, cr->peer, content_type, msg->message, peer_uri);
+			}
+			ms_free(peer_uri);
 		}
-		ms_free(peer_uri);
+
+		if (msg->from){
+			/*
+			 * BUG
+			 * the file transfer message constructor sets the from, but doesn't do it as well as here.
+			 */
+			linphone_address_destroy(msg->from);
+		}
+		msg->from = linphone_address_new(identity);
+		msg->storage_id = linphone_chat_message_store(msg);
+
+		if (cr->unread_count >= 0 && !msg->is_read)
+			cr->unread_count++;
+
+		if (cr->is_composing == LinphoneIsComposingActive) {
+			cr->is_composing = LinphoneIsComposingIdle;
+		}
+		linphone_chat_room_delete_composing_idle_timer(cr);
+		linphone_chat_room_delete_composing_refresh_timer(cr);
+
+		if (call && call->op == op) {
+			/*In this case, chat delivery status is not notified, so unrefing chat message right now*/
+			/*Might be better fixed by delivering status, but too costly for now*/
+			msg->chat_room->transient_messages = bctbx_list_remove(msg->chat_room->transient_messages, msg);
+			linphone_chat_message_unref(msg);
+			linphone_chat_message_unref(msg);
+			return;
+		}
+
+
 	}
-
-	msg->dir=LinphoneChatMessageOutgoing;
-	msg->from=linphone_address_new(identity);
-	msg->storage_id=linphone_chat_message_store(msg);
-
-	if(cr->unread_count >= 0 && !msg->is_read) cr->unread_count++;
-
-	// add to transient list
-	cr->transient_messages = ms_list_append(cr->transient_messages, linphone_chat_message_ref(msg));
-
-	if (cr->is_composing == LinphoneIsComposingActive) {
-		cr->is_composing = LinphoneIsComposingIdle;
-	}
-	linphone_chat_room_delete_composing_idle_timer(cr);
-	linphone_chat_room_delete_composing_refresh_timer(cr);
-	linphone_chat_message_unref(msg);
-}
-
-void linphone_chat_message_update_state(LinphoneChatMessage* chat_msg ) {
-	linphone_chat_message_store_state(chat_msg);
-
-	if( chat_msg->state == LinphoneChatMessageStateDelivered
-			|| chat_msg->state == LinphoneChatMessageStateNotDelivered ){
-		// message is not transient anymore, we can remove it from our transient list and unref it :
-		chat_msg->chat_room->transient_messages = ms_list_remove(chat_msg->chat_room->transient_messages, chat_msg);
-		linphone_chat_message_unref(chat_msg);
+	// if operation failed, we should not change message state
+	if (msg->dir == LinphoneChatMessageOutgoing) {
+		linphone_chat_message_set_state(msg, LinphoneChatMessageStateInProgress);
+	}
+}
+
+void linphone_chat_message_update_state(LinphoneChatMessage *msg, LinphoneChatMessageState new_state) {
+	linphone_chat_message_set_state(msg, new_state);
+	linphone_chat_message_store_state(msg);
+
+	if (msg->state == LinphoneChatMessageStateDelivered || msg->state == LinphoneChatMessageStateNotDelivered) {
+		// msg is not transient anymore, we can remove it from our transient list and unref it
+		msg->chat_room->transient_messages = bctbx_list_remove(msg->chat_room->transient_messages, msg);
+		linphone_chat_message_unref(msg);
 	}
 }
 
-/**
- * Send a message to peer member of this chat room.
- * @deprecated linphone_chat_room_send_message2() gives more control on the message expedition.
- * @param cr #LinphoneChatRoom object
- * @param msg message to be sent
- */
 void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg) {
-	_linphone_chat_room_send_message(cr,linphone_chat_room_create_message(cr,msg));
+	_linphone_chat_room_send_message(cr, linphone_chat_room_create_message(cr, msg));
 }
 
-void linphone_chat_room_message_received(LinphoneChatRoom *cr, LinphoneCore *lc, LinphoneChatMessage *msg){
-	if (msg->message){
+void linphone_chat_room_message_received(LinphoneChatRoom *cr, LinphoneCore *lc, LinphoneChatMessage *msg) {
+	if (msg->message) {
 		/*legacy API*/
 		linphone_core_notify_text_message_received(lc, cr, msg->from, msg->message);
 	}
-	linphone_core_notify_message_received(lc, cr,msg);
+	linphone_core_notify_message_received(lc, cr, msg);
 	cr->remote_is_composing = LinphoneIsComposingIdle;
 	linphone_core_notify_is_composing_received(cr->lc, cr);
 }
 
-void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessage *sal_msg){
-	LinphoneChatRoom *cr=NULL;
+void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessage *sal_msg) {
+	LinphoneChatRoom *cr = NULL;
 	LinphoneAddress *addr;
-	LinphoneChatMessage* msg;
+	LinphoneChatMessage *msg;
 	const SalCustomHeader *ch;
 
-	addr=linphone_address_new(sal_msg->from);
+	addr = linphone_address_new(sal_msg->from);
 	linphone_address_clean(addr);
-	cr=linphone_core_get_chat_room(lc,addr);
+	cr = linphone_core_get_chat_room(lc, addr);
 
-	if (sal_msg->content_type != NULL) { /* content_type field is, for now, used only for rcs file transfer but we shall strcmp it with "application/vnd.gsma.rcs-ft-http+xml" */
+	if (sal_msg->content_type !=
+		NULL) { /* content_type field is, for now, used only for rcs file transfer but we shall strcmp it with
+				   "application/vnd.gsma.rcs-ft-http+xml" */
 		xmlChar *file_url = NULL;
 		xmlDocPtr xmlMessageBody;
 		xmlNodePtr cur;
 
-		msg = linphone_chat_room_create_message(cr, NULL); /* create a message with empty body */
-		msg->content_type = ms_strdup(sal_msg->content_type); /* add the content_type "application/vnd.gsma.rcs-ft-http+xml" */
+		msg = linphone_chat_room_create_message(cr, NULL); /* create a msg with empty body */
+		msg->content_type =
+			ms_strdup(sal_msg->content_type); /* add the content_type "application/vnd.gsma.rcs-ft-http+xml" */
 		msg->file_transfer_information = linphone_content_new();
 
-		/* parse the message body to get all informations from it */
+		/* parse the msg body to get all informations from it */
 		xmlMessageBody = xmlParseDoc((const xmlChar *)sal_msg->text);
 
 		cur = xmlDocGetRootElement(xmlMessageBody);
 		if (cur != NULL) {
 			cur = cur->xmlChildrenNode;
-			while (cur!=NULL) {
-				if (!xmlStrcmp(cur->name, (const xmlChar *)"file-info")) { /* we found a file info node, check it has a type="file" attribute */
+			while (cur != NULL) {
+				if (!xmlStrcmp(
+						cur->name, (const xmlChar *)"file-info")) { /* we found a file info node, check it has a
+																	   type="file" attribute */
 					xmlChar *typeAttribute = xmlGetProp(cur, (const xmlChar *)"type");
-					if(!xmlStrcmp(typeAttribute, (const xmlChar *)"file")) { /* this is the node we are looking for */
+					if (!xmlStrcmp(typeAttribute, (const xmlChar *)"file")) { /* this is the node we are looking for */
 						cur = cur->xmlChildrenNode; /* now loop on the content of the file-info node */
-						while (cur!=NULL) {
+						while (cur != NULL) {
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"file-size")) {
 								xmlChar *fileSizeString = xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1);
-								linphone_content_set_size(msg->file_transfer_information, strtol((const char*)fileSizeString, NULL, 10));
+								linphone_content_set_size(msg->file_transfer_information,
+														  strtol((const char *)fileSizeString, NULL, 10));
 								xmlFree(fileSizeString);
 							}
 
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"file-name")) {
-								linphone_content_set_name(msg->file_transfer_information, (const char *)xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1));
+								xmlChar *filename = xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1);
+								linphone_content_set_name(
+									msg->file_transfer_information,
+									(char *)filename);
+								xmlFree(filename);
 							}
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"content-type")) {
 								xmlChar *contentType = xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1);
 								int contentTypeIndex = 0;
 								char *type;
 								char *subtype;
-								while (contentType[contentTypeIndex]!='/' && contentType[contentTypeIndex]!='\0') {
+								while (contentType[contentTypeIndex] != '/' && contentType[contentTypeIndex] != '\0') {
 									contentTypeIndex++;
 								}
 								type = ms_strndup((char *)contentType, contentTypeIndex);
-								subtype = ms_strdup(((char *)contentType+contentTypeIndex+1));
+								subtype = ms_strdup(((char *)contentType + contentTypeIndex + 1));
 								linphone_content_set_type(msg->file_transfer_information, type);
 								linphone_content_set_subtype(msg->file_transfer_information, subtype);
 								ms_free(subtype);
@@ -723,22 +576,26 @@ void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessag
 								xmlFree(contentType);
 							}
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"data")) {
-								file_url = 	xmlGetProp(cur, (const xmlChar *)"url");
+								file_url = xmlGetProp(cur, (const xmlChar *)"url");
 							}
 
-							if (!xmlStrcmp(cur->name, (const xmlChar *)"file-key")) { /* there is a key in the message: file has been encrypted */
+							if (!xmlStrcmp(cur->name,
+										   (const xmlChar *)"file-key")) { /* there is a key in the msg: file has
+																			  been encrypted */
 								/* convert the key from base 64 */
 								xmlChar *keyb64 = xmlNodeListGetString(xmlMessageBody, cur->xmlChildrenNode, 1);
-								int keyLength = b64_decode((char *)keyb64, strlen((char *)keyb64), NULL, 0);
+								size_t keyLength = b64_decode((char *)keyb64, strlen((char *)keyb64), NULL, 0);
 								uint8_t *keyBuffer = (uint8_t *)malloc(keyLength);
 								/* decode the key into local key buffer */
 								b64_decode((char *)keyb64, strlen((char *)keyb64), keyBuffer, keyLength);
-								linphone_content_set_key(msg->file_transfer_information, (char *)keyBuffer, keyLength); /* duplicate key value into the linphone content private structure */
+								linphone_content_set_key(
+									msg->file_transfer_information, (char *)keyBuffer,
+									strlen((char *)keyBuffer)); /* duplicate key value into the linphone content private structure */
 								xmlFree(keyb64);
 								free(keyBuffer);
 							}
 
-							cur=cur->next;
+							cur = cur->next;
 						}
 						xmlFree(typeAttribute);
 						break;
@@ -752,35 +609,39 @@ void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessag
 
 		linphone_chat_message_set_external_body_url(msg, (const char *)file_url);
 		xmlFree(file_url);
-	} else { /* message is not rcs file transfer, create it with provided sal_msg->text as ->message */
+	} else { /* msg is not rcs file transfer, create it with provided sal_msg->text as ->msg */
 		msg = linphone_chat_room_create_message(cr, sal_msg->text);
 	}
 	linphone_chat_message_set_from(msg, cr->peer_url);
 
 	{
 		LinphoneAddress *to;
-		to=sal_op_get_to(op) ? linphone_address_new(sal_op_get_to(op)) : linphone_address_new(linphone_core_get_identity(lc));
-		msg->to=to;
+		to = sal_op_get_to(op) ? linphone_address_new(sal_op_get_to(op))
+							   : linphone_address_new(linphone_core_get_identity(lc));
+		msg->to = to;
 	}
 
-	msg->time=sal_msg->time;
-	msg->state=LinphoneChatMessageStateDelivered;
-	msg->is_read=FALSE;
-	msg->dir=LinphoneChatMessageIncoming;
-	ch=sal_op_get_recv_custom_header(op);
-	if (ch) msg->custom_headers=sal_custom_header_clone(ch);
+	msg->time = sal_msg->time;
+	msg->state = LinphoneChatMessageStateDelivered;
+	msg->is_read = FALSE;
+	msg->dir = LinphoneChatMessageIncoming;
+	ch = sal_op_get_recv_custom_header(op);
+	if (ch)
+		msg->custom_headers = sal_custom_header_clone(ch);
 
 	if (sal_msg->url) {
 		linphone_chat_message_set_external_body_url(msg, sal_msg->url);
 	}
 
 	linphone_address_destroy(addr);
-	msg->storage_id=linphone_chat_message_store(msg);
+	msg->storage_id = linphone_chat_message_store(msg);
 
-	if(cr->unread_count < 0) cr->unread_count = 1;
-	else cr->unread_count++;
+	if (cr->unread_count < 0)
+		cr->unread_count = 1;
+	else
+		cr->unread_count++;
 
-	linphone_chat_room_message_received(cr,lc,msg);
+	linphone_chat_room_message_received(cr, lc, msg);
 	linphone_chat_message_unref(msg);
 }
 
@@ -800,20 +661,24 @@ static void process_im_is_composing_notification(LinphoneChatRoom *cr, xmlparsin
 	xmlXPathObjectPtr iscomposing_object;
 	const char *state_str = NULL;
 	const char *refresh_str = NULL;
-	int refresh_duration = lp_config_get_int(cr->lc->config, "sip", "composing_remote_refresh_timeout", COMPOSING_DEFAULT_REMOTE_REFRESH_TIMEOUT);
+	int refresh_duration = lp_config_get_int(cr->lc->config, "sip", "composing_remote_refresh_timeout",
+											 COMPOSING_DEFAULT_REMOTE_REFRESH_TIMEOUT);
 	int i;
 	LinphoneIsComposingState state = LinphoneIsComposingIdle;
 
-	if (linphone_create_xml_xpath_context(xml_ctx) < 0) return;
+	if (linphone_create_xml_xpath_context(xml_ctx) < 0)
+		return;
 
-	xmlXPathRegisterNs(xml_ctx->xpath_ctx, (const xmlChar *)"xsi", (const xmlChar *)"urn:ietf:params:xml:ns:im-iscomposing");
+	xmlXPathRegisterNs(xml_ctx->xpath_ctx, (const xmlChar *)"xsi",
+					   (const xmlChar *)"urn:ietf:params:xml:ns:im-iscomposing");
 	iscomposing_object = linphone_get_xml_xpath_object_for_node_list(xml_ctx, iscomposing_prefix);
-	if (iscomposing_object != NULL){
-		if(iscomposing_object->nodesetval != NULL) {
+	if (iscomposing_object != NULL) {
+		if (iscomposing_object->nodesetval != NULL) {
 			for (i = 1; i <= iscomposing_object->nodesetval->nodeNr; i++) {
 				snprintf(xpath_str, sizeof(xpath_str), "%s[%i]/xsi:state", iscomposing_prefix, i);
 				state_str = linphone_get_xml_text_content(xml_ctx, xpath_str);
-				if (state_str == NULL) continue;
+				if (state_str == NULL)
+					continue;
 				snprintf(xpath_str, sizeof(xpath_str), "%s[%i]/xsi:refresh", iscomposing_prefix, i);
 				refresh_str = linphone_get_xml_text_content(xml_ctx, xpath_str);
 			}
@@ -828,7 +693,9 @@ static void process_im_is_composing_notification(LinphoneChatRoom *cr, xmlparsin
 				refresh_duration = atoi(refresh_str);
 			}
 			if (!cr->remote_composing_refresh_timer) {
-				cr->remote_composing_refresh_timer = sal_create_timer(cr->lc->sal, linphone_chat_room_remote_refresh_composing_expired, cr, refresh_duration * 1000, "composing remote refresh timeout");
+				cr->remote_composing_refresh_timer =
+					sal_create_timer(cr->lc->sal, linphone_chat_room_remote_refresh_composing_expired, cr,
+									 refresh_duration * 1000, "composing remote refresh timeout");
 			} else {
 				belle_sip_source_set_timeout(cr->remote_composing_refresh_timer, refresh_duration * 1000);
 			}
@@ -848,7 +715,7 @@ static void process_im_is_composing_notification(LinphoneChatRoom *cr, xmlparsin
 static void linphone_chat_room_notify_is_composing(LinphoneChatRoom *cr, const char *text) {
 	xmlparsing_context_t *xml_ctx = linphone_xmlparsing_context_new();
 	xmlSetGenericErrorFunc(xml_ctx, linphone_xmlparsing_genericxml_error);
-	xml_ctx->doc = xmlReadDoc((const unsigned char*)text, 0, NULL, 0);
+	xml_ctx->doc = xmlReadDoc((const unsigned char *)text, 0, NULL, 0);
 	if (xml_ctx->doc != NULL) {
 		process_im_is_composing_notification(cr, xml_ctx);
 	} else {
@@ -870,70 +737,65 @@ bool_t linphone_chat_room_is_remote_composing(const LinphoneChatRoom *cr) {
 	return (cr->remote_is_composing == LinphoneIsComposingActive) ? TRUE : FALSE;
 }
 
-LinphoneCore* linphone_chat_room_get_lc(LinphoneChatRoom *cr){
+LinphoneCore *linphone_chat_room_get_lc(LinphoneChatRoom *cr) {
+	return linphone_chat_room_get_core(cr);
+}
+
+LinphoneCore *linphone_chat_room_get_core(LinphoneChatRoom *cr) {
 	return cr->lc;
 }
 
-LinphoneCore* linphone_chat_room_get_core(LinphoneChatRoom *cr){
-	return cr->lc;
-}
-
-const LinphoneAddress* linphone_chat_room_get_peer_address(LinphoneChatRoom *cr) {
+const LinphoneAddress *linphone_chat_room_get_peer_address(LinphoneChatRoom *cr) {
 	return cr->peer_url;
 }
 
-LinphoneChatMessage* linphone_chat_room_create_message(LinphoneChatRoom *cr, const char* message) {
-	LinphoneChatMessage* msg = belle_sip_object_new(LinphoneChatMessage);
-	msg->callbacks=linphone_chat_message_cbs_new();
-	msg->chat_room=(LinphoneChatRoom*)cr;
-	msg->message=message?ms_strdup(message):NULL;
-	msg->is_read=TRUE;
-	msg->content_type = NULL; /* this property is used only when transfering file */
+LinphoneChatMessage *linphone_chat_room_create_message(LinphoneChatRoom *cr, const char *message) {
+	LinphoneChatMessage *msg = belle_sip_object_new(LinphoneChatMessage);
+	msg->state = LinphoneChatMessageStateIdle;
+	msg->callbacks = linphone_chat_message_cbs_new();
+	msg->chat_room = (LinphoneChatRoom *)cr;
+	msg->message = message ? ms_strdup(message) : NULL;
+	msg->is_read = TRUE;
+	msg->content_type = NULL;			   /* this property is used only when transfering file */
 	msg->file_transfer_information = NULL; /* this property is used only when transfering file */
 	msg->http_request = NULL;
+	msg->time = ms_time(0);
 	return msg;
 }
 
-LinphoneChatMessage* linphone_chat_room_create_message_2(
-		LinphoneChatRoom *cr, const char* message, const char* external_body_url,
-		LinphoneChatMessageState state, time_t time, bool_t is_read, bool_t is_incoming) {
-	LinphoneCore *lc=linphone_chat_room_get_lc(cr);
-
-	LinphoneChatMessage* msg = belle_sip_object_new(LinphoneChatMessage);
-	msg->callbacks=linphone_chat_message_cbs_new();
-	msg->chat_room=(LinphoneChatRoom*)cr;
-	msg->message=message?ms_strdup(message):NULL;
-	msg->external_body_url=external_body_url?ms_strdup(external_body_url):NULL;
-	msg->time=time;
-	msg->state=state;
-	msg->is_read=is_read;
-	msg->content_type = NULL; /* this property is used only when transfering file */
-	msg->file_transfer_information = NULL; /* this property is used only when transfering file */
+LinphoneChatMessage *linphone_chat_room_create_message_2(LinphoneChatRoom *cr, const char *message,
+														 const char *external_body_url, LinphoneChatMessageState state,
+														 time_t time, bool_t is_read, bool_t is_incoming) {
+	LinphoneChatMessage *msg = linphone_chat_room_create_message(cr, message);
+	LinphoneCore *lc = linphone_chat_room_get_core(cr);
+	msg->external_body_url = external_body_url ? ms_strdup(external_body_url) : NULL;
+	msg->time = time;
+	msg->is_read = is_read;
+	linphone_chat_message_set_state(msg, state);
 	if (is_incoming) {
-		msg->dir=LinphoneChatMessageIncoming;
+		msg->dir = LinphoneChatMessageIncoming;
 		linphone_chat_message_set_from(msg, linphone_chat_room_get_peer_address(cr));
-		linphone_chat_message_set_to(msg, linphone_address_new(linphone_core_get_identity(lc)));
+		msg->to = linphone_address_new(linphone_core_get_identity(lc)); /*direct assignment*/
 	} else {
-		msg->dir=LinphoneChatMessageOutgoing;
+		msg->dir = LinphoneChatMessageOutgoing;
 		linphone_chat_message_set_to(msg, linphone_chat_room_get_peer_address(cr));
-		linphone_chat_message_set_from(msg, linphone_address_new(linphone_core_get_identity(lc)));
+		msg->from = linphone_address_new(linphone_core_get_identity(lc));/*direct assignment*/
 	}
 	return msg;
 }
 
-void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangedCb status_cb, void* ud) {
-	msg->cb=status_cb;
-	msg->cb_ud=ud;
-	msg->state=LinphoneChatMessageStateInProgress;
+void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage *msg,
+									  LinphoneChatMessageStateChangedCb status_cb, void *ud) {
+	msg->message_state_changed_cb = status_cb;
+	msg->message_state_changed_user_data = ud;
 	_linphone_chat_room_send_message(cr, msg);
 }
 
 void linphone_chat_room_send_chat_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg) {
-	msg->state = LinphoneChatMessageStateInProgress;
 	_linphone_chat_room_send_message(cr, msg);
 }
 
-static char * linphone_chat_room_create_is_composing_xml(LinphoneChatRoom *cr) {
+static char *linphone_chat_room_create_is_composing_xml(LinphoneChatRoom *cr) {
 	xmlBufferPtr buf;
 	xmlTextWriterPtr writer;
 	int err;
@@ -952,23 +814,26 @@ static char * linphone_chat_room_create_is_composing_xml(LinphoneChatRoom *cr) {
 
 	err = xmlTextWriterStartDocument(writer, "1.0", "UTF-8", NULL);
 	if (err >= 0) {
-		err = xmlTextWriterStartElementNS(writer, NULL, (const xmlChar *)"isComposing", (const xmlChar *)"urn:ietf:params:xml:ns:im-iscomposing");
+		err = xmlTextWriterStartElementNS(writer, NULL, (const xmlChar *)"isComposing",
+										  (const xmlChar *)"urn:ietf:params:xml:ns:im-iscomposing");
 	}
 	if (err >= 0) {
-		err = xmlTextWriterWriteAttributeNS(writer, (const xmlChar *)"xmlns", (const xmlChar *)"xsi",
-			NULL, (const xmlChar *)"http://www.w3.org/2001/XMLSchema-instance");
+		err = xmlTextWriterWriteAttributeNS(writer, (const xmlChar *)"xmlns", (const xmlChar *)"xsi", NULL,
+											(const xmlChar *)"http://www.w3.org/2001/XMLSchema-instance");
 	}
 	if (err >= 0) {
-		err = xmlTextWriterWriteAttributeNS(writer, (const xmlChar *)"xsi", (const xmlChar *)"schemaLocation",
-			NULL, (const xmlChar *)"urn:ietf:params:xml:ns:im-composing iscomposing.xsd");
+		err = xmlTextWriterWriteAttributeNS(writer, (const xmlChar *)"xsi", (const xmlChar *)"schemaLocation", NULL,
+											(const xmlChar *)"urn:ietf:params:xml:ns:im-composing iscomposing.xsd");
 	}
 	if (err >= 0) {
 		err = xmlTextWriterWriteElement(writer, (const xmlChar *)"state",
-			(cr->is_composing == LinphoneIsComposingActive) ? (const xmlChar *)"active" : (const xmlChar *)"idle");
+										(cr->is_composing == LinphoneIsComposingActive) ? (const xmlChar *)"active"
+																						: (const xmlChar *)"idle");
 	}
 	if ((err >= 0) && (cr->is_composing == LinphoneIsComposingActive)) {
-		char refresh_str[4] = { 0 };
-		int refresh_timeout = lp_config_get_int(cr->lc->config, "sip", "composing_refresh_timeout", COMPOSING_DEFAULT_REFRESH_TIMEOUT);
+		char refresh_str[4] = {0};
+		int refresh_timeout =
+			lp_config_get_int(cr->lc->config, "sip", "composing_refresh_timeout", COMPOSING_DEFAULT_REFRESH_TIMEOUT);
 		snprintf(refresh_str, sizeof(refresh_str), "%u", refresh_timeout);
 		err = xmlTextWriterWriteElement(writer, (const xmlChar *)"refresh", (const xmlChar *)refresh_str);
 	}
@@ -999,7 +864,8 @@ static void linphone_chat_room_send_is_composing_notification(LinphoneChatRoom *
 		identity = linphone_core_get_primary_contact(cr->lc);
 	/*sending out of calls*/
 	op = sal_op_new(cr->lc->sal);
-	linphone_configure_op(cr->lc, op, cr->peer_url, NULL, lp_config_get_int(cr->lc->config, "sip", "chat_msg_with_contact", 0));
+	linphone_configure_op(cr->lc, op, cr->peer_url, NULL,
+						  lp_config_get_int(cr->lc->config, "sip", "chat_msg_with_contact", 0));
 
 	content = linphone_chat_room_create_is_composing_xml(cr);
 	if (content != NULL) {
@@ -1009,6 +875,137 @@ static void linphone_chat_room_send_is_composing_notification(LinphoneChatRoom *
 	}
 }
 
+static char* utf8_to_char(uint32_t ic) {
+	char *result = ms_malloc(sizeof(char) * 5);
+	int size = 0;
+	if (ic < 0x80) {
+		result[0] = ic;
+		size = 1;
+	} else if (ic < 0x800) {
+		result[1] = 0x80 + ((ic & 0x3F));
+		result[0] = 0xC0 + ((ic >> 6) & 0x1F);
+		size = 2;
+	} else if (ic < 0x100000) {
+		result[2] = 0x80 + (ic & 0x3F);
+		result[1] = 0x80 + ((ic >> 6) & 0x3F);
+		result[0] = 0xE0 + ((ic >> 12) & 0xF);
+		size = 3;
+	} else if (ic < 0x110000) {
+		result[3] = 0x80 + (ic & 0x3F);
+		result[2] = 0x80 + ((ic >> 6) & 0x3F);
+		result[1] = 0x80 + ((ic >> 12) & 0x3F);
+		result[0] = 0xF0 + ((ic >> 18) & 0x7);
+		size = 4;
+	}
+	result[size] = '\0';
+	return result;
+}
+
+void linphone_core_real_time_text_received(LinphoneCore *lc, LinphoneChatRoom *cr, uint32_t character, LinphoneCall *call) {
+	uint32_t new_line = 0x2028;
+	uint32_t crlf = 0x0D0A;
+	uint32_t lf = 0x0A;
+
+	if (call && linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(call))) {
+		LinphoneChatMessageCharacter *cmc = ms_new0(LinphoneChatMessageCharacter, 1);
+
+		if (cr->pending_message == NULL) {
+			cr->pending_message = linphone_chat_room_create_message(cr, "");
+		}
+
+		cmc->value = character;
+		cmc->has_been_read = FALSE;
+		cr->received_rtt_characters = bctbx_list_append(cr->received_rtt_characters, (void *)cmc);
+
+		cr->remote_is_composing = LinphoneIsComposingActive;
+		linphone_core_notify_is_composing_received(cr->lc, cr);
+
+		if (character == new_line || character == crlf || character == lf) {
+			// End of message
+			LinphoneChatMessage *msg = cr->pending_message;
+			ms_debug("New line received, forge a message with content %s", cr->pending_message->message);
+
+			linphone_chat_message_set_from(msg, cr->peer_url);
+			if (msg->to)
+				linphone_address_destroy(msg->to);
+			msg->to = call->dest_proxy ? linphone_address_clone(call->dest_proxy->identity_address) :
+					linphone_address_new(linphone_core_get_identity(lc));
+			msg->time = ms_time(0);
+			msg->state = LinphoneChatMessageStateDelivered;
+			msg->is_read = FALSE;
+			msg->dir = LinphoneChatMessageIncoming;
+
+			if (lp_config_get_int(lc->config, "misc", "store_rtt_messages", 1) == 1) {
+				msg->storage_id = linphone_chat_message_store(msg);
+			}
+
+			if (cr->unread_count < 0) cr->unread_count = 1;
+			else cr->unread_count++;
+
+			linphone_chat_room_message_received(cr, lc, msg);
+			linphone_chat_message_unref(msg);
+			cr->pending_message = NULL;
+			cr->received_rtt_characters = bctbx_list_free(cr->received_rtt_characters);
+		} else {
+			char *value = utf8_to_char(character);
+			cr->pending_message->message = ms_strcat_printf(cr->pending_message->message, value);
+			ms_debug("Received RTT character: %s (%lu), pending text is %s", value, (unsigned long)character, cr->pending_message->message);
+			ms_free(value);
+		}
+	}
+}
+
+uint32_t linphone_chat_room_get_char(const LinphoneChatRoom *cr) {
+	if (cr && cr->received_rtt_characters) {
+		bctbx_list_t *characters = cr->received_rtt_characters;
+		while (characters != NULL) {
+			LinphoneChatMessageCharacter *cmc = (LinphoneChatMessageCharacter *)characters->data;
+			if (!cmc->has_been_read) {
+				cmc->has_been_read = TRUE;
+				return cmc->value;
+			}
+			characters = bctbx_list_next(characters);
+		}
+	}
+	return 0;
+}
+
+int linphone_chat_message_put_char(LinphoneChatMessage *msg, uint32_t character) {
+	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(msg);
+	LinphoneCall *call = cr->call;
+	LinphoneCore *lc = cr->lc;
+	uint32_t new_line = 0x2028;
+	uint32_t crlf = 0x0D0A;
+	uint32_t lf = 0x0A;
+
+	if (!call || !call->textstream) {
+		return -1;
+	}
+
+	if (character == new_line || character == crlf || character == lf) {
+		if (lc && lp_config_get_int(lc->config, "misc", "store_rtt_messages", 1) == 1) {
+			ms_debug("New line sent, forge a message with content %s", msg->message);
+			msg->time = ms_time(0);
+			msg->state = LinphoneChatMessageStateDelivered;
+			msg->is_read = TRUE;
+			msg->dir = LinphoneChatMessageOutgoing;
+			if (msg->from) linphone_address_destroy(msg->from);
+			msg->from = linphone_address_new(linphone_core_get_identity(lc));
+			msg->storage_id = linphone_chat_message_store(msg);
+			ms_free(msg->message);
+			msg->message = NULL;
+		}
+	} else {
+		char *value = utf8_to_char(character);
+		msg->message = ms_strcat_printf(msg->message, value);
+		ms_debug("Sent RTT character: %s (%lu), pending text is %s", value, (unsigned long)character, msg->message);
+		ms_free(value);
+	}
+
+	text_stream_putchar32(call->textstream, character);
+	return 0;
+}
+
 static int linphone_chat_room_stop_composing(void *data, unsigned int revents) {
 	LinphoneChatRoom *cr = (LinphoneChatRoom *)data;
 	cr->is_composing = LinphoneIsComposingIdle;
@@ -1026,329 +1023,149 @@ static int linphone_chat_room_refresh_composing(void *data, unsigned int revents
 }
 
 void linphone_chat_room_compose(LinphoneChatRoom *cr) {
-	int idle_timeout = lp_config_get_int(cr->lc->config, "sip", "composing_idle_timeout", COMPOSING_DEFAULT_IDLE_TIMEOUT);
-	int refresh_timeout = lp_config_get_int(cr->lc->config, "sip", "composing_refresh_timeout", COMPOSING_DEFAULT_REFRESH_TIMEOUT);
+	int idle_timeout =
+		lp_config_get_int(cr->lc->config, "sip", "composing_idle_timeout", COMPOSING_DEFAULT_IDLE_TIMEOUT);
+	int refresh_timeout =
+		lp_config_get_int(cr->lc->config, "sip", "composing_refresh_timeout", COMPOSING_DEFAULT_REFRESH_TIMEOUT);
 	if (cr->is_composing == LinphoneIsComposingIdle) {
 		cr->is_composing = LinphoneIsComposingActive;
 		linphone_chat_room_send_is_composing_notification(cr);
 		if (!cr->composing_refresh_timer) {
-			cr->composing_refresh_timer = sal_create_timer(cr->lc->sal, linphone_chat_room_refresh_composing, cr, refresh_timeout * 1000, "composing refresh timeout");
+			cr->composing_refresh_timer = sal_create_timer(cr->lc->sal, linphone_chat_room_refresh_composing, cr,
+														   refresh_timeout * 1000, "composing refresh timeout");
 		} else {
 			belle_sip_source_set_timeout(cr->composing_refresh_timer, refresh_timeout * 1000);
 		}
 		if (!cr->composing_idle_timer) {
-			cr->composing_idle_timer = sal_create_timer(cr->lc->sal, linphone_chat_room_stop_composing, cr, idle_timeout * 1000, "composing idle timeout");
+			cr->composing_idle_timer = sal_create_timer(cr->lc->sal, linphone_chat_room_stop_composing, cr,
+														idle_timeout * 1000, "composing idle timeout");
 		}
 	}
 	belle_sip_source_set_timeout(cr->composing_idle_timer, idle_timeout * 1000);
 }
 
-const char* linphone_chat_message_state_to_string(const LinphoneChatMessageState state) {
+const char *linphone_chat_message_state_to_string(const LinphoneChatMessageState state) {
 	switch (state) {
-		case LinphoneChatMessageStateIdle:return "LinphoneChatMessageStateIdle";
-		case LinphoneChatMessageStateInProgress:return "LinphoneChatMessageStateInProgress";
-		case LinphoneChatMessageStateDelivered:return "LinphoneChatMessageStateDelivered";
-		case LinphoneChatMessageStateNotDelivered:return "LinphoneChatMessageStateNotDelivered";
-		case LinphoneChatMessageStateFileTransferError:return "LinphoneChatMessageStateFileTransferError";
-		case LinphoneChatMessageStateFileTransferDone: return "LinphoneChatMessageStateFileTransferDone ";
+	case LinphoneChatMessageStateIdle:
+		return "LinphoneChatMessageStateIdle";
+	case LinphoneChatMessageStateInProgress:
+		return "LinphoneChatMessageStateInProgress";
+	case LinphoneChatMessageStateDelivered:
+		return "LinphoneChatMessageStateDelivered";
+	case LinphoneChatMessageStateNotDelivered:
+		return "LinphoneChatMessageStateNotDelivered";
+	case LinphoneChatMessageStateFileTransferError:
+		return "LinphoneChatMessageStateFileTransferError";
+	case LinphoneChatMessageStateFileTransferDone:
+		return "LinphoneChatMessageStateFileTransferDone ";
 	}
 	return NULL;
 }
 
-LinphoneChatRoom* linphone_chat_message_get_chat_room(LinphoneChatMessage *msg){
+LinphoneChatRoom *linphone_chat_message_get_chat_room(LinphoneChatMessage *msg) {
 	return msg->chat_room;
 }
 
-const LinphoneAddress* linphone_chat_message_get_peer_address(LinphoneChatMessage *msg) {
+const LinphoneAddress *linphone_chat_message_get_peer_address(LinphoneChatMessage *msg) {
 	return linphone_chat_room_get_peer_address(msg->chat_room);
 }
 
-void linphone_chat_message_set_user_data(LinphoneChatMessage* message,void* ud) {
-	message->message_userdata=ud;
+void linphone_chat_message_set_user_data(LinphoneChatMessage *msg, void *ud) {
+	msg->message_userdata = ud;
 }
 
-void* linphone_chat_message_get_user_data(const LinphoneChatMessage* message) {
-	return message->message_userdata;
+void *linphone_chat_message_get_user_data(const LinphoneChatMessage *msg) {
+	return msg->message_userdata;
 }
 
-const char* linphone_chat_message_get_external_body_url(const LinphoneChatMessage* message) {
-	return message->external_body_url;
+const char *linphone_chat_message_get_external_body_url(const LinphoneChatMessage *msg) {
+	return msg->external_body_url;
 }
 
-void linphone_chat_message_set_external_body_url(LinphoneChatMessage* message, const char* url) {
-	if (message->external_body_url) {
-		ms_free(message->external_body_url);
+void linphone_chat_message_set_external_body_url(LinphoneChatMessage *msg, const char *url) {
+	if (msg->external_body_url) {
+		ms_free(msg->external_body_url);
 	}
-	message->external_body_url=url?ms_strdup(url):NULL;
+	msg->external_body_url = url ? ms_strdup(url) : NULL;
 }
 
-const char* linphone_chat_message_get_appdata(const LinphoneChatMessage* message){
-	return message->appdata;
+const char *linphone_chat_message_get_appdata(const LinphoneChatMessage *msg) {
+	return msg->appdata;
 }
 
-void linphone_chat_message_set_appdata(LinphoneChatMessage* message, const char* data){
-	if ( message->appdata ){
-		ms_free(message->appdata);
+void linphone_chat_message_set_appdata(LinphoneChatMessage *msg, const char *data) {
+	if (msg->appdata) {
+		ms_free(msg->appdata);
 	}
-	message->appdata = data? ms_strdup(data) : NULL;
-	linphone_chat_message_store_appdata(message);
+	msg->appdata = data ? ms_strdup(data) : NULL;
+	linphone_chat_message_store_appdata(msg);
 }
 
-
-const LinphoneContent *linphone_chat_message_get_file_transfer_information(const LinphoneChatMessage*message) {
-	return message->file_transfer_information;
+void linphone_chat_message_set_from_address(LinphoneChatMessage *msg, const LinphoneAddress *from) {
+	if (msg->from)
+		linphone_address_destroy(msg->from);
+	msg->from = linphone_address_clone(from);
 }
 
-static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t *msg, void *data, size_t offset, const uint8_t *buffer, size_t size){
-	LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data;
-	LinphoneCore *lc = chatMsg->chat_room->lc;
-
-	if (!chatMsg->http_request || belle_http_request_is_cancelled(chatMsg->http_request)) {
-		ms_warning("Cancelled request for msg [%p], ignoring %s", chatMsg, __FUNCTION__);
-		return;
-	}
-
-	/* first call may be with a zero size, ignore it */
-	if (size == 0) {
-		return;
-	}
-
-	if (linphone_content_get_key(chatMsg->file_transfer_information) != NULL) { /* we have a key, we must decrypt the file */
-		/* get data from callback to a plainBuffer */
-		char *plainBuffer = (char *)malloc(size);
-		lime_decryptFile(linphone_content_get_cryptoContext_address(chatMsg->file_transfer_information), (unsigned char *)linphone_content_get_key(chatMsg->file_transfer_information), size, plainBuffer, (char *)buffer);
-		if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
-			LinphoneBuffer *lb = linphone_buffer_new_from_data((unsigned char *)plainBuffer, size);
-			linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, lb);
-			linphone_buffer_unref(lb);
-		} else {
-			/* legacy: call back given by application level */
-			linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, plainBuffer, size);
-		}
-		free(plainBuffer);
-	} else { /* regular file, no deciphering */
-		if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
-			LinphoneBuffer *lb = linphone_buffer_new_from_data(buffer, size);
-			linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, lb);
-			linphone_buffer_unref(lb);
-		} else {
-			/* Legacy: call back given by application level */
-			linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, (char *)buffer, size);
-		}
-	}
-
-	return;
+const LinphoneAddress *linphone_chat_message_get_from_address(const LinphoneChatMessage *msg) {
+	return msg->from;
 }
 
-
-static LinphoneContent* linphone_chat_create_file_transfer_information_from_headers(const belle_sip_message_t* message ){
-	LinphoneContent *content = linphone_content_new();
-
-	belle_sip_header_content_length_t* content_length_hdr = BELLE_SIP_HEADER_CONTENT_LENGTH(belle_sip_message_get_header(message, "Content-Length"));
-	belle_sip_header_content_type_t* content_type_hdr = BELLE_SIP_HEADER_CONTENT_TYPE(belle_sip_message_get_header(message, "Content-Type"));
-	const char* type = NULL,*subtype = NULL;
-
-	linphone_content_set_name(content, "");
-
-	if( content_type_hdr ){
-		type = belle_sip_header_content_type_get_type(content_type_hdr);
-		subtype = belle_sip_header_content_type_get_subtype(content_type_hdr);
-		ms_message("Extracted content type %s / %s from header", type?type:"", subtype?subtype:"");
-		if( type ) linphone_content_set_type(content, type);
-		if( subtype ) linphone_content_set_subtype(content, subtype);
-	}
-
-	if( content_length_hdr ){
-		linphone_content_set_size(content, belle_sip_header_content_length_get_content_length(content_length_hdr));
-		ms_message("Extracted content length %i from header", (int)linphone_content_get_size(content));
-	}
-
-	return content;
+void linphone_chat_message_set_to_address(LinphoneChatMessage *msg, const LinphoneAddress *to) {
+	if (msg->to)
+		linphone_address_destroy(msg->to);
+	msg->to = linphone_address_clone(to);
 }
 
-static void linphone_chat_process_response_headers_from_get_file(void *data, const belle_http_response_event_t *event){
-	if (event->response){
-		/*we are receiving a response, set a specific body handler to acquire the response.
-		 * if not done, belle-sip will create a memory body handler, the default*/
-		LinphoneChatMessage *message=(LinphoneChatMessage *)belle_sip_object_data_get(BELLE_SIP_OBJECT(event->request),"message");
-		belle_sip_message_t* response = BELLE_SIP_MESSAGE(event->response);
-		size_t body_size = 0;
-
-		if( message->file_transfer_information == NULL ){
-			ms_warning("No file transfer information for message %p: creating...", message);
-			message->file_transfer_information = linphone_chat_create_file_transfer_information_from_headers(response);
-		}
-
-		if( message->file_transfer_information ){
-			body_size = linphone_content_get_size(message->file_transfer_information);
-		}
-
-		if (message->file_transfer_filepath == NULL) {
-			belle_sip_message_set_body_handler(
-				(belle_sip_message_t*)event->response,
-				(belle_sip_body_handler_t*)belle_sip_user_body_handler_new(body_size, linphone_chat_message_file_transfer_on_progress,on_recv_body,NULL,message)
-			);
-		} else {
-			belle_sip_body_handler_t *bh = (belle_sip_body_handler_t *)belle_sip_file_body_handler_new(message->file_transfer_filepath, linphone_chat_message_file_transfer_on_progress, message);
-			if (belle_sip_body_handler_get_size(bh) == 0) {
-				/* If the size of the body has not been initialized from the file stat, use the one from the file_transfer_information. */
-				belle_sip_body_handler_set_size(bh, body_size);
-			}
-			belle_sip_message_set_body_handler((belle_sip_message_t *)event->response, bh);
-		}
-	}
-}
-
-static void linphone_chat_process_response_from_get_file(void *data, const belle_http_response_event_t *event){
-	/* check the answer code */
-	if (event->response){
-		int code=belle_http_response_get_status_code(event->response);
-		if (code==200) {
-			LinphoneChatMessage* chatMsg=(LinphoneChatMessage *)data;
-			LinphoneCore *lc = chatMsg->chat_room->lc;
-			/* if the file was encrypted, finish the decryption and free context */
-			if (linphone_content_get_key(chatMsg->file_transfer_information) != NULL) {
-				lime_decryptFile(linphone_content_get_cryptoContext_address(chatMsg->file_transfer_information), NULL, 0, NULL, NULL);
-			}
-			/* file downloaded succesfully, call again the callback with size at zero */
-			if (linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)) {
-				LinphoneBuffer *lb = linphone_buffer_new();
-				linphone_chat_message_cbs_get_file_transfer_recv(chatMsg->callbacks)(chatMsg, chatMsg->file_transfer_information, lb);
-				linphone_buffer_unref(lb);
-			} else {
-				linphone_core_notify_file_transfer_recv(lc, chatMsg, chatMsg->file_transfer_information, NULL, 0);
-			}
-			chatMsg->state = LinphoneChatMessageStateFileTransferDone;
-			if (chatMsg->cb) {
-				chatMsg->cb(chatMsg, chatMsg->state, chatMsg->cb_ud);
-			}
-			if (linphone_chat_message_cbs_get_msg_state_changed(chatMsg->callbacks)) {
-				linphone_chat_message_cbs_get_msg_state_changed(chatMsg->callbacks)(chatMsg, chatMsg->state);
-			}
-		}
-	}
-}
-
-void linphone_chat_message_download_file(LinphoneChatMessage *message) {
-	belle_http_request_listener_callbacks_t cbs={0};
-	belle_http_request_listener_t *l;
-	belle_generic_uri_t *uri;
-	const char *url=message->external_body_url;
-	char* ua;
-
-	if (url == NULL) {
-		ms_error("Cannot download file from chat message [%p] because url is NULL",message);
-		return;
-	}
-	ua = ms_strdup_printf("%s/%s", linphone_core_get_user_agent_name(), linphone_core_get_user_agent_version());
-	uri=belle_generic_uri_parse(url);
-
-	message->http_request=belle_http_request_create("GET",
-				uri,
-				belle_sip_header_create("User-Agent",ua),
-				NULL);
-	belle_sip_object_ref(message->http_request);	/* keep a reference on the request to be able to cancel the download */
-	ms_free(ua);
-
-	cbs.process_response_headers=linphone_chat_process_response_headers_from_get_file;
-	cbs.process_response=linphone_chat_process_response_from_get_file;
-	cbs.process_io_error=process_io_error_download;
-	cbs.process_auth_requested=process_auth_requested_download;
-	l=belle_http_request_listener_create_from_callbacks(&cbs, (void *)message);
-	belle_sip_object_data_set(BELLE_SIP_OBJECT(message->http_request),"message",(void *)message,NULL);
-	message->state = LinphoneChatMessageStateInProgress; /* start the download, status is In Progress */
-	belle_http_provider_send_request(message->chat_room->lc->http_provider,message->http_request,l);
-}
-
-void linphone_chat_message_start_file_download(LinphoneChatMessage *message, LinphoneChatMessageStateChangedCb status_cb, void *ud) {
-	message->cb = status_cb;
-	message->cb_ud = ud;
-	linphone_chat_message_download_file(message);
-}
-
-void linphone_chat_message_cancel_file_transfer(LinphoneChatMessage *msg) {
-	if (msg->http_request) {
-		if (!belle_http_request_is_cancelled(msg->http_request)) {
-			ms_message("Cancelling file transfer %s - msg [%p] chat room[%p]", (msg->external_body_url==NULL)?linphone_core_get_file_transfer_server(msg->chat_room->lc):msg->external_body_url, msg, msg->chat_room);
-
-			belle_http_provider_cancel_request(msg->chat_room->lc->http_provider, msg->http_request);
-			belle_sip_object_unref(msg->http_request);
-			msg->http_request = NULL;
-			msg->state = LinphoneChatMessageStateNotDelivered;
-			if (msg->cb) {
-				msg->cb(msg, msg->state, msg->cb_ud);
-			}
-			if (linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)) {
-				linphone_chat_message_cbs_get_msg_state_changed(msg->callbacks)(msg, msg->state);
-			}
-		}
-	} else {
-		ms_message("No existing file transfer - nothing to cancel");
-	}
-}
-
-
-void linphone_chat_message_set_from_address(LinphoneChatMessage* message, const LinphoneAddress* from) {
-	if(message->from) linphone_address_destroy(message->from);
-	message->from=linphone_address_clone(from);
-}
-
-const LinphoneAddress* linphone_chat_message_get_from_address(const LinphoneChatMessage* message) {
-	return message->from;
-}
-
-void linphone_chat_message_set_to_address(LinphoneChatMessage* message, const LinphoneAddress* to) {
-	if(message->to) linphone_address_destroy(message->to);
-	message->to=linphone_address_clone(to);
-}
-
-const LinphoneAddress* linphone_chat_message_get_to_address(const LinphoneChatMessage* message){
-	if (message->to) return message->to;
-	if (message->dir==LinphoneChatMessageOutgoing){
-		return message->chat_room->peer_url;
+const LinphoneAddress *linphone_chat_message_get_to_address(const LinphoneChatMessage *msg) {
+	if (msg->to)
+		return msg->to;
+	if (msg->dir == LinphoneChatMessageOutgoing) {
+		return msg->chat_room->peer_url;
 	}
 	return NULL;
 }
 
-LinphoneAddress *linphone_chat_message_get_local_address(const LinphoneChatMessage* message){
-	return message->dir==LinphoneChatMessageOutgoing ? message->from : message->to;
+LinphoneAddress *linphone_chat_message_get_local_address(const LinphoneChatMessage *msg) {
+	return msg->dir == LinphoneChatMessageOutgoing ? msg->from : msg->to;
 }
 
-time_t linphone_chat_message_get_time(const LinphoneChatMessage* message) {
-	return message->time;
+time_t linphone_chat_message_get_time(const LinphoneChatMessage *msg) {
+	return msg->time;
 }
 
-LinphoneChatMessageState linphone_chat_message_get_state(const LinphoneChatMessage* message) {
-	return message->state;
+LinphoneChatMessageState linphone_chat_message_get_state(const LinphoneChatMessage *msg) {
+	return msg->state;
 }
 
-const char * linphone_chat_message_get_text(const LinphoneChatMessage* message) {
-	return message->message;
+const char *linphone_chat_message_get_text(const LinphoneChatMessage *msg) {
+	return msg->message;
 }
 
-void linphone_chat_message_add_custom_header(LinphoneChatMessage* message, const char *header_name, const char *header_value){
-	message->custom_headers=sal_custom_header_append(message->custom_headers,header_name,header_value);
+void linphone_chat_message_add_custom_header(LinphoneChatMessage *msg, const char *header_name,
+											 const char *header_value) {
+	msg->custom_headers = sal_custom_header_append(msg->custom_headers, header_name, header_value);
 }
 
-const char * linphone_chat_message_get_custom_header(LinphoneChatMessage* message, const char *header_name){
-	return sal_custom_header_find(message->custom_headers,header_name);
+const char *linphone_chat_message_get_custom_header(LinphoneChatMessage *msg, const char *header_name) {
+	return sal_custom_header_find(msg->custom_headers, header_name);
 }
 
-bool_t linphone_chat_message_is_read(LinphoneChatMessage* message) {
-	return message->is_read;
+bool_t linphone_chat_message_is_read(LinphoneChatMessage *msg) {
+	return msg->is_read;
 }
 
-bool_t linphone_chat_message_is_outgoing(LinphoneChatMessage* message) {
-	return message->dir == LinphoneChatMessageOutgoing;
+bool_t linphone_chat_message_is_outgoing(LinphoneChatMessage *msg) {
+	return msg->dir == LinphoneChatMessageOutgoing;
 }
 
-unsigned int linphone_chat_message_get_storage_id(LinphoneChatMessage* message) {
-	return message->storage_id;
+unsigned int linphone_chat_message_get_storage_id(LinphoneChatMessage *msg) {
+	return msg->storage_id;
 }
 
-LinphoneChatMessage* linphone_chat_message_clone(const LinphoneChatMessage* msg) {
+LinphoneChatMessage *linphone_chat_message_clone(const LinphoneChatMessage *msg) {
 	/*struct _LinphoneChatMessage {
-	 char* message;
+	 char* msg;
 	 LinphoneChatRoom* chat_room;
 	 LinphoneChatMessageStateChangeCb cb;
 	 void* cb_ud;
@@ -1359,94 +1176,88 @@ LinphoneChatMessage* linphone_chat_message_clone(const LinphoneChatMessage* msg)
 	 SalCustomHeader *custom_headers;
 	 LinphoneChatMessageState state;
 	 };*/
-	LinphoneChatMessage* new_message = linphone_chat_room_create_message(msg->chat_room,msg->message);
-	if (msg->external_body_url) new_message->external_body_url=ms_strdup(msg->external_body_url);
-	if (msg->appdata) new_message->appdata = ms_strdup(msg->appdata);
-	new_message->cb=msg->cb;
-	new_message->cb_ud=msg->cb_ud;
-	new_message->message_userdata=msg->message_userdata;
-	new_message->cb=msg->cb;
-	new_message->time=msg->time;
-	new_message->state=msg->state;
-	new_message->storage_id=msg->storage_id;
-	if (msg->from) new_message->from=linphone_address_clone(msg->from);
-	if (msg->file_transfer_filepath) new_message->file_transfer_filepath=ms_strdup(msg->file_transfer_filepath);
-	if (msg->file_transfer_information) new_message->file_transfer_information=linphone_content_copy(msg->file_transfer_information);
+	LinphoneChatMessage *new_message = linphone_chat_room_create_message(msg->chat_room, msg->message);
+	if (msg->external_body_url)
+		new_message->external_body_url = ms_strdup(msg->external_body_url);
+	if (msg->appdata)
+		new_message->appdata = ms_strdup(msg->appdata);
+	new_message->message_state_changed_cb = msg->message_state_changed_cb;
+	new_message->message_state_changed_user_data = msg->message_state_changed_user_data;
+	new_message->message_userdata = msg->message_userdata;
+	new_message->time = msg->time;
+	new_message->state = msg->state;
+	new_message->storage_id = msg->storage_id;
+	if (msg->from)
+		new_message->from = linphone_address_clone(msg->from);
+	if (msg->file_transfer_filepath)
+		new_message->file_transfer_filepath = ms_strdup(msg->file_transfer_filepath);
+	if (msg->file_transfer_information)
+		new_message->file_transfer_information = linphone_content_copy(msg->file_transfer_information);
 	return new_message;
 }
 
-void linphone_chat_message_destroy(LinphoneChatMessage* msg){
+void linphone_chat_message_destroy(LinphoneChatMessage *msg) {
 	belle_sip_object_unref(msg);
 }
 
-static void _linphone_chat_message_destroy(LinphoneChatMessage* msg) {
-	if (msg->op) sal_op_release(msg->op);
-	if (msg->message) ms_free(msg->message);
-	if (msg->external_body_url) ms_free(msg->external_body_url);
-	if (msg->appdata) ms_free(msg->appdata);
-	if (msg->from) linphone_address_destroy(msg->from);
-	if (msg->to) linphone_address_destroy(msg->to);
-	if (msg->custom_headers) sal_custom_header_free(msg->custom_headers);
-	if (msg->content_type) ms_free(msg->content_type);
+static void _linphone_chat_message_destroy(LinphoneChatMessage *msg) {
+	if (msg->op)
+		sal_op_release(msg->op);
+	if (msg->message)
+		ms_free(msg->message);
+	if (msg->external_body_url)
+		ms_free(msg->external_body_url);
+	if (msg->appdata)
+		ms_free(msg->appdata);
+	if (msg->from)
+		linphone_address_destroy(msg->from);
+	if (msg->to)
+		linphone_address_destroy(msg->to);
+	if (msg->custom_headers)
+		sal_custom_header_free(msg->custom_headers);
+	if (msg->content_type)
+		ms_free(msg->content_type);
 	if (msg->file_transfer_information) {
 		linphone_content_unref(msg->file_transfer_information);
 	}
 	if (msg->file_transfer_filepath != NULL) {
 		ms_free(msg->file_transfer_filepath);
 	}
-	linphone_chat_message_cbs_unref(msg->callbacks);
+	if (msg->callbacks) {
+		linphone_chat_message_cbs_unref(msg->callbacks);
+	}
 }
 
-LinphoneChatMessage * linphone_chat_message_ref(LinphoneChatMessage *msg){
+LinphoneChatMessage *linphone_chat_message_ref(LinphoneChatMessage *msg) {
 	belle_sip_object_ref(msg);
 	return msg;
 }
 
-void linphone_chat_message_unref(LinphoneChatMessage *msg){
+void linphone_chat_message_unref(LinphoneChatMessage *msg) {
 	belle_sip_object_unref(msg);
 }
 
-static void linphone_chat_message_release(LinphoneChatMessage *msg){
-	/*mark the chat message as orphan (it has no chat room anymore), and unref it*/
+static void linphone_chat_message_release(LinphoneChatMessage *msg) {
+	/*mark the chat msg as orphan (it has no chat room anymore), and unref it*/
 	msg->chat_room = NULL;
+	if (msg->file_transfer_information != NULL) {
+		linphone_chat_message_cancel_file_transfer(msg);
+	}
 	linphone_chat_message_unref(msg);
 }
 
-const LinphoneErrorInfo *linphone_chat_message_get_error_info(const LinphoneChatMessage *msg){
+const LinphoneErrorInfo *linphone_chat_message_get_error_info(const LinphoneChatMessage *msg) {
 	return linphone_error_info_from_sal_op(msg->op);
 }
 
-LinphoneReason linphone_chat_message_get_reason(LinphoneChatMessage* msg) {
+LinphoneReason linphone_chat_message_get_reason(LinphoneChatMessage *msg) {
 	return linphone_error_info_get_reason(linphone_chat_message_get_error_info(msg));
 }
 
-
-void linphone_chat_message_set_file_transfer_filepath(LinphoneChatMessage *msg, const char *filepath) {
-	if (msg->file_transfer_filepath != NULL) {
-		ms_free(msg->file_transfer_filepath);
-	}
-	msg->file_transfer_filepath = ms_strdup(filepath);
-}
-
-const char * linphone_chat_message_get_file_transfer_filepath(LinphoneChatMessage *msg) {
-	return msg->file_transfer_filepath;
-}
-
-LinphoneChatMessageCbs * linphone_chat_message_get_callbacks(const LinphoneChatMessage *msg) {
+LinphoneChatMessageCbs *linphone_chat_message_get_callbacks(const LinphoneChatMessage *msg) {
 	return msg->callbacks;
 }
 
-LinphoneChatMessage* linphone_chat_room_create_file_transfer_message(LinphoneChatRoom *cr, const LinphoneContent* initial_content) {
-	LinphoneChatMessage* msg = belle_sip_object_new(LinphoneChatMessage);
-	msg->callbacks=linphone_chat_message_cbs_new();
-	msg->chat_room=(LinphoneChatRoom*)cr;
-	msg->message = NULL;
-	msg->is_read=TRUE;
-	msg->file_transfer_information = linphone_content_copy(initial_content);
-	msg->dir=LinphoneChatMessageOutgoing;
-	linphone_chat_message_set_to(msg, linphone_chat_room_get_peer_address(cr));
-	linphone_chat_message_set_from(msg, linphone_address_new(linphone_core_get_identity(cr->lc)));
-	msg->content_type=NULL; /* this will be set to application/vnd.gsma.rcs-ft-http+xml when we will transfer the xml reply from server to the peers */
-	msg->http_request=NULL; /* this will store the http request during file upload to the server */
-	return msg;
+LinphoneCall *linphone_chat_room_get_call(const LinphoneChatRoom *room) {
+	return room->call;
 }
diff --git a/coreapi/chat_file_transfer.c b/coreapi/chat_file_transfer.c
new file mode 100644
index 000000000..6669257d4
--- /dev/null
+++ b/coreapi/chat_file_transfer.c
@@ -0,0 +1,627 @@
+/***************************************************************************
+ *            chat_file_transfer.c
+ *
+ *  Sun Jun  5 19:34:18 2005
+ *  Copyright  2005  Simon Morlat
+ *  Email simon dot morlat at linphone dot org
+ ****************************************************************************/
+
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "linphonecore.h"
+#include "private.h"
+#include "lime.h"
+#include "ortp/b64.h"
+
+#define FILE_TRANSFER_KEY_SIZE 32
+
+static bool_t file_transfer_in_progress_and_valid(LinphoneChatMessage* msg) {
+	return (msg->chat_room && msg->chat_room->lc && msg->http_request && !belle_http_request_is_cancelled(msg->http_request));
+}
+
+static void _release_http_request(LinphoneChatMessage* msg) {
+	if (msg->http_request) {
+		belle_sip_object_unref(msg->http_request);
+		msg->http_request = NULL;
+		if (msg->http_listener){
+			belle_sip_object_unref(msg->http_listener);
+			msg->http_listener = NULL;
+			// unhold the reference that the listener was holding on the message
+			linphone_chat_message_unref(msg);
+		}
+	}
+}
+
+static void linphone_chat_message_process_io_error_upload(void *data, const belle_sip_io_error_event_t *event) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	ms_error("I/O Error during file upload of msg [%p]", msg);
+	linphone_chat_message_update_state(msg, LinphoneChatMessageStateNotDelivered);
+	_release_http_request(msg);
+	linphone_chat_message_unref(msg);
+}
+
+static void linphone_chat_message_process_auth_requested_upload(void *data, belle_sip_auth_event_t *event) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	ms_error("Error during file upload: auth requested for msg [%p]", msg);
+	linphone_chat_message_update_state(msg, LinphoneChatMessageStateNotDelivered);
+	_release_http_request(msg);
+	linphone_chat_message_unref(msg);
+}
+
+static void linphone_chat_message_process_io_error_download(void *data, const belle_sip_io_error_event_t *event) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	ms_error("I/O Error during file download msg [%p]", msg);
+	linphone_chat_message_update_state(msg, LinphoneChatMessageStateFileTransferError);
+	_release_http_request(msg);
+}
+
+static void linphone_chat_message_process_auth_requested_download(void *data, belle_sip_auth_event_t *event) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	ms_error("Error during file download : auth requested for msg [%p]", msg);
+	linphone_chat_message_update_state(msg, LinphoneChatMessageStateFileTransferError);
+	_release_http_request(msg);
+}
+
+static void linphone_chat_message_file_transfer_on_progress(belle_sip_body_handler_t *bh, belle_sip_message_t *m,
+															void *data, size_t offset, size_t total) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	if (msg->http_request && !file_transfer_in_progress_and_valid(msg)) {
+		ms_warning("Cancelled request for %s msg [%p], ignoring %s", msg->chat_room?"":"ORPHAN", msg, __FUNCTION__);
+		_release_http_request(msg);
+		return;
+	}
+	if (linphone_chat_message_cbs_get_file_transfer_progress_indication(msg->callbacks)) {
+		linphone_chat_message_cbs_get_file_transfer_progress_indication(msg->callbacks)(
+			msg, msg->file_transfer_information, offset, total);
+	} else {
+		/* Legacy: call back given by application level */
+		linphone_core_notify_file_transfer_progress_indication(msg->chat_room->lc, msg, msg->file_transfer_information,
+															   offset, total);
+	}
+}
+
+static int linphone_chat_message_file_transfer_on_send_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t *m,
+															void *data, size_t offset, uint8_t *buffer, size_t *size) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	LinphoneCore *lc = NULL;
+	char *buf = (char *)buffer;
+
+	if (!file_transfer_in_progress_and_valid(msg)) {
+		if (msg->http_request) {
+			ms_warning("Cancelled request for %s msg [%p], ignoring %s", msg->chat_room?"":"ORPHAN", msg, __FUNCTION__);
+			_release_http_request(msg);
+		}
+		return BELLE_SIP_STOP;
+	}
+
+	lc = msg->chat_room->lc;
+	/* if we've not reach the end of file yet, ask for more data*/
+	if (offset < linphone_content_get_size(msg->file_transfer_information)) {
+		char *plainBuffer = NULL;
+
+		if (linphone_content_get_key(msg->file_transfer_information) !=
+			NULL) { /* if we have a key to cipher the msg, use it! */
+			/* if this chunk is not the last one, the lenght must be a multiple of block cipher size(16 bytes)*/
+			if (offset + *size < linphone_content_get_size(msg->file_transfer_information)) {
+				*size -= (*size % 16);
+			}
+			plainBuffer = (char *)ms_malloc0(*size);
+		}
+
+		/* get data from call back */
+		if (linphone_chat_message_cbs_get_file_transfer_send(msg->callbacks)) {
+			LinphoneBuffer *lb = linphone_chat_message_cbs_get_file_transfer_send(msg->callbacks)(
+				msg, msg->file_transfer_information, offset, *size);
+			if (lb == NULL) {
+				*size = 0;
+			} else {
+				*size = linphone_buffer_get_size(lb);
+				memcpy(plainBuffer ? plainBuffer : buf, linphone_buffer_get_content(lb), *size);
+				linphone_buffer_unref(lb);
+			}
+		} else {
+			/* Legacy */
+			linphone_core_notify_file_transfer_send(lc, msg, msg->file_transfer_information,
+													plainBuffer ? plainBuffer : buf, size);
+		}
+
+		if (linphone_content_get_key(msg->file_transfer_information) !=
+			NULL) { /* if we have a key to cipher the msg, use it! */
+			lime_encryptFile(linphone_content_get_cryptoContext_address(msg->file_transfer_information),
+							 (unsigned char *)linphone_content_get_key(msg->file_transfer_information), *size,
+							 plainBuffer, (char *)buffer);
+			ms_free(plainBuffer);
+			/* check if we reach the end of file */
+			if (offset + *size >= linphone_content_get_size(msg->file_transfer_information)) {
+				/* conclude file ciphering by calling it context with a zero size */
+				lime_encryptFile(linphone_content_get_cryptoContext_address(msg->file_transfer_information), NULL, 0,
+								 NULL, NULL);
+			}
+		}
+	}
+
+	return BELLE_SIP_CONTINUE;
+}
+
+static void linphone_chat_message_process_response_from_post_file(void *data,
+																  const belle_http_response_event_t *event) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+
+	if (msg->http_request && !file_transfer_in_progress_and_valid(msg)) {
+		ms_warning("Cancelled request for %s msg [%p], ignoring %s", msg->chat_room?"":"ORPHAN", msg, __FUNCTION__);
+		_release_http_request(msg);
+		return;
+	}
+
+	/* check the answer code */
+	if (event->response) {
+		int code = belle_http_response_get_status_code(event->response);
+		if (code == 204) { /* this is the reply to the first post to the server - an empty msg */
+			/* start uploading the file */
+			belle_sip_multipart_body_handler_t *bh;
+			char *first_part_header;
+			belle_sip_body_handler_t *first_part_bh;
+
+			/* shall we encrypt the file */
+			if (linphone_chat_room_lime_available(msg->chat_room) &&
+			 linphone_core_lime_for_file_sharing_enabled(msg->chat_room->lc)) {
+				char keyBuffer
+					[FILE_TRANSFER_KEY_SIZE]; /* temporary storage of generated key: 192 bits of key + 64 bits of
+												 initial vector */
+				/* generate a random 192 bits key + 64 bits of initial vector and store it into the
+				 * file_transfer_information->key field of the msg */
+				sal_get_random_bytes((unsigned char *)keyBuffer, FILE_TRANSFER_KEY_SIZE);
+				linphone_content_set_key(
+					msg->file_transfer_information, keyBuffer,
+					FILE_TRANSFER_KEY_SIZE); /* key is duplicated in the content private structure */
+				/* temporary storage for the Content-disposition header value : use a generic filename to not leak it
+				 * Actual filename stored in msg->file_transfer_information->name will be set in encrypted msg
+				 * sended to the  */
+				first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"filename.txt\"");
+			} else {
+				/* temporary storage for the Content-disposition header value */
+				first_part_header = belle_sip_strdup_printf("form-data; name=\"File\"; filename=\"%s\"",
+															linphone_content_get_name(msg->file_transfer_information));
+			}
+
+			/* create a user body handler to take care of the file and add the content disposition and content-type
+			 * headers */
+			if (msg->file_transfer_filepath != NULL) {
+				first_part_bh =
+					(belle_sip_body_handler_t *)belle_sip_file_body_handler_new(msg->file_transfer_filepath, NULL, msg);
+			} else if (linphone_content_get_buffer(msg->file_transfer_information) != NULL) {
+				first_part_bh = (belle_sip_body_handler_t *)belle_sip_memory_body_handler_new_from_buffer(
+					linphone_content_get_buffer(msg->file_transfer_information),
+					linphone_content_get_size(msg->file_transfer_information), NULL, msg);
+			} else {
+				first_part_bh = (belle_sip_body_handler_t *)belle_sip_user_body_handler_new(
+					linphone_content_get_size(msg->file_transfer_information), NULL, NULL,
+					linphone_chat_message_file_transfer_on_send_body, msg);
+			}
+			belle_sip_body_handler_add_header(first_part_bh,
+											  belle_sip_header_create("Content-disposition", first_part_header));
+			belle_sip_free(first_part_header);
+			belle_sip_body_handler_add_header(first_part_bh,
+											  (belle_sip_header_t *)belle_sip_header_content_type_create(
+												  linphone_content_get_type(msg->file_transfer_information),
+												  linphone_content_get_subtype(msg->file_transfer_information)));
+
+			/* insert it in a multipart body handler which will manage the boundaries of multipart msg */
+			bh = belle_sip_multipart_body_handler_new(linphone_chat_message_file_transfer_on_progress, msg, first_part_bh, NULL);
+
+			linphone_chat_message_ref(msg);
+			_release_http_request(msg);
+			linphone_chat_room_upload_file(msg);
+			belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(msg->http_request), BELLE_SIP_BODY_HANDLER(bh));
+			linphone_chat_message_unref(msg);
+		} else if (code == 200) { /* file has been uplaoded correctly, get server reply and send it */
+			const char *body = belle_sip_message_get_body((belle_sip_message_t *)event->response);
+			if (body && strlen(body) > 0) {
+				/* if we have an encryption key for the file, we must insert it into the msg and restore the correct
+				 * filename */
+				if (linphone_content_get_key(msg->file_transfer_information) != NULL) {
+					/* parse the msg body */
+					xmlDocPtr xmlMessageBody = xmlParseDoc((const xmlChar *)body);
+
+					xmlNodePtr cur = xmlDocGetRootElement(xmlMessageBody);
+					if (cur != NULL) {
+						cur = cur->xmlChildrenNode;
+						while (cur != NULL) {
+							if (!xmlStrcmp(cur->name, (const xmlChar *)"file-info")) { /* we found a file info node, check
+																						  it has a type="file" attribute */
+								xmlChar *typeAttribute = xmlGetProp(cur, (const xmlChar *)"type");
+								if (!xmlStrcmp(typeAttribute,
+											   (const xmlChar *)"file")) { /* this is the node we are looking for : add a
+																			  file-key children node */
+									xmlNodePtr fileInfoNodeChildren =
+										cur
+											->xmlChildrenNode; /* need to parse the children node to update the file-name
+																  one */
+									/* convert key to base64 */
+									size_t b64Size = b64_encode(NULL, FILE_TRANSFER_KEY_SIZE, NULL, 0);
+									char *keyb64 = (char *)ms_malloc0(b64Size + 1);
+									int xmlStringLength;
+
+									b64Size = b64_encode(linphone_content_get_key(msg->file_transfer_information),
+														 FILE_TRANSFER_KEY_SIZE, keyb64, b64Size);
+									keyb64[b64Size] = '\0'; /* libxml need a null terminated string */
+
+									/* add the node containing the key to the file-info node */
+									xmlNewTextChild(cur, NULL, (const xmlChar *)"file-key", (const xmlChar *)keyb64);
+									xmlFree(typeAttribute);
+									ms_free(keyb64);
+
+									/* look for the file-name node and update its content */
+									while (fileInfoNodeChildren != NULL) {
+										if (!xmlStrcmp(
+												fileInfoNodeChildren->name,
+												(const xmlChar *)"file-name")) { /* we found a the file-name node, update
+																					its content with the real filename */
+											/* update node content */
+											xmlNodeSetContent(fileInfoNodeChildren,
+															  (const xmlChar *)(linphone_content_get_name(
+																  msg->file_transfer_information)));
+											break;
+										}
+										fileInfoNodeChildren = fileInfoNodeChildren->next;
+									}
+
+									/* dump the xml into msg->message */
+									xmlDocDumpFormatMemoryEnc(xmlMessageBody, (xmlChar **)&msg->message, &xmlStringLength,
+															  "UTF-8", 0);
+
+									break;
+								}
+								xmlFree(typeAttribute);
+							}
+							cur = cur->next;
+						}
+					}
+					xmlFreeDoc(xmlMessageBody);
+				} else { /* no encryption key, transfer in plain, just copy the msg sent by server */
+					msg->message = ms_strdup(body);
+				}
+				msg->content_type = ms_strdup("application/vnd.gsma.rcs-ft-http+xml");
+				linphone_chat_message_ref(msg);
+				linphone_chat_message_set_state(msg, LinphoneChatMessageStateFileTransferDone);
+				_release_http_request(msg);
+				_linphone_chat_room_send_message(msg->chat_room, msg);
+				linphone_chat_message_unref(msg);
+			} else {
+				ms_warning("Received empty response from server, file transfer failed");
+				linphone_chat_message_update_state(msg, LinphoneChatMessageStateNotDelivered);
+				_release_http_request(msg);
+				linphone_chat_message_unref(msg);
+			}
+		} else {
+			ms_warning("Unhandled HTTP code response %d for file transfer", code);
+			linphone_chat_message_update_state(msg, LinphoneChatMessageStateNotDelivered);
+			_release_http_request(msg);
+			linphone_chat_message_unref(msg);
+		}
+	}
+}
+
+const LinphoneContent *linphone_chat_message_get_file_transfer_information(const LinphoneChatMessage *msg) {
+	return msg->file_transfer_information;
+}
+
+static void on_recv_body(belle_sip_user_body_handler_t *bh, belle_sip_message_t *m, void *data, size_t offset,
+						 const uint8_t *buffer, size_t size) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	LinphoneCore *lc;
+
+	if (!msg->chat_room) {
+		linphone_chat_message_cancel_file_transfer(msg);
+		return;
+	}
+	lc = msg->chat_room->lc;
+
+	if (lc == NULL){
+		return; /*might happen during linphone_core_destroy()*/
+	}
+
+	if (!msg->http_request || belle_http_request_is_cancelled(msg->http_request)) {
+		ms_warning("Cancelled request for msg [%p], ignoring %s", msg, __FUNCTION__);
+		return;
+	}
+
+	/* first call may be with a zero size, ignore it */
+	if (size == 0) {
+		return;
+	}
+
+	if (linphone_content_get_key(msg->file_transfer_information) !=
+		NULL) { /* we have a key, we must decrypt the file */
+		/* get data from callback to a plainBuffer */
+		char *plainBuffer = (char *)ms_malloc0(size);
+		lime_decryptFile(linphone_content_get_cryptoContext_address(msg->file_transfer_information),
+						 (unsigned char *)linphone_content_get_key(msg->file_transfer_information), size, plainBuffer,
+						 (char *)buffer);
+		if (linphone_chat_message_cbs_get_file_transfer_recv(msg->callbacks)) {
+			LinphoneBuffer *lb = linphone_buffer_new_from_data((unsigned char *)plainBuffer, size);
+			linphone_chat_message_cbs_get_file_transfer_recv(msg->callbacks)(msg, msg->file_transfer_information, lb);
+			linphone_buffer_unref(lb);
+		} else {
+			/* legacy: call back given by application level */
+			linphone_core_notify_file_transfer_recv(lc, msg, msg->file_transfer_information, plainBuffer, size);
+		}
+		ms_free(plainBuffer);
+	} else { /* regular file, no deciphering */
+		if (linphone_chat_message_cbs_get_file_transfer_recv(msg->callbacks)) {
+			LinphoneBuffer *lb = linphone_buffer_new_from_data(buffer, size);
+			linphone_chat_message_cbs_get_file_transfer_recv(msg->callbacks)(msg, msg->file_transfer_information, lb);
+			linphone_buffer_unref(lb);
+		} else {
+			/* Legacy: call back given by application level */
+			linphone_core_notify_file_transfer_recv(lc, msg, msg->file_transfer_information, (char *)buffer, size);
+		}
+	}
+
+	return;
+}
+
+static LinphoneContent *linphone_chat_create_file_transfer_information_from_headers(const belle_sip_message_t *m) {
+	LinphoneContent *content = linphone_content_new();
+
+	belle_sip_header_content_length_t *content_length_hdr =
+		BELLE_SIP_HEADER_CONTENT_LENGTH(belle_sip_message_get_header(m, "Content-Length"));
+	belle_sip_header_content_type_t *content_type_hdr =
+		BELLE_SIP_HEADER_CONTENT_TYPE(belle_sip_message_get_header(m, "Content-Type"));
+	const char *type = NULL, *subtype = NULL;
+
+	linphone_content_set_name(content, "");
+
+	if (content_type_hdr) {
+		type = belle_sip_header_content_type_get_type(content_type_hdr);
+		subtype = belle_sip_header_content_type_get_subtype(content_type_hdr);
+		ms_message("Extracted content type %s / %s from header", type ? type : "", subtype ? subtype : "");
+		if (type)
+			linphone_content_set_type(content, type);
+		if (subtype)
+			linphone_content_set_subtype(content, subtype);
+	}
+
+	if (content_length_hdr) {
+		linphone_content_set_size(content, belle_sip_header_content_length_get_content_length(content_length_hdr));
+		ms_message("Extracted content length %i from header", (int)linphone_content_get_size(content));
+	}
+
+	return content;
+}
+
+static void linphone_chat_process_response_headers_from_get_file(void *data, const belle_http_response_event_t *event) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	if (event->response) {
+		/*we are receiving a response, set a specific body handler to acquire the response.
+		 * if not done, belle-sip will create a memory body handler, the default*/
+		belle_sip_message_t *response = BELLE_SIP_MESSAGE(event->response);
+		size_t body_size = 0;
+
+		if (msg->file_transfer_information == NULL) {
+			ms_warning("No file transfer information for msg %p: creating...", msg);
+			msg->file_transfer_information = linphone_chat_create_file_transfer_information_from_headers(response);
+		}
+
+		if (msg->file_transfer_information) {
+			body_size = linphone_content_get_size(msg->file_transfer_information);
+		}
+
+		if (msg->file_transfer_filepath == NULL) {
+			belle_sip_message_set_body_handler(
+				(belle_sip_message_t *)event->response,
+				(belle_sip_body_handler_t *)belle_sip_user_body_handler_new(
+					body_size, linphone_chat_message_file_transfer_on_progress, on_recv_body, NULL, msg));
+		} else {
+			belle_sip_body_handler_t *bh = (belle_sip_body_handler_t *)belle_sip_file_body_handler_new(
+				msg->file_transfer_filepath, linphone_chat_message_file_transfer_on_progress, msg);
+			if (belle_sip_body_handler_get_size(bh) == 0) {
+				/* If the size of the body has not been initialized from the file stat, use the one from the
+				 * file_transfer_information. */
+				belle_sip_body_handler_set_size(bh, body_size);
+			}
+			belle_sip_message_set_body_handler((belle_sip_message_t *)event->response, bh);
+		}
+	}
+}
+
+static void linphone_chat_process_response_from_get_file(void *data, const belle_http_response_event_t *event) {
+	LinphoneChatMessage *msg = (LinphoneChatMessage *)data;
+	/* check the answer code */
+	if (event->response) {
+		int code = belle_http_response_get_status_code(event->response);
+		if (code == 200) {
+			LinphoneCore *lc = msg->chat_room->lc;
+			if (msg->file_transfer_filepath == NULL) {
+				/* if the file was encrypted, finish the decryption and free context */
+				if (linphone_content_get_key(msg->file_transfer_information) != NULL) {
+					lime_decryptFile(linphone_content_get_cryptoContext_address(msg->file_transfer_information), NULL, 0, NULL, NULL);
+				}
+				if (linphone_chat_message_cbs_get_file_transfer_recv(msg->callbacks)) {
+					LinphoneBuffer *lb = linphone_buffer_new();
+					linphone_chat_message_cbs_get_file_transfer_recv(msg->callbacks)(msg, msg->file_transfer_information, lb);
+					linphone_buffer_unref(lb);
+				} else {
+					linphone_core_notify_file_transfer_recv(lc, msg, msg->file_transfer_information, NULL, 0);
+				}
+			} else {
+				if (linphone_content_get_key(msg->file_transfer_information) != NULL) {
+					bctbx_vfs_t *vfs = bctbx_vfs_get_default();
+					bctbx_vfs_file_t *decrypted_file;
+					bctbx_vfs_file_t *encrypted_file = bctbx_file_open(vfs, msg->file_transfer_filepath, "r");
+					size_t encrypted_file_size = (size_t)bctbx_file_size(encrypted_file);
+					char *encrypted_content = bctbx_malloc(encrypted_file_size);
+					char *decrypted_content = bctbx_malloc(encrypted_file_size);
+					bctbx_file_read(encrypted_file, encrypted_content, encrypted_file_size, 0);
+					bctbx_file_close(encrypted_file);
+					lime_decryptFile(linphone_content_get_cryptoContext_address(msg->file_transfer_information),
+						(unsigned char *)linphone_content_get_key(msg->file_transfer_information),
+						encrypted_file_size, decrypted_content, encrypted_content);
+					lime_decryptFile(linphone_content_get_cryptoContext_address(msg->file_transfer_information), NULL, 0, NULL, NULL);
+					decrypted_file = bctbx_file_open(vfs, msg->file_transfer_filepath, "w");
+					bctbx_file_write(decrypted_file, decrypted_content, encrypted_file_size, 0);
+					bctbx_file_close(decrypted_file);
+					bctbx_free(encrypted_content);
+					bctbx_free(decrypted_content);
+				}
+				linphone_core_notify_file_transfer_recv(lc, msg, msg->file_transfer_information, NULL, 0);
+			}
+			linphone_chat_message_set_state(msg, LinphoneChatMessageStateFileTransferDone);
+		} else if (code >= 400 && code < 500) {
+			ms_warning("File transfer failed with code %d", code);
+			linphone_chat_message_set_state(msg, LinphoneChatMessageStateFileTransferError);
+		} else {
+			ms_warning("Unhandled HTTP code response %d for file transfer", code);
+		}
+		_release_http_request(msg);
+	}
+}
+
+int _linphone_chat_room_start_http_transfer(LinphoneChatMessage *msg, const char* url, const char* action, const belle_http_request_listener_callbacks_t *cbs) {
+	belle_generic_uri_t *uri = NULL;
+	const char* ua = linphone_core_get_user_agent(msg->chat_room->lc);
+
+	if (url == NULL) {
+		ms_warning("Cannot process file transfer msg: no file remote URI configured.");
+		goto error;
+	}
+	uri = belle_generic_uri_parse(url);
+	if (uri == NULL || belle_generic_uri_get_host(uri)==NULL) {
+		ms_warning("Cannot process file transfer msg: incorrect file remote URI configured '%s'.", url);
+		goto error;
+	}
+
+	msg->http_request = belle_http_request_create(action, uri, belle_sip_header_create("User-Agent", ua), NULL);
+
+	if (msg->http_request == NULL) {
+		ms_warning("Could not create http request for uri %s", url);
+		goto error;
+	}
+	/* keep a reference to the http request to be able to cancel it during upload */
+	belle_sip_object_ref(msg->http_request);
+
+	/* give msg to listener to be able to start the actual file upload when server answer a 204 No content */
+	msg->http_listener = belle_http_request_listener_create_from_callbacks(cbs, linphone_chat_message_ref(msg));
+	belle_http_provider_send_request(msg->chat_room->lc->http_provider, msg->http_request, msg->http_listener);
+	return 0;
+error:
+	if (uri) {
+		belle_sip_object_unref(uri);
+	}
+	return -1;
+}
+
+int linphone_chat_room_upload_file(LinphoneChatMessage *msg) {
+	belle_http_request_listener_callbacks_t cbs = {0};
+	int err;
+
+	if (msg->http_request){
+		ms_error("linphone_chat_room_upload_file(): there is already an upload in progress.");
+		return -1;
+	}
+
+	cbs.process_response = linphone_chat_message_process_response_from_post_file;
+	cbs.process_io_error = linphone_chat_message_process_io_error_upload;
+	cbs.process_auth_requested = linphone_chat_message_process_auth_requested_upload;
+	err = _linphone_chat_room_start_http_transfer(msg, linphone_core_get_file_transfer_server(msg->chat_room->lc), "POST", &cbs);
+	if (err == -1){
+		linphone_chat_message_set_state(msg, LinphoneChatMessageStateNotDelivered);
+	}
+	return err;
+}
+
+int linphone_chat_message_download_file(LinphoneChatMessage *msg) {
+	belle_http_request_listener_callbacks_t cbs = {0};
+	int err;
+
+	if (msg->http_request){
+		ms_error("linphone_chat_message_download_file(): there is already a download in progress");
+		return -1;
+	}
+	cbs.process_response_headers = linphone_chat_process_response_headers_from_get_file;
+	cbs.process_response = linphone_chat_process_response_from_get_file;
+	cbs.process_io_error = linphone_chat_message_process_io_error_download;
+	cbs.process_auth_requested = linphone_chat_message_process_auth_requested_download;
+	err = _linphone_chat_room_start_http_transfer(msg, msg->external_body_url, "GET", &cbs);
+	if (err == -1) return -1;
+	/* start the download, status is In Progress */
+	linphone_chat_message_set_state(msg, LinphoneChatMessageStateInProgress);
+	return 0;
+}
+
+void linphone_chat_message_start_file_download(LinphoneChatMessage *msg,
+											   LinphoneChatMessageStateChangedCb status_cb, void *ud) {
+	msg->message_state_changed_cb = status_cb;
+	msg->message_state_changed_user_data = ud;
+	linphone_chat_message_download_file(msg);
+}
+
+void linphone_chat_message_cancel_file_transfer(LinphoneChatMessage *msg) {
+	if (msg->http_request) {
+		if (msg->state == LinphoneChatMessageStateInProgress) {
+			linphone_chat_message_set_state(msg, LinphoneChatMessageStateNotDelivered);
+		}
+		if (!belle_http_request_is_cancelled(msg->http_request)) {
+			if (msg->chat_room) {
+				ms_message("Canceling file transfer %s - msg [%p] chat room[%p]"
+								, (msg->external_body_url == NULL) ? linphone_core_get_file_transfer_server(msg->chat_room->lc) : msg->external_body_url
+								, msg
+								, msg->chat_room);
+				belle_http_provider_cancel_request(msg->chat_room->lc->http_provider, msg->http_request);
+				if (msg->dir == LinphoneChatMessageOutgoing) {
+					// must release it
+					linphone_chat_message_unref(msg);
+				}
+			} else {
+				ms_message("Warning: http request still running for ORPHAN msg [%p]: this is a memory leak", msg);
+			}
+		}
+		_release_http_request(msg);
+	} else {
+		ms_message("No existing file transfer - nothing to cancel");
+	}
+}
+
+void linphone_chat_message_set_file_transfer_filepath(LinphoneChatMessage *msg, const char *filepath) {
+	if (msg->file_transfer_filepath != NULL) {
+		ms_free(msg->file_transfer_filepath);
+	}
+	msg->file_transfer_filepath = ms_strdup(filepath);
+}
+
+const char *linphone_chat_message_get_file_transfer_filepath(LinphoneChatMessage *msg) {
+	return msg->file_transfer_filepath;
+}
+
+LinphoneChatMessage *linphone_chat_room_create_file_transfer_message(LinphoneChatRoom *cr,
+																	 const LinphoneContent *initial_content) {
+	LinphoneChatMessage *msg = belle_sip_object_new(LinphoneChatMessage);
+	msg->callbacks = linphone_chat_message_cbs_new();
+	msg->chat_room = (LinphoneChatRoom *)cr;
+	msg->message = NULL;
+	msg->is_read = TRUE;
+	msg->file_transfer_information = linphone_content_copy(initial_content);
+	msg->dir = LinphoneChatMessageOutgoing;
+	linphone_chat_message_set_to(msg, linphone_chat_room_get_peer_address(cr));
+	msg->from = linphone_address_new(linphone_core_get_identity(cr->lc)); /*direct assignment*/
+	/* this will be set to application/vnd.gsma.rcs-ft-http+xml when we will transfer the xml reply from server to the peers */
+	msg->content_type = NULL;
+	/* this will store the http request during file upload to the server */
+	msg->http_request = NULL;
+	msg->time = ms_time(0);
+	return msg;
+}
diff --git a/coreapi/conference.c b/coreapi/conference.c
deleted file mode 100644
index 5479c8315..000000000
--- a/coreapi/conference.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/***************************************************************************
- *            conference.c
- *
- *  Mon Sep 12, 2011
- *  Copyright  2011  Belledonne Communications
- *  Author: Simon Morlat
- *  Email simon dot morlat at linphone dot org
- ****************************************************************************/
-
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "private.h"
-#include "lpconfig.h"
-
-#include "mediastreamer2/msvolume.h"
-
-/**
- * @addtogroup conferencing
- * @{
-**/
-
-
-static int convert_conference_to_call(LinphoneCore *lc);
-
-static void conference_check_init(LinphoneConference *ctx, int samplerate){
-	if (ctx->conf==NULL){
-		MSAudioConferenceParams params;
-		params.samplerate=samplerate;
-		ctx->conf=ms_audio_conference_new(&params);
-		ctx->terminated=FALSE;
-	}
-}
-
-static void remove_local_endpoint(LinphoneConference *ctx){
-	if (ctx->local_endpoint){
-		ms_audio_conference_remove_member(ctx->conf,ctx->local_endpoint);
-		ms_audio_endpoint_release_from_stream(ctx->local_endpoint);
-		ctx->local_endpoint=NULL;
-		audio_stream_stop(ctx->local_participant);
-		ctx->local_participant=NULL;
-		rtp_profile_destroy(ctx->local_dummy_profile);
-	}
-}
-
-static int linphone_conference_get_size(LinphoneConference *conf){
-	if (conf->conf == NULL) {
-		return 0;
-	}
-	return ms_audio_conference_get_size(conf->conf) - (conf->record_endpoint ? 1 : 0);
-}
-
-static int remote_participants_count(LinphoneConference *ctx) {
-	int count=linphone_conference_get_size(ctx);
-	if (count==0) return 0;
-	if (!ctx->local_participant) return count;
-	return count -1;
-}
-
-void linphone_core_conference_check_uninit(LinphoneCore *lc){
-	LinphoneConference *ctx=&lc->conf_ctx;
-	if (ctx->conf){
-		int remote_count=remote_participants_count(ctx);
-		ms_message("conference_check_uninit(): size=%i",linphone_conference_get_size(ctx));
-		if (remote_count==1 && !ctx->terminated){
-			convert_conference_to_call(lc);
-		}
-		if (remote_count==0){
-			if (ctx->local_participant!=NULL)
-				remove_local_endpoint(ctx);
-			if (ctx->record_endpoint){
-				ms_audio_conference_remove_member(ctx->conf,ctx->record_endpoint);
-				ms_audio_endpoint_destroy(ctx->record_endpoint);
-				ctx->record_endpoint=NULL;
-			}
-		}
-
-		if (ms_audio_conference_get_size(ctx->conf)==0){
-			ms_audio_conference_destroy(ctx->conf);
-			ctx->conf=NULL;
-		}
-	}
-}
-
-void linphone_call_add_to_conf(LinphoneCall *call, bool_t muted){
-	LinphoneCore *lc=call->core;
-	LinphoneConference *conf=&lc->conf_ctx;
-	MSAudioEndpoint *ep;
-	call->params->has_video = FALSE;
-	call->camera_enabled = FALSE;
-	ep=ms_audio_endpoint_get_from_stream(call->audiostream,TRUE);
-	ms_audio_conference_add_member(conf->conf,ep);
-	ms_audio_conference_mute_member(conf->conf,ep,muted);
-	call->endpoint=ep;
-}
-
-void linphone_call_remove_from_conf(LinphoneCall *call){
-	LinphoneCore *lc=call->core;
-	LinphoneConference *conf=&lc->conf_ctx;
-
-	ms_audio_conference_remove_member(conf->conf,call->endpoint);
-	ms_audio_endpoint_release_from_stream(call->endpoint);
-	call->endpoint=NULL;
-}
-
-static RtpProfile *make_dummy_profile(int samplerate){
-	RtpProfile *prof=rtp_profile_new("dummy");
-	PayloadType *pt=payload_type_clone(&payload_type_l16_mono);
-	pt->clock_rate=samplerate;
-	rtp_profile_set_payload(prof,0,pt);
-	return prof;
-}
-
-static void add_local_endpoint(LinphoneConference *conf,LinphoneCore *lc){
-	/*create a dummy audiostream in order to extract the local part of it */
-	/* network address and ports have no meaning and are not used here. */
-	AudioStream *st=audio_stream_new(65000,65001,FALSE);
-	MSSndCard *playcard=lc->sound_conf.lsd_card ?
-			lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
-	MSSndCard *captcard=lc->sound_conf.capt_sndcard;
-	const MSAudioConferenceParams *params=ms_audio_conference_get_params(conf->conf);
-	conf->local_dummy_profile=make_dummy_profile(params->samplerate);
-
-	audio_stream_start_full(st, conf->local_dummy_profile,
-				"127.0.0.1",
-				65000,
-				"127.0.0.1",
-				65001,
-				0,
-				40,
-				NULL,
-				NULL,
-				playcard,
-				captcard,
-				linphone_core_echo_cancellation_enabled(lc)
-				);
-	_post_configure_audio_stream(st,lc,FALSE);
-	conf->local_participant=st;
-	conf->local_endpoint=ms_audio_endpoint_get_from_stream(st,FALSE);
-	ms_audio_conference_add_member(conf->conf,conf->local_endpoint);
-
-}
-
-/**
- * Returns the sound volume (mic input) of the local participant of the conference.
- * @param lc the linphone core
- * @return the measured input volume expressed in dbm0.
- **/
-float linphone_core_get_conference_local_input_volume(LinphoneCore *lc){
-	LinphoneConference *conf=&lc->conf_ctx;
-	AudioStream *st=conf->local_participant;
-	if (st && st->volsend && !conf->local_muted){
-		float vol=0;
-		ms_filter_call_method(st->volsend,MS_VOLUME_GET,&vol);
-		return vol;
-
-	}
-	return LINPHONE_VOLUME_DB_LOWEST;
-}
-
-/**
- * Merge a call into a conference.
- * @param lc the linphone core
- * @param call an established call, either in LinphoneCallStreamsRunning or LinphoneCallPaused state.
- *
- * If this is the first call that enters the conference, the virtual conference will be created automatically.
- * If the local user was actively part of the call (ie not in paused state), then the local user is automatically entered into the conference.
- * If the call was in paused state, then it is automatically resumed when entering into the conference.
- *
- * @return 0 if successful, -1 otherwise.
-**/
-int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
-	LinphoneConference *conf=&lc->conf_ctx;
-
-	if (call->current_params->in_conference){
-		ms_error("Already in conference");
-		return -1;
-	}
-	conference_check_init(&lc->conf_ctx, lp_config_get_int(lc->config, "sound","conference_rate",16000));
-
-	if (call->state==LinphoneCallPaused){
-		call->params->in_conference=TRUE;
-		call->params->has_video=FALSE;
-		linphone_core_resume_call(lc,call);
-	}else if (call->state==LinphoneCallStreamsRunning){
-		LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
-		params->in_conference=TRUE;
-		params->has_video=FALSE;
-
-		if (call->audiostream || call->videostream){
-			linphone_call_stop_media_streams(call); /*free the audio & video local resources*/
-			linphone_call_init_media_streams(call);
-		}
-		if (call==lc->current_call){
-			lc->current_call=NULL;
-		}
-		/*this will trigger a reINVITE that will later redraw the streams */
-		/*FIXME probably a bit too much to just redraw streams !*/
-		linphone_core_update_call(lc,call,params);
-		linphone_call_params_destroy(params);
-		add_local_endpoint(conf,lc);
-	}else{
-		ms_error("Call is in state %s, it cannot be added to the conference.",linphone_call_state_to_string(call->state));
-		return -1;
-	}
-	return 0;
-}
-
-static int remove_from_conference(LinphoneCore *lc, LinphoneCall *call, bool_t active){
-	int err=0;
-	char *str;
-
-	if (!call->current_params->in_conference){
-		if (call->params->in_conference){
-			ms_warning("Not (yet) in conference, be patient");
-			return -1;
-		}else{
-			ms_error("Not in a conference.");
-			return -1;
-		}
-	}
-	call->params->in_conference=FALSE;
-
-	str=linphone_call_get_remote_address_as_string(call);
-	ms_message("%s will be removed from conference", str);
-	ms_free(str);
-	if (active){
-		LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
-		params->in_conference=FALSE;
-		// reconnect local audio with this call
-		if (linphone_core_is_in_conference(lc)){
-			ms_message("Leaving conference for reconnecting with unique call.");
-			linphone_core_leave_conference(lc);
-		}
-		ms_message("Updating call to actually remove from conference");
-		err=linphone_core_update_call(lc,call,params);
-		linphone_call_params_destroy(params);
-	} else{
-		ms_message("Pausing call to actually remove from conference");
-		err=_linphone_core_pause_call(lc,call);
-	}
-	return err;
-}
-
-static int convert_conference_to_call(LinphoneCore *lc){
-	int err=0;
-	MSList *calls=lc->calls;
-
-	if (remote_participants_count(&lc->conf_ctx)!=1){
-		ms_error("No unique call remaining in conference.");
-		return -1;
-	}
-
-	while (calls) {
-		LinphoneCall *rc=(LinphoneCall*)calls->data;
-		calls=calls->next;
-		if (rc->params->in_conference) { // not using current_param
-			bool_t active_after_removed=linphone_core_is_in_conference(lc);
-			err=remove_from_conference(lc, rc, active_after_removed);
-			break;
-		}
-	}
-	return err;
-}
-
-/**
- * Remove a call from the conference.
- * @param lc the linphone core
- * @param call a call that has been previously merged into the conference.
- *
- * After removing the remote participant belonging to the supplied call, the call becomes a normal call in paused state.
- * If one single remote participant is left alone together with the local user in the conference after the removal, then the conference is
- * automatically transformed into a simple call in StreamsRunning state.
- * The conference's resources are then automatically destroyed.
- *
- * In other words, unless linphone_core_leave_conference() is explicitely called, the last remote participant of a conference is automatically
- * put in a simple call in running state.
- *
- * @return 0 if successful, -1 otherwise.
- **/
-int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call){
-	int err;
-	char * str=linphone_call_get_remote_address_as_string(call);
-	ms_message("Removing call %s from the conference", str);
-	ms_free(str);
-	err=remove_from_conference(lc,call, FALSE);
-	if (err){
-		ms_error("Error removing participant from conference.");
-		return err;
-	}
-
-	if (remote_participants_count(&lc->conf_ctx)==1){
-		ms_message("conference size is 1: need to be converted to plain call");
-		err=convert_conference_to_call(lc);
-	} else {
-		ms_message("the conference need not to be converted as size is %i", remote_participants_count(&lc->conf_ctx));
-	}
-	return err;
-}
-
-bool_t linphone_core_is_in_conference(const LinphoneCore *lc){
-	return lc->conf_ctx.local_participant!=NULL;
-}
-
-/**
- * Moves the local participant out of the conference.
- * @param lc the linphone core
- * When the local participant is out of the conference, the remote participants can continue to talk normally.
- * @return 0 if successful, -1 otherwise.
-**/
-int linphone_core_leave_conference(LinphoneCore *lc){
-	LinphoneConference *conf=&lc->conf_ctx;
-	if (linphone_core_is_in_conference(lc))
-		remove_local_endpoint(conf);
-	return 0;
-}
-
-/**
- * Moves the local participant inside the conference.
- * @param lc the linphone core
- *
- * Makes the local participant to join the conference.
- * Typically, the local participant is by default always part of the conference when joining an active call into a conference.
- * However, by calling linphone_core_leave_conference() and linphone_core_enter_conference() the application can decide to temporarily
- * move out and in the local participant from the conference.
- *
- * @return 0 if successful, -1 otherwise
-**/
-int linphone_core_enter_conference(LinphoneCore *lc){
-	LinphoneConference *conf;
-	if (linphone_core_sound_resources_locked(lc)) {
-		return -1;
-	}
-	if (lc->current_call != NULL) {
-		_linphone_core_pause_call(lc, lc->current_call);
-	}
-	conf=&lc->conf_ctx;
-	if (conf->local_participant==NULL) add_local_endpoint(conf,lc);
-	return 0;
-}
-
-/**
- * Add all calls into a conference.
- * @param lc the linphone core
- *
- * Merge all established calls (either in LinphoneCallStreamsRunning or LinphoneCallPaused) into a conference.
- *
- * @return 0 if successful, -1 otherwise
-**/
-int linphone_core_add_all_to_conference(LinphoneCore *lc) {
-	MSList *calls=lc->calls;
-	while (calls) {
-		LinphoneCall *call=(LinphoneCall*)calls->data;
-		calls=calls->next;
-		if (!call->current_params->in_conference) {
-			linphone_core_add_to_conference(lc, call);
-		}
-	}
-	linphone_core_enter_conference(lc);
-	return 0;
-}
-
-/**
- * Terminates the conference and the calls associated with it.
- * @param lc the linphone core
- *
- * All the calls that were merged to the conference are terminated, and the conference resources are destroyed.
- *
- * @return 0 if successful, -1 otherwise
-**/
-int linphone_core_terminate_conference(LinphoneCore *lc) {
-	MSList *calls=lc->calls;
-	LinphoneConference *conf=&lc->conf_ctx;
-	conf->terminated=TRUE;
-
-	while (calls) {
-		LinphoneCall *call=(LinphoneCall*)calls->data;
-		calls=calls->next;
-		if (call->current_params->in_conference) {
-			linphone_core_terminate_call(lc, call);
-		}
-	}
-	return 0;
-}
-
-/**
- * Returns the number of participants to the conference, including the local participant.
- * @param lc the linphone core
- *
- * Typically, after merging two calls into the conference, there is total of 3 participants:
- * the local participant (or local user), and two remote participants that were the destinations of the two previously establised calls.
- *
- * @return the number of participants to the conference
-**/
-int linphone_core_get_conference_size(LinphoneCore *lc) {
-	LinphoneConference *conf=&lc->conf_ctx;
-	return linphone_conference_get_size(conf);
-}
-
-
-int linphone_core_start_conference_recording(LinphoneCore *lc, const char *path){
-	LinphoneConference *conf=&lc->conf_ctx;
-	if (conf->conf == NULL) {
-		ms_warning("linphone_core_start_conference_recording(): no conference now.");
-		return -1;
-	}
-	if (conf->record_endpoint==NULL){
-		conf->record_endpoint=ms_audio_endpoint_new_recorder();
-		ms_audio_conference_add_member(conf->conf,conf->record_endpoint);
-	}
-	ms_audio_recorder_endpoint_start(conf->record_endpoint,path);
-	return 0;
-}
-
-int linphone_core_stop_conference_recording(LinphoneCore *lc){
-	LinphoneConference *conf=&lc->conf_ctx;
-	if (conf->conf == NULL) {
-		ms_warning("linphone_core_stop_conference_recording(): no conference now.");
-		return -1;
-	}
-	if (conf->record_endpoint==NULL){
-		ms_warning("linphone_core_stop_conference_recording(): no record active.");
-		return -1;
-	}
-	ms_audio_recorder_endpoint_stop(conf->record_endpoint);
-	return 0;
-}
-
-/**
- * @}
-**/
-
diff --git a/coreapi/conference.cc b/coreapi/conference.cc
new file mode 100644
index 000000000..16b9f82a4
--- /dev/null
+++ b/coreapi/conference.cc
@@ -0,0 +1,1048 @@
+/*******************************************************************************
+ *            conference.cc
+ *
+ *  Thu Nov 26, 2015
+ *  Copyright  2015  Belledonne Communications
+ *  Author: Linphone's team
+ *  Email info@belledonne-communications.com
+ ******************************************************************************/
+
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "private.h"
+#include "conference_private.h"
+#include <mediastreamer2/msvolume.h>
+#include <typeinfo>
+#include <list>
+#include <algorithm>
+
+namespace Linphone {
+
+class Conference {
+public:
+	class Participant {
+	public:
+		Participant(LinphoneCall *call) {
+			m_uri = linphone_address_clone(linphone_call_get_remote_address(call));
+			m_call = call;
+		}
+		
+		~Participant() {
+			linphone_address_unref(m_uri);
+			if(m_call) m_call->conf_ref = NULL;
+			
+		}
+		
+		const LinphoneAddress *getUri() const {
+			return m_uri;
+		}
+		
+		LinphoneCall *getCall() const {
+			return m_call;
+		}
+		
+	private:
+		Participant(const Participant &src);
+		Participant &operator=(const Participant &src);
+		
+	private:
+		LinphoneAddress *m_uri;
+		LinphoneCall *m_call;
+		
+	friend class RemoteConference;
+	};
+	
+	
+	class Params {
+	public:
+		Params(const LinphoneCore *core = NULL) {
+			m_enableVideo = false;
+			if(core) {
+				const LinphoneVideoPolicy *policy = linphone_core_get_video_policy(core);
+				if(policy->automatically_initiate) m_enableVideo = true;
+			}
+			m_stateChangedCb = NULL;
+			m_userData = NULL;
+		}
+		void enableVideo(bool enable) {m_enableVideo = enable;}
+		bool videoRequested() const {return m_enableVideo;}
+		void setStateChangedCallback(LinphoneConferenceStateChangedCb cb, void *userData) {
+			m_stateChangedCb =cb;
+			m_userData = userData;
+		}
+		
+	private:
+		bool m_enableVideo;
+		LinphoneConferenceStateChangedCb m_stateChangedCb;
+		void *m_userData;
+		
+		friend class Conference;
+	};
+	
+	Conference(LinphoneCore *core, const Params *params = NULL);
+	virtual ~Conference() {};
+	
+	const Params &getCurrentParams() const {return m_currentParams;}
+	
+	virtual int addParticipant(LinphoneCall *call) = 0;
+	virtual int removeParticipant(LinphoneCall *call) = 0;
+	virtual int removeParticipant(const LinphoneAddress *uri) = 0;
+	virtual int terminate() = 0;
+	
+	virtual int enter() = 0;
+	virtual int leave() = 0;
+	virtual bool isIn() const = 0;
+	
+	AudioStream *getAudioStream() const {return m_localParticipantStream;}
+	int muteMicrophone(bool val);
+	bool microphoneIsMuted() const {return m_isMuted;}
+	float getInputVolume() const;
+	
+	virtual int getSize() const {return (int)m_participants.size() + (isIn()?1:0);}
+	const std::list<Participant *> &getParticipants() const {return m_participants;}
+	
+	virtual int startRecording(const char *path) = 0;
+	virtual int stopRecording() = 0;
+	
+	virtual void onCallStreamStarting(LinphoneCall *call, bool isPausedByRemote) {};
+	virtual void onCallStreamStopping(LinphoneCall *call) {};
+	virtual void onCallTerminating(LinphoneCall *call) {};
+	
+	LinphoneConferenceState getState() const {return m_state;}
+	static const char *stateToString(LinphoneConferenceState state);
+	
+protected:
+	void setState(LinphoneConferenceState state);
+	Participant *findParticipant(const LinphoneCall *call) const;
+	Participant *findParticipant(const LinphoneAddress *uri) const;
+	
+protected:
+	LinphoneCore *m_core;
+	AudioStream *m_localParticipantStream;
+	bool m_isMuted;
+	std::list<Participant *> m_participants;
+	Params m_currentParams;
+	LinphoneConferenceState m_state;
+};
+
+class LocalConference: public Conference {
+public:
+	LocalConference(LinphoneCore *core, const Params *params = NULL);
+	virtual ~LocalConference();
+	
+	virtual int addParticipant(LinphoneCall *call);
+	virtual int removeParticipant(LinphoneCall *call);
+	virtual int removeParticipant(const LinphoneAddress *uri);
+	virtual int terminate();
+	
+	virtual int enter();
+	virtual int leave();
+	virtual bool isIn() const {return m_localParticipantStream!=NULL;}
+	virtual int getSize() const;
+	
+	virtual int startRecording(const char *path);
+	virtual int stopRecording();
+	
+	virtual void onCallStreamStarting(LinphoneCall *call, bool isPausedByRemote);
+	virtual void onCallStreamStopping(LinphoneCall *call);
+	virtual void onCallTerminating(LinphoneCall *call);
+	
+private:
+	void addLocalEndpoint();
+	int remoteParticipantsCount();
+	void removeLocalEndpoint();
+	int removeFromConference(LinphoneCall *call, bool_t active);
+	int convertConferenceToCall();
+	static RtpProfile *sMakeDummyProfile(int samplerate);
+
+	MSAudioConference *m_conf;
+	MSAudioEndpoint *m_localEndpoint;
+	MSAudioEndpoint *m_recordEndpoint;
+	RtpProfile *m_localDummyProfile;
+	bool_t m_terminating;
+};
+
+class RemoteConference: public Conference {
+public:
+	RemoteConference(LinphoneCore *core, const Params *params = NULL);
+	virtual ~RemoteConference();
+	
+	virtual int addParticipant(LinphoneCall *call);
+	virtual int removeParticipant(LinphoneCall *call) {return -1;}
+	virtual int removeParticipant(const LinphoneAddress *uri);
+	virtual int terminate();
+	
+	virtual int enter();
+	virtual int leave();
+	virtual bool isIn() const;
+	
+	virtual int startRecording(const char *path) {return 0;}
+	virtual int stopRecording() {return 0;}
+
+private:
+	bool focusIsReady() const;
+	bool transferToFocus(LinphoneCall *call);
+	void reset();
+	
+	void onFocusCallSateChanged(LinphoneCallState state);
+	void onPendingCallStateChanged(LinphoneCall *call, LinphoneCallState state);
+	void onTransferingCallStateChanged(LinphoneCall *transfered, LinphoneCallState newCallState);
+	
+	static void callStateChangedCb(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *message);
+	static void transferStateChanged(LinphoneCore *lc, LinphoneCall *transfered, LinphoneCallState new_call_state);
+	
+	const char *m_focusAddr;
+	char *m_focusContact;
+	LinphoneCall *m_focusCall;
+	LinphoneCoreVTable *m_vtable;
+	std::list<LinphoneCall *> m_pendingCalls;
+	std::list<LinphoneCall *> m_transferingCalls;
+};
+
+};
+
+
+using namespace Linphone;
+using namespace std;
+
+
+Conference::Conference(LinphoneCore *core, const Conference::Params *params):
+	m_core(core),
+	m_localParticipantStream(NULL),
+	m_isMuted(false),
+	m_currentParams(),
+	m_state(LinphoneConferenceStopped) {
+	if(params) m_currentParams = *params;
+}
+
+int Conference::addParticipant(LinphoneCall *call) {
+	Participant *p =new Participant(call);
+	m_participants.push_back(p);
+	call->conf_ref = (LinphoneConference *)this;
+	return 0;
+}
+
+int Conference::removeParticipant(LinphoneCall *call) {
+	Participant *p = findParticipant(call);
+	if(p == NULL) return -1;
+	delete p;
+	m_participants.remove(p);
+	return 0;
+}
+
+int Conference::removeParticipant(const LinphoneAddress *uri) {
+	Participant *p = findParticipant(uri);
+	if(p == NULL) return -1;
+	delete p;
+	m_participants.remove(p);
+	return 0;
+}
+
+int Conference::terminate() {
+	for(list<Participant *>::iterator it = m_participants.begin(); it!=m_participants.end(); it++) {
+		delete *it;
+	}
+	m_participants.clear();
+	return 0;
+}
+
+int Conference::muteMicrophone(bool val)  {
+	if (val) {
+		audio_stream_set_mic_gain(m_localParticipantStream, 0);
+	} else {
+		audio_stream_set_mic_gain_db(m_localParticipantStream, m_core->sound_conf.soft_mic_lev);
+	}
+	if ( linphone_core_get_rtp_no_xmit_on_audio_mute(m_core) ){
+		audio_stream_mute_rtp(m_localParticipantStream, val);
+	}
+	m_isMuted=val;
+	return 0;
+}
+
+float Conference::getInputVolume() const {
+	AudioStream *st=m_localParticipantStream;
+	if (st && st->volsend && !m_isMuted){
+		float vol=0;
+		ms_filter_call_method(st->volsend,MS_VOLUME_GET,&vol);
+		return vol;
+
+	}
+	return LINPHONE_VOLUME_DB_LOWEST;
+}
+
+const char *Conference::stateToString(LinphoneConferenceState state) {
+	switch(state) {
+		case LinphoneConferenceStopped: return "Stopped";
+		case LinphoneConferenceStarting: return "Starting";
+		case LinphoneConferenceRunning: return "Ready";
+		case LinphoneConferenceStartingFailed: return "Startig failed";
+		default: return "Invalid state";
+	}
+}
+
+
+
+void Conference::setState(LinphoneConferenceState state) {
+	if(m_state != state) {
+		ms_message("Switching conference [%p] into state '%s'", this, stateToString(state));
+		m_state = state;
+		if(m_currentParams.m_stateChangedCb) {
+			m_currentParams.m_stateChangedCb((LinphoneConference *)this, state, m_currentParams.m_userData);
+		}
+	}
+}
+
+Conference::Participant *Conference::findParticipant(const LinphoneCall *call) const {
+	for(list<Participant *>::const_iterator it=m_participants.begin(); it!=m_participants.end(); it++) {
+		if((*it)->getCall() == call) return *it;
+	}
+	return NULL;
+}
+
+Conference::Participant *Conference::findParticipant(const LinphoneAddress *uri) const {
+	for(list<Participant *>::const_iterator it=m_participants.begin(); it!=m_participants.end(); it++) {
+		if(linphone_address_equal((*it)->getUri(), uri)) return *it;
+	}
+	return NULL;
+}
+
+
+
+
+LocalConference::LocalConference(LinphoneCore *core, const Conference::Params *params):
+	Conference(core, params),
+	m_conf(NULL),
+	m_localEndpoint(NULL),
+	m_recordEndpoint(NULL),
+	m_localDummyProfile(NULL),
+	m_terminating(FALSE) {
+
+	MSAudioConferenceParams ms_conf_params;
+	ms_conf_params.samplerate = lp_config_get_int(m_core->config, "sound","conference_rate",16000);
+	m_conf=ms_audio_conference_new(&ms_conf_params, core->factory);
+	m_state= LinphoneConferenceRunning;
+}
+
+LocalConference::~LocalConference() {
+	terminate();
+	ms_audio_conference_destroy(m_conf);
+}
+
+RtpProfile *LocalConference::sMakeDummyProfile(int samplerate){
+	RtpProfile *prof=rtp_profile_new("dummy");
+	PayloadType *pt=payload_type_clone(&payload_type_l16_mono);
+	pt->clock_rate=samplerate;
+	rtp_profile_set_payload(prof,0,pt);
+	return prof;
+}
+
+void LocalConference::addLocalEndpoint() {
+	/*create a dummy audiostream in order to extract the local part of it */
+	/* network address and ports have no meaning and are not used here. */
+	AudioStream *st=audio_stream_new(m_core->factory, 65000,65001,FALSE);
+	MSSndCard *playcard=m_core->sound_conf.lsd_card ?
+			m_core->sound_conf.lsd_card : m_core->sound_conf.play_sndcard;
+	MSSndCard *captcard=m_core->sound_conf.capt_sndcard;
+	const MSAudioConferenceParams *params=ms_audio_conference_get_params(m_conf);
+	m_localDummyProfile=sMakeDummyProfile(params->samplerate);
+
+	audio_stream_start_full(st, m_localDummyProfile,
+				"127.0.0.1",
+				65000,
+				"127.0.0.1",
+				65001,
+				0,
+				40,
+				NULL,
+				NULL,
+				playcard,
+				captcard,
+				linphone_core_echo_cancellation_enabled(m_core)
+				);
+	_post_configure_audio_stream(st,m_core,FALSE);
+	m_localParticipantStream=st;
+	m_localEndpoint=ms_audio_endpoint_get_from_stream(st,FALSE);
+	ms_audio_conference_add_member(m_conf,m_localEndpoint);
+}
+
+int LocalConference::addParticipant(LinphoneCall *call) {
+	if (call->current_params->in_conference){
+		ms_error("Already in conference");
+		return -1;
+	}
+
+	if (call->state==LinphoneCallPaused){
+		call->params->in_conference=TRUE;
+		call->params->has_video=FALSE;
+		linphone_core_resume_call(m_core,call);
+	}else if (call->state==LinphoneCallStreamsRunning){
+		LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
+		params->in_conference=TRUE;
+		params->has_video=FALSE;
+
+		if (call->audiostream || call->videostream){
+			linphone_call_stop_media_streams(call); /*free the audio & video local resources*/
+			linphone_call_init_media_streams(call);
+		}
+		if (call==m_core->current_call){
+			m_core->current_call=NULL;
+		}
+		/*this will trigger a reINVITE that will later redraw the streams */
+		/*FIXME probably a bit too much to just redraw streams !*/
+		linphone_core_update_call(m_core,call,params);
+		linphone_call_params_destroy(params);
+		addLocalEndpoint();
+	}else{
+		ms_error("Call is in state %s, it cannot be added to the conference.",linphone_call_state_to_string(call->state));
+		return -1;
+	}
+	return 0;
+}
+
+int LocalConference::removeFromConference(LinphoneCall *call, bool_t active){
+	int err=0;
+	char *str;
+
+	if (!call->current_params->in_conference){
+		if (call->params->in_conference){
+			ms_warning("Not (yet) in conference, be patient");
+			return -1;
+		}else{
+			ms_error("Not in a conference.");
+			return -1;
+		}
+	}
+	call->params->in_conference=FALSE;
+
+	str=linphone_call_get_remote_address_as_string(call);
+	ms_message("%s will be removed from conference", str);
+	ms_free(str);
+	if (active){
+		LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
+		params->in_conference=FALSE;
+		// reconnect local audio with this call
+		if (isIn()){
+			ms_message("Leaving conference for reconnecting with unique call.");
+			leave();
+		}
+		ms_message("Updating call to actually remove from conference");
+		err=linphone_core_update_call(m_core,call,params);
+		linphone_call_params_destroy(params);
+	} else{
+		ms_message("Pausing call to actually remove from conference");
+		err=_linphone_core_pause_call(m_core,call);
+	}
+	return err;
+}
+
+int LocalConference::remoteParticipantsCount() {
+	int count=getSize();
+	if (count==0) return 0;
+	if (!m_localParticipantStream) return count;
+	return count -1;
+}
+
+int LocalConference::convertConferenceToCall(){
+	int err=0;
+	bctbx_list_t *calls=m_core->calls;
+
+	if (remoteParticipantsCount()!=1){
+		ms_error("No unique call remaining in conference.");
+		return -1;
+	}
+
+	while (calls) {
+		LinphoneCall *rc=(LinphoneCall*)calls->data;
+		calls=calls->next;
+		if (rc->params->in_conference) { // not using current_param
+			bool_t active_after_removed=isIn();
+			err=removeFromConference(rc, active_after_removed);
+			break;
+		}
+	}
+	return err;
+}
+
+int LocalConference::removeParticipant(LinphoneCall *call) {
+	int err;
+	char * str=linphone_call_get_remote_address_as_string(call);
+	ms_message("Removing call %s from the conference", str);
+	ms_free(str);
+	err=removeFromConference(call, FALSE);
+	if (err){
+		ms_error("Error removing participant from conference.");
+		return err;
+	}
+
+	if (remoteParticipantsCount()==1){
+		ms_message("conference size is 1: need to be converted to plain call");
+		err=convertConferenceToCall();
+	} else {
+		ms_message("the conference need not to be converted as size is %i", remoteParticipantsCount());
+	}
+	return err;
+}
+
+int LocalConference::removeParticipant(const LinphoneAddress *uri) {
+	const Participant *participant = findParticipant(uri);
+	if(participant == NULL) return -1;
+	LinphoneCall *call = participant->getCall();
+	if(call == NULL) return -1;
+	return removeParticipant(call);
+}
+
+int LocalConference::terminate() {
+	bctbx_list_t *calls=m_core->calls;
+	m_terminating =TRUE;
+
+	while (calls) {
+		LinphoneCall *call=(LinphoneCall*)calls->data;
+		calls=calls->next;
+		if (call->current_params->in_conference) {
+			linphone_core_terminate_call(m_core, call);
+		}
+	}
+	
+	Conference::terminate();
+	m_terminating = FALSE;
+	
+	return 0;
+}
+
+int LocalConference::enter() {
+	if (linphone_core_sound_resources_locked(m_core)) {
+		return -1;
+	}
+	if (m_core->current_call != NULL) {
+		_linphone_core_pause_call(m_core, m_core->current_call);
+	}
+	if (m_localParticipantStream==NULL) addLocalEndpoint();
+	return 0;
+}
+
+void LocalConference::removeLocalEndpoint(){
+	if (m_localEndpoint){
+		ms_audio_conference_remove_member(m_conf,m_localEndpoint);
+		ms_audio_endpoint_release_from_stream(m_localEndpoint);
+		m_localEndpoint=NULL;
+		audio_stream_stop(m_localParticipantStream);
+		m_localParticipantStream=NULL;
+		rtp_profile_destroy(m_localDummyProfile);
+	}
+}
+
+int LocalConference::leave() {
+	if (isIn())
+		removeLocalEndpoint();
+	return 0;
+}
+
+int LocalConference::getSize() const {
+	if (m_conf == NULL) {
+		return 0;
+	}
+	return ms_audio_conference_get_size(m_conf) - (m_recordEndpoint ? 1 : 0);
+}
+
+int LocalConference::startRecording(const char *path) {
+	if (m_conf == NULL) {
+		ms_warning("linphone_core_start_conference_recording(): no conference now.");
+		return -1;
+	}
+	if (m_recordEndpoint==NULL){
+		m_recordEndpoint=ms_audio_endpoint_new_recorder(m_core->factory);
+		ms_audio_conference_add_member(m_conf,m_recordEndpoint);
+	}
+	ms_audio_recorder_endpoint_start(m_recordEndpoint,path);
+	return 0;
+}
+
+int LocalConference::stopRecording() {
+	if (m_conf == NULL) {
+		ms_warning("linphone_core_stop_conference_recording(): no conference now.");
+		return -1;
+	}
+	if (m_recordEndpoint==NULL){
+		ms_warning("linphone_core_stop_conference_recording(): no record active.");
+		return -1;
+	}
+	ms_audio_recorder_endpoint_stop(m_recordEndpoint);
+	return 0;
+}
+
+void LocalConference::onCallStreamStarting(LinphoneCall *call, bool isPausedByRemote) {
+	call->params->has_video = FALSE;
+	call->camera_enabled = FALSE;
+	MSAudioEndpoint *ep=ms_audio_endpoint_get_from_stream(call->audiostream,TRUE);
+	ms_audio_conference_add_member(m_conf,ep);
+	ms_audio_conference_mute_member(m_conf,ep,isPausedByRemote);
+	call->endpoint=ep;
+	setState(LinphoneConferenceRunning);
+	Conference::addParticipant(call);
+}
+
+void LocalConference::onCallStreamStopping(LinphoneCall *call) {
+	ms_audio_conference_remove_member(m_conf,call->endpoint);
+	ms_audio_endpoint_release_from_stream(call->endpoint);
+	call->endpoint=NULL;
+	Conference::removeParticipant(call);
+}
+
+void LocalConference::onCallTerminating(LinphoneCall *call) {
+	int remote_count=remoteParticipantsCount();
+	ms_message("conference_check_uninit(): size=%i", getSize());
+	if (remote_count==1 && !m_terminating){
+		convertConferenceToCall();
+	}
+	if (remote_count==0){
+		if (m_localParticipantStream)
+			removeLocalEndpoint();
+		if (m_recordEndpoint){
+			ms_audio_conference_remove_member(m_conf, m_recordEndpoint);
+			ms_audio_endpoint_destroy(m_recordEndpoint);
+		}
+		setState(LinphoneConferenceStopped);
+	}
+}
+
+
+
+RemoteConference::RemoteConference(LinphoneCore *core, const Conference::Params *params): Conference(core, params) {
+	m_focusAddr = NULL;
+	m_focusContact = NULL;
+	m_focusCall = NULL;
+	m_vtable = NULL;
+	m_focusAddr = lp_config_get_string(m_core->config, "misc", "conference_focus_addr", "");
+	m_vtable = linphone_core_v_table_new();
+	m_vtable->call_state_changed = callStateChangedCb;
+	m_vtable->transfer_state_changed = transferStateChanged;
+	linphone_core_v_table_set_user_data(m_vtable, this);
+	_linphone_core_add_listener(m_core, m_vtable, FALSE, TRUE);
+}
+
+RemoteConference::~RemoteConference() {
+	terminate();
+	linphone_core_remove_listener(m_core, m_vtable);
+	linphone_core_v_table_destroy(m_vtable);
+}
+
+int RemoteConference::addParticipant(LinphoneCall *call) {
+	LinphoneAddress *addr;
+	LinphoneCallParams *params;
+	
+	switch(m_state) {
+		case LinphoneConferenceStopped:
+		case LinphoneConferenceStartingFailed:
+			Conference::addParticipant(call);
+			ms_message("Calling the conference focus (%s)", m_focusAddr);
+			addr = linphone_address_new(m_focusAddr);
+			if(addr) {
+				params = linphone_core_create_call_params(m_core, NULL);
+				linphone_call_params_enable_video(params, m_currentParams.videoRequested());
+				m_focusCall = linphone_core_invite_address_with_params(m_core, addr, params);
+				m_localParticipantStream = m_focusCall->audiostream;
+				m_pendingCalls.push_back(call);
+				LinphoneCallLog *callLog = linphone_call_get_call_log(m_focusCall);
+				callLog->was_conference = TRUE;
+				linphone_address_unref(addr);
+				linphone_call_params_unref(params);
+				setState(LinphoneConferenceStarting);
+				return 0;
+			} else return -1;
+
+		case LinphoneConferenceStarting:
+			Conference::addParticipant(call);
+			if(focusIsReady()) {
+				transferToFocus(call);
+			} else {
+				m_pendingCalls.push_back(call);
+			}
+			return 0;
+			
+		case LinphoneConferenceRunning:
+			Conference::addParticipant(call);
+			transferToFocus(call);
+			return 0;
+
+		default:
+			ms_error("Could not add call %p to the conference. Bad conference state (%s)", call, stateToString(m_state));
+			return -1;
+	}
+}
+
+int RemoteConference::removeParticipant(const LinphoneAddress *uri) {
+	char *refer_to;
+	LinphoneAddress *refer_to_addr;
+	int res;
+	
+	switch(m_state) {
+		case LinphoneConferenceRunning:
+			if(findParticipant(uri) == NULL) {
+				char *tmp = linphone_address_as_string(uri);
+				ms_error("Conference: could not remove participant '%s': not in the participants list", tmp);
+				ms_free(tmp);
+				return -1;
+			}
+			
+			refer_to_addr = linphone_address_clone(uri);
+			linphone_address_set_method_param(refer_to_addr, "BYE");
+			refer_to = linphone_address_as_string(refer_to_addr);
+			linphone_address_unref(refer_to_addr);
+			res = sal_call_refer(m_focusCall->op, refer_to);
+			ms_free(refer_to);
+			
+			if(res == 0) {
+				return Conference::removeParticipant(uri);
+			} else {
+				char *tmp = linphone_address_as_string(uri);
+				ms_error("Conference: could not remove participant '%s': REFER with BYE has failed", tmp);
+				ms_free(tmp);
+				return -1;
+			}
+			
+		default:
+			ms_error("Cannot remove %s from conference: Bad conference state (%s)", linphone_address_as_string(uri), stateToString(m_state));
+			return -1;
+	}
+}
+
+int RemoteConference::terminate() {
+	switch(m_state) {
+		case LinphoneConferenceRunning:
+		case LinphoneConferenceStarting:
+			linphone_core_terminate_call(m_core, m_focusCall);
+			break;
+			
+		default: break;
+	}
+	return 0;
+}
+
+int RemoteConference::enter() {
+	if(m_state != LinphoneConferenceRunning) {
+		ms_error("Could not enter in the conference: bad conference state (%s)", stateToString(m_state));
+		return -1;
+	}
+	LinphoneCallState callState = linphone_call_get_state(m_focusCall);
+	switch(callState) {
+		case LinphoneCallStreamsRunning: break;
+		case LinphoneCallPaused:
+			linphone_core_resume_call(m_core, m_focusCall);
+			break;
+		default:
+			ms_error("Could not join the conference: bad focus call state (%s)", linphone_call_state_to_string(callState));
+			return -1;
+	}
+	return 0;
+}
+
+int RemoteConference::leave() {
+	if(m_state != LinphoneConferenceRunning) {
+		ms_error("Could not leave the conference: bad conference state (%s)", stateToString(m_state));
+		return -1;
+	}
+	LinphoneCallState callState = linphone_call_get_state(m_focusCall);
+	switch(callState) {
+		case LinphoneCallPaused: break;
+		case LinphoneCallStreamsRunning:
+			linphone_core_pause_call(m_core, m_focusCall);
+			break;
+		default:
+			ms_error("Could not leave the conference: bad focus call state (%s)", linphone_call_state_to_string(callState));
+			return -1;
+	}
+	return 0;
+}
+
+bool RemoteConference::isIn() const {
+	if(m_state != LinphoneConferenceRunning) return false;
+	LinphoneCallState callState = linphone_call_get_state(m_focusCall);
+	return callState == LinphoneCallStreamsRunning;
+}
+
+bool RemoteConference::focusIsReady() const {
+	LinphoneCallState focusState;
+	if(m_focusCall == NULL) return false;
+	focusState = linphone_call_get_state(m_focusCall);
+	return focusState == LinphoneCallStreamsRunning || focusState == LinphoneCallPaused;
+}
+
+bool RemoteConference::transferToFocus(LinphoneCall *call) {
+	if(linphone_core_transfer_call(m_core, call, m_focusContact) == 0) {
+		m_transferingCalls.push_back(call);
+		return true;
+	} else {
+		ms_error("Conference: could not transfer call [%p] to %s", call, m_focusContact);
+		return false;
+	}
+}
+
+void RemoteConference::reset() {
+	m_localParticipantStream = NULL;
+	m_focusAddr = NULL;
+	if(m_focusContact) {
+		ms_free(m_focusContact);
+		m_focusContact = NULL;
+	}
+	m_focusCall = NULL;
+	m_pendingCalls.clear();
+	m_transferingCalls.clear();
+}
+
+void RemoteConference::onFocusCallSateChanged(LinphoneCallState state) {
+	list<LinphoneCall *>::iterator it;
+	
+	switch (state) {
+		case LinphoneCallConnected:
+			m_focusContact = ms_strdup(linphone_call_get_remote_contact(m_focusCall));
+			it = m_pendingCalls.begin();
+			while (it != m_pendingCalls.end()) {
+				LinphoneCall *pendingCall = *it;
+				LinphoneCallState pendingCallState = linphone_call_get_state(pendingCall);
+				if(pendingCallState == LinphoneCallStreamsRunning || pendingCallState == LinphoneCallPaused) {
+					it = m_pendingCalls.erase(it);
+					transferToFocus(pendingCall);
+				} else {
+					it++;
+				}
+			}
+			setState(LinphoneConferenceRunning);
+			break;
+
+		case LinphoneCallError:
+			reset();
+			Conference::terminate();
+			setState(LinphoneConferenceStartingFailed);
+			break;
+			
+		case LinphoneCallEnd:
+			reset();
+			Conference::terminate();
+			setState(LinphoneConferenceStopped);
+			break;
+
+		default: break;
+	}
+}
+
+void RemoteConference::onPendingCallStateChanged(LinphoneCall *call, LinphoneCallState state) {
+	switch(state) {
+			case LinphoneCallStreamsRunning:
+			case LinphoneCallPaused:
+				if(m_state == LinphoneConferenceRunning) {
+					m_pendingCalls.remove(call);
+					m_transferingCalls.push_back(call);
+					linphone_core_transfer_call(m_core, call, m_focusContact);
+				}
+				break;
+				
+			case LinphoneCallError:
+			case LinphoneCallEnd:
+				m_pendingCalls.remove(call);
+				Conference::removeParticipant(call);
+				if(m_participants.size() + m_pendingCalls.size() + m_transferingCalls.size() == 0) {
+					terminate();
+				}
+				break;
+				
+			default: break;
+		}
+}
+
+void RemoteConference::onTransferingCallStateChanged(LinphoneCall* transfered, LinphoneCallState newCallState) {
+	switch (newCallState) {
+		case LinphoneCallConnected:
+			m_transferingCalls.push_back(transfered);
+			findParticipant(transfered)->m_call = NULL;
+			break;
+			
+		case LinphoneCallError:
+			m_transferingCalls.remove(transfered);
+			Conference::removeParticipant(transfered);
+			if(m_participants.size() + m_pendingCalls.size() + m_transferingCalls.size() == 0) {
+				terminate();
+			}
+			break;
+
+		default:
+			break;
+	}
+}
+
+void RemoteConference::callStateChangedCb(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *message) {
+	LinphoneCoreVTable *vtable = linphone_core_get_current_vtable(lc);
+	RemoteConference *conf = (RemoteConference *)linphone_core_v_table_get_user_data(vtable);
+	if (call == conf->m_focusCall) {
+		conf->onFocusCallSateChanged(cstate);
+	} else {
+		list<LinphoneCall *>::iterator it = find(conf->m_pendingCalls.begin(), conf->m_pendingCalls.end(), call);
+		if(it != conf->m_pendingCalls.end()) {
+			conf->onPendingCallStateChanged(call, cstate);
+		}
+	}
+}
+
+void RemoteConference::transferStateChanged(LinphoneCore *lc, LinphoneCall *transfered, LinphoneCallState new_call_state) {
+	LinphoneCoreVTable *vtable = linphone_core_get_current_vtable(lc);
+	RemoteConference *conf = (RemoteConference *)linphone_core_v_table_get_user_data(vtable);
+	list<LinphoneCall *>::iterator it = find(conf->m_transferingCalls.begin(), conf->m_transferingCalls.end(), transfered);
+	if (it != conf->m_transferingCalls.end()) {
+		conf->onTransferingCallStateChanged(transfered, new_call_state);
+	}
+}
+
+
+
+const char *linphone_conference_state_to_string(LinphoneConferenceState state) {
+	return Conference::stateToString(state);
+}
+
+LinphoneConferenceParams *linphone_conference_params_new(const LinphoneCore *core) {
+	return (LinphoneConferenceParams *)new Conference::Params(core);
+}
+
+void linphone_conference_params_free(LinphoneConferenceParams *params) {
+	delete (Conference::Params *)params;
+}
+
+LinphoneConferenceParams *linphone_conference_params_clone(const LinphoneConferenceParams *params) {
+	return (LinphoneConferenceParams *)new Conference::Params(*(Conference::Params *)params);
+}
+
+void linphone_conference_params_enable_video(LinphoneConferenceParams *params, bool_t enable) {
+	((Conference::Params *)params)->enableVideo((enable == TRUE) ? true : false);
+}
+
+bool_t linphone_conference_params_video_requested(const LinphoneConferenceParams *params) {
+	return ((Conference::Params *)params)->videoRequested();
+}
+
+void linphone_conference_params_set_state_changed_callback(LinphoneConferenceParams *params, LinphoneConferenceStateChangedCb cb, void *user_data) {
+	((Conference::Params *)params)->setStateChangedCallback(cb, user_data);
+}
+
+
+
+LinphoneConference *linphone_local_conference_new(LinphoneCore *core) {
+	return (LinphoneConference *) new LocalConference(core);
+}
+
+LinphoneConference *linphone_local_conference_new_with_params(LinphoneCore *core, const LinphoneConferenceParams *params) {
+	return (LinphoneConference *) new LocalConference(core, (Conference::Params *)params);
+}
+
+LinphoneConference *linphone_remote_conference_new(LinphoneCore *core) {
+	return (LinphoneConference *) new RemoteConference(core);
+}
+
+LinphoneConference *linphone_remote_conference_new_with_params(LinphoneCore *core, const LinphoneConferenceParams *params) {
+	return (LinphoneConference *) new RemoteConference(core, (Conference::Params *)params);
+}
+
+void linphone_conference_free(LinphoneConference *obj) {
+	delete (Conference *)obj;
+}
+
+LinphoneConferenceState linphone_conference_get_state(const LinphoneConference *obj) {
+	return ((Conference *)obj)->getState();
+}
+
+int linphone_conference_add_participant(LinphoneConference *obj, LinphoneCall *call) {
+	return ((Conference *)obj)->addParticipant(call);
+}
+
+int linphone_conference_remove_participant(LinphoneConference *obj, const LinphoneAddress *uri) {
+	return ((Conference *)obj)->removeParticipant(uri);
+}
+
+int linphone_conference_remove_participant_with_call(LinphoneConference *obj, LinphoneCall *call) {
+	return ((Conference *)obj)->removeParticipant(call);
+}
+
+int linphone_conference_terminate(LinphoneConference *obj) {
+	return ((Conference *)obj)->terminate();
+}
+
+int linphone_conference_enter(LinphoneConference *obj) {
+	return ((Conference *)obj)->enter();
+}
+
+int linphone_conference_leave(LinphoneConference *obj) {
+	return ((Conference *)obj)->leave();
+}
+
+bool_t linphone_conference_is_in(const LinphoneConference *obj) {
+	return ((Conference *)obj)->isIn();
+}
+
+AudioStream *linphone_conference_get_audio_stream(const LinphoneConference *obj) {
+	return ((Conference *)obj)->getAudioStream();
+}
+
+int linphone_conference_mute_microphone(LinphoneConference *obj, bool_t val) {
+	return ((Conference *)obj)->muteMicrophone((val == TRUE) ? true : false);
+}
+
+bool_t linphone_conference_microphone_is_muted(const LinphoneConference *obj) {
+	return ((Conference *)obj)->microphoneIsMuted();
+}
+
+float linphone_conference_get_input_volume(const LinphoneConference *obj) {
+	return ((Conference *)obj)->getInputVolume();
+}
+
+int linphone_conference_get_size(const LinphoneConference *obj) {
+	return ((Conference *)obj)->getSize();
+}
+
+bctbx_list_t *linphone_conference_get_participants(const LinphoneConference *obj) {
+	const list<Conference::Participant *> &participants = ((Conference *)obj)->getParticipants();
+	bctbx_list_t *participants_list = NULL;
+	for(list<Conference::Participant *>::const_iterator it=participants.begin();it!=participants.end();it++) {
+		LinphoneAddress *uri = linphone_address_clone((*it)->getUri());
+		participants_list = bctbx_list_append(participants_list, uri);
+	}
+	return participants_list;
+}
+
+int linphone_conference_start_recording(LinphoneConference *obj, const char *path) {
+	return ((Conference *)obj)->startRecording(path);
+}
+
+int linphone_conference_stop_recording(LinphoneConference *obj) {
+	return ((Conference *)obj)->stopRecording();
+}
+
+void linphone_conference_on_call_stream_starting(LinphoneConference *obj, LinphoneCall *call, bool_t is_paused_by_remote) {
+	((Conference *)obj)->onCallStreamStarting(call, (is_paused_by_remote == TRUE) ? true : false);
+}
+
+void linphone_conference_on_call_stream_stopping(LinphoneConference *obj, LinphoneCall *call) {
+	((Conference *)obj)->onCallStreamStopping(call);
+}
+
+void linphone_conference_on_call_terminating(LinphoneConference *obj, LinphoneCall *call) {
+	((Conference *)obj)->onCallTerminating(call);
+}
+
+bool_t linphone_conference_check_class(LinphoneConference *obj, LinphoneConferenceClass _class) {
+	switch(_class) {
+		case LinphoneConferenceClassLocal: return typeid(obj) == typeid(LocalConference);
+		case LinphoneConferenceClassRemote: return typeid(obj) == typeid(RemoteConference);
+		default: return FALSE;
+	}
+}
diff --git a/coreapi/conference.h b/coreapi/conference.h
new file mode 100644
index 000000000..269e442f1
--- /dev/null
+++ b/coreapi/conference.h
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ *            conference.h
+ *
+ *  Thu Nov 26, 2015
+ *  Copyright  2015  Belledonne Communications
+ *  Author: Linphone's team
+ *  Email info@belledonne-communications.com
+ ******************************************************************************/
+
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef CONFERENCE_H
+#define CONFERENCE_H
+	
+#include "linphonecore.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup call_control
+ * @{
+ */
+
+/**
+ * LinphoneConference class
+ * The _LinphoneConference struct does not exists, it's the Conference C++ class that is used behind
+ */
+typedef struct _LinphoneConference LinphoneConference;
+
+/**
+ * Parameters for initialization of conferences
+ * The _LinphoneConferenceParams struct does not exists, it's the ConferenceParams C++ class that is used behind
+ */
+typedef struct _LinphoneConferenceParams LinphoneConferenceParams;
+
+
+
+
+/**
+ * Create a #LinphoneConferenceParams with default parameters set.
+ * @param core #LinphoneCore to use to find out the default parameters. Can be NULL.
+ * @return A freshly allocated #LinphoneConferenceParams
+ */
+LINPHONE_PUBLIC LinphoneConferenceParams *linphone_conference_params_new(const LinphoneCore *core);
+
+/**
+ * Free a #LinphoneConferenceParams
+ * @param params #LinphoneConferenceParams to free
+ */
+LINPHONE_PUBLIC void linphone_conference_params_free(LinphoneConferenceParams *params);
+
+/**
+ * Clone a #LinphoneConferenceParams
+ * @param params The #LinphoneConferenceParams to clone
+ * @return An allocated #LinphoneConferenceParams with the same parameters than params
+ */
+LINPHONE_PUBLIC LinphoneConferenceParams *linphone_conference_params_clone(const LinphoneConferenceParams *params);
+
+/**
+ * Enable video when starting a conference
+ * @param params A #LinphoneConferenceParams
+ * @param enable If true, video will be enabled during conference
+ */
+LINPHONE_PUBLIC void linphone_conference_params_enable_video(LinphoneConferenceParams *params, bool_t enable);
+
+/**
+ * Check whether video will be enable at conference starting
+ * @return if true, the video will be enable at conference starting
+ */
+LINPHONE_PUBLIC bool_t linphone_conference_params_video_requested(const LinphoneConferenceParams *params);
+
+
+
+
+
+/**
+ * Remove a participant from a conference
+ * @param obj A #LinphoneConference
+ * @param uri SIP URI of the participant to remove
+ * @warning The passed SIP URI must be one of the URIs returned by linphone_conference_get_participants()
+ * @return 0 if succeeded, -1 if failed
+ */
+LINPHONE_PUBLIC int linphone_conference_remove_participant(LinphoneConference *obj, const LinphoneAddress *uri);
+
+/**
+ * Get URIs of all participants of one conference
+ * The returned bctbx_list_t contains URIs of all participant. That list must be
+ * freed after use and each URI must be unref with linphone_address_unref()
+ * @param obj A #LinphoneConference
+ * @return \mslist{LinphoneAddress}
+ */
+LINPHONE_PUBLIC bctbx_list_t *linphone_conference_get_participants(const LinphoneConference *obj);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CONFERENCE_H
diff --git a/coreapi/conference_private.h b/coreapi/conference_private.h
new file mode 100644
index 000000000..eaa649cd1
--- /dev/null
+++ b/coreapi/conference_private.h
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ *            conference_private.h
+ *
+ *  Tue Jan 12, 2015
+ *  Copyright  2015  Belledonne Communications
+ *  Author: Linphone's team
+ *  Email info@belledonne-communications.com
+ ******************************************************************************/
+
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef CONFERENCE_PRIVATE_H
+#define CONFERENCE_PRIVATE_H
+
+#include "linphonecore.h"
+#include "conference.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+	LinphoneConferenceClassLocal,
+	LinphoneConferenceClassRemote
+} LinphoneConferenceClass;
+
+/**
+ * List of states used by #LinphoneConference
+ */
+typedef enum {
+	LinphoneConferenceStopped, /*< Initial state */
+	LinphoneConferenceStarting, /*< A participant has been added but the conference is not running yet */
+	LinphoneConferenceRunning, /*< The conference is running */
+	LinphoneConferenceStartingFailed /*< A participant has been added but the initialization of the conference has failed */
+} LinphoneConferenceState;
+/**
+ * Type of the funtion to pass as callback to linphone_conference_params_set_state_changed_callback()
+ * @param conference The conference instance which the state has changed
+ * @param new_state The new state of the conferenece
+ * @param user_data Pointer pass to user_data while linphone_conference_params_set_state_changed_callback() was being called
+ */
+typedef void (*LinphoneConferenceStateChangedCb)(LinphoneConference *conference, LinphoneConferenceState new_state, void *user_data);
+
+
+/**
+ * A function to converte a #LinphoneConferenceState into a string
+ */
+const char *linphone_conference_state_to_string(LinphoneConferenceState state);
+
+
+/**
+ * Set a callback which will be called when the state of the conferenec is switching
+ * @param params A #LinphoneConferenceParams object
+ * @param cb The callback to call
+ * @param user_data Pointer to pass to the user_data parameter of #LinphoneConferenceStateChangedCb
+ */
+void linphone_conference_params_set_state_changed_callback(LinphoneConferenceParams *params, LinphoneConferenceStateChangedCb cb, void *user_data);
+
+
+LinphoneConference *linphone_local_conference_new(LinphoneCore *core);
+LinphoneConference *linphone_local_conference_new_with_params(LinphoneCore *core, const LinphoneConferenceParams *params);
+LinphoneConference *linphone_remote_conference_new(LinphoneCore *core);
+LinphoneConference *linphone_remote_conference_new_with_params(LinphoneCore *core, const LinphoneConferenceParams *params);
+void linphone_conference_free(LinphoneConference *obj);
+/**
+ * Get the state of a conference
+ */
+LinphoneConferenceState linphone_conference_get_state(const LinphoneConference *obj);
+
+int linphone_conference_add_participant(LinphoneConference *obj, LinphoneCall *call);
+int linphone_conference_remove_participant_with_call(LinphoneConference *obj, LinphoneCall *call);
+int linphone_conference_terminate(LinphoneConference *obj);
+int linphone_conference_get_size(const LinphoneConference *obj);
+
+int linphone_conference_enter(LinphoneConference *obj);
+int linphone_conference_leave(LinphoneConference *obj);
+bool_t linphone_conference_is_in(const LinphoneConference *obj);
+
+AudioStream *linphone_conference_get_audio_stream(const LinphoneConference *obj);
+
+int linphone_conference_mute_microphone(LinphoneConference *obj, bool_t val);
+bool_t linphone_conference_microphone_is_muted(const LinphoneConference *obj);
+float linphone_conference_get_input_volume(const LinphoneConference *obj);
+
+int linphone_conference_start_recording(LinphoneConference *obj, const char *path);
+int linphone_conference_stop_recording(LinphoneConference *obj);
+
+void linphone_conference_on_call_stream_starting(LinphoneConference *obj, LinphoneCall *call, bool_t is_paused_by_remote);
+void linphone_conference_on_call_stream_stopping(LinphoneConference *obj, LinphoneCall *call);
+void linphone_conference_on_call_terminating(LinphoneConference *obj, LinphoneCall *call);
+
+LINPHONE_PUBLIC bool_t linphone_conference_check_class(LinphoneConference *obj, LinphoneConferenceClass _class);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //CONFERENCE_PRIVATE_H
diff --git a/coreapi/contactprovider.c b/coreapi/contactprovider.c
index 2ee037c78..ce7991a3e 100644
--- a/coreapi/contactprovider.c
+++ b/coreapi/contactprovider.c
@@ -130,6 +130,7 @@ BELLE_SIP_INSTANCIATE_CUSTOM_VPTR_BEGIN(LinphoneContactProvider)
 		(belle_sip_object_destroy_t) contact_provider_destroy,
 		NULL,/*no clone*/
 		NULL,/*no marshal*/
+		BELLE_SIP_DEFAULT_BUFSIZE_HINT
 	},
 	"",
 	// Pure virtual
diff --git a/coreapi/content.c b/coreapi/content.c
index 23eb6c26c..a158d2b9f 100644
--- a/coreapi/content.c
+++ b/coreapi/content.c
@@ -22,23 +22,46 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
 
+static void linphone_content_set_sal_body_handler(LinphoneContent *content, SalBodyHandler *body_handler) {
+	if (content->body_handler != NULL) {
+		sal_body_handler_unref(content->body_handler);
+		content->body_handler = NULL;
+	}
+	content->body_handler = sal_body_handler_ref(body_handler);
+}
+
+static LinphoneContent * linphone_content_new_with_body_handler(SalBodyHandler *body_handler) {
+	LinphoneContent *content = belle_sip_object_new(LinphoneContent);
+	belle_sip_object_ref(content);
+	content->owned_fields = TRUE;
+	content->cryptoContext = NULL; /* this field is managed externally by encryption/decryption functions so be careful to initialise it to NULL */
+	if (body_handler == NULL) {
+		linphone_content_set_sal_body_handler(content, sal_body_handler_new());
+	} else {
+		linphone_content_set_sal_body_handler(content, body_handler);
+	}
+	return content;
+}
+
 static void linphone_content_destroy(LinphoneContent *content) {
 	if (content->owned_fields == TRUE) {
-		if (content->lcp.type) belle_sip_free(content->lcp.type);
-		if (content->lcp.subtype) belle_sip_free(content->lcp.subtype);
-		if (content->lcp.data) belle_sip_free(content->lcp.data);
-		if (content->lcp.encoding) belle_sip_free(content->lcp.encoding);
-		if (content->lcp.name) belle_sip_free(content->lcp.name);
-		if (content->lcp.key) belle_sip_free(content->lcp.key);
+		if (content->body_handler) sal_body_handler_unref(content->body_handler);
+		if (content->name) belle_sip_free(content->name);
+		if (content->key) belle_sip_free(content->key);
 		/* note : crypto context is allocated/destroyed by the encryption function */
 	}
 }
 
 static void linphone_content_clone(LinphoneContent *obj, const LinphoneContent *ref) {
 	obj->owned_fields = TRUE;
-	linphone_content_set_type(obj, linphone_content_get_type(ref));
-	linphone_content_set_subtype(obj, linphone_content_get_subtype(ref));
-	linphone_content_set_encoding(obj, linphone_content_get_encoding(ref));
+	linphone_content_set_sal_body_handler(obj, sal_body_handler_new());
+	if ((linphone_content_get_type(ref) != NULL) || (linphone_content_get_subtype(ref) != NULL)) {
+		linphone_content_set_type(obj, linphone_content_get_type(ref));
+		linphone_content_set_subtype(obj, linphone_content_get_subtype(ref));
+	}
+	if (linphone_content_get_encoding(ref) != NULL) {
+		linphone_content_set_encoding(obj, linphone_content_get_encoding(ref));
+	}
 	linphone_content_set_name(obj, linphone_content_get_name(ref));
 	linphone_content_set_key(obj, linphone_content_get_key(ref), linphone_content_get_key_size(ref));
 	if (linphone_content_get_buffer(ref) != NULL) {
@@ -81,163 +104,137 @@ void linphone_content_set_user_data(LinphoneContent *content, void *ud) {
 }
 
 const char * linphone_content_get_type(const LinphoneContent *content) {
-	return content->lcp.type;
+	return sal_body_handler_get_type(content->body_handler);
 }
 
 void linphone_content_set_type(LinphoneContent *content, const char *type) {
-	if (content->lcp.type != NULL) {
-		belle_sip_free(content->lcp.type);
-		content->lcp.type = NULL;
-	}
-	if (type != NULL) {
-		content->lcp.type = belle_sip_strdup(type);
-	}
+	sal_body_handler_set_type(content->body_handler, type);
 }
 
 const char * linphone_content_get_subtype(const LinphoneContent *content) {
-	return content->lcp.subtype;
+	return sal_body_handler_get_subtype(content->body_handler);
 }
 
 void linphone_content_set_subtype(LinphoneContent *content, const char *subtype) {
-	if (content->lcp.subtype != NULL) {
-		belle_sip_free(content->lcp.subtype);
-		content->lcp.subtype = NULL;
-	}
-	if (subtype != NULL) {
-		content->lcp.subtype = belle_sip_strdup(subtype);
-	}
+	sal_body_handler_set_subtype(content->body_handler, subtype);
 }
 
 void * linphone_content_get_buffer(const LinphoneContent *content) {
-	return content->lcp.data;
+	return sal_body_handler_get_data(content->body_handler);
 }
 
 void linphone_content_set_buffer(LinphoneContent *content, const void *buffer, size_t size) {
-	content->lcp.size = size;
-	content->lcp.data = belle_sip_malloc(size + 1);
-	memcpy(content->lcp.data, buffer, size);
-	((char *)content->lcp.data)[size] = '\0';
+	void *data;
+	sal_body_handler_set_size(content->body_handler, size);
+	data = belle_sip_malloc(size + 1);
+	memcpy(data, buffer, size);
+	((char *)data)[size] = '\0';
+	sal_body_handler_set_data(content->body_handler, data);
 }
 
 const char * linphone_content_get_string_buffer(const LinphoneContent *content) {
-	return (char *)content->lcp.data;
+	return (const char *)linphone_content_get_buffer(content);
 }
 
 void linphone_content_set_string_buffer(LinphoneContent *content, const char *buffer) {
-	content->lcp.size = strlen(buffer);
-	content->lcp.data = belle_sip_strdup(buffer);
+	sal_body_handler_set_size(content->body_handler, strlen(buffer));
+	sal_body_handler_set_data(content->body_handler, belle_sip_strdup(buffer));
 }
 
 size_t linphone_content_get_size(const LinphoneContent *content) {
-	return content->lcp.size;
+	return sal_body_handler_get_size(content->body_handler);
 }
 
 void linphone_content_set_size(LinphoneContent *content, size_t size) {
-	content->lcp.size = size;
+	sal_body_handler_set_size(content->body_handler, size);
 }
 
 const char * linphone_content_get_encoding(const LinphoneContent *content) {
-	return content->lcp.encoding;
+	return sal_body_handler_get_encoding(content->body_handler);
 }
 
 void linphone_content_set_encoding(LinphoneContent *content, const char *encoding) {
-	if (content->lcp.encoding != NULL) {
-		belle_sip_free(content->lcp.encoding);
-		content->lcp.encoding = NULL;
-	}
-	if (encoding != NULL) {
-		content->lcp.encoding = belle_sip_strdup(encoding);
-	}
+	sal_body_handler_set_encoding(content->body_handler, encoding);
 }
 
 const char * linphone_content_get_name(const LinphoneContent *content) {
-	return content->lcp.name;
+	return content->name;
 }
 
 void linphone_content_set_name(LinphoneContent *content, const char *name) {
-	if (content->lcp.name != NULL) {
-		belle_sip_free(content->lcp.name);
-		content->lcp.name = NULL;
+	if (content->name != NULL) {
+		belle_sip_free(content->name);
+		content->name = NULL;
 	}
 	if (name != NULL) {
-		content->lcp.name = belle_sip_strdup(name);
+		content->name = belle_sip_strdup(name);
 	}
 }
 
 size_t linphone_content_get_key_size(const LinphoneContent *content) {
-	return content->lcp.keyLength;
+	return content->keyLength;
 }
 
 const char * linphone_content_get_key(const LinphoneContent *content) {
-	return content->lcp.key;
+	return content->key;
 }
 
 void linphone_content_set_key(LinphoneContent *content, const char *key, const size_t keyLength) {
-	if (content->lcp.key != NULL) {
-		belle_sip_free(content->lcp.key);
-		content->lcp.key = NULL;
+	if (content->key != NULL) {
+		belle_sip_free(content->key);
+		content->key = NULL;
 	}
 	if (key != NULL) {
-		content->lcp.key = belle_sip_malloc(keyLength);
-		memcpy(content->lcp.key, key, keyLength);
+		content->key = belle_sip_malloc(keyLength);
+		memcpy(content->key, key, keyLength);
+		content->keyLength = keyLength;
 	}
 }
 
 /* crypto context is managed(allocated/freed) by the encryption function, so provide the address of field in the private structure */
 void ** linphone_content_get_cryptoContext_address(LinphoneContent *content) {
-	return &(content->lcp.cryptoContext);
+	return &(content->cryptoContext);
+}
+
+bool_t linphone_content_is_multipart(const LinphoneContent *content) {
+	return sal_body_handler_is_multipart(content->body_handler);
+}
+
+LinphoneContent * linphone_content_get_part(const LinphoneContent *content, int idx) {
+	SalBodyHandler *part_body_handler;
+	if (!linphone_content_is_multipart(content)) return NULL;
+	part_body_handler = sal_body_handler_get_part(content->body_handler, idx);
+	return linphone_content_from_sal_body_handler(part_body_handler);
+}
+
+LinphoneContent * linphone_content_find_part_by_header(const LinphoneContent *content, const char *header_name, const char *header_value) {
+	SalBodyHandler *part_body_handler;
+	if (!linphone_content_is_multipart(content)) return NULL;
+	part_body_handler = sal_body_handler_find_part_by_header(content->body_handler, header_name, header_value);
+	return linphone_content_from_sal_body_handler(part_body_handler);
+}
+
+const char * linphone_content_get_custom_header(const LinphoneContent *content, const char *header_name) {
+	return sal_body_handler_get_header(content->body_handler, header_name);
 }
 
 
 LinphoneContent * linphone_content_new(void) {
-	LinphoneContent *content = belle_sip_object_new(LinphoneContent);
-	belle_sip_object_ref(content);
-	content->owned_fields = TRUE;
-	content->lcp.cryptoContext = NULL; /* this field is managed externally by encryption/decryption functions so be careful to initialise it to NULL */
-	return content;
+	return linphone_content_new_with_body_handler(NULL);
 }
 
 LinphoneContent * linphone_content_copy(const LinphoneContent *ref) {
 	return (LinphoneContent *)belle_sip_object_ref(belle_sip_object_clone(BELLE_SIP_OBJECT(ref)));
 }
 
-LinphoneContent * linphone_content_from_sal_body(const SalBody *ref) {
-	if (ref && ref->type) {
-		LinphoneContent *content = linphone_content_new();
-		linphone_content_set_type(content, ref->type);
-		linphone_content_set_subtype(content, ref->subtype);
-		linphone_content_set_encoding(content, ref->encoding);
-		if (ref->data != NULL) {
-			linphone_content_set_buffer(content, ref->data, ref->size);
-		} else {
-			linphone_content_set_size(content, ref->size);
-		}
-		return content;
+LinphoneContent * linphone_content_from_sal_body_handler(SalBodyHandler *body_handler) {
+	if (body_handler) {
+		return linphone_content_new_with_body_handler(body_handler);
 	}
 	return NULL;
 }
 
-SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *content) {
-	if (content && linphone_content_get_type(content)) {
-		body->type = linphone_content_get_type(content);
-		body->subtype = linphone_content_get_subtype(content);
-		body->data = linphone_content_get_buffer(content);
-		body->size = linphone_content_get_size(content);
-		body->encoding = linphone_content_get_encoding(content);
-		return body;
-	}
-	return NULL;
-}
-
-
-
-LinphoneContent * linphone_content_private_to_linphone_content(const LinphoneContentPrivate *lcp) {
-	LinphoneContent *content = belle_sip_object_new(LinphoneContent);
-	memcpy(&content->lcp, lcp, sizeof(LinphoneContentPrivate));
-	content->owned_fields = FALSE;
-	return content;
-}
-
-LinphoneContentPrivate * linphone_content_to_linphone_content_private(const LinphoneContent *content) {
-	return (LinphoneContentPrivate *)&content->lcp;
+SalBodyHandler * sal_body_handler_from_content(const LinphoneContent *content) {
+	if (content == NULL) return NULL;
+	return content->body_handler;
 }
diff --git a/coreapi/content.h b/coreapi/content.h
index 02ccc3833..340a815df 100644
--- a/coreapi/content.h
+++ b/coreapi/content.h
@@ -40,51 +40,6 @@ struct _LinphoneContent;
 **/
 typedef struct _LinphoneContent LinphoneContent;
 
-/**
- * @deprecated Use LinphoneContent objects instead of this structure.
- */
-struct _LinphoneContentPrivate{
-	char *type; /**<mime type for the data, for example "application"*/
-	char *subtype; /**<mime subtype for the data, for example "html"*/
-	void *data; /**<the actual data buffer, usually a string. Null when provided by callbacks #LinphoneCoreFileTransferSendCb or #LinphoneCoreFileTransferRecvCb*/
-	size_t size; /**<the size of the data buffer, excluding null character despite null character is always set for convenience.
-				When provided by callback #LinphoneCoreFileTransferSendCb or #LinphoneCoreFileTransferRecvCb, it states the total number of bytes of the transfered file*/
-	char *encoding; /**<The encoding of the data buffer, for example "gzip"*/
-	char *name; /**< used by RCS File transfer messages to store the original filename of the file to be downloaded from server */
-	char *key; /**< used by RCS File transfer messages to store the key to encrypt file if needed */
-	size_t keyLength; /**< Length of key in bytes */
-	void *cryptoContext; /**< crypto context used to encrypt file for RCS file transfer */
-};
-
-/**
- * Alias to the LinphoneContentPrivate struct.
- * @deprecated
-**/
-typedef struct _LinphoneContentPrivate LinphoneContentPrivate;
-
-/**
- * Convert a LinphoneContentPrivate structure to a LinphoneContent object.
- * @deprecated Utility macro to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
- */
-#define LINPHONE_CONTENT(lcp) linphone_content_private_to_linphone_content(lcp)
-
-/**
- * Convert a LinphoneContentPrivate structure to a LinphoneContent object.
- * @deprecated Utility function to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
- */
-LINPHONE_PUBLIC LinphoneContent * linphone_content_private_to_linphone_content(const LinphoneContentPrivate *lcp);
-
-/**
- * Convert a LinphoneContent object to a LinphoneContentPrivate structure.
- * @deprecated Utility macro to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
- */
-#define LINPHONE_CONTENT_PRIVATE(lc) linphone_content_to_linphone_content_private(lc)
-
-/**
- * Convert a LinphoneContent object to a LinphoneContentPrivate structure.
- * @deprecated Utility function to ease porting existing code from LinphoneContentPrivate structure (old LinphoneContent structure) to new LinphoneContent object.
- */
-LINPHONE_PUBLIC LinphoneContentPrivate * linphone_content_to_linphone_content_private(const LinphoneContent *content);
 
 /**
  * Create a content with default values from Linphone core.
@@ -219,6 +174,38 @@ LINPHONE_PUBLIC const char * linphone_content_get_name(const LinphoneContent *co
  */
 LINPHONE_PUBLIC void linphone_content_set_name(LinphoneContent *content, const char *name);
 
+/**
+ * Tell whether a content is a multipart content.
+ * @param[in] content LinphoneContent object.
+ * @return A boolean value telling whether the content is multipart or not.
+ */
+LINPHONE_PUBLIC bool_t linphone_content_is_multipart(const LinphoneContent *content);
+
+/**
+ * Get a part from a multipart content according to its index.
+ * @param[in] content LinphoneContent object.
+ * @param[in] idx The index of the part to get.
+ * @return A LinphoneContent object holding the part if found, NULL otherwise.
+ */
+LINPHONE_PUBLIC LinphoneContent * linphone_content_get_part(const LinphoneContent *content, int idx);
+
+/**
+ * Find a part from a multipart content looking for a part header with a specified value.
+ * @param[in] content LinphoneContent object.
+ * @param[in] header_name The name of the header to look for.
+ * @param[in] header_value The value of the header to look for.
+ * @return A LinphoneContent object object the part if found, NULL otherwise.
+ */
+LINPHONE_PUBLIC LinphoneContent * linphone_content_find_part_by_header(const LinphoneContent *content, const char *header_name, const char *header_value);
+
+/**
+ * Get a custom header value of a content.
+ * @param[in] content LinphoneContent object.
+ * @param[in] header_name The name of the header to get the value from.
+ * @return The value of the header if found, NULL otherwise.
+ */
+LINPHONE_PUBLIC const char * linphone_content_get_custom_header(const LinphoneContent *content, const char *header_name);
+
 /**
  * @}
  */
diff --git a/coreapi/dial_plan.c b/coreapi/dial_plan.c
new file mode 100644
index 000000000..6441cb2f3
--- /dev/null
+++ b/coreapi/dial_plan.c
@@ -0,0 +1,318 @@
+/*
+linphone
+Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
+*/
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "linphonecore_utils.h"
+
+/*
+ * http://en.wikipedia.org/wiki/Telephone_numbering_plan
+ * http://en.wikipedia.org/wiki/Telephone_numbers_in_Europe
+ * imported from https://en.wikipedia.org/wiki/List_of_mobile_phone_number_series_by_country
+ */
+static LinphoneDialPlan const dial_plans[]={
+	//Country					, iso country code, e164 country calling code, number length, international usual prefix
+	{"Afghanistan"                  ,"AF"		, "93"      , 9		, "00"  },
+	{"Albania"                      ,"AL"		, "355"     , 9		, "00"  },
+	{"Algeria"                      ,"DZ"		, "213"     , 9		, "00"  },
+	{"American Samoa"               ,"AS"		, "1"       , 10	, "011"	},
+	{"Andorra"                      ,"AD"		, "376"     , 6		, "00"  },
+	{"Angola"                       ,"AO"		, "244"     , 9		, "00"  },
+	{"Anguilla"                     ,"AI"		, "1"       , 10	, "011" },
+	{"Antigua and Barbuda"          ,"AG"		, "1"       , 10	, "011"	},
+	{"Argentina"                    ,"AR"		, "54"      , 10	, "00"  },
+	{"Armenia"                      ,"AM"		, "374"     , 8		, "00"  },
+	{"Aruba"                        ,"AW"		, "297"     , 7		, "011"	},
+	{"Australia"                    ,"AU"		, "61"      , 9	    , "0011"},
+	{"Austria"                      ,"AT"		, "43"      , 10	, "00"  },
+	{"Azerbaijan"                   ,"AZ"       , "994"     , 9		, "00"  },
+	{"Bahamas"                      ,"BS"		, "1"       , 10    , "011"	},
+	{"Bahrain"                      ,"BH"		, "973"     , 8     , "00"  },
+	{"Bangladesh"                   ,"BD"		, "880"     , 10    , "00"  },
+	{"Barbados"                     ,"BB"		, "1"       , 10    , "011"	},
+	{"Belarus"                      ,"BY"		, "375"     , 9     , "00"  },
+	{"Belgium"                      ,"BE"		, "32"      , 9     , "00"  },
+	{"Belize"                       ,"BZ"		, "501"     , 7     , "00"  },
+	{"Benin"                        ,"BJ"		, "229"     , 8     , "00"	},
+	{"Bermuda"                      ,"BM"		, "1"       , 10    , "011" },
+	{"Bhutan"                       ,"BT"		, "975"     , 8     , "00"  },
+	{"Bolivia"                      ,"BO"		, "591"     , 8     , "00"	},
+	{"Bosnia and Herzegovina"       ,"BA"		, "387"     , 8     , "00"  },
+	{"Botswana"                     ,"BW"		, "267"     , 8     , "00"  },
+	{"Brazil"                       ,"BR"		, "55"      , 10	, "00"  },
+	{"Brunei Darussalam"            ,"BN"		, "673"     , 7		, "00"	},
+	{"Bulgaria"                     ,"BG"		, "359"     , 9		, "00"  },
+	{"Burkina Faso"                 ,"BF"		, "226"     , 8		, "00"  },
+	{"Burundi"                      ,"BI"		, "257"     , 8     , "011" },
+	{"Cambodia"                     ,"KH"		, "855"     , 9		, "00"  },
+	{"Cameroon"                     ,"CM"		, "237"     , 8		, "00"  },
+	{"Canada"                       ,"CA"		, "1"       , 10	, "011" },
+	{"Cape Verde"                   ,"CV"		, "238"     , 7		, "00"	},
+	{"Cayman Islands"               ,"KY"		, "1"       , 10	, "011" },
+	{"Central African Republic"     ,"CF"		, "236"     , 8     , "00"  },
+	{"Chad"                         ,"TD"		, "235"     , 8		, "00"	},
+	{"Chile"                        ,"CL"		, "56"      , 9	    , "00"  },
+	{"China"                        ,"CN"		, "86"      , 11	, "00"  },
+	{"Colombia"                     ,"CO"       , "57"      , 10	, "00"  },
+	{"Comoros"                      ,"KM"		, "269"     , 7     , "00"	},
+	{"Congo"                        ,"CG"		, "242"     , 9		, "00"	},
+	{"Congo Democratic Republic"	,"CD"		, "243"     , 9		, "00"  },
+	{"Cook Islands"                 ,"CK"		, "682"     , 5		, "00"  },
+	{"Costa Rica"                   ,"CR"		, "506"     , 8     , "00"	},
+	{"Cote d'Ivoire"	            ,"AD"		, "225"     , 8     , "00"  },
+	{"Croatia"                      ,"HR"		, "385"     , 9		, "00"  },
+	{"Cuba"                         ,"CU"		, "53"      , 8     , "119" },
+	{"Cyprus"                       ,"CY"		, "357"     , 8     , "00"	},
+	{"Czech Republic"               ,"CZ"		, "420"     , 9     , "00"  },
+	{"Denmark"                      ,"DK"		, "45"      , 8		, "00"  },
+	{"Djibouti"                     ,"DJ"		, "253"     , 8		, "00"	},
+	{"Dominica"                     ,"DM"		, "1"       , 10	, "011" },
+	{"Dominican Republic"	        ,"DO"		, "1"       , 10	, "011" },
+	{"Ecuador"                      ,"EC"       , "593"     , 9		, "00"  },
+	{"Egypt"                        ,"EG"		, "20"      , 10	, "00"	},
+	{"El Salvador"                  ,"SV"		, "503"     , 8		, "00"	},
+	{"Equatorial Guinea"            ,"GQ"		, "240"     , 9		, "00"  },
+	{"Eritrea"                      ,"ER"		, "291"     , 7		, "00"  },
+	{"Estonia"                      ,"EE"		, "372"     , 8     , "00"	},
+	{"Ethiopia"                     ,"ET"		, "251"     , 9     , "00"  },
+	{"Falkland Islands"	            ,"FK"		, "500"     , 5		, "00"  },
+	{"Faroe Islands"	            ,"FO"		, "298"     , 6     , "00"  },
+	{"Fiji"                         ,"FJ"		, "679"     , 7     , "00"	},
+	{"Finland"                      ,"FI"		, "358"     , 9     , "00"  },
+	{"France"                       ,"FR"		, "33"      , 9		, "00"	},
+	{"French Guiana"				,"GF"		, "594"     , 9		, "00"	},
+	{"French Polynesia"             ,"PF"		, "689"     , 6	    , "00"  },
+	{"Gabon"                        ,"GA"		, "241"     , 8     , "00"  },
+	{"Gambia"                       ,"GM"       , "220"     , 7		, "00"  },
+	{"Georgia"                      ,"GE"		, "995"     , 9     , "00"	},
+	{"Germany"                      ,"DE"		, "49"      , 11	, "00"	},
+	{"Ghana"                        ,"GH"		, "233"     , 9		, "00"  },
+	{"Gibraltar"                    ,"GI"		, "350"     , 8		, "00"  },
+	{"Greece"                       ,"GR"		, "30"      ,10     , "00"	},
+	{"Greenland"                    ,"GL"		, "299"     , 6		, "00"  },
+	{"Grenada"                      ,"GD"		, "1"       , 10	, "011" },
+	{"Guadeloupe"                   ,"GP"		, "590"     , 9     , "00"  },
+	{"Guam"                         ,"GU"		, "1"       , 10	, "011"	},
+	{"Guatemala"                    ,"GT"		, "502"     , 8     , "00"  },
+	{"Guinea"                       ,"GN"		, "224"     , 8		, "00"  },
+	{"Guinea-Bissau"				,"GW"		, "245"     , 7		, "00"	},
+	{"Guyana"                       ,"GY"		, "592"     , 7	    , "001" },
+	{"Haiti"                        ,"HT"		, "509"     , 8     , "00"  },
+	{"Honduras"                     ,"HN"       , "504"     , 8		, "00"  },
+	{"Hong Kong"                    ,"HK"		, "852"     , 8     , "001"	},
+	{"Hungary"                      ,"HU"		, "36"      , 9     , "00"  },
+	{"Iceland"                      ,"IS"		, "354"     , 9     , "00"  },
+	{"India"                        ,"IN"		, "91"      , 10    , "00"  },
+	{"Indonesia"                    ,"ID"		, "62"      , 10	, "001"	},
+	{"Iran"                         ,"IR"		, "98"      , 10	, "00"	},
+	{"Iraq"                         ,"IQ"		, "964"     , 10	, "00"  },
+	{"Ireland"                      ,"IE"		, "353"     , 9		, "00"  },
+	{"Israel"                       ,"IL"		, "972"     , 9     , "00"	},
+	{"Italy"                        ,"IT"		, "39"      , 10	, "00"  },
+/*	{"Jersey"                       ,"JE"		, "44"      , 10	, "00"	},*/
+	{"Jamaica"                      ,"JM"		, "1"       , 10	, "011" },
+	{"Japan"                        ,"JP"		, "81"      , 10	, "010" },
+	{"Jordan"                       ,"JO"		, "962"     , 9     , "00"	},
+	{"Kazakhstan"                   ,"KZ"		, "7"       , 10    , "00"  },
+	{"Kenya"                        ,"KE"		, "254"     , 9		, "000" },
+	{"Kiribati"                     ,"KI"		, "686"     , 5		, "00"	},
+	{"Korea, North"                 ,"KP"		, "850"     , 12	, "99"  },
+	{"Korea, South"                 ,"KR"       , "82"      , 12	, "001" },
+	{"Kuwait"                       ,"KW"		, "965"     , 8     , "00"	},
+	{"Kyrgyzstan"                   ,"KG"		, "996"     , 9     , "00"  },
+	{"Laos"                         ,"LA"		, "856"     , 10    , "00"  },
+	{"Latvia"                       ,"LV"		, "371"     , 8     , "00"	},
+	{"Lebanon"                      ,"LB"		, "961"     , 7     , "00"	},
+	{"Lesotho"                      ,"LS"		, "266"     , 8		, "00"	},
+	{"Liberia"                      ,"LR"		, "231"     , 8		, "00"  },
+	{"Libya"                        ,"LY"		, "218"     , 8		, "00"  },
+	{"Liechtenstein"                ,"LI"		, "423"     , 7     , "00"	},
+	{"Lithuania"                    ,"LT"		, "370"     , 8		, "00"  },
+	{"Luxembourg"                   ,"LU"		, "352"     , 9		, "00"  },
+	{"Macau"                        ,"MO"		, "853"     , 8     , "00"  },
+	{"Macedonia"                    ,"MK"		, "389"     , 8     , "00"	},
+	{"Madagascar"                   ,"MG"		, "261"     , 9     , "00"  },
+	{"Malawi"                       ,"MW"		, "265"     , 9		, "00"  },
+	{"Malaysia"                     ,"MY"		, "60"      , 9		, "00"	},
+	{"Maldives"                     ,"MV"		, "960"     , 7	    , "00"  },
+	{"Mali"                         ,"ML"		, "223"     , 8     , "00"  },
+	{"Malta"                        ,"MT"       , "356"     , 8		, "00"  },
+	{"Marshall Islands"				,"MH"		, "692"     , 7     , "011"	},
+	{"Martinique"                   ,"MQ"		, "596"     , 9     , "00"  },
+	{"Mauritania"                   ,"MR"		, "222"     , 8     , "00"  },
+	{"Mauritius"                    ,"MU"		, "230"     , 7     , "00"	},
+	{"Mayotte Island"               ,"YT"		, "262"     , 9     , "00"	},
+	{"Mexico"                       ,"MX"		, "52"      , 10	, "00"	},
+	{"Micronesia"                   ,"FM"		, "691"     , 7		, "011" },
+	{"Moldova"                      ,"MD"		, "373"     , 8		, "00"  },
+	{"Monaco"                       ,"MC"		, "377"     , 8     , "00"	},
+	{"Mongolia"                     ,"MN"		, "976"     , 8     , "001" },
+	{"Montenegro"                   ,"ME"		, "382"     , 8		, "00"  },
+	{"Montserrat"                   ,"MS"		, "664"     , 10	, "011" },
+	{"Morocco"                      ,"MA"		, "212"     , 9     , "00"	},
+	{"Mozambique"                   ,"MZ"		, "258"     , 9     , "00"  },
+	{"Myanmar"                      ,"MM"		, "95"      , 8		, "00"  },
+	{"Namibia"                      ,"NA"		, "264"     , 9		, "00"	},
+	{"Nauru"                        ,"NR"		, "674"     , 7	    , "00"  },
+	{"Nepal"                        ,"NP"		, "43"      , 10	, "00"  },
+	{"Netherlands"                  ,"NL"       , "31"      , 9		, "00"  },
+	{"New Caledonia"				,"NC"		, "687"     , 6     , "00"	},
+	{"New Zealand"                  ,"NZ"		, "64"      , 10	, "00"  },
+	{"Nicaragua"                    ,"NI"		, "505"     , 8     , "00"  },
+	{"Niger"                        ,"NE"		, "227"     , 8     , "00"	},
+	{"Nigeria"                      ,"NG"		, "234"     , 10	, "009"	},
+	{"Niue"                         ,"NU"		, "683"     , 4		, "00"	},
+	{"Norfolk Island"	            ,"NF"		, "672"     , 5		, "00"  },
+	{"Northern Mariana Islands"	    ,"MP"		, "1"       , 10	, "011" },
+	{"Norway"                       ,"NO"		, "47"      , 8     , "00"	},
+	{"Oman"                         ,"OM"		, "968"     , 8		, "00"  },
+	{"Pakistan"                     ,"PK"		, "92"      , 10	, "00"  },
+	{"Palau"                        ,"PW"		, "680"     , 7     , "011" },
+	{"Palestine"                    ,"PS"		, "970"     , 9     , "00"	},
+	{"Panama"                       ,"PA"		, "507"     , 8     , "00"  },
+	{"Papua New Guinea"	            ,"PG"		, "675"     , 8		, "00"  },
+	{"Paraguay"                     ,"PY"		, "595"     , 9		, "00"	},
+	{"Peru"                         ,"PE"		, "51"      , 9	    , "00"  },
+	{"Philippines"                  ,"PH"		, "63"      , 10	, "00"  },
+	{"Poland"                       ,"PL"       , "48"      , 9		, "00"  },
+	{"Portugal"                     ,"PT"		, "351"     , 9     , "00"	},
+	{"Puerto Rico"                  ,"PR"		, "1"       , 10	, "011" },
+	{"Qatar"                        ,"QA"		, "974"     , 8     , "00"  },
+	{"R�union Island"				,"RE"		, "262"     , 9     , "011"	},
+	{"Romania"                      ,"RO"		, "40"      , 9     , "00"	},
+	{"Russian Federation"           ,"RU"		, "7"       , 10	, "8"	},
+	{"Rwanda"                       ,"RW"		, "250"     , 9		, "00"  },
+	{"Saint Helena"                 ,"SH"		, "290"     , 4		, "00"  },
+	{"Saint Kitts and Nevis"		,"KN"		, "1"       , 10	, "011"	},
+	{"Saint Lucia"                  ,"LC"		, "1"       , 10	, "011" },
+	{"Saint Pierre and Miquelon"    ,"PM"		, "508"     , 6		, "00"  },
+	{"Saint Vincent and the Grenadines","VC"	, "1"       , 10	, "011" },
+	{"Samoa"                        ,"WS"		, "685"     , 7     , "0"	},
+	{"San Marino"                   ,"SM"		, "378"     , 10	, "00"  },
+	{"Sao Tome and Principe"        ,"ST"		, "239"     , 7		, "00"  },
+	{"Saudi Arabia"                 ,"SA"		, "966"     , 9		, "00"	},
+	{"Senegal"                      ,"SN"		, "221"     , 9	    , "00"  },
+	{"Serbia"                       ,"RS"		, "381"     , 9     , "00"  },
+	{"Seychelles"                   ,"SC"       , "248"     , 7		, "00"  },
+	{"Sierra Leone"                 ,"SL"		, "232"     , 8     , "00"	},
+	{"Singapore"                    ,"SG"		, "65"      , 8     , "001" },
+	{"Slovakia"                     ,"SK"		, "421"     , 9     , "00"  },
+	{"Slovenia"                     ,"SI"		, "386"     , 8     , "00"	},
+	{"Solomon Islands"              ,"SB"		, "677"     , 7     , "00"	},
+	{"Somalia"                      ,"SO"		, "252"     , 8		, "00"	},
+	{"South Africa"                 ,"ZA"		, "27"      , 9		, "00"  },
+	{"Spain"                        ,"ES"		, "34"      , 9		, "00"  },
+	{"Sri Lanka"                    ,"LK"		, "94"      , 9     , "00"	},
+	{"Sudan"                        ,"SD"		, "249"     , 9		, "00"  },
+	{"Suriname"                     ,"SR"		, "597"     , 7		, "00"  },
+	{"Swaziland"                    ,"SZ"		, "268"     , 8     , "00"  },
+	{"Sweden"                       ,"SE"		, "1"       , 9     , "00"	},
+	{"Switzerland"                  ,"XK"		, "41"      , 9		, "00"	},
+	{"Syria"                        ,"SY"		, "963"     , 9		, "00"  },
+	{"Taiwan"                       ,"TW"		, "886"     , 9		, "810"	},
+	{"Tajikistan"                   ,"TJ"		, "992"     , 9	    , "002" },
+	{"Tanzania"                     ,"TZ"		, "255"     , 9     , "000" },
+	{"Thailand"                     ,"TH"       , "66"      , 9		, "001" },
+	{"Togo"                         ,"TG"		, "228"     , 8     , "00"	},
+	{"Tokelau"                      ,"TK"		, "690"     , 4     , "00"  },
+	{"Tonga"                        ,"TO"		, "676"     , 5     , "00"  },
+	{"Trinidad and Tobago"			,"TT"		, "1"       , 10    , "011"	},
+	{"Tunisia"                      ,"TN"		, "216"     , 8     , "00"	},
+	{"Turkey"                       ,"TR"		, "90"      , 10	, "00"	},
+	{"Turkmenistan"                 ,"TM"		, "993"     , 8		, "00"  },
+	{"Turks and Caicos Islands"	    ,"TC"		, "1"       , 7		, "0"   },
+	{"Tuvalu"                       ,"TV"		, "688"     , 5     , "00"	},
+	{"Uganda"                       ,"UG"		, "256"     , 9     , "000" },
+	{"Ukraine"                      ,"UA"		, "380"     , 9		, "00"  },
+	{"United Arab Emirates"	        ,"AE"		, "971"     , 9     , "00"  },
+	{"United Kingdom"               ,"GB"		, "44"      , 10	, "00"	},
+/*	{"United Kingdom"               ,"UK"		, "44"      , 10	, "00"	},*/
+	{"United States"                ,"US"		, "1"       , 10	, "011" },
+	{"Uruguay"                      ,"UY"		, "598"     , 8		, "00"  },
+	{"Uzbekistan"                   ,"UZ"		, "998"     , 9		, "8"	},
+	{"Vanuatu"                      ,"VU"		, "678"     , 7	    , "00"  },
+	{"Venezuela"                    ,"VE"		, "58"      , 10	, "00"  },
+	{"Vietnam"                      ,"VN"		, "84"      , 9     , "00"  },
+	{"Wallis and Futuna"	        ,"WF"		, "681"     , 5		, "00"  },
+	{"Yemen"                        ,"YE"		, "967"     , 9     , "00"  },
+	{"Zambia"                       ,"ZM"		, "260"     , 9     , "00"	},
+	{"Zimbabwe"                     ,"ZW"		, "263"     , 9     , "00"  },
+	{NULL                           ,NULL       ,  ""       , 0     , NULL	}
+};
+static LinphoneDialPlan most_common_dialplan={ "generic" ,"", "", 10, "00"};
+
+int linphone_dial_plan_lookup_ccc_from_e164(const char* e164) {
+	LinphoneDialPlan* dial_plan;
+	LinphoneDialPlan* elected_dial_plan=NULL;
+	unsigned int found;
+	unsigned int i=0;
+	if (e164[1]=='1') {
+		/*USA case*/
+		return 1;
+	}
+	do {
+		found=0;
+		i++;
+		for (dial_plan=(LinphoneDialPlan*)dial_plans; dial_plan->country!=NULL; dial_plan++) {
+			if (strncmp(dial_plan->ccc,&e164[1],i) == 0) {
+				elected_dial_plan=dial_plan;
+				found++;
+			}
+		}
+	} while ((found>1 || found==0) && i < sizeof(dial_plan->ccc));
+	if (found==1) {
+		return atoi(elected_dial_plan->ccc);
+	} else {
+		return -1; /*not found */
+	}
+
+}
+int linphone_dial_plan_lookup_ccc_from_iso(const char* iso) {
+	LinphoneDialPlan* dial_plan;
+	for (dial_plan=(LinphoneDialPlan*)dial_plans; dial_plan->country!=NULL; dial_plan++) {
+		if (strcmp(iso, dial_plan->iso_country_code)==0) {
+			return atoi(dial_plan->ccc);
+		}
+	}
+	return -1;
+}
+
+const LinphoneDialPlan* linphone_dial_plan_by_ccc(const char *ccc) {
+	int i;
+	if (!ccc) {
+		return &most_common_dialplan;
+	}
+
+	for(i=0;dial_plans[i].country!=NULL;++i){
+		if (strcmp(ccc,dial_plans[i].ccc)==0){
+			return &dial_plans[i];
+		}
+	}
+	/*else return a generic "most common" dial plan*/
+	return &most_common_dialplan;
+}
+
+const LinphoneDialPlan* linphone_dial_plan_get_all() {
+	return dial_plans;
+}
+
+bool_t linphone_dial_plan_is_generic(const LinphoneDialPlan *ccc) {
+	if (strcmp(ccc->country, most_common_dialplan.country) == 0)
+		return TRUE;
+	return FALSE;
+}
diff --git a/coreapi/dict.c b/coreapi/dict.c
index 1dae02c5a..6909ed9cb 100644
--- a/coreapi/dict.c
+++ b/coreapi/dict.c
@@ -103,7 +103,7 @@ int linphone_dictionary_haskey(const LinphoneDictionary* obj, const char* key)
 
 void linphone_dictionary_foreach(const LinphoneDictionary* obj, void (*apply_func)(const char*, void*, void*), void* userdata)
 {
-	return belle_sip_dict_foreach(obj, apply_func, userdata);
+	belle_sip_dict_foreach(obj, apply_func, userdata);
 }
 
 struct lp_config_to_dict {
diff --git a/coreapi/ec-calibrator.c b/coreapi/ec-calibrator.c
index 3ac8b55ef..098fb8b4f 100644
--- a/coreapi/ec-calibrator.c
+++ b/coreapi/ec-calibrator.c
@@ -41,25 +41,25 @@ static void ecc_init_filters(EcCalibrator *ecc){
 	ms_filter_call_method(ecc->sndread,MS_FILTER_GET_SAMPLE_RATE,&rate);
 	ms_filter_call_method(ecc->sndread,MS_FILTER_SET_NCHANNELS,&ecc_channels);
 	ms_filter_call_method(ecc->sndread,MS_FILTER_GET_NCHANNELS,&channels);
-	ecc->read_resampler=ms_filter_new(MS_RESAMPLE_ID);
+	ecc->read_resampler=ms_factory_create_filter(ecc->factory, MS_RESAMPLE_ID);
 	ms_filter_call_method(ecc->read_resampler,MS_FILTER_SET_SAMPLE_RATE,&rate);
 	ms_filter_call_method(ecc->read_resampler,MS_FILTER_SET_OUTPUT_SAMPLE_RATE,&ecc->rate);
 	ms_filter_call_method(ecc->read_resampler,MS_FILTER_SET_NCHANNELS,&ecc_channels);
 	ms_filter_call_method(ecc->read_resampler,MS_FILTER_SET_OUTPUT_NCHANNELS,&channels);
 	
 	
-	ecc->det=ms_filter_new(MS_TONE_DETECTOR_ID);
+	ecc->det=ms_factory_create_filter(ecc->factory, MS_TONE_DETECTOR_ID);
 	ms_filter_call_method(ecc->det,MS_FILTER_SET_SAMPLE_RATE,&ecc->rate);
-	ecc->rec=ms_filter_new(MS_VOID_SINK_ID);
+	ecc->rec=ms_factory_create_filter(ecc->factory, MS_VOID_SINK_ID);
 
 	ms_filter_link(ecc->sndread,0,ecc->read_resampler,0);
 	ms_filter_link(ecc->read_resampler,0,ecc->det,0);
 	ms_filter_link(ecc->det,0,ecc->rec,0);
 
-	ecc->play=ms_filter_new(MS_VOID_SOURCE_ID);
-	ecc->gen=ms_filter_new(MS_DTMF_GEN_ID);
+	ecc->play=ms_factory_create_filter(ecc->factory, MS_VOID_SOURCE_ID);
+	ecc->gen=ms_factory_create_filter(ecc->factory, MS_DTMF_GEN_ID);
 	ms_filter_call_method(ecc->gen,MS_FILTER_SET_SAMPLE_RATE,&ecc->rate);
-	ecc->write_resampler=ms_filter_new(MS_RESAMPLE_ID);
+	ecc->write_resampler=ms_factory_create_filter(ecc->factory, MS_RESAMPLE_ID);
 	ecc->sndwrite=ms_snd_card_create_writer(ecc->play_card);
 	
 	ms_filter_call_method(ecc->sndwrite,MS_FILTER_SET_SAMPLE_RATE,&ecc->rate);
@@ -114,8 +114,10 @@ static void ecc_deinit_filters(EcCalibrator *ecc){
 static void on_tone_sent(void *data, MSFilter *f, unsigned int event_id, void *arg){
 	MSDtmfGenEvent *ev=(MSDtmfGenEvent*)arg;
 	EcCalibrator *ecc=(EcCalibrator*)data;
-	ecc->acc-=ev->tone_start_time;
-	ms_message("Sent tone at %u",(unsigned int)ev->tone_start_time);
+	if (ev->tone_name[0] != '\0'){
+		ecc->acc-=ev->tone_start_time;
+		ms_message("Sent tone at %u",(unsigned int)ev->tone_start_time);
+	}
 }
 
 static bool_t is_valid_tone(EcCalibrator *ecc, MSToneDetectorEvent *ev){
@@ -159,23 +161,23 @@ static void ecc_play_tones(EcCalibrator *ecc){
 	/* configure the tones to be scanned */
 	
 	strncpy(expected_tone.tone_name,"freq1",sizeof(expected_tone.tone_name));
-	expected_tone.frequency=2000;
+	expected_tone.frequency=(int)2349.32;
 	expected_tone.min_duration=40;
-	expected_tone.min_amplitude=0.1;
+	expected_tone.min_amplitude=0.1f;
 
 	ms_filter_call_method (ecc->det,MS_TONE_DETECTOR_ADD_SCAN,&expected_tone);
 	
 	strncpy(expected_tone.tone_name,"freq2",sizeof(expected_tone.tone_name));
-	expected_tone.frequency=2300;
+	expected_tone.frequency=(int)2637.02;
 	expected_tone.min_duration=40;
-	expected_tone.min_amplitude=0.1;
+	expected_tone.min_amplitude=0.1f;
 
 	ms_filter_call_method (ecc->det,MS_TONE_DETECTOR_ADD_SCAN,&expected_tone);
 	
 	strncpy(expected_tone.tone_name,"freq3",sizeof(expected_tone.tone_name));
-	expected_tone.frequency=2500;
+	expected_tone.frequency=(int)2093;
 	expected_tone.min_duration=40;
-	expected_tone.min_amplitude=0.1;
+	expected_tone.min_amplitude=0.1f;
 
 	ms_filter_call_method (ecc->det,MS_TONE_DETECTOR_ADD_SCAN,&expected_tone);
 	
@@ -192,23 +194,63 @@ static void ecc_play_tones(EcCalibrator *ecc){
 	
 	/* play the three tones*/
 	
-	tone.frequencies[0]=2000;
-	tone.duration=100;
-	ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
-	ms_usleep(300000);
 	
-	tone.frequencies[0]=2300;
-	tone.duration=100;
-	ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
-	ms_usleep(300000);
+	if (ecc->play_cool_tones){
+		strncpy(tone.tone_name, "D", sizeof(tone.tone_name));
+		tone.frequencies[0]=(int)2349.32;
+		tone.duration=100;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+		ms_usleep(300000);
+		
+		strncpy(tone.tone_name, "E", sizeof(tone.tone_name));
+		tone.frequencies[0]=(int)2637.02;
+		tone.duration=100;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+		ms_usleep(300000);
+		
+		strncpy(tone.tone_name, "C", sizeof(tone.tone_name));
+		tone.frequencies[0]=(int)2093;
+		tone.duration=100;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+		ms_usleep(300000);
+	}else{
+		strncpy(tone.tone_name, "C", sizeof(tone.tone_name));
+		tone.frequencies[0]=(int)2093;
+		tone.duration=100;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+		ms_usleep(300000);
+		
+		strncpy(tone.tone_name, "D", sizeof(tone.tone_name));
+		tone.frequencies[0]=(int)2349.32;
+		tone.duration=100;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+		ms_usleep(300000);
+		
+		strncpy(tone.tone_name, "E", sizeof(tone.tone_name));
+		tone.frequencies[0]=(int)2637.02;
+		tone.duration=100;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+		ms_usleep(300000);
+	}
+	
+	/*these two next ones are for lyrism*/
+	if (ecc->play_cool_tones){
+		tone.tone_name[0]='\0';
+		tone.frequencies[0]=(int)1046.5;
+		tone.duration=400;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+		ms_usleep(300000);
+		
+		tone.tone_name[0]='\0';
+		tone.frequencies[0]=(int)1567.98;
+		tone.duration=400;
+		ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
+	}
 	
-	tone.frequencies[0]=2500;
-	tone.duration=100;
-	ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
 	ms_sleep(1);
 	
 	if (ecc->freq1 && ecc->freq2 && ecc->freq3) {
-		int delay=ecc->acc/3;
+		int delay=(int)(ecc->acc/3);
 		if (delay<0){
 			ms_error("Quite surprising calibration result, delay=%i",delay);
 			ecc->status=LinphoneEcCalibratorFailed;
@@ -239,7 +281,7 @@ static void  * ecc_thread(void *p){
 	return NULL;
 }
 
-EcCalibrator * ec_calibrator_new(MSSndCard *play_card, MSSndCard *capt_card, unsigned int rate, LinphoneEcCalibrationCallback cb,
+EcCalibrator * ec_calibrator_new(MSFactory *factory, MSSndCard *play_card, MSSndCard *capt_card, unsigned int rate, LinphoneEcCalibrationCallback cb,
 				 LinphoneEcCalibrationAudioInit audio_init_cb, LinphoneEcCalibrationAudioUninit audio_uninit_cb, void *cb_data){
 	EcCalibrator *ecc=ms_new0(EcCalibrator,1);
 
@@ -250,16 +292,20 @@ EcCalibrator * ec_calibrator_new(MSSndCard *play_card, MSSndCard *capt_card, uns
 	ecc->audio_uninit_cb=audio_uninit_cb;
 	ecc->capt_card=capt_card;
 	ecc->play_card=play_card;
-	ms_thread_create(&ecc->thread,NULL,ecc_thread,ecc);
+	ecc->factory=factory;
 	return ecc;
 }
 
+void ec_calibrator_start(EcCalibrator *ecc){
+	ms_thread_create(&ecc->thread,NULL,ecc_thread,ecc);
+}
+
 LinphoneEcCalibratorStatus ec_calibrator_get_status(EcCalibrator *ecc){
 	return ecc->status;
 }
 
 void ec_calibrator_destroy(EcCalibrator *ecc){
-	ms_thread_join(ecc->thread,NULL);
+	if (ecc->thread != 0) ms_thread_join(ecc->thread,NULL);
 	ms_free(ecc);
 }
 
@@ -272,7 +318,9 @@ int linphone_core_start_echo_calibration(LinphoneCore *lc, LinphoneEcCalibration
 		return -1;
 	}
 	rate = lp_config_get_int(lc->config,"sound","echo_cancellation_rate",8000);
-	lc->ecc=ec_calibrator_new(lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard,rate,cb,audio_init_cb,audio_uninit_cb,cb_data);
+	lc->ecc=ec_calibrator_new(lc->factory, lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard,rate,cb,audio_init_cb,audio_uninit_cb,cb_data);
+	lc->ecc->play_cool_tones = lp_config_get_int(lc->config, "sound", "ec_calibrator_cool_tones", 0);
+	ec_calibrator_start(lc->ecc);
 	return 0;
 }
 
diff --git a/coreapi/echo-tester.c b/coreapi/echo-tester.c
new file mode 100644
index 000000000..5740c7302
--- /dev/null
+++ b/coreapi/echo-tester.c
@@ -0,0 +1,104 @@
+/*
+linphone
+Copyright (C) 2016 Belledonne Communications SARL
+Author: Erwan CROZE (erwan.croze@belledonne-communications.com)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "private.h"
+
+#include "mediastreamer2/msfilter.h"
+#include "mediastreamer2/mssndcard.h"
+#include "mediastreamer2/msticker.h"
+#include <ortp/ortp.h>
+
+EchoTester* ec_tester_new(MSFactory *factory, MSSndCard *capture_card, MSSndCard *playback_card, unsigned int rate) {
+    EchoTester *ect = ms_new0(EchoTester,1);
+    ect->factory = factory;
+    ect->capture_card = capture_card;
+    ect->playback_card = playback_card;
+    ect->rate = rate;
+
+    return ect;
+}
+
+static void ect_init_filters(EchoTester *ect) {
+    unsigned int rate;
+    int channels = 1;
+    int ect_channels = 1;
+    MSTickerParams params={0};
+	params.name="Echo tester";
+	params.prio=MS_TICKER_PRIO_HIGH;
+	ect->ticker=ms_ticker_new_with_params(&params);
+
+    ect->in = ms_snd_card_create_reader(ect->capture_card);
+    ect->out = ms_snd_card_create_writer(ect->playback_card);
+
+    ms_filter_call_method(ect->in,MS_FILTER_SET_SAMPLE_RATE,&ect->rate);
+    ms_filter_call_method(ect->in,MS_FILTER_GET_SAMPLE_RATE,&rate);
+    ms_filter_call_method(ect->in,MS_FILTER_SET_NCHANNELS,&ect_channels);
+    ms_filter_call_method(ect->in,MS_FILTER_GET_NCHANNELS,&channels);
+
+    ms_filter_call_method(ect->out,MS_FILTER_SET_SAMPLE_RATE,&ect->rate);
+    ms_filter_call_method(ect->out,MS_FILTER_SET_OUTPUT_SAMPLE_RATE,&rate);
+    ms_filter_call_method(ect->out,MS_FILTER_SET_NCHANNELS,&ect_channels);
+    ms_filter_call_method(ect->out,MS_FILTER_SET_OUTPUT_NCHANNELS,&channels);
+
+    ms_filter_link(ect->in,0,ect->out,0);
+
+    ms_ticker_attach(ect->ticker,ect->in);
+    ms_ticker_attach(ect->ticker,ect->out);
+}
+
+static void ect_uninit_filters(EchoTester *ect) {
+    ms_ticker_detach(ect->ticker,ect->in);
+    ms_ticker_detach(ect->ticker,ect->out);
+
+    ms_filter_unlink(ect->in,0,ect->out,0);
+
+    ms_filter_destroy(ect->in);
+    ms_filter_destroy(ect->out);
+
+    ms_ticker_destroy(ect->ticker);
+}
+
+void ec_tester_destroy(EchoTester *ect) {
+    ms_free(ect);
+}
+
+int linphone_core_start_echo_tester(LinphoneCore *lc, unsigned int rate) {
+    if (lc->ect != NULL) {
+        ms_error("Echo tester is still on going !");
+        return -1;
+    }
+    lc->ect = ec_tester_new(lc->factory, lc->sound_conf.capt_sndcard
+        ,lc->sound_conf.play_sndcard, rate);
+    ect_init_filters(lc->ect);
+
+    return 1;
+}
+
+int linphone_core_stop_echo_tester(LinphoneCore *lc) {
+    if (lc->ect == NULL) {
+        ms_error("Echo tester is not running !");
+        return -1;
+    }
+    ect_uninit_filters(lc->ect);
+
+    ec_tester_destroy(lc->ect);
+    lc->ect = NULL;
+    return 1;
+}
\ No newline at end of file
diff --git a/coreapi/enum.c b/coreapi/enum.c
index e917e0383..2c6857d1d 100644
--- a/coreapi/enum.c
+++ b/coreapi/enum.c
@@ -31,10 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
 static char *create_enum_domain(const char *number){
-	int len=strlen(number);
+	long len=(long)strlen(number);
 	char *domain=ms_malloc((len*2)+10);
-	int i,j;
-	
+	long i,j;
+
 	for (i=0,j=len-1;j>=0;j--){
 		domain[i]=number[j];
 		i++;
@@ -105,11 +105,11 @@ int enum_lookup(const char *enum_domain, enum_lookup_res_t **res){
 	/*
 	ns_msg handle;
 	int count;
-	
+
 	memset(&handle,0,sizeof(handle));
 	*res=NULL;
 	ms_message("Resolving %s...",enum_domain);
-	
+
 	err=res_search(enum_domain,ns_c_in,ns_t_naptr,dns_answer,DNS_ANSWER_MAX_SIZE);
 	if (err<0){
 		ms_warning("Error resolving enum:",herror(h_errno));
@@ -117,7 +117,7 @@ int enum_lookup(const char *enum_domain, enum_lookup_res_t **res){
 	}
 	ns_initparse(dns_answer,DNS_ANSWER_MAX_SIZE,&handle);
 	count=ns_msg_count(handle,ns_s_an);
-	
+
 	for(i=0;i<count;i++){
 		ns_rr rr;
 		memset(&rr,0,sizeof(rr));
@@ -136,9 +136,9 @@ int enum_lookup(const char *enum_domain, enum_lookup_res_t **res){
 	}else{
 		ms_warning("Could not spawn the \'host\' command.");
 		return -1;
-	}		
+	}
 	ms_message("Answer received from dns (err=%i): %s",err,host_result);
-	
+
 	begin=strstr(host_result,"sip:");
 	if (begin==0) {
 		ms_warning("No sip address found in dns naptr answer.");
diff --git a/coreapi/event.c b/coreapi/event.c
index 6d3beefaf..9eae159b8 100644
--- a/coreapi/event.c
+++ b/coreapi/event.c
@@ -20,6 +20,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "private.h"
 #include "lpconfig.h"
 
+const char * linphone_subscription_dir_to_string(LinphoneSubscriptionDir dir){
+	switch(dir){
+		case LinphoneSubscriptionIncoming:
+			return "LinphoneSubscriptionIncoming";
+		case LinphoneSubscriptionOutgoing:
+			return "LinphoneSubscriptionOutgoing";
+		case LinphoneSubscriptionInvalidDir:
+			return "LinphoneSubscriptionInvalidDir";
+	}
+	return "INVALID";
+}
 
 LinphoneSubscriptionState linphone_subscription_state_from_sal(SalSubscribeStatus ss){
 	switch(ss){
@@ -35,7 +46,7 @@ const char *linphone_subscription_state_to_string(LinphoneSubscriptionState stat
 	switch(state){
 		case LinphoneSubscriptionNone: return "LinphoneSubscriptionNone";
 		case LinphoneSubscriptionIncomingReceived: return "LinphoneSubscriptionIncomingReceived";
-		case LinphoneSubscriptionOutgoingInit: return "LinphoneSubscriptionOutoingInit";
+		case LinphoneSubscriptionOutgoingProgress: return "LinphoneSubscriptionOutgoingProgress";
 		case LinphoneSubscriptionPending: return "LinphoneSubscriptionPending";
 		case LinphoneSubscriptionActive: return "LinphoneSubscriptionActive";
 		case LinphoneSubscriptionTerminated: return "LinphoneSubscriptionTerminated";
@@ -57,12 +68,19 @@ LINPHONE_PUBLIC const char *linphone_publish_state_to_string(LinphonePublishStat
 	return NULL;
 }
 
+static void linphone_event_release(LinphoneEvent *lev){
+	if (lev->op) {
+		/*this will stop the refresher*/
+		sal_op_stop_refreshing(lev->op);
+	}
+	linphone_event_unref(lev);
+}
+
 static LinphoneEvent * linphone_event_new_base(LinphoneCore *lc, LinphoneSubscriptionDir dir, const char *name, SalOp *op){
-	LinphoneEvent *lev=ms_new0(LinphoneEvent,1);
+	LinphoneEvent *lev=belle_sip_object_new(LinphoneEvent);
 	lev->lc=lc;
 	lev->dir=dir;
 	lev->op=op;
-	lev->refcnt=1;
 	lev->name=ms_strdup(name);
 	sal_op_set_user_pointer(lev->op,lev);
 	return lev;
@@ -88,13 +106,21 @@ LinphoneEvent *linphone_event_new_with_out_of_dialog_op(LinphoneCore *lc, SalOp
 	return linphone_event_new_with_op_base(lc,op,dir,name,TRUE);
 }
 
+void linphone_event_set_internal(LinphoneEvent *lev, bool_t internal) {
+	lev->internal = internal;
+}
+
+bool_t linphone_event_is_internal(LinphoneEvent *lev) {
+	return lev->internal;
+}
+
 void linphone_event_set_state(LinphoneEvent *lev, LinphoneSubscriptionState state){
 	if (lev->subscription_state!=state){
 		ms_message("LinphoneEvent [%p] moving to subscription state %s",lev,linphone_subscription_state_to_string(state));
 		lev->subscription_state=state;
 		linphone_core_notify_subscription_state_changed(lev->lc,lev,state);
-		if (state==LinphoneSubscriptionTerminated){
-			linphone_event_unref(lev);
+		if (state==LinphoneSubscriptionTerminated || state == LinphoneSubscriptionError){
+			linphone_event_release(lev);
 		}
 	}
 }
@@ -106,13 +132,13 @@ void linphone_event_set_publish_state(LinphoneEvent *lev, LinphonePublishState s
 		linphone_core_notify_publish_state_changed(lev->lc,lev,state);
 		switch(state){
 			case LinphonePublishCleared:
-				if (lev->expires!=-1)
-					linphone_event_unref(lev);
+				linphone_event_release(lev);
 				break;
 			case LinphonePublishOk:
+				if (lev->oneshot) linphone_event_release(lev);
+				break;
 			case LinphonePublishError:
-				if (lev->expires==-1)
-					linphone_event_unref(lev);
+				linphone_event_release(lev);
 				break;
 			case LinphonePublishNone:
 			case LinphonePublishProgress:
@@ -143,15 +169,23 @@ LinphoneEvent *linphone_core_create_subscribe(LinphoneCore *lc, const LinphoneAd
 	return lev;
 }
 
+LinphoneEvent *linphone_core_create_notify(LinphoneCore *lc, const LinphoneAddress *resource, const char *event){
+	LinphoneEvent *lev=linphone_event_new(lc, LinphoneSubscriptionIncoming, event, -1);
+	linphone_configure_op(lc,lev->op,resource,NULL,TRUE);
+	lev->subscription_state = LinphoneSubscriptionIncomingReceived;
+	sal_op_set_event(lev->op, event);
+	lev->is_out_of_dialog_op = TRUE;
+	return lev;
+}
+
 LinphoneEvent *linphone_core_subscribe(LinphoneCore *lc, const LinphoneAddress *resource, const char *event, int expires, const LinphoneContent *body){
 	LinphoneEvent *lev=linphone_core_create_subscribe(lc,resource,event,expires);
 	linphone_event_send_subscribe(lev,body);
 	return lev;
 }
 
-
 int linphone_event_send_subscribe(LinphoneEvent *lev, const LinphoneContent *body){
-	SalBody salbody;
+	SalBodyHandler *body_handler;
 	int err;
 
 	if (lev->dir!=LinphoneSubscriptionOutgoing){
@@ -161,7 +195,7 @@ int linphone_event_send_subscribe(LinphoneEvent *lev, const LinphoneContent *bod
 	switch (lev->subscription_state){
 		case LinphoneSubscriptionIncomingReceived:
 		case LinphoneSubscriptionTerminated:
-		case LinphoneSubscriptionOutgoingInit:
+		case LinphoneSubscriptionOutgoingProgress:
 			ms_error("linphone_event_send_subscribe(): cannot update subscription while in state [%s]", linphone_subscription_state_to_string(lev->subscription_state));
 			return -1;
 		break;
@@ -176,13 +210,15 @@ int linphone_event_send_subscribe(LinphoneEvent *lev, const LinphoneContent *bod
 
 	if (lev->send_custom_headers){
 		sal_op_set_sent_custom_header(lev->op,lev->send_custom_headers);
+		sal_custom_header_free(lev->send_custom_headers);
 		lev->send_custom_headers=NULL;
 	}else sal_op_set_sent_custom_header(lev->op,NULL);
 
-	err=sal_subscribe(lev->op,NULL,NULL,lev->name,lev->expires,sal_body_from_content(&salbody,body));
+	body_handler = sal_body_handler_from_content(body);
+	err=sal_subscribe(lev->op,NULL,NULL,lev->name,lev->expires,body_handler);
 	if (err==0){
 		if (lev->subscription_state==LinphoneSubscriptionNone)
-			linphone_event_set_state(lev,LinphoneSubscriptionOutgoingInit);
+			linphone_event_set_state(lev,LinphoneSubscriptionOutgoingProgress);
 	}
 	return err;
 }
@@ -191,6 +227,10 @@ int linphone_event_update_subscribe(LinphoneEvent *lev, const LinphoneContent *b
 	return linphone_event_send_subscribe(lev,body);
 }
 
+int linphone_event_refresh_subscribe(LinphoneEvent *lev) {
+	return sal_op_refresh(lev->op);
+}
+
 int linphone_event_accept_subscription(LinphoneEvent *lev){
 	int err;
 	if (lev->subscription_state!=LinphoneSubscriptionIncomingReceived){
@@ -216,8 +256,8 @@ int linphone_event_deny_subscription(LinphoneEvent *lev, LinphoneReason reason){
 }
 
 int linphone_event_notify(LinphoneEvent *lev, const LinphoneContent *body){
-	SalBody salbody;
-	if (lev->subscription_state!=LinphoneSubscriptionActive){
+	SalBodyHandler *body_handler;
+	if (lev->subscription_state!=LinphoneSubscriptionActive && lev->subscription_state!=LinphoneSubscriptionIncomingReceived){
 		ms_error("linphone_event_notify(): cannot notify if subscription is not active.");
 		return -1;
 	}
@@ -225,7 +265,8 @@ int linphone_event_notify(LinphoneEvent *lev, const LinphoneContent *body){
 		ms_error("linphone_event_notify(): cannot notify if not an incoming subscription.");
 		return -1;
 	}
-	return sal_notify(lev->op,sal_body_from_content(&salbody,body));
+	body_handler = sal_body_handler_from_content(body);
+	return sal_notify(lev->op, body_handler);
 }
 
 LinphoneEvent *linphone_core_create_publish(LinphoneCore *lc, const LinphoneAddress *resource, const char *event, int expires){
@@ -235,8 +276,14 @@ LinphoneEvent *linphone_core_create_publish(LinphoneCore *lc, const LinphoneAddr
 	return lev;
 }
 
+LinphoneEvent *linphone_core_create_one_shot_publish(LinphoneCore *lc, const LinphoneAddress *resource, const char *event){
+	LinphoneEvent *lev = linphone_core_create_publish(lc, resource, event, -1);
+	lev->oneshot = TRUE;
+	return lev;
+}
+
 static int _linphone_event_send_publish(LinphoneEvent *lev, const LinphoneContent *body, bool_t notify_err){
-	SalBody salbody;
+	SalBodyHandler *body_handler;
 	int err;
 
 	if (lev->dir!=LinphoneSubscriptionInvalidDir){
@@ -245,9 +292,11 @@ static int _linphone_event_send_publish(LinphoneEvent *lev, const LinphoneConten
 	}
 	if (lev->send_custom_headers){
 		sal_op_set_sent_custom_header(lev->op,lev->send_custom_headers);
+		sal_custom_header_free(lev->send_custom_headers);
 		lev->send_custom_headers=NULL;
 	}else sal_op_set_sent_custom_header(lev->op,NULL);
-	err=sal_publish(lev->op,NULL,NULL,lev->name,lev->expires,sal_body_from_content(&salbody,body));
+	body_handler = sal_body_handler_from_content(body);
+	err=sal_publish(lev->op,NULL,NULL,lev->name,lev->expires,body_handler);
 	if (err==0){
 		linphone_event_set_publish_state(lev,LinphonePublishProgress);
 	}else if (notify_err){
@@ -276,6 +325,16 @@ int linphone_event_update_publish(LinphoneEvent* lev, const LinphoneContent* bod
 	return linphone_event_send_publish(lev,body);
 }
 
+int linphone_event_refresh_publish(LinphoneEvent *lev) {
+	return sal_op_refresh(lev->op);
+}
+void linphone_event_pause_publish(LinphoneEvent *lev) {
+	if (lev->op) sal_op_stop_refreshing(lev->op);
+}
+void linphone_event_unpublish(LinphoneEvent *lev) {
+	lev->terminating = TRUE; /* needed to get clear event*/
+	if (lev->op) sal_op_unpublish(lev->op);
+}
 void linphone_event_set_user_data(LinphoneEvent *ev, void *up){
 	ev->userdata=up;
 }
@@ -295,7 +354,17 @@ const char* linphone_event_get_custom_header(LinphoneEvent* ev, const char* name
 
 
 void linphone_event_terminate(LinphoneEvent *lev){
+	// if event was already terminated (including on error), we should not terminate it again
+	// otherwise it will be unreffed twice.
+	if (lev->publish_state == LinphonePublishError || lev->publish_state == LinphonePublishCleared) {
+		return;
+	}
+	if (lev->subscription_state == LinphoneSubscriptionError || lev->subscription_state == LinphoneSubscriptionTerminated) {
+		return;
+	}
+
 	lev->terminating=TRUE;
+
 	if (lev->dir==LinphoneSubscriptionIncoming){
 		sal_notify_close(lev->op);
 	}else if (lev->dir==LinphoneSubscriptionOutgoing){
@@ -304,8 +373,8 @@ void linphone_event_terminate(LinphoneEvent *lev){
 
 	if (lev->publish_state!=LinphonePublishNone){
 		if (lev->publish_state==LinphonePublishOk && lev->expires!=-1){
-			sal_publish(lev->op,NULL,NULL,NULL,0,NULL);
-		}else sal_op_stop_refreshing(lev->op);
+			sal_op_unpublish(lev->op);
+		}
 		linphone_event_set_publish_state(lev,LinphonePublishCleared);
 		return;
 	}
@@ -318,20 +387,18 @@ void linphone_event_terminate(LinphoneEvent *lev){
 
 
 LinphoneEvent *linphone_event_ref(LinphoneEvent *lev){
-	lev->refcnt++;
+	belle_sip_object_ref(lev);
 	return lev;
 }
 
 static void linphone_event_destroy(LinphoneEvent *lev){
-	if (lev->op)
-		sal_op_release(lev->op);
+	if (lev->op) sal_op_release(lev->op);
+	if (lev->send_custom_headers) sal_custom_header_free(lev->send_custom_headers);
 	ms_free(lev->name);
-	ms_free(lev);
 }
 
 void linphone_event_unref(LinphoneEvent *lev){
-	lev->refcnt--;
-	if (lev->refcnt==0) linphone_event_destroy(lev);
+	belle_sip_object_unref(lev);
 }
 
 LinphoneSubscriptionDir linphone_event_get_subscription_dir(LinphoneEvent *lev){
@@ -347,7 +414,7 @@ const char *linphone_event_get_name(const LinphoneEvent *lev){
 }
 
 const LinphoneAddress *linphone_event_get_from(const LinphoneEvent *lev){
-	if (lev->is_out_of_dialog_op){
+	if (lev->is_out_of_dialog_op && lev->dir == LinphoneSubscriptionOutgoing){
 		return (LinphoneAddress*)sal_op_get_to_address(lev->op);
 	}else{
 		return (LinphoneAddress*)sal_op_get_from_address(lev->op);
@@ -355,7 +422,7 @@ const LinphoneAddress *linphone_event_get_from(const LinphoneEvent *lev){
 }
 
 const LinphoneAddress *linphone_event_get_resource(const LinphoneEvent *lev){
-	if (lev->is_out_of_dialog_op){
+	if (lev->is_out_of_dialog_op && lev->dir == LinphoneSubscriptionOutgoing){
 		return (LinphoneAddress*)sal_op_get_from_address(lev->op);
 	}else{
 		return (LinphoneAddress*)sal_op_get_to_address(lev->op);
@@ -366,3 +433,22 @@ LinphoneCore *linphone_event_get_core(const LinphoneEvent *lev){
 	return lev->lc;
 }
 
+static belle_sip_error_code _linphone_event_marshall(belle_sip_object_t *obj, char* buff, size_t buff_size, size_t *offset) {
+	LinphoneEvent *ev = (LinphoneEvent*)obj;
+	belle_sip_error_code err = BELLE_SIP_OK;
+
+	err = belle_sip_snprintf(buff, buff_size, offset, "%s of %s", ev->dir == LinphoneSubscriptionIncoming ?
+		"Incoming Subscribe" : (ev->dir == LinphoneSubscriptionOutgoing ? "Outgoing subscribe" : "Publish"), ev->name);
+
+	return err;
+}
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneEvent);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneEvent, belle_sip_object_t,
+	(belle_sip_object_destroy_t) linphone_event_destroy,
+	NULL, // clone
+	_linphone_event_marshall,
+	FALSE
+);
+
diff --git a/coreapi/event.h b/coreapi/event.h
index 07332ca2e..47db9cc79 100644
--- a/coreapi/event.h
+++ b/coreapi/event.h
@@ -49,6 +49,7 @@ typedef enum _LinphoneSubscriptionDir LinphoneSubscriptionDir;
 
 /**
  * Enum for subscription states.
+ * LinphoneSubscriptionTerminated and LinphoneSubscriptionError are final states.
 **/
 enum _LinphoneSubscriptionState{
 	LinphoneSubscriptionNone, /**< Initial state, should not be used.**/
@@ -57,13 +58,10 @@ enum _LinphoneSubscriptionState{
 	LinphoneSubscriptionPending, /**<Subscription is pending, waiting for user approval*/
 	LinphoneSubscriptionActive, /**<Subscription is accepted.*/
 	LinphoneSubscriptionTerminated, /**<Subscription is terminated normally*/
-	LinphoneSubscriptionError, /**<Subscription encountered an error, indicated by linphone_event_get_reason()*/
+	LinphoneSubscriptionError, /**<Subscription was terminated by an error, indicated by linphone_event_get_reason().*/
 	LinphoneSubscriptionExpiring, /**<Subscription is about to expire, only sent if [sip]->refresh_generic_subscribe property is set to 0.*/
 };
-/*typo compatibility*/
-#define LinphoneSubscriptionOutoingInit LinphoneSubscriptionOutgoingInit
 
-#define LinphoneSubscriptionOutgoingInit LinphoneSubscriptionOutgoingProgress
 /**
  * Typedef for subscription state enum.
 **/
@@ -129,6 +127,18 @@ LINPHONE_PUBLIC LinphoneEvent *linphone_core_subscribe(LinphoneCore *lc, const L
 **/
 LINPHONE_PUBLIC LinphoneEvent *linphone_core_create_subscribe(LinphoneCore *lc, const LinphoneAddress *resource, const char *event, int expires);
 
+
+/**
+ * Create an out-of-dialog notification, specifying the destination resource, the event name.
+ * The notification can be send with linphone_event_notify().
+ * @param lc the #LinphoneCore
+ * @param resource the destination resource
+ * @param event the event name
+ * @return a LinphoneEvent holding the context of the notification.
+**/
+LINPHONE_PUBLIC LinphoneEvent *linphone_core_create_notify(LinphoneCore *lc, const LinphoneAddress *resource, const char *event);
+
+
 /**
  * Send a subscription previously created by linphone_core_create_subscribe().
  * @param ev the LinphoneEvent
@@ -138,12 +148,19 @@ LINPHONE_PUBLIC LinphoneEvent *linphone_core_create_subscribe(LinphoneCore *lc,
 LINPHONE_PUBLIC int linphone_event_send_subscribe(LinphoneEvent *ev, const LinphoneContent *body);
 
 /**
- * Update (refresh) an outgoing subscription.
+ * Update (refresh) an outgoing subscription, changing the body.
  * @param lev a LinphoneEvent
  * @param body an optional body to include in the subscription update, may be NULL.
 **/
 LINPHONE_PUBLIC int linphone_event_update_subscribe(LinphoneEvent *lev, const LinphoneContent *body);
 
+/**
+ * Refresh an outgoing subscription keeping the same body.
+ * @param lev LinphoneEvent object.
+ * @return 0 if successful, -1 otherwise.
+ */
+LINPHONE_PUBLIC int linphone_event_refresh_subscribe(LinphoneEvent *lev);
+
 
 /**
  * Accept an incoming subcription.
@@ -187,6 +204,19 @@ LINPHONE_PUBLIC LinphoneEvent *linphone_core_publish(LinphoneCore *lc, const Lin
 **/
 LINPHONE_PUBLIC LinphoneEvent *linphone_core_create_publish(LinphoneCore *lc, const LinphoneAddress *resource, const char *event, int expires);
 
+
+/**
+ * Create a publish context for a one-shot publish.
+ * After being created, the publish must be sent using linphone_event_send_publish().
+ * The LinphoneEvent is automatically terminated when the publish transaction is finished, either with success or failure.
+ * The application must not call linphone_event_terminate() for such one-shot publish.
+ * @param lc the #LinphoneCore
+ * @param resource the resource uri for the event
+ * @param event the event name
+ * @return the LinphoneEvent holding the context of the publish.
+**/
+LINPHONE_PUBLIC LinphoneEvent *linphone_core_create_one_shot_publish(LinphoneCore *lc, const LinphoneAddress *resource, const char *event);
+
 /**
  * Send a publish created by linphone_core_create_publish().
  * @param lev the #LinphoneEvent
@@ -201,6 +231,21 @@ LINPHONE_PUBLIC int linphone_event_send_publish(LinphoneEvent *lev, const Linpho
 **/
 LINPHONE_PUBLIC int linphone_event_update_publish(LinphoneEvent *lev, const LinphoneContent *body);
 
+/**
+ * Refresh an outgoing publish keeping the same body.
+ * @param lev LinphoneEvent object.
+ * @return 0 if successful, -1 otherwise.
+ */
+LINPHONE_PUBLIC int linphone_event_refresh_publish(LinphoneEvent *lev);
+
+/**
+ * Prevent an event from refreshing its publish.
+ * This is useful to let registrations to expire naturally (or) when the application wants to keep control on when
+ * refreshes are sent.
+ * The refreshing operations can be resumed with linphone_proxy_config_refresh_register().
+ * @param[in] lev #LinphoneEvent object.
+ **/
+LINPHONE_PUBLIC void linphone_event_pause_publish(LinphoneEvent *lev);
 
 /**
  * Return reason code (in case of error state reached).
@@ -256,10 +301,8 @@ LINPHONE_PUBLIC const char *linphone_event_get_custom_header(LinphoneEvent *ev,
 
 /**
  * Terminate an incoming or outgoing subscription that was previously acccepted, or a previous publication.
- * This function does not unref the object. The core will unref() if it does not need this object anymore.
- *
- * For subscribed event, when the subscription is terminated normally or because of an error, the core will unref.
- * For published events, no unref is performed. This is because it is allowed to re-publish an expired publish, as well as retry it in case of error.
+ * The LinphoneEvent shall not be used anymore after this operation, unless the application explicitely took a reference on the object with
+ * linphone_event_ref().
 **/
 LINPHONE_PUBLIC void linphone_event_terminate(LinphoneEvent *lev);
 
diff --git a/coreapi/friend.c b/coreapi/friend.c
index 5dd49bec3..16bf62912 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -26,6 +26,21 @@
 #include "private.h"
 #include "lpconfig.h"
 
+#ifdef SQLITE_STORAGE_ENABLED
+#ifndef _WIN32
+#if !defined(ANDROID) && !defined(__QNXNTO__)
+#	include <langinfo.h>
+#	include <iconv.h>
+#	include <string.h>
+#endif
+#else
+#include <Windows.h>
+#endif
+
+#define MAX_PATH_SIZE 1024
+#include "sqlite3.h"
+#endif
+
 const char *linphone_online_status_to_string(LinphoneOnlineStatus ss){
 	const char *str=NULL;
 	switch(ss){
@@ -70,71 +85,110 @@ const char *linphone_online_status_to_string(LinphoneOnlineStatus ss){
 	return str;
 }
 
-static int friend_compare(const void * a, const void * b){
-	LinphoneAddress *fa=((LinphoneFriend*)a)->uri;
-	LinphoneAddress *fb=((LinphoneFriend*)b)->uri;
-	if (linphone_address_weak_equal(fa,fb)) return 0;
-	return 1;
+static int friend_compare(const void * a, const void * b) {
+	LinphoneFriend *lfa = (LinphoneFriend *)a;
+	LinphoneFriend *lfb = (LinphoneFriend *)b;
+	const bctbx_list_t *addressesa = linphone_friend_get_addresses(lfa);
+	const bctbx_list_t *addressesb = linphone_friend_get_addresses(lfb);
+	bctbx_list_t *iteratora = (bctbx_list_t *)addressesa;
+	bctbx_list_t *iteratorb = (bctbx_list_t *)addressesb;
+	int ret = 1;
+
+	while (iteratora && (ret == 1)) {
+		LinphoneAddress *fa = (LinphoneAddress *)bctbx_list_get_data(iteratora);
+		while (iteratorb && (ret == 1)) {
+			LinphoneAddress *fb = (LinphoneAddress *)bctbx_list_get_data(iteratorb);
+			if (linphone_address_weak_equal(fa, fb)) ret = 0;
+			iteratorb = bctbx_list_next(iteratorb);
+		}
+		iteratora = bctbx_list_next(iteratora);
+	}
+
+	return ret;
+}
+
+static LinphoneFriendPresence * find_presence_model_for_uri_or_tel(const LinphoneFriend *lf, const char *uri_or_tel) {
+	bctbx_list_t *iterator = lf->presence_models;
+	while (iterator) {
+		LinphoneFriendPresence *lfp = (LinphoneFriendPresence *)bctbx_list_get_data(iterator);
+		if (strcmp(lfp->uri_or_tel, uri_or_tel) == 0) return lfp;
+		iterator = bctbx_list_next(iterator);
+	}
+	return NULL;
+}
+
+static void add_presence_model_for_uri_or_tel(LinphoneFriend *lf, const char *uri_or_tel, LinphonePresenceModel *presence) {
+	LinphoneFriendPresence *lfp = ms_new0(LinphoneFriendPresence, 1);
+	lfp->uri_or_tel = ms_strdup(uri_or_tel);
+	lfp->presence = presence;
+	lf->presence_models = bctbx_list_append(lf->presence_models, lfp);
+}
+
+static void free_friend_presence(LinphoneFriendPresence *lfp) {
+	ms_free(lfp->uri_or_tel);
+	if (lfp->presence) linphone_presence_model_unref(lfp->presence);
+	ms_free(lfp);
+}
+
+static void free_phone_number_sip_uri(LinphoneFriendPhoneNumberSipUri *lfpnsu) {
+	ms_free(lfpnsu->number);
+	ms_free(lfpnsu->uri);
+	ms_free(lfpnsu);
 }
 
 
-MSList *linphone_find_friend_by_address(MSList *fl, const LinphoneAddress *addr, LinphoneFriend **lf){
-	MSList *res=NULL;
+
+bctbx_list_t *linphone_find_friend_by_address(bctbx_list_t *fl, const LinphoneAddress *addr, LinphoneFriend **lf){
+	bctbx_list_t *res=NULL;
 	LinphoneFriend dummy;
 	if (lf!=NULL) *lf=NULL;
+	memset(&dummy, 0, sizeof(LinphoneFriend));
 	dummy.uri=(LinphoneAddress*)addr;
-	res=ms_list_find_custom(fl,friend_compare,&dummy);
-	if (lf!=NULL && res!=NULL) *lf=(LinphoneFriend*)res->data;
+	res=bctbx_list_find_custom(fl,friend_compare,&dummy);
+	if (lf!=NULL && res!=NULL) *lf=(LinphoneFriend*)bctbx_list_get_data(res);
 	return res;
 }
 
-LinphoneFriend *linphone_find_friend_by_inc_subscribe(MSList *l, SalOp *op){
-	MSList *elem;
-	for (elem=l;elem!=NULL;elem=elem->next){
-		LinphoneFriend *lf=(LinphoneFriend*)elem->data;
-		if (ms_list_find(lf->insubs, op)) return lf;
-	}
-	return NULL;
-}
-
-LinphoneFriend *linphone_find_friend_by_out_subscribe(MSList *l, SalOp *op){
-	MSList *elem;
-	LinphoneFriend *lf;
-	for (elem=l;elem!=NULL;elem=elem->next){
-		lf=(LinphoneFriend*)elem->data;
-		if (lf->outsub==op) return lf;
-	}
-	return NULL;
-}
-
 void __linphone_friend_do_subscribe(LinphoneFriend *fr){
 	LinphoneCore *lc=fr->lc;
+	const LinphoneAddress *addr = linphone_friend_get_address(fr);
 
-	if (fr->outsub==NULL){
-		/* people for which we don't have yet an answer should appear as offline */
-		fr->presence=NULL;
-		/*
-		if (fr->lc->vtable.notify_recv)
-			fr->lc->vtable.notify_recv(fr->lc,(LinphoneFriend*)fr);
-		 */
-	}else{
-		sal_op_release(fr->outsub);
-		fr->outsub=NULL;
+	if (addr != NULL) {
+		if (fr->outsub==NULL){
+			/* people for which we don't have yet an answer should appear as offline */
+			fr->presence_models = bctbx_list_free_with_data(fr->presence_models, (bctbx_list_free_func)free_friend_presence);
+			/*
+			if (fr->lc->vtable.notify_recv)
+				fr->lc->vtable.notify_recv(fr->lc,(LinphoneFriend*)fr);
+			*/
+		}else{
+			sal_op_release(fr->outsub);
+			fr->outsub=NULL;
+		}
+		fr->outsub=sal_op_new(lc->sal);
+		linphone_configure_op(lc,fr->outsub,addr,NULL,TRUE);
+		sal_subscribe_presence(fr->outsub,NULL,NULL,lp_config_get_int(lc->config,"sip","subscribe_expires",600));
+		fr->subscribe_active=TRUE;
 	}
-	fr->outsub=sal_op_new(lc->sal);
-	linphone_configure_op(lc,fr->outsub,fr->uri,NULL,TRUE);
-	sal_subscribe_presence(fr->outsub,NULL,NULL,lp_config_get_int(lc->config,"sip","subscribe_expires",600));
-	fr->subscribe_active=TRUE;
 }
 
-LinphoneFriend * linphone_friend_new(){
-	LinphoneFriend *obj=belle_sip_object_new(LinphoneFriend);
-	obj->pol=LinphoneSPAccept;
-	obj->presence=NULL;
-	obj->subscribe=TRUE;
+LinphoneFriend * linphone_friend_new(void){
+	LinphoneFriend *obj = belle_sip_object_new(LinphoneFriend);
+	obj->pol = LinphoneSPAccept;
+	obj->subscribe = TRUE;
+	obj->vcard = NULL;
+	obj->storage_id = 0;
 	return obj;
 }
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 LinphoneFriend *linphone_friend_new_with_address(const char *addr){
 	LinphoneAddress* linphone_address = linphone_address_new(addr);
 	LinphoneFriend *fr;
@@ -145,9 +199,12 @@ LinphoneFriend *linphone_friend_new_with_address(const char *addr){
 	}
 	fr=linphone_friend_new();
 	linphone_friend_set_address(fr,linphone_address);
-	linphone_address_destroy(linphone_address);
+	linphone_address_unref(linphone_address);
 	return fr;
 }
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
 
 void linphone_friend_set_user_data(LinphoneFriend *lf, void *data){
 	lf->user_data=data;
@@ -157,8 +214,8 @@ void* linphone_friend_get_user_data(const LinphoneFriend *lf){
 	return lf->user_data;
 }
 
-bool_t linphone_friend_in_list(const LinphoneFriend *lf){
-	return lf->lc!=NULL;
+bool_t linphone_friend_in_list(const LinphoneFriend *lf) {
+	return lf->friend_list != NULL;
 }
 
 void linphone_core_interpret_friend_uri(LinphoneCore *lc, const char *uri, char **result){
@@ -182,7 +239,7 @@ void linphone_core_interpret_friend_uri(LinphoneCore *lc, const char *uri, char
 				linphone_address_set_display_name(id,NULL);
 				linphone_address_set_username(id,uri);
 				*result=linphone_address_as_string(id);
-				linphone_address_destroy(id);
+				linphone_address_unref(id);
 			}
 		}
 		if (*result){
@@ -193,25 +250,129 @@ void linphone_core_interpret_friend_uri(LinphoneCore *lc, const char *uri, char
 		}
 	}else {
 		*result=linphone_address_as_string(fr);
-		linphone_address_destroy(fr);
+		linphone_address_unref(fr);
 	}
 }
 
-int linphone_friend_set_address(LinphoneFriend *lf, const LinphoneAddress *addr){
-	LinphoneAddress *fr=linphone_address_clone(addr);
+const LinphoneAddress * linphone_friend_get_address(const LinphoneFriend *lf) {
+	if (linphone_core_vcard_supported()) {
+		if (lf->vcard) {
+			const bctbx_list_t *sip_addresses = linphone_vcard_get_sip_addresses(lf->vcard);
+			if (sip_addresses) {
+				LinphoneAddress *addr = (LinphoneAddress *)bctbx_list_nth_data(sip_addresses, 0);
+				return addr;
+			}
+		}
+		return NULL;
+	}
+	if (lf->uri) return lf->uri;
+	return NULL;
+}
+
+int linphone_friend_set_address(LinphoneFriend *lf, const LinphoneAddress *addr) {
+	LinphoneAddress *fr = linphone_address_clone(addr);
+
 	linphone_address_clean(fr);
-	if (lf->uri!=NULL) linphone_address_destroy(lf->uri);
-	lf->uri=fr;
+	if (linphone_core_vcard_supported()) {
+		char *address;
+		if (!lf->vcard) {
+			const char *dpname = linphone_address_get_display_name(fr) ? linphone_address_get_display_name(fr) : linphone_address_get_username(fr);
+			linphone_friend_create_vcard(lf, dpname);
+		}
+		address = linphone_address_as_string_uri_only(fr);
+		linphone_vcard_edit_main_sip_address(lf->vcard, address);
+		ms_free(address);
+		linphone_address_unref(fr);
+	} else {
+		if (lf->uri != NULL) linphone_address_unref(lf->uri);
+		lf->uri = fr;
+	}
+
 	return 0;
 }
 
-int linphone_friend_set_name(LinphoneFriend *lf, const char *name){
-	LinphoneAddress *fr=lf->uri;
-	if (fr==NULL){
-		ms_error("linphone_friend_set_sip_addr() must be called before linphone_friend_set_name().");
-		return -1;
+void linphone_friend_add_address(LinphoneFriend *lf, const LinphoneAddress *addr) {
+	LinphoneAddress *fr;
+
+	if (!lf || !addr) return;
+
+	fr = linphone_address_clone(addr);
+	linphone_address_clean(fr);
+
+	if (linphone_core_vcard_supported()) {
+		if (lf->vcard) {
+			char *address = linphone_address_as_string_uri_only(fr);
+			linphone_vcard_add_sip_address(lf->vcard, address);
+			ms_free(address);
+			linphone_address_unref(fr);
+		}
+	} else {
+		if (lf->uri == NULL) lf->uri = fr;
+		else linphone_address_unref(fr);
+	}
+}
+
+const bctbx_list_t* linphone_friend_get_addresses(const LinphoneFriend *lf) {
+	if (!lf) return NULL;
+
+	if (linphone_core_vcard_supported()) {
+		const bctbx_list_t * addresses = linphone_vcard_get_sip_addresses(lf->vcard);
+		return addresses;
+	} else {
+		bctbx_list_t *addresses = NULL;
+		return lf->uri ? bctbx_list_append(addresses, lf->uri) : NULL;
+	}
+}
+
+void linphone_friend_remove_address(LinphoneFriend *lf, const LinphoneAddress *addr) {
+	if (!lf || !addr || !lf->vcard) return;
+
+	if (linphone_core_vcard_supported()) {
+		char *address = linphone_address_as_string_uri_only(addr);
+		linphone_vcard_remove_sip_address(lf->vcard, address);
+		ms_free(address);
+	}
+}
+
+void linphone_friend_add_phone_number(LinphoneFriend *lf, const char *phone) {
+	if (!lf || !phone) return;
+
+	if (linphone_core_vcard_supported()) {
+		if (!lf->vcard) {
+			linphone_friend_create_vcard(lf, phone);
+		}
+		linphone_vcard_add_phone_number(lf->vcard, phone);
+	}
+}
+
+bctbx_list_t* linphone_friend_get_phone_numbers(LinphoneFriend *lf) {
+	if (!lf || !lf->vcard) return NULL;
+
+	if (linphone_core_vcard_supported()) {
+		return linphone_vcard_get_phone_numbers(lf->vcard);
+	}
+	return NULL;
+}
+
+void linphone_friend_remove_phone_number(LinphoneFriend *lf, const char *phone) {
+	if (!lf || !phone || !lf->vcard) return;
+
+	if (linphone_core_vcard_supported()) {
+		linphone_vcard_remove_phone_number(lf->vcard, phone);
+	}
+}
+
+int linphone_friend_set_name(LinphoneFriend *lf, const char *name){
+	if (linphone_core_vcard_supported()) {
+		if (!lf->vcard) linphone_friend_create_vcard(lf, name);
+		linphone_vcard_set_full_name(lf->vcard, name);
+	} else {
+		if (!lf->uri) {
+			ms_warning("linphone_friend_set_address() must be called before linphone_friend_set_name() to be able to set display name.");
+			return -1;
+		}
+		linphone_address_set_display_name(lf->uri, name);
 	}
-	linphone_address_set_display_name(fr,name);
 	return 0;
 }
 
@@ -220,81 +381,116 @@ int linphone_friend_enable_subscribes(LinphoneFriend *fr, bool_t val){
 	return 0;
 }
 
-int linphone_friend_set_inc_subscribe_policy(LinphoneFriend *fr, LinphoneSubscribePolicy pol)
-{
+int linphone_friend_set_inc_subscribe_policy(LinphoneFriend *fr, LinphoneSubscribePolicy pol) {
 	fr->pol=pol;
 	return 0;
 }
 
 void linphone_friend_notify(LinphoneFriend *lf, LinphonePresenceModel *presence){
-	MSList *elem;
+	bctbx_list_t *elem;
 	if (lf->insubs){
-		char *addr=linphone_address_as_string(linphone_friend_get_address(lf));
-		ms_message("Want to notify %s",addr);
-		ms_free(addr);
+		const LinphoneAddress *addr = linphone_friend_get_address(lf);
+		if (addr) {
+			char *addr_str = linphone_address_as_string(addr);
+			ms_message("Want to notify %s", addr_str);
+			ms_free(addr_str);
+		}
 	}
-	for(elem=lf->insubs; elem!=NULL; elem=elem->next){
-		SalOp *op = (SalOp*)elem->data;
+	for(elem=lf->insubs; elem!=NULL; elem=bctbx_list_next(elem)){
+		SalOp *op = (SalOp*)bctbx_list_get_data(elem);
 		sal_notify_presence(op,(SalPresenceModel *)presence);
 	}
 }
 
 void linphone_friend_add_incoming_subscription(LinphoneFriend *lf, SalOp *op){
-	lf->insubs = ms_list_append(lf->insubs, op);
+	/*ownership of the op is transfered from sal to the LinphoneFriend*/
+	lf->insubs = bctbx_list_append(lf->insubs, op);
 }
 
 void linphone_friend_remove_incoming_subscription(LinphoneFriend *lf, SalOp *op){
-	lf->insubs = ms_list_remove(lf->insubs, op);
+	if (bctbx_list_find(lf->insubs, op)){
+		sal_op_release(op);
+		lf->insubs = bctbx_list_remove(lf->insubs, op);
+	}
 }
 
 static void linphone_friend_unsubscribe(LinphoneFriend *lf){
 	if (lf->outsub!=NULL) {
 		sal_unsubscribe(lf->outsub);
-		lf->subscribe_active=FALSE;
 	}
+	/* for friend list there is no necessary outsub*/
+	lf->subscribe_active=FALSE;
 }
 
-static void linphone_friend_invalidate_subscription(LinphoneFriend *lf){
+void linphone_friend_invalidate_subscription(LinphoneFriend *lf){
+	bctbx_list_t *iterator;
+	LinphoneCore *lc=lf->lc;
+
 	if (lf->outsub!=NULL) {
-		LinphoneCore *lc=lf->lc;
 		sal_op_release(lf->outsub);
 		lf->outsub=NULL;
 		lf->subscribe_active=FALSE;
-		/*notify application that we no longer know the presence activity */
-		if (lf->presence != NULL) {
-			linphone_presence_model_unref(lf->presence);
-		}
-		lf->presence = linphone_presence_model_new_with_activity(LinphonePresenceActivityOffline,"unknown activity");
-		linphone_core_notify_notify_presence_received(lc,lf);
 	}
+
+	/* Notify application that we no longer know the presence activity */
+	iterator = lf->presence_models;
+	while (iterator) {
+		LinphoneFriendPresence *lfp = (LinphoneFriendPresence *)bctbx_list_get_data(iterator);
+		linphone_presence_model_unref(lfp->presence);
+		lfp->presence = linphone_presence_model_new_with_activity(LinphonePresenceActivityOffline, "unknown activity");
+		linphone_core_notify_notify_presence_received_for_uri_or_tel(lc, lf, lfp->uri_or_tel, lfp->presence);
+		iterator = bctbx_list_next(iterator);
+	}
+	if (bctbx_list_size(lf->presence_models) > 0)
+		linphone_core_notify_notify_presence_received(lc, lf);
+
 	lf->initial_subscribes_sent=FALSE;
 }
 
 void linphone_friend_close_subscriptions(LinphoneFriend *lf){
 	linphone_friend_unsubscribe(lf);
-	ms_list_for_each(lf->insubs, (MSIterateFunc) sal_notify_presence_close);
-
+	bctbx_list_for_each(lf->insubs, (MSIterateFunc) sal_notify_presence_close);
+	lf->insubs = bctbx_list_free_with_data(lf->insubs, (MSIterateFunc)sal_op_release);
 }
 
-static void _linphone_friend_destroy(LinphoneFriend *lf){
-	lf->insubs = ms_list_free_with_data(lf->insubs, (MSIterateFunc) sal_op_release);
+static void _linphone_friend_release_ops(LinphoneFriend *lf){
+	lf->insubs = bctbx_list_free_with_data(lf->insubs, (MSIterateFunc) sal_op_release);
 	if (lf->outsub){
 		sal_op_release(lf->outsub);
 		lf->outsub=NULL;
 	}
-	if (lf->presence != NULL) linphone_presence_model_unref(lf->presence);
-	if (lf->uri!=NULL) linphone_address_destroy(lf->uri);
-	if (lf->info!=NULL) buddy_info_free(lf->info);
 }
 
-const LinphoneAddress *linphone_friend_get_address(const LinphoneFriend *lf){
-	return lf->uri;
+static void _linphone_friend_destroy(LinphoneFriend *lf){
+	_linphone_friend_release_ops(lf);
+	if (lf->presence_models) bctbx_list_free_with_data(lf->presence_models, (bctbx_list_free_func)free_friend_presence);
+	if (lf->phone_number_sip_uri_map) bctbx_list_free_with_data(lf->phone_number_sip_uri_map, (bctbx_list_free_func)free_phone_number_sip_uri);
+	if (lf->uri!=NULL) linphone_address_unref(lf->uri);
+	if (lf->info!=NULL) buddy_info_free(lf->info);
+	if (lf->vcard != NULL) linphone_vcard_free(lf->vcard);
+	if (lf->refkey != NULL) ms_free(lf->refkey);
+}
+
+static belle_sip_error_code _linphone_friend_marshall(belle_sip_object_t *obj, char* buff, size_t buff_size, size_t *offset) {
+	LinphoneFriend *lf = (LinphoneFriend*)obj;
+	belle_sip_error_code err = BELLE_SIP_OK;
+	if (lf->uri){
+		char *tmp = linphone_address_as_string(lf->uri);
+		err = belle_sip_snprintf(buff, buff_size, offset, "%s", tmp);
+		ms_free(tmp);
+	}
+	return err;
 }
 
 const char * linphone_friend_get_name(const LinphoneFriend *lf) {
-	LinphoneAddress *fr = lf->uri;
-	if (fr == NULL) return NULL;
-	return linphone_address_get_display_name(fr);
+	if (!lf) return NULL;
+
+	if (linphone_core_vcard_supported()) {
+		if (lf->vcard) return linphone_vcard_get_full_name(lf->vcard);
+	} else if (lf->uri) {
+		return linphone_address_get_display_name(lf->uri);
+	}
+	return NULL;
 }
 
 bool_t linphone_friend_get_send_subscribe(const LinphoneFriend *lf){
@@ -306,25 +502,30 @@ LinphoneSubscribePolicy linphone_friend_get_inc_subscribe_policy(const LinphoneF
 }
 
 LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf){
+	const LinphonePresenceModel *presence = linphone_friend_get_presence_model(lf);
 	LinphoneOnlineStatus online_status = LinphoneStatusOffline;
 	LinphonePresenceBasicStatus basic_status = LinphonePresenceBasicStatusClosed;
 	LinphonePresenceActivity *activity = NULL;
+	const char *description = NULL;
 	unsigned int nb_activities = 0;
 
-	if (lf->presence != NULL) {
-		basic_status = linphone_presence_model_get_basic_status(lf->presence);
-		nb_activities = linphone_presence_model_get_nb_activities(lf->presence);
+	if (presence != NULL) {
+		basic_status = linphone_presence_model_get_basic_status(presence);
+		nb_activities = linphone_presence_model_get_nb_activities(presence);
 		online_status = (basic_status == LinphonePresenceBasicStatusOpen) ? LinphoneStatusOnline : LinphoneStatusOffline;
 		if (nb_activities > 1) {
 			char *tmp = NULL;
 			const LinphoneAddress *addr = linphone_friend_get_address(lf);
 			if (addr) tmp = linphone_address_as_string(addr);
 			ms_warning("Friend %s has several activities, get status from the first one", tmp ? tmp : "unknown");
-			if (tmp) ms_free(tmp);
+			if (tmp) {
+				ms_free(tmp);
+			}
 			nb_activities = 1;
 		}
 		if (nb_activities == 1) {
-			activity = linphone_presence_model_get_activity(lf->presence);
+			activity = linphone_presence_model_get_activity(presence);
+			description = linphone_presence_activity_get_description(activity);
 			switch (linphone_presence_activity_get_type(activity)) {
 				case LinphonePresenceActivityBreakfast:
 				case LinphonePresenceActivityDinner:
@@ -351,6 +552,12 @@ LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf){
 					online_status = LinphoneStatusVacation;
 					break;
 				case LinphonePresenceActivityBusy:
+					if (description && strcmp(description, "Do not disturb") == 0) { // See linphonecore.c linphone_core_set_presence_info() method
+						online_status = LinphoneStatusDoNotDisturb;
+					} else {
+						online_status = LinphoneStatusBusy;
+					}
+					break;
 				case LinphonePresenceActivityLookingForWork:
 				case LinphonePresenceActivityPlaying:
 				case LinphonePresenceActivityShopping:
@@ -373,7 +580,7 @@ LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf){
 					break;
 				case LinphonePresenceActivityOnline:
 					/* Should not happen! */
-					ms_warning("LinphonePresenceActivityOnline should not happen here!");
+					/*ms_warning("LinphonePresenceActivityOnline should not happen here!");*/
 					break;
 				case LinphonePresenceActivityOffline:
 					online_status = LinphoneStatusOffline;
@@ -385,8 +592,58 @@ LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf){
 	return online_status;
 }
 
-const LinphonePresenceModel * linphone_friend_get_presence_model(LinphoneFriend *lf) {
-	return lf->presence;
+const LinphonePresenceModel * linphone_friend_get_presence_model(const LinphoneFriend *lf) {
+	const LinphonePresenceModel *presence = NULL;
+	LinphoneFriend* fuckconst = (LinphoneFriend*)lf;
+	const bctbx_list_t* addrs = linphone_friend_get_addresses(fuckconst);
+	bctbx_list_t* phones = NULL;
+	bctbx_list_t *it;
+
+	for (it = (bctbx_list_t *)addrs; it!= NULL; it = it->next) {
+		LinphoneAddress *addr = (LinphoneAddress*)it->data;
+		char *uri = linphone_address_as_string_uri_only(addr);
+		presence = linphone_friend_get_presence_model_for_uri_or_tel(fuckconst, uri);
+		ms_free(uri);
+		if (presence) break;
+	}
+	if (presence) return presence;
+
+	phones = linphone_friend_get_phone_numbers(fuckconst);
+	for (it = phones; it!= NULL; it = it->next) {
+		presence = linphone_friend_get_presence_model_for_uri_or_tel(fuckconst, it->data);
+		if (presence) break;
+	}
+	bctbx_list_free(phones);
+	return presence;
+}
+
+const LinphonePresenceModel * linphone_friend_get_presence_model_for_uri_or_tel(const LinphoneFriend *lf, const char *uri_or_tel) {
+	LinphoneFriendPresence *lfp = find_presence_model_for_uri_or_tel(lf, uri_or_tel);
+	if (lfp) return lfp->presence;
+	return NULL;
+}
+
+void linphone_friend_set_presence_model(LinphoneFriend *lf, LinphonePresenceModel *presence) {
+	const LinphoneAddress *addr = linphone_friend_get_address(lf);
+	if (addr) {
+		char *uri = linphone_address_as_string_uri_only(addr);
+		linphone_friend_set_presence_model_for_uri_or_tel(lf, uri, presence);
+		ms_free(uri);
+	}
+}
+
+void linphone_friend_set_presence_model_for_uri_or_tel(LinphoneFriend *lf, const char *uri_or_tel, LinphonePresenceModel *presence) {
+	LinphoneFriendPresence *lfp = find_presence_model_for_uri_or_tel(lf, uri_or_tel);
+	if (lfp) {
+		if (lfp->presence) linphone_presence_model_unref(lfp->presence);
+		lfp->presence = presence;
+	} else {
+		add_presence_model_for_uri_or_tel(lf, uri_or_tel, presence);
+	}
+}
+
+bool_t linphone_friend_is_presence_received(const LinphoneFriend *lf) {
+	return lf->presence_received;
 }
 
 BuddyInfo * linphone_friend_get_info(const LinphoneFriend *lf){
@@ -394,23 +651,25 @@ BuddyInfo * linphone_friend_get_info(const LinphoneFriend *lf){
 }
 
 /*
- * updates the subscriptions.
+ * updates the p2p subscriptions.
  * If only_when_registered is TRUE, subscribe will be sent only if the friend's corresponding proxy config is in registered.
  * Otherwise if the proxy config goes to unregistered state, the subscription refresh will be suspended.
  * An optional proxy whose state has changed can be passed to optimize the processing.
 **/
-void linphone_friend_update_subscribes(LinphoneFriend *fr, LinphoneProxyConfig *proxy, bool_t only_when_registered){
+void linphone_friend_update_subscribes(LinphoneFriend *fr, bool_t only_when_registered){
 	int can_subscribe=1;
 
 	if (only_when_registered && (fr->subscribe || fr->subscribe_active)){
-		LinphoneProxyConfig *cfg=linphone_core_lookup_known_proxy(fr->lc,fr->uri);
-		if (proxy && proxy!=cfg) return;
-		if (cfg && cfg->state!=LinphoneRegistrationOk){
-			char *tmp=linphone_address_as_string(fr->uri);
-			ms_message("Friend [%s] belongs to proxy config with identity [%s], but this one isn't registered. Subscription is suspended.",
-				   tmp,linphone_proxy_config_get_identity(cfg));
-			ms_free(tmp);
-			can_subscribe=0;
+		const LinphoneAddress *addr = linphone_friend_get_address(fr);
+		if (addr != NULL) {
+			LinphoneProxyConfig *cfg=linphone_core_lookup_known_proxy(fr->lc, addr);
+			if (cfg && cfg->state!=LinphoneRegistrationOk){
+				char *tmp=linphone_address_as_string(addr);
+				ms_message("Friend [%s] belongs to proxy config with identity [%s], but this one isn't registered. Subscription is suspended.",
+					tmp,linphone_proxy_config_get_identity(cfg));
+				ms_free(tmp);
+				can_subscribe=0;
+			}
 		}
 	}
 	if (can_subscribe && fr->subscribe && fr->subscribe_active==FALSE){
@@ -424,92 +683,128 @@ void linphone_friend_update_subscribes(LinphoneFriend *fr, LinphoneProxyConfig *
 	}
 }
 
-void linphone_friend_apply(LinphoneFriend *fr, LinphoneCore *lc){
-	LinphonePresenceModel *model;
+void linphone_friend_save(LinphoneFriend *fr, LinphoneCore *lc) {
+	if (!lc) return;
+#ifdef SQLITE_STORAGE_ENABLED
+	if (lc->friends_db_file) {
+		linphone_core_store_friend_in_db(lc, fr);
+	} else {
+		linphone_core_write_friends_config(lc);
+	}
+#else
+	linphone_core_write_friends_config(lc);
+#endif
+}
 
-	if (fr->uri==NULL) {
-		ms_warning("No sip url defined.");
+void linphone_friend_apply(LinphoneFriend *fr, LinphoneCore *lc) {
+	LinphonePresenceModel *model;
+	const LinphoneAddress *addr = linphone_friend_get_address(fr);
+
+	if (!addr) {
+		ms_debug("No sip url defined in friend %s", linphone_friend_get_name(fr));
+		return;
+	}
+	if (!linphone_core_ready(lc)) {
+		/* lc not ready, deffering subscription */
+		fr->commit=TRUE;
 		return;
 	}
 
-	linphone_core_write_friends_config(lc);
-
-	if (fr->inc_subscribe_pending){
-		switch(fr->pol){
+	if (fr->inc_subscribe_pending) {
+		switch(fr->pol) {
 			case LinphoneSPWait:
 				model = linphone_presence_model_new_with_activity(LinphonePresenceActivityOther, "Waiting for user acceptance");
-				linphone_friend_notify(fr,model);
+				linphone_friend_notify(fr, model);
 				linphone_presence_model_unref(model);
 				break;
 			case LinphoneSPAccept:
-				if (fr->lc!=NULL)
-					linphone_friend_notify(fr,fr->lc->presence_model);
+				if (fr->lc)
+					linphone_friend_notify(fr, fr->lc->presence_model);
 				break;
 			case LinphoneSPDeny:
-				linphone_friend_notify(fr,NULL);
+				linphone_friend_notify(fr, NULL);
 				break;
 		}
-		fr->inc_subscribe_pending=FALSE;
+		fr->inc_subscribe_pending = FALSE;
 	}
-	if (fr->lc)
-		linphone_friend_update_subscribes(fr,NULL,linphone_core_should_subscribe_friends_only_when_registered(fr->lc));
-	ms_message("linphone_friend_apply() done.");
+	
+	linphone_friend_update_subscribes(fr, linphone_core_should_subscribe_friends_only_when_registered(lc));
+
+	ms_debug("linphone_friend_apply() done.");
 	lc->bl_refresh=TRUE;
 	fr->commit=FALSE;
 }
 
-void linphone_friend_edit(LinphoneFriend *fr){
+void linphone_friend_edit(LinphoneFriend *fr) {
+	if (fr && linphone_core_vcard_supported() && fr->vcard) {
+		linphone_vcard_compute_md5_hash(fr->vcard);
+	}
 }
 
-void linphone_friend_done(LinphoneFriend *fr){
-	ms_return_if_fail(fr!=NULL);
-	if (fr->lc==NULL) return;
-	linphone_friend_apply(fr,fr->lc);
+void linphone_friend_done(LinphoneFriend *fr) {
+	ms_return_if_fail(fr);
+	if (!fr->lc) return;
+	linphone_friend_apply(fr, fr->lc);
+	linphone_friend_save(fr, fr->lc);
+
+	if (fr && linphone_core_vcard_supported() && fr->vcard) {
+		if (linphone_vcard_compare_md5_hash(fr->vcard) != 0) {
+			ms_debug("vCard's md5 has changed, mark friend as dirty and clear sip addresses list cache");
+			linphone_vcard_clean_cache(fr->vcard);
+			if (fr->friend_list) {
+				fr->friend_list->dirty_friends_to_update = bctbx_list_append(fr->friend_list->dirty_friends_to_update, linphone_friend_ref(fr));
+			}
+		}
+	}
 }
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 LinphoneFriend * linphone_core_create_friend(LinphoneCore *lc) {
-	return linphone_friend_new();
+	LinphoneFriend * lf = linphone_friend_new();
+	lf->lc = lc;
+	return lf;
 }
 
 LinphoneFriend * linphone_core_create_friend_with_address(LinphoneCore *lc, const char *address) {
-	return linphone_friend_new_with_address(address);
+	LinphoneFriend * lf = linphone_friend_new_with_address(address);
+	if (lf)
+		lf->lc = lc;
+	return lf;
 }
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
 
-void linphone_core_add_friend(LinphoneCore *lc, LinphoneFriend *lf)
-{
-	ms_return_if_fail(lf->lc==NULL);
-	ms_return_if_fail(lf->uri!=NULL);
-	if (ms_list_find(lc->friends,lf)!=NULL){
-		char *tmp=NULL;
-		const LinphoneAddress *addr=linphone_friend_get_address(lf);
-		if (addr) tmp=linphone_address_as_string(addr);
-		ms_warning("Friend %s already in list, ignored.", tmp ? tmp : "unknown");
-		if (tmp) ms_free(tmp);
-		return ;
-	}
-	lc->friends=ms_list_append(lc->friends,linphone_friend_ref(lf));
-	lf->lc=lc;
-	if ( linphone_core_ready(lc)) linphone_friend_apply(lf,lc);
-	else lf->commit=TRUE;
-	return ;
-}
-
-void linphone_core_remove_friend(LinphoneCore *lc, LinphoneFriend* fl){
-	MSList *el=ms_list_find(lc->friends,fl);
-	if (el!=NULL){
-		linphone_friend_destroy((LinphoneFriend*)el->data);
-		lc->friends=ms_list_remove_link(lc->friends,el);
-		linphone_core_write_friends_config(lc);
-	}else{
-		ms_error("linphone_core_remove_friend(): friend [%p] is not part of core's list.",fl);
+void linphone_core_add_friend(LinphoneCore *lc, LinphoneFriend *lf) {
+	if (linphone_friend_list_add_friend(linphone_core_get_default_friend_list(lc), lf) != LinphoneFriendListOK) return;
+	if (bctbx_list_find(lc->subscribers, lf)) {
+		/*if this friend was in the pending subscriber list, now remove it from this list*/
+		lc->subscribers = bctbx_list_remove(lc->subscribers, lf);
+		linphone_friend_unref(lf);
 	}
 }
 
-void linphone_core_update_friends_subscriptions(LinphoneCore *lc, LinphoneProxyConfig *cfg, bool_t only_when_registered){
-	const MSList *elem;
-	for(elem=lc->friends;elem!=NULL;elem=elem->next){
-		LinphoneFriend *f=(LinphoneFriend*)elem->data;
-		linphone_friend_update_subscribes(f,cfg,only_when_registered);
+void linphone_core_remove_friend(LinphoneCore *lc, LinphoneFriend *lf) {
+	if (lf && lf->friend_list) {
+		if (linphone_friend_list_remove_friend(lf->friend_list, lf) == LinphoneFriendListNonExistentFriend) {
+			ms_error("linphone_core_remove_friend(): friend [%p] is not part of core's list.", lf);
+		}
+	}
+}
+
+void linphone_core_update_friends_subscriptions(LinphoneCore *lc) {
+	bctbx_list_t *lists = lc->friends_lists;
+	while (lists) {
+		LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+		linphone_friend_list_update_subscriptions(list);
+		lists = bctbx_list_next(lists);
 	}
 }
 
@@ -517,65 +812,94 @@ bool_t linphone_core_should_subscribe_friends_only_when_registered(const Linphon
 	return lp_config_get_int(lc->config,"sip","subscribe_presence_only_when_registered",1);
 }
 
-void linphone_core_send_initial_subscribes(LinphoneCore *lc){
+void linphone_core_send_initial_subscribes(LinphoneCore *lc) {
+
 	if (lc->initial_subscribes_sent) return;
 	lc->initial_subscribes_sent=TRUE;
-	linphone_core_update_friends_subscriptions(lc,NULL,linphone_core_should_subscribe_friends_only_when_registered(lc));
+	
+	linphone_core_update_friends_subscriptions(lc);
 }
 
-void linphone_core_invalidate_friend_subscriptions(LinphoneCore *lc){
-	const MSList *elem;
-	for(elem=lc->friends;elem!=NULL;elem=elem->next){
-		LinphoneFriend *f=(LinphoneFriend*)elem->data;
-		linphone_friend_invalidate_subscription(f);
+void linphone_core_invalidate_friend_subscriptions(LinphoneCore *lc) {
+	bctbx_list_t *lists = lc->friends_lists;
+	while (lists) {
+		LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+		linphone_friend_list_invalidate_subscriptions(list);
+		lists = bctbx_list_next(lists);
 	}
 	lc->initial_subscribes_sent=FALSE;
 }
 
 void linphone_friend_set_ref_key(LinphoneFriend *lf, const char *key){
-	if (lf->refkey!=NULL){
+	if (lf->refkey != NULL) {
 		ms_free(lf->refkey);
-		lf->refkey=NULL;
+		lf->refkey = NULL;
+	}
+	if (key) {
+		lf->refkey = ms_strdup(key);
+	}
+	if (lf->lc) {
+		linphone_friend_save(lf, lf->lc);
 	}
-	if (key)
-		lf->refkey=ms_strdup(key);
-	if (lf->lc)
-		linphone_core_write_friends_config(lf->lc);
 }
 
 const char *linphone_friend_get_ref_key(const LinphoneFriend *lf){
 	return lf->refkey;
 }
 
-LinphoneFriend *linphone_core_find_friend(const LinphoneCore *lc, const LinphoneAddress *addr){
-	LinphoneFriend *lf=NULL;
-	MSList *elem;
-	for(elem=lc->friends;elem!=NULL;elem=ms_list_next(elem)){
-		lf=(LinphoneFriend*)elem->data;
-		if (linphone_address_weak_equal(lf->uri,addr))
-			break;
-		lf=NULL;
+LinphoneFriend *linphone_core_find_friend(const LinphoneCore *lc, const LinphoneAddress *addr) {
+	bctbx_list_t *lists = lc->friends_lists;
+	LinphoneFriend *lf = NULL;
+	while (lists && !lf) {
+		LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+		lf = linphone_friend_list_find_friend_by_address(list, addr);
+		lists = bctbx_list_next(lists);
 	}
 	return lf;
 }
 
-LinphoneFriend *linphone_core_get_friend_by_address(const LinphoneCore *lc, const char *uri){
-	LinphoneAddress *puri=linphone_address_new(uri);
-	LinphoneFriend *lf=puri ? linphone_core_find_friend(lc,puri) : NULL;
-	if (puri) linphone_address_unref(puri);
+LinphoneFriend *linphone_core_get_friend_by_address(const LinphoneCore *lc, const char *uri) {
+	bctbx_list_t *lists = lc->friends_lists;
+	LinphoneFriend *lf = NULL;
+	while (lists && !lf) {
+		LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+		lf = linphone_friend_list_find_friend_by_uri(list, uri);
+		lists = bctbx_list_next(lists);
+	}
 	return lf;
 }
 
-LinphoneFriend *linphone_core_get_friend_by_ref_key(const LinphoneCore *lc, const char *key){
-	const MSList *elem;
-	if (key==NULL) return NULL;
-	for(elem=linphone_core_get_friend_list(lc);elem!=NULL;elem=elem->next){
-		LinphoneFriend *lf=(LinphoneFriend*)elem->data;
-		if (lf->refkey!=NULL && strcmp(lf->refkey,key)==0){
-			return lf;
-		}
+LinphoneFriend *linphone_core_get_friend_by_ref_key(const LinphoneCore *lc, const char *key) {
+	bctbx_list_t *lists = lc->friends_lists;
+	LinphoneFriend *lf = NULL;
+	while (lists && !lf) {
+		LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+		lf = linphone_friend_list_find_friend_by_ref_key(list, key);
+		lists = bctbx_list_next(lists);
 	}
-	return NULL;
+	return lf;
+}
+
+LinphoneFriend *linphone_core_find_friend_by_out_subscribe(const LinphoneCore *lc, SalOp *op) {
+	bctbx_list_t *lists = lc->friends_lists;
+	LinphoneFriend *lf = NULL;
+	while (lists && !lf) {
+		LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+		lf = linphone_friend_list_find_friend_by_out_subscribe(list, op);
+		lists = bctbx_list_next(lists);
+	}
+	return lf;
+}
+
+LinphoneFriend *linphone_core_find_friend_by_inc_subscribe(const LinphoneCore *lc, SalOp *op) {
+	bctbx_list_t *lists = lc->friends_lists;
+	LinphoneFriend *lf = NULL;
+	while (lists && !lf) {
+		LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+		lf = linphone_friend_list_find_friend_by_inc_subscribe(list, op);
+		lists = bctbx_list_next(lists);
+	}
+	return lf;
 }
 
 #define key_compare(s1,s2)	strcmp(s1,s2)
@@ -595,7 +919,7 @@ LinphoneSubscribePolicy __policy_str_to_enum(const char* pol){
 }
 
 LinphoneProxyConfig *__index_to_proxy(LinphoneCore *lc, int index){
-	if (index>=0) return (LinphoneProxyConfig*)ms_list_nth_data(lc->sip_conf.proxies,index);
+	if (index>=0) return (LinphoneProxyConfig*)bctbx_list_nth_data(lc->sip_conf.proxies,index);
 	else return NULL;
 }
 
@@ -616,7 +940,7 @@ LinphoneFriend * linphone_friend_new_from_config_file(LinphoneCore *lc, int inde
 	if (tmp==NULL) {
 		return NULL;
 	}
-	lf=linphone_friend_new_with_address(tmp);
+	lf=linphone_core_create_friend_with_address(lc, tmp);
 	if (lf==NULL) {
 		return NULL;
 	}
@@ -627,6 +951,8 @@ LinphoneFriend * linphone_friend_new_from_config_file(LinphoneCore *lc, int inde
 	}
 	a=lp_config_get_int(config,item,"subscribe",0);
 	linphone_friend_send_subscribe(lf,a);
+	a = lp_config_get_int(config, item, "presence_received", 0);
+	lf->presence_received = (bool_t)a;
 
 	linphone_friend_set_ref_key(lf,lp_config_get_string(config,item,"refkey",NULL));
 	return lf;
@@ -669,6 +995,7 @@ void linphone_friend_write_to_config_file(LpConfig *config, LinphoneFriend *lf,
 	}
 	lp_config_set_string(config,key,"pol",__policy_enum_to_str(lf->pol));
 	lp_config_set_int(config,key,"subscribe",lf->subscribe);
+	lp_config_set_int(config, key, "presence_received", lf->presence_received);
 
 	refkey=linphone_friend_get_ref_key(lf);
 	if (refkey){
@@ -676,15 +1003,19 @@ void linphone_friend_write_to_config_file(LpConfig *config, LinphoneFriend *lf,
 	}
 }
 
-void linphone_core_write_friends_config(LinphoneCore* lc)
-{
-	MSList *elem;
+void linphone_core_write_friends_config(LinphoneCore* lc) {
+	bctbx_list_t *elem;
 	int i;
+	int store_friends;
+
 	if (! linphone_core_ready(lc)) return; /*dont write config when reading it !*/
-	for (elem=lc->friends,i=0; elem!=NULL; elem=ms_list_next(elem),i++){
-		linphone_friend_write_to_config_file(lc->config,(LinphoneFriend*)elem->data,i);
+	store_friends = lp_config_get_int(lc->config, "misc", "store_friends", 1);
+	if (store_friends) {
+		for (elem=linphone_core_get_default_friend_list(lc)->friends,i=0; elem!=NULL; elem=bctbx_list_next(elem),i++){
+			linphone_friend_write_to_config_file(lc->config,(LinphoneFriend*)bctbx_list_get_data(elem),i);
+		}
+		linphone_friend_write_to_config_file(lc->config,NULL,i);	/* set the end */
 	}
-	linphone_friend_write_to_config_file(lc->config,NULL,i);	/* set the end */
 }
 
 LinphoneCore *linphone_friend_get_core(const LinphoneFriend *fr){
@@ -705,11 +1036,674 @@ void linphone_friend_destroy(LinphoneFriend *lf) {
 	linphone_friend_unref(lf);
 }
 
+LinphoneVcard* linphone_friend_get_vcard(LinphoneFriend *fr) {
+	if (fr && linphone_core_vcard_supported()) return fr->vcard;
+	return NULL;
+}
+
+void linphone_friend_set_vcard(LinphoneFriend *fr, LinphoneVcard *vcard) {
+	if (!fr || !linphone_core_vcard_supported()) return;
+
+	if (fr->vcard) linphone_vcard_free(fr->vcard);
+	fr->vcard = vcard;
+	linphone_friend_save(fr, fr->lc);
+}
+
+bool_t linphone_friend_create_vcard(LinphoneFriend *fr, const char *name) {
+	LinphoneVcard *vcard = NULL;
+
+	if (!fr || !name) {
+		ms_error("Friend or name is null");
+		return FALSE;
+	}
+	if (!linphone_core_vcard_supported()) {
+		ms_warning("VCard support is not builtin");
+		return FALSE;
+	}
+	if (fr->vcard) {
+		ms_error("Friend already has a VCard");
+		return FALSE;
+	}
+
+	vcard = linphone_vcard_new();
+	linphone_vcard_set_full_name(vcard, name);
+	linphone_friend_set_vcard(fr, vcard);
+	return TRUE;
+}
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+LinphoneFriend *linphone_friend_new_from_vcard(LinphoneVcard *vcard) {
+	LinphoneFriend *fr;
+
+	if (!linphone_core_vcard_supported()) {
+		ms_error("VCard support is not builtin");
+		return NULL;
+	}
+	if (vcard == NULL) {
+		ms_error("Cannot create friend from null vcard");
+		return NULL;
+	}
+
+	fr = linphone_friend_new();
+	// Currently presence takes too much time when dealing with hundreds of friends, so I disabled it for now
+	fr->pol = LinphoneSPDeny;
+	fr->subscribe = FALSE;
+	linphone_friend_set_vcard(fr, vcard);
+	return fr;
+}
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
+/*drops all references to the core and unref*/
+void _linphone_friend_release(LinphoneFriend *lf){
+	lf->lc = NULL;
+	_linphone_friend_release_ops(lf);
+	linphone_friend_unref(lf);
+}
+
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneFriend);
 
 BELLE_SIP_INSTANCIATE_VPTR(LinphoneFriend, belle_sip_object_t,
 	(belle_sip_object_destroy_t) _linphone_friend_destroy,
 	NULL, // clone
-	NULL, // marshal
+	_linphone_friend_marshall,
 	FALSE
-);
\ No newline at end of file
+);
+
+/*******************************************************************************
+ * SQL storage related functions                                               *
+ ******************************************************************************/
+
+#ifdef SQLITE_STORAGE_ENABLED
+
+static void linphone_create_table(sqlite3* db) {
+	char* errmsg = NULL;
+	int ret;
+	ret = sqlite3_exec(db,"CREATE TABLE IF NOT EXISTS friends ("
+						"id                INTEGER PRIMARY KEY AUTOINCREMENT,"
+						"friend_list_id    INTEGER,"
+						"sip_uri           TEXT,"
+						"subscribe_policy  INTEGER,"
+						"send_subscribe    INTEGER,"
+						"ref_key           TEXT,"
+						"vCard             TEXT,"
+						"vCard_etag        TEXT,"
+						"vCard_url         TEXT,"
+						"presence_received INTEGER"
+						");",
+			0, 0, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("Error in creation: %s.\n", errmsg);
+		sqlite3_free(errmsg);
+	}
+
+	ret = sqlite3_exec(db,"CREATE TABLE IF NOT EXISTS friends_lists ("
+						"id                INTEGER PRIMARY KEY AUTOINCREMENT,"
+						"display_name      TEXT,"
+						"rls_uri           TEXT,"
+						"uri               TEXT,"
+						"revision          INTEGER"
+						");",
+			0, 0, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("Error in creation: %s.\n", errmsg);
+		sqlite3_free(errmsg);
+	}
+}
+
+static bool_t linphone_update_table(sqlite3* db) {
+	static sqlite3_stmt *stmt_version;
+	int database_user_version = -1;
+	char *errmsg = NULL;
+
+    if (sqlite3_prepare_v2(db, "PRAGMA user_version;", -1, &stmt_version, NULL) == SQLITE_OK) {
+        while(sqlite3_step(stmt_version) == SQLITE_ROW) {
+            database_user_version = sqlite3_column_int(stmt_version, 0);
+			ms_debug("friends database user version = %i", database_user_version);
+		}
+	}
+    sqlite3_finalize(stmt_version);
+
+	if (database_user_version != 3100) { // Linphone 3.10.0
+		int ret = sqlite3_exec(db,
+			"BEGIN TRANSACTION;\n"
+			"ALTER TABLE friends RENAME TO temp_friends;\n"
+			"CREATE TABLE IF NOT EXISTS friends ("
+						"id                INTEGER PRIMARY KEY AUTOINCREMENT,"
+						"friend_list_id    INTEGER,"
+						"sip_uri           TEXT,"
+						"subscribe_policy  INTEGER,"
+						"send_subscribe    INTEGER,"
+						"ref_key           TEXT,"
+						"vCard             TEXT,"
+						"vCard_etag        TEXT,"
+						"vCard_url         TEXT,"
+						"presence_received INTEGER"
+						");\n"
+			"INSERT INTO friends SELECT id, friend_list_id, sip_uri, subscribe_policy, send_subscribe, ref_key, vCard, vCard_etag, vCard_url, presence_received FROM temp_friends;\n"
+			"DROP TABLE temp_friends;\n"
+			"PRAGMA user_version = 3100;\n"
+			"COMMIT;", 0, 0, &errmsg);
+		if (ret != SQLITE_OK) {
+			ms_error("Error altering table friends: %s.\n", errmsg);
+			sqlite3_free(errmsg);
+			return FALSE;
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void linphone_core_friends_storage_init(LinphoneCore *lc) {
+	int ret;
+	const char *errmsg;
+	sqlite3 *db;
+	const bctbx_list_t *friends_lists = NULL;
+
+	linphone_core_friends_storage_close(lc);
+
+	ret = _linphone_sqlite3_open(lc->friends_db_file, &db);
+	if (ret != SQLITE_OK) {
+		errmsg = sqlite3_errmsg(db);
+		ms_error("Error in the opening: %s.\n", errmsg);
+		sqlite3_close(db);
+		return;
+	}
+
+	linphone_create_table(db);
+	if (linphone_update_table(db)) {
+		// After updating schema, database need to be closed/reopenned
+		sqlite3_close(lc->friends_db);
+		_linphone_sqlite3_open(lc->friends_db_file, &db);
+	}
+
+	lc->friends_db = db;
+
+	friends_lists = linphone_core_fetch_friends_lists_from_db(lc);
+	if (friends_lists) {
+		ms_warning("Replacing current default friend list by the one(s) from the database");
+		lc->friends_lists = bctbx_list_free_with_data(lc->friends_lists, (void (*)(void*))linphone_friend_list_unref);
+
+		while (friends_lists) {
+			LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(friends_lists);
+			linphone_core_add_friend_list(lc, list);
+			friends_lists = bctbx_list_next(friends_lists);
+		}
+	}
+}
+
+void linphone_core_friends_storage_close(LinphoneCore *lc) {
+	if (lc->friends_db) {
+		sqlite3_close(lc->friends_db);
+		lc->friends_db = NULL;
+	}
+}
+
+/* DB layout:
+ * | 0  | storage_id
+ * | 1  | display_name
+ * | 2  | rls_uri
+ * | 3  | uri
+ * | 4  | revision
+ */
+static int create_friend_list(void *data, int argc, char **argv, char **colName) {
+	bctbx_list_t **list = (bctbx_list_t **)data;
+	unsigned int storage_id = (unsigned int)atoi(argv[0]);
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(NULL);
+
+	lfl->storage_id = storage_id;
+	linphone_friend_list_set_display_name(lfl, argv[1]);
+	linphone_friend_list_set_rls_uri(lfl, argv[2]);
+	linphone_friend_list_set_uri(lfl, argv[3]);
+	lfl->revision = atoi(argv[4]);
+
+	*list = bctbx_list_append(*list, linphone_friend_list_ref(lfl));
+	linphone_friend_list_unref(lfl);
+	return 0;
+}
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+/* DB layout:
+ * | 0  | storage_id
+ * | 1  | friend_list_id
+ * | 2  | sip_uri
+ * | 3  | subscribe_policy
+ * | 4  | send_subscribe
+ * | 5  | ref_key
+ * | 6  | vCard
+ * | 7  | vCard eTag
+ * | 8  | vCard URL
+ * | 9  | presence_received
+ */
+static int create_friend(void *data, int argc, char **argv, char **colName) {
+	LinphoneVcardContext *context = (LinphoneVcardContext *)data;
+	bctbx_list_t **list = (bctbx_list_t **)linphone_vcard_context_get_user_data(context);
+	LinphoneFriend *lf = NULL;
+	LinphoneVcard *vcard = NULL;
+	unsigned int storage_id = (unsigned int)atoi(argv[0]);
+
+	vcard = linphone_vcard_context_get_vcard_from_buffer(context, argv[6]);
+	if (vcard) {
+		linphone_vcard_set_etag(vcard, argv[7]);
+		linphone_vcard_set_url(vcard, argv[8]);
+		lf = linphone_friend_new_from_vcard(vcard);
+	}
+	if (!lf) {
+		lf = linphone_friend_new();
+		if (argv[2] != NULL) {
+			LinphoneAddress *addr = linphone_address_new(argv[2]);
+			if (addr) {
+				linphone_friend_set_address(lf, addr);
+				linphone_address_unref(addr);
+			}
+		}
+	}
+	linphone_friend_set_inc_subscribe_policy(lf, atoi(argv[3]));
+	linphone_friend_send_subscribe(lf, atoi(argv[4]));
+	linphone_friend_set_ref_key(lf, ms_strdup(argv[5]));
+	lf->presence_received = atoi(argv[9]);
+	lf->storage_id = storage_id;
+
+	*list = bctbx_list_append(*list, linphone_friend_ref(lf));
+	linphone_friend_unref(lf);
+	return 0;
+}
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
+static int linphone_sql_request_friend(sqlite3* db, const char *stmt, LinphoneVcardContext *context) {
+	char* errmsg = NULL;
+	int ret;
+	ret = sqlite3_exec(db, stmt, create_friend, context, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("linphone_sql_request: statement %s -> error sqlite3_exec(): %s.", stmt, errmsg);
+		sqlite3_free(errmsg);
+	}
+	return ret;
+}
+
+static int linphone_sql_request_friends_list(sqlite3* db, const char *stmt, bctbx_list_t **list) {
+	char* errmsg = NULL;
+	int ret;
+	ret = sqlite3_exec(db, stmt, create_friend_list, list, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("linphone_sql_request: statement %s -> error sqlite3_exec(): %s.", stmt, errmsg);
+		sqlite3_free(errmsg);
+	}
+	return ret;
+}
+
+static int linphone_sql_request_generic(sqlite3* db, const char *stmt) {
+	char* errmsg = NULL;
+	int ret;
+	ret = sqlite3_exec(db, stmt, NULL, NULL, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("linphone_sql_request: statement %s -> error sqlite3_exec(): %s.", stmt, errmsg);
+		sqlite3_free(errmsg);
+	}
+	return ret;
+}
+
+void linphone_core_store_friend_in_db(LinphoneCore *lc, LinphoneFriend *lf) {
+	if (lc && lc->friends_db) {
+		char *buf;
+		int store_friends = lp_config_get_int(lc->config, "misc", "store_friends", 1);
+		LinphoneVcard *vcard = NULL;
+		const LinphoneAddress *addr;
+		char *addr_str = NULL;
+
+		if (!store_friends) {
+			return;
+		}
+
+		if (!lf || !lf->friend_list) {
+			ms_warning("Either the friend or the friend list is null, skipping...");
+			return;
+		}
+
+		if (lf->friend_list->storage_id == 0) {
+			ms_warning("Trying to add a friend in db, but friend list isn't, let's do that first");
+			linphone_core_store_friends_list_in_db(lc, lf->friend_list);
+		}
+
+		if (linphone_core_vcard_supported()) vcard = linphone_friend_get_vcard(lf);
+		addr = linphone_friend_get_address(lf);
+		if (addr != NULL) addr_str = linphone_address_as_string(addr);
+		if (lf->storage_id > 0) {
+			buf = sqlite3_mprintf("UPDATE friends SET friend_list_id=%u,sip_uri=%Q,subscribe_policy=%i,send_subscribe=%i,ref_key=%Q,vCard=%Q,vCard_etag=%Q,vCard_url=%Q,presence_received=%i WHERE (id = %u);",
+				lf->friend_list->storage_id,
+				addr_str,
+				lf->pol,
+				lf->subscribe,
+				lf->refkey,
+				vcard ? linphone_vcard_as_vcard4_string(vcard) : NULL,
+				vcard ? linphone_vcard_get_etag(vcard) : NULL,
+				vcard ? linphone_vcard_get_url(vcard): NULL,
+				lf->presence_received,
+				lf->storage_id
+			);
+		} else {
+			buf = sqlite3_mprintf("INSERT INTO friends VALUES(NULL,%u,%Q,%i,%i,%Q,%Q,%Q,%Q,%i);",
+				lf->friend_list->storage_id,
+				addr_str,
+				lf->pol,
+				lf->subscribe,
+				lf->refkey,
+				vcard ? linphone_vcard_as_vcard4_string(vcard) : NULL,
+				vcard ? linphone_vcard_get_etag(vcard) : NULL,
+				vcard ? linphone_vcard_get_url(vcard) : NULL,
+				lf->presence_received
+			);
+		}
+		if (addr_str != NULL) ms_free(addr_str);
+	
+		linphone_sql_request_generic(lc->friends_db, buf);
+		sqlite3_free(buf);
+
+		if (lf->storage_id == 0) {
+			lf->storage_id = (unsigned int)sqlite3_last_insert_rowid(lc->friends_db);
+		}
+	}
+}
+
+void linphone_core_store_friends_list_in_db(LinphoneCore *lc, LinphoneFriendList *list) {
+	if (lc && lc->friends_db) {
+		char *buf;
+		int store_friends = lp_config_get_int(lc->config, "misc", "store_friends", 1);
+
+		if (!store_friends) {
+			return;
+		}
+
+		if (list->storage_id > 0) {
+			buf = sqlite3_mprintf("UPDATE friends_lists SET display_name=%Q,rls_uri=%Q,uri=%Q,revision=%i WHERE (id = %u);",
+				list->display_name,
+				list->rls_uri,
+				list->uri,
+				list->revision,
+				list->storage_id
+			);
+		} else {
+			buf = sqlite3_mprintf("INSERT INTO friends_lists VALUES(NULL,%Q,%Q,%Q,%i);",
+				list->display_name,
+				list->rls_uri,
+				list->uri,
+				list->revision
+			);
+		}
+		linphone_sql_request_generic(lc->friends_db, buf);
+		sqlite3_free(buf);
+
+		if (list->storage_id == 0) {
+			list->storage_id = (unsigned int)sqlite3_last_insert_rowid(lc->friends_db);
+		}
+	}
+}
+
+void linphone_core_remove_friend_from_db(LinphoneCore *lc, LinphoneFriend *lf) {
+	if (lc && lc->friends_db) {
+		char *buf;
+		if (lf->storage_id == 0) {
+			ms_error("Friend doesn't have a storage_id !");
+			return;
+		}
+
+		buf = sqlite3_mprintf("DELETE FROM friends WHERE id = %u", lf->storage_id);
+		linphone_sql_request_generic(lc->friends_db, buf);
+		sqlite3_free(buf);
+
+		lf->storage_id = 0;
+	}
+}
+
+void linphone_core_remove_friends_list_from_db(LinphoneCore *lc, LinphoneFriendList *list) {
+	if (lc && lc->friends_db) {
+		char *buf;
+		if (list->storage_id == 0) {
+			ms_error("Friends list doesn't have a storage_id !");
+			return;
+		}
+
+		buf = sqlite3_mprintf("DELETE FROM friends_lists WHERE id = %u", list->storage_id);
+		linphone_sql_request_generic(lc->friends_db, buf);
+		sqlite3_free(buf);
+
+		list->storage_id = 0;
+	}
+}
+
+bctbx_list_t* linphone_core_fetch_friends_from_db(LinphoneCore *lc, LinphoneFriendList *list) {
+	char *buf;
+	uint64_t begin,end;
+	bctbx_list_t *result = NULL;
+	bctbx_list_t *elem = NULL;
+
+	if (!lc || lc->friends_db == NULL || list == NULL) {
+		ms_warning("Either lc (or list) is NULL or friends database wasn't initialized with linphone_core_friends_storage_init() yet");
+		return NULL;
+	}
+
+	linphone_vcard_context_set_user_data(lc->vcard_context, &result);
+
+	buf = sqlite3_mprintf("SELECT * FROM friends WHERE friend_list_id = %u ORDER BY id", list->storage_id);
+
+	begin = ortp_get_cur_time_ms();
+	linphone_sql_request_friend(lc->friends_db, buf, lc->vcard_context);
+	end = ortp_get_cur_time_ms();
+	ms_message("%s(): %u results fetched, completed in %i ms",__FUNCTION__, (unsigned int)bctbx_list_size(result), (int)(end-begin));
+	sqlite3_free(buf);
+
+	for(elem = result; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		lf->lc = lc;
+		lf->friend_list = list;
+		linphone_friend_save(lf, lc); /* required if we freshly created vcard but core was not set at this time */
+	}
+	linphone_vcard_context_set_user_data(lc->vcard_context, NULL);
+
+	return result;
+}
+
+bctbx_list_t* linphone_core_fetch_friends_lists_from_db(LinphoneCore *lc) {
+	char *buf;
+	uint64_t begin,end;
+	bctbx_list_t *result = NULL;
+	bctbx_list_t *elem = NULL;
+
+	if (!lc || lc->friends_db == NULL) {
+		ms_warning("Either lc is NULL or friends database wasn't initialized with linphone_core_friends_storage_init() yet");
+		return NULL;
+	}
+
+	buf = sqlite3_mprintf("SELECT * FROM friends_lists ORDER BY id");
+
+	begin = ortp_get_cur_time_ms();
+	linphone_sql_request_friends_list(lc->friends_db, buf, &result);
+	end = ortp_get_cur_time_ms();
+	ms_message("%s(): %u results fetched, completed in %i ms",__FUNCTION__, (unsigned int)bctbx_list_size(result), (int)(end-begin));
+	sqlite3_free(buf);
+
+	for(elem = result; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriendList *lfl = (LinphoneFriendList *)bctbx_list_get_data(elem);
+		lfl->lc = lc;
+		lfl->friends = linphone_core_fetch_friends_from_db(lc, lfl);
+	}
+
+	return result;
+}
+
+#else
+
+void linphone_core_friends_storage_init(LinphoneCore *lc) {
+}
+
+void linphone_core_friends_storage_close(LinphoneCore *lc) {
+}
+
+void linphone_core_store_friend_in_db(LinphoneCore *lc, LinphoneFriend *lf) {
+}
+
+void linphone_core_store_friends_list_in_db(LinphoneCore *lc, LinphoneFriendList *list) {
+}
+
+void linphone_core_remove_friend_from_db(LinphoneCore *lc, LinphoneFriend *lf) {
+}
+
+void linphone_core_remove_friends_list_from_db(LinphoneCore *lc, LinphoneFriendList *list) {
+}
+
+bctbx_list_t* linphone_core_fetch_friends_from_db(LinphoneCore *lc, LinphoneFriendList *list) {
+	return NULL;
+}
+
+bctbx_list_t* linphone_core_fetch_friends_lists_from_db(LinphoneCore *lc) {
+	return NULL;
+}
+
+#endif
+
+void linphone_core_set_friends_database_path(LinphoneCore *lc, const char *path) {
+	if (lc->friends_db_file){
+		ms_free(lc->friends_db_file);
+		lc->friends_db_file = NULL;
+	}
+	if (path) {
+		lc->friends_db_file = ms_strdup(path);
+		linphone_core_friends_storage_init(lc);
+
+		linphone_core_migrate_friends_from_rc_to_db(lc);
+	}
+}
+
+void linphone_core_migrate_friends_from_rc_to_db(LinphoneCore *lc) {
+	LpConfig *lpc = NULL;
+	LinphoneFriend *lf = NULL;
+	LinphoneFriendList *lfl = linphone_core_get_default_friend_list(lc);
+	int i;
+#ifndef SQLITE_STORAGE_ENABLED
+	ms_warning("linphone has been compiled without sqlite, can't migrate friends");
+	return;
+#endif
+	if (!lc) {
+		return;
+	}
+
+	lpc = linphone_core_get_config(lc);
+	if (!lpc) {
+		ms_warning("this core has been started without a rc file, nothing to migrate");
+		return;
+	}
+	if (lp_config_get_int(lpc, "misc", "friends_migration_done", 0) == 1) {
+		ms_warning("the friends migration has already been done, skipping...");
+		return;
+	}
+
+	if (bctbx_list_size(linphone_friend_list_get_friends(lfl)) > 0 && lfl->storage_id == 0) {
+		linphone_core_remove_friend_list(lc, lfl);
+		lfl = linphone_core_create_friend_list(lc);
+		linphone_core_add_friend_list(lc, lfl);
+		linphone_friend_list_unref(lfl);
+	}
+
+	for (i = 0; (lf = linphone_friend_new_from_config_file(lc, i)) != NULL; i++) {
+		char friend_section[32];
+
+		const LinphoneAddress *addr = linphone_friend_get_address(lf);
+		if (addr) {
+			char *address = NULL;
+			const char *displayName = linphone_address_get_display_name(addr);
+			if (!displayName) displayName = linphone_address_get_username(addr);
+
+			address = linphone_address_as_string(addr);
+			if (linphone_core_vcard_supported()) {
+				if (!linphone_friend_create_vcard(lf, displayName)) {
+					ms_warning("Couldn't create vCard for friend %s", address);
+				} else {
+					linphone_vcard_add_sip_address(linphone_friend_get_vcard(lf), address);
+					linphone_address_unref(lf->uri);
+					lf->uri = NULL;
+				}
+			}
+			ms_free(address);
+
+			linphone_friend_list_add_friend(lfl, lf);
+			linphone_friend_unref(lf);
+
+			snprintf(friend_section, sizeof(friend_section), "friend_%i", i);
+			lp_config_clean_section(lpc, friend_section);
+		}
+	}
+
+	ms_debug("friends migration successful: %i friends migrated", i);
+	lp_config_set_int(lpc, "misc", "friends_migration_done", 1);
+}
+
+LinphoneSubscriptionState linphone_friend_get_subscription_state(const LinphoneFriend *lf) {
+	return lf->out_sub_state;
+}
+
+const char * linphone_friend_phone_number_to_sip_uri(LinphoneFriend *lf, const char *phone_number) {
+	LinphoneFriendPhoneNumberSipUri * lfpnsu;
+	LinphoneAddress *addr;
+	char *normalized_number;
+	char *uri;
+	char *full_uri;
+	LinphoneProxyConfig *proxy_config;
+	bctbx_list_t *iterator = lf->phone_number_sip_uri_map;
+
+	while (iterator) {
+		lfpnsu = (LinphoneFriendPhoneNumberSipUri *)bctbx_list_get_data(iterator);
+		if (strcmp(lfpnsu->number, phone_number) == 0) return lfpnsu->uri;
+		iterator = bctbx_list_next(iterator);
+	}
+
+	proxy_config = linphone_core_get_default_proxy_config(linphone_friend_get_core(lf));
+	if (!proxy_config) return NULL;
+	if (strstr(phone_number, "tel:") == phone_number) phone_number += 4; /* Remove the "tel:" prefix if it is present. */
+	normalized_number = linphone_proxy_config_normalize_phone_number(proxy_config, phone_number);
+	if (!normalized_number) return NULL;
+	uri = ms_strdup_printf("sip:%s@%s", normalized_number, linphone_proxy_config_get_domain(proxy_config));
+	ms_free(normalized_number);
+	addr = linphone_core_create_address(linphone_friend_get_core(lf), uri);
+	ms_free(uri);
+	if (!addr) return NULL;
+	linphone_address_set_uri_param(addr, "user", "phone");
+	full_uri = linphone_address_as_string_uri_only(addr);
+	linphone_address_unref(addr);
+	lfpnsu = ms_new0(LinphoneFriendPhoneNumberSipUri, 1);
+	lfpnsu->number = ms_strdup(phone_number);
+	lfpnsu->uri = full_uri;
+	lf->phone_number_sip_uri_map = bctbx_list_append(lf->phone_number_sip_uri_map, lfpnsu);
+	return full_uri;
+}
+
+const char * linphone_friend_sip_uri_to_phone_number(LinphoneFriend *lf, const char *uri) {
+	bctbx_list_t *iterator = lf->phone_number_sip_uri_map;
+
+	while (iterator) {
+		LinphoneFriendPhoneNumberSipUri *lfpnsu = (LinphoneFriendPhoneNumberSipUri *)bctbx_list_get_data(iterator);
+		if (strcmp(lfpnsu->uri, uri) == 0) return lfpnsu->number;
+		iterator = bctbx_list_next(iterator);
+	}
+	return NULL;
+}
+
+void linphone_friend_clear_presence_models(LinphoneFriend *lf) {
+	lf->presence_models = bctbx_list_free_with_data(lf->presence_models, (bctbx_list_free_func)free_friend_presence);
+}
diff --git a/coreapi/friendlist.c b/coreapi/friendlist.c
new file mode 100644
index 000000000..9db5c74e0
--- /dev/null
+++ b/coreapi/friendlist.c
@@ -0,0 +1,1034 @@
+/*
+linphone
+Copyright (C) 2010-2015 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "linphonecore.h"
+#include "private.h"
+
+#include <bctoolbox/crypto.h>
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneFriendListCbs);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneFriendListCbs, belle_sip_object_t,
+	NULL, // destroy
+	NULL, // clone
+	NULL, // Marshall
+	FALSE
+);
+
+static LinphoneFriendListCbs * linphone_friend_list_cbs_new(void) {
+	return belle_sip_object_new(LinphoneFriendListCbs);
+}
+
+LinphoneFriendListCbs * linphone_friend_list_get_callbacks(const LinphoneFriendList *list) {
+	return list->cbs;
+}
+
+LinphoneFriendListCbs * linphone_friend_list_cbs_ref(LinphoneFriendListCbs *cbs) {
+	belle_sip_object_ref(cbs);
+	return cbs;
+}
+
+void linphone_friend_list_cbs_unref(LinphoneFriendListCbs *cbs) {
+	belle_sip_object_unref(cbs);
+}
+
+void *linphone_friend_list_cbs_get_user_data(const LinphoneFriendListCbs *cbs) {
+	return cbs->user_data;
+}
+
+void linphone_friend_list_cbs_set_user_data(LinphoneFriendListCbs *cbs, void *ud) {
+	cbs->user_data = ud;
+}
+
+LinphoneFriendListCbsContactCreatedCb linphone_friend_list_cbs_get_contact_created(const LinphoneFriendListCbs *cbs) {
+	return cbs->contact_created_cb;
+}
+
+void linphone_friend_list_cbs_set_contact_created(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsContactCreatedCb cb) {
+	cbs->contact_created_cb = cb;
+}
+
+LinphoneFriendListCbsContactDeletedCb linphone_friend_list_cbs_get_contact_deleted(const LinphoneFriendListCbs *cbs) {
+	return cbs->contact_deleted_cb;
+}
+
+void linphone_friend_list_cbs_set_contact_deleted(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsContactDeletedCb cb) {
+	cbs->contact_deleted_cb = cb;
+}
+
+LinphoneFriendListCbsContactUpdatedCb linphone_friend_list_cbs_get_contact_updated(const LinphoneFriendListCbs *cbs) {
+	return cbs->contact_updated_cb;
+}
+
+void linphone_friend_list_cbs_set_contact_updated(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsContactUpdatedCb cb) {
+	cbs->contact_updated_cb = cb;
+}
+
+LinphoneFriendListCbsSyncStateChangedCb linphone_friend_list_cbs_get_sync_status_changed(const LinphoneFriendListCbs *cbs) {
+	return cbs->sync_state_changed_cb;
+}
+
+void linphone_friend_list_cbs_set_sync_status_changed(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsSyncStateChangedCb cb) {
+	cbs->sync_state_changed_cb = cb;
+}
+
+static int add_uri_entry(xmlTextWriterPtr writer, int err, const char *uri) {
+	if (err >= 0) {
+		err = xmlTextWriterStartElement(writer, (const xmlChar *)"entry");
+	}
+	if (err >= 0) {
+		err = xmlTextWriterWriteAttribute(writer, (const xmlChar *)"uri", (const xmlChar *)uri);
+	}
+	if (err >= 0) {
+		/* Close the "entry" element. */
+		err = xmlTextWriterEndElement(writer);
+	}
+	return err;
+}
+
+static bctbx_list_t * uri_list(const LinphoneFriendList *list) {
+	bctbx_list_t * uri_list = NULL;
+	bctbx_list_t * elem = NULL;
+	for (elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		bctbx_list_t *iterator;
+		const bctbx_list_t *addresses = linphone_friend_get_addresses(lf);
+		bctbx_list_t *numbers = linphone_friend_get_phone_numbers(lf);
+		iterator = (bctbx_list_t *)addresses;
+		while (iterator) {
+			LinphoneAddress *addr = (LinphoneAddress *)bctbx_list_get_data(iterator);
+			if (addr) {
+				char *uri = linphone_address_as_string_uri_only(addr);
+				if (uri) {
+					if (bctbx_list_find_custom(uri_list, (bctbx_compare_func)strcmp, uri) == NULL) {
+						uri_list =  bctbx_list_insert_sorted(uri_list, uri, (bctbx_compare_func)strcasecmp);
+					}
+				}
+			}
+			iterator = bctbx_list_next(iterator);
+		}
+		iterator = numbers;
+		while (iterator) {
+			const char *number = (const char *)bctbx_list_get_data(iterator);
+			const char *uri = linphone_friend_phone_number_to_sip_uri(lf, number);
+			if (uri) {
+				if (bctbx_list_find_custom(uri_list, (bctbx_compare_func)strcmp, uri) == NULL) {
+					uri_list = bctbx_list_insert_sorted(uri_list, ms_strdup(uri), (bctbx_compare_func)strcasecmp);
+				}
+			}
+			iterator = bctbx_list_next(iterator);
+		}
+	}
+	return uri_list;
+}
+
+static char * create_resource_list_xml(const LinphoneFriendList *list) {
+	char *xml_content = NULL;
+	xmlBufferPtr buf;
+	xmlTextWriterPtr writer;
+	int err;
+
+	if (bctbx_list_size(list->friends) <= 0) return NULL;
+
+	buf = xmlBufferCreate();
+	if (buf == NULL) {
+		ms_error("%s: Error creating the XML buffer", __FUNCTION__);
+		return NULL;
+	}
+	writer = xmlNewTextWriterMemory(buf, 0);
+	if (writer == NULL) {
+		ms_error("%s: Error creating the XML writer", __FUNCTION__);
+		return NULL;
+	}
+
+	xmlTextWriterSetIndent(writer,1);
+	err = xmlTextWriterStartDocument(writer, "1.0", "UTF-8", NULL);
+	if (err >= 0) {
+		err = xmlTextWriterStartElementNS(writer, NULL, (const xmlChar *)"resource-lists", (const xmlChar *)"urn:ietf:params:xml:ns:resource-lists");
+	}
+	if (err >= 0) {
+		err = xmlTextWriterWriteAttributeNS(writer, (const xmlChar *)"xmlns", (const xmlChar *)"xsi",
+						    NULL, (const xmlChar *)"http://www.w3.org/2001/XMLSchema-instance");
+	}
+
+	if (err>= 0) {
+		err = xmlTextWriterStartElement(writer, (const xmlChar *)"list");
+	}
+
+	{
+		bctbx_list_t* entries = uri_list(list);
+		bctbx_list_t* it;
+		for(it = entries; it != NULL; it = it->next){
+			err = add_uri_entry(writer, err, it->data);
+		}
+		bctbx_list_free_with_data(entries, ms_free);
+	}
+	if (err >= 0) {
+		/* Close the "list" element. */
+		err = xmlTextWriterEndElement(writer);
+	}
+
+	if (err >= 0) {
+		/* Close the "resource-lists" element. */
+		err = xmlTextWriterEndElement(writer);
+	}
+	if (err >= 0) {
+		err = xmlTextWriterEndDocument(writer);
+	}
+	if (err > 0) {
+		/* xmlTextWriterEndDocument returns the size of the content. */
+		xml_content = ms_strdup((char *)buf->content);
+	}
+	xmlFreeTextWriter(writer);
+	xmlBufferFree(buf);
+
+	return xml_content;
+}
+
+static void linphone_friend_list_parse_multipart_related_body(LinphoneFriendList *list, const LinphoneContent *body, const char *first_part_body) {
+	xmlparsing_context_t *xml_ctx = linphone_xmlparsing_context_new();
+	xmlSetGenericErrorFunc(xml_ctx, linphone_xmlparsing_genericxml_error);
+	xml_ctx->doc = xmlReadDoc((const unsigned char*)first_part_body, 0, NULL, 0);
+	if (xml_ctx->doc != NULL) {
+		char xpath_str[MAX_XPATH_LENGTH];
+		LinphoneFriend *lf;
+		LinphoneContent *presence_part;
+		xmlXPathObjectPtr resource_object;
+		const char *version_str = NULL;
+		const char *full_state_str = NULL;
+		const char *uri = NULL;
+		bool_t full_state = FALSE;
+		int version;
+		int i;
+
+		if (linphone_create_xml_xpath_context(xml_ctx) < 0) goto end;
+		xmlXPathRegisterNs(xml_ctx->xpath_ctx, (const xmlChar *)"rlmi", (const xmlChar *)"urn:ietf:params:xml:ns:rlmi");
+
+		version_str = linphone_get_xml_attribute_text_content(xml_ctx, "/rlmi:list", "version");
+		if (version_str == NULL) {
+			ms_warning("rlmi+xml: No version attribute in list");
+			goto end;
+		}
+		version = atoi(version_str);
+		linphone_free_xml_text_content(version_str);
+		if (version < list->expected_notification_version) {
+			ms_warning("rlmi+xml: Discarding received notification with version %d because %d was expected", version, list->expected_notification_version);
+			linphone_friend_list_update_subscriptions(list); /* Refresh subscription to get new full state notify. */
+			goto end;
+		}
+
+		full_state_str = linphone_get_xml_attribute_text_content(xml_ctx, "/rlmi:list", "fullState");
+		if (full_state_str == NULL) {
+			ms_warning("rlmi+xml: No fullState attribute in list");
+			goto end;
+		}
+		if ((strcmp(full_state_str, "true") == 0) || (strcmp(full_state_str, "1") == 0)) {
+			bctbx_list_t *l = list->friends;
+			for (; l != NULL; l = bctbx_list_next(l)) {
+				lf = (LinphoneFriend *)bctbx_list_get_data(l);
+				linphone_friend_clear_presence_models(lf);
+			}
+			full_state = TRUE;
+		}
+		linphone_free_xml_text_content(full_state_str);
+		if ((list->expected_notification_version == 0) && (full_state == FALSE)) {
+			ms_warning("rlmi+xml: Notification with version 0 is not full state, this is not valid");
+			goto end;
+		}
+		list->expected_notification_version = version + 1;
+
+		resource_object = linphone_get_xml_xpath_object_for_node_list(xml_ctx, "/rlmi:list/rlmi:resource");
+		if ((resource_object != NULL) && (resource_object->nodesetval != NULL)) {
+			for (i = 1; i <= resource_object->nodesetval->nodeNr; i++) {
+				LinphoneAddress* addr;
+				snprintf(xpath_str, sizeof(xpath_str), "/rlmi:list/rlmi:resource[%i]/@uri", i);
+				uri = linphone_get_xml_text_content(xml_ctx, xpath_str);
+				if (uri == NULL) continue;
+				addr = linphone_address_new(uri);
+				if (!addr) continue;
+				lf = linphone_friend_list_find_friend_by_address(list, addr);
+				linphone_address_unref(addr);
+				if (lf != NULL) {
+					const char *state = NULL;
+					snprintf(xpath_str, sizeof(xpath_str),"/rlmi:list/rlmi:resource[%i]/rlmi:instance/@state", i);
+					state = linphone_get_xml_text_content(xml_ctx, xpath_str);
+					if ((state != NULL) && (strcmp(state, "active") == 0)) {
+						const char *cid = NULL;
+						snprintf(xpath_str, sizeof(xpath_str),"/rlmi:list/rlmi:resource[%i]/rlmi:instance/@cid", i);
+						cid = linphone_get_xml_text_content(xml_ctx, xpath_str);
+						if (cid != NULL) {
+							presence_part = linphone_content_find_part_by_header(body, "Content-Id", cid);
+							if (presence_part == NULL) {
+								ms_warning("rlmi+xml: Cannot find part with Content-Id: %s", cid);
+							} else {
+								SalPresenceModel *presence = NULL;
+								linphone_notify_parse_presence(linphone_content_get_type(presence_part), linphone_content_get_subtype(presence_part), linphone_content_get_string_buffer(presence_part), &presence);
+								if (presence != NULL) {
+									const char *phone_number = linphone_friend_sip_uri_to_phone_number(lf, uri);
+									lf->presence_received = TRUE;
+									if (phone_number) linphone_friend_set_presence_model_for_uri_or_tel(lf, phone_number, (LinphonePresenceModel *)presence);
+									else linphone_friend_set_presence_model_for_uri_or_tel(lf, uri, (LinphonePresenceModel *)presence);
+									if (full_state == FALSE) {
+										if (phone_number)
+											linphone_core_notify_notify_presence_received_for_uri_or_tel(list->lc, lf, phone_number, (LinphonePresenceModel *)presence);
+										else
+											linphone_core_notify_notify_presence_received_for_uri_or_tel(list->lc, lf, uri, (LinphonePresenceModel *)presence);
+										linphone_core_notify_notify_presence_received(list->lc, lf);
+									}
+								}
+								linphone_content_unref(presence_part);
+							}
+						}
+						if (cid != NULL) linphone_free_xml_text_content(cid);
+					}
+					if (state != NULL) linphone_free_xml_text_content(state);
+					lf->subscribe_active = TRUE;
+				}
+				linphone_free_xml_text_content(uri);
+			}
+		}
+		if (resource_object != NULL) xmlXPathFreeObject(resource_object);
+
+		if (full_state == TRUE) {
+			const bctbx_list_t *addresses;
+			bctbx_list_t *numbers;
+			bctbx_list_t *iterator;
+			bctbx_list_t *l = list->friends;
+			for (; l != NULL; l = bctbx_list_next(l)) {
+				lf = (LinphoneFriend *)bctbx_list_get_data(l);
+				addresses = linphone_friend_get_addresses(lf);
+				numbers = linphone_friend_get_phone_numbers(lf);
+				iterator = (bctbx_list_t *)addresses;
+				while (iterator) {
+					LinphoneAddress *addr = (LinphoneAddress *)bctbx_list_get_data(iterator);
+					char *uri = linphone_address_as_string_uri_only(addr);
+					const LinphonePresenceModel *presence = linphone_friend_get_presence_model_for_uri_or_tel(lf, uri);
+					if (presence) linphone_core_notify_notify_presence_received_for_uri_or_tel(list->lc, lf, uri, presence);
+					ms_free(uri);
+					iterator = bctbx_list_next(iterator);
+				}
+				iterator = numbers;
+				while (iterator) {
+					const char *number = (const char *)bctbx_list_get_data(iterator);
+					const LinphonePresenceModel *presence = linphone_friend_get_presence_model_for_uri_or_tel(lf, number);
+					if (presence) linphone_core_notify_notify_presence_received_for_uri_or_tel(list->lc, lf, number, presence);
+					iterator = bctbx_list_next(iterator);
+				}
+				if (numbers) bctbx_list_free(numbers);
+				if (linphone_friend_is_presence_received(lf) == TRUE) {
+					linphone_core_notify_notify_presence_received(list->lc, lf);
+				}
+			}
+		}
+	} else {
+		ms_warning("Wrongly formatted rlmi+xml body: %s", xml_ctx->errorBuffer);
+	}
+
+end:
+	linphone_xmlparsing_context_destroy(xml_ctx);
+}
+
+static bool_t linphone_friend_list_has_subscribe_inactive(const LinphoneFriendList *list) {
+	bctbx_list_t *l = list->friends;
+	bool_t has_subscribe_inactive = FALSE;
+	for (; l != NULL; l = bctbx_list_next(l)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(l);
+		if (lf->subscribe_active != TRUE) {
+			has_subscribe_inactive = TRUE;
+			break;
+		}
+	}
+	return has_subscribe_inactive;
+}
+
+static LinphoneFriendList * linphone_friend_list_new(void) {
+	LinphoneFriendList *list = belle_sip_object_new(LinphoneFriendList);
+	list->cbs = linphone_friend_list_cbs_new();
+	list->enable_subscriptions = TRUE;
+	belle_sip_object_ref(list);
+	return list;
+}
+
+static void linphone_friend_list_destroy(LinphoneFriendList *list) {
+	if (list->display_name != NULL) ms_free(list->display_name);
+	if (list->rls_addr) linphone_address_unref(list->rls_addr);
+	if (list->rls_uri != NULL) ms_free(list->rls_uri);
+	if (list->content_digest != NULL) ms_free(list->content_digest);
+	if (list->event != NULL) {
+		linphone_event_terminate(list->event);
+		linphone_event_unref(list->event);
+		list->event = NULL;
+	}
+	if (list->uri != NULL) ms_free(list->uri);
+	if (list->cbs) linphone_friend_list_cbs_unref(list->cbs);
+	if (list->dirty_friends_to_update) list->dirty_friends_to_update = bctbx_list_free_with_data(list->dirty_friends_to_update, (void (*)(void *))linphone_friend_unref);
+	if (list->friends) list->friends = bctbx_list_free_with_data(list->friends, (void (*)(void *))_linphone_friend_release);
+}
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneFriendList);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneFriendList, belle_sip_object_t,
+	(belle_sip_object_destroy_t)linphone_friend_list_destroy,
+	NULL, // clone
+	NULL, // marshal
+	TRUE
+);
+
+
+LinphoneFriendList * linphone_core_create_friend_list(LinphoneCore *lc) {
+	LinphoneFriendList *list = linphone_friend_list_new();
+	list->lc = lc;
+	return list;
+}
+
+LinphoneFriendList * linphone_friend_list_ref(LinphoneFriendList *list) {
+	belle_sip_object_ref(list);
+	return list;
+}
+
+void _linphone_friend_list_release(LinphoneFriendList *list){
+	/*drops all references to core and unref*/
+	list->lc = NULL;
+	if (list->event != NULL) {
+		linphone_event_unref(list->event);
+		list->event = NULL;
+	}
+	if (list->cbs) {
+		linphone_friend_list_cbs_unref(list->cbs);
+		list->cbs = NULL;
+	}
+	if (list->dirty_friends_to_update) {
+		list->dirty_friends_to_update = bctbx_list_free_with_data(list->dirty_friends_to_update, (void (*)(void *))linphone_friend_unref);
+	}
+	if (list->friends) {
+		list->friends = bctbx_list_free_with_data(list->friends, (void (*)(void *))_linphone_friend_release);
+	}
+	linphone_friend_list_unref(list);
+}
+
+void linphone_friend_list_unref(LinphoneFriendList *list) {
+	belle_sip_object_unref(list);
+}
+
+void * linphone_friend_list_get_user_data(const LinphoneFriendList *list) {
+	return list->user_data;
+}
+
+void linphone_friend_list_set_user_data(LinphoneFriendList *list, void *ud) {
+	list->user_data = ud;
+}
+
+const char * linphone_friend_list_get_display_name(const LinphoneFriendList *list) {
+	return list->display_name;
+}
+
+void linphone_friend_list_set_display_name(LinphoneFriendList *list, const char *display_name) {
+	if (list->display_name != NULL) {
+		ms_free(list->display_name);
+		list->display_name = NULL;
+	}
+	if (display_name != NULL) {
+		list->display_name = ms_strdup(display_name);
+		linphone_core_store_friends_list_in_db(list->lc, list);
+	}
+}
+
+const LinphoneAddress * linphone_friend_list_get_rls_address(const LinphoneFriendList *list){
+	return list->rls_addr;
+}
+const LinphoneAddress * _linphone_friend_list_get_rls_address(const LinphoneFriendList *list) {
+	if (list->rls_addr)
+		return list->rls_addr;
+	else if (list->lc)
+		return list->lc->default_rls_addr;
+	else
+		return NULL;
+}
+void linphone_friend_list_set_rls_address(LinphoneFriendList *list, const LinphoneAddress *rls_addr){
+	LinphoneAddress *new_rls_addr = rls_addr ? linphone_address_clone(rls_addr) : NULL;
+	
+	if (list->rls_addr){
+		linphone_address_unref(list->rls_addr);
+	}
+	list->rls_addr = new_rls_addr;
+	if (list->rls_uri != NULL){
+		ms_free(list->rls_uri);
+		list->rls_uri = NULL;
+	}
+	if (list->rls_addr){
+		list->rls_uri = linphone_address_as_string(list->rls_addr);
+		linphone_core_store_friends_list_in_db(list->lc, list);
+	}
+}
+
+const char * linphone_friend_list_get_rls_uri(const LinphoneFriendList *list) {
+	return list->rls_uri;
+}
+
+void linphone_friend_list_set_rls_uri(LinphoneFriendList *list, const char *rls_uri) {
+	LinphoneAddress *addr = rls_uri ? linphone_core_create_address(list->lc, rls_uri) : NULL;
+	linphone_friend_list_set_rls_address(list, addr);
+	if (addr) linphone_address_destroy(addr);
+}
+
+static LinphoneFriendListStatus _linphone_friend_list_add_friend(LinphoneFriendList *list, LinphoneFriend *lf, bool_t synchronize) {
+	LinphoneFriendListStatus status = LinphoneFriendListInvalidFriend;
+	const LinphoneAddress *addr;
+
+	if (!list || lf->friend_list) {
+		if (!list)
+			ms_error("linphone_friend_list_add_friend(): invalid list, null");
+		if (lf->friend_list)
+			ms_error("linphone_friend_list_add_friend(): invalid friend, already in list");
+		return status;
+	}
+	addr = linphone_friend_get_address(lf);
+	if (bctbx_list_find(list->friends, lf) != NULL) {
+		char *tmp = NULL;
+		if (addr) tmp = linphone_address_as_string(addr);
+		ms_warning("Friend %s already in list [%s], ignored.", tmp ? tmp : "unknown", list->display_name);
+		if (tmp) ms_free(tmp);
+	} else {
+		status = linphone_friend_list_import_friend(list, lf, synchronize);
+		linphone_friend_save(lf, lf->lc);
+	}
+
+	if (list->rls_uri == NULL) {
+		/* Mimic the behaviour of linphone_core_add_friend() when a resource list server is not in use */
+		linphone_friend_apply(lf, lf->lc);
+	}
+	return status;
+}
+
+LinphoneFriendListStatus linphone_friend_list_add_friend(LinphoneFriendList *list, LinphoneFriend *lf) {
+	return _linphone_friend_list_add_friend(list, lf, TRUE);
+}
+
+LinphoneFriendListStatus linphone_friend_list_add_local_friend(LinphoneFriendList *list, LinphoneFriend *lf) {
+	return _linphone_friend_list_add_friend(list, lf, FALSE);
+}
+
+LinphoneFriendListStatus linphone_friend_list_import_friend(LinphoneFriendList *list, LinphoneFriend *lf, bool_t synchronize) {
+	if (lf->friend_list) {
+		if (lf->friend_list)
+			ms_error("linphone_friend_list_add_friend(): invalid friend, already in list");
+		return LinphoneFriendListInvalidFriend;
+	}
+	lf->friend_list = list;
+	lf->lc = list->lc;
+	list->friends = bctbx_list_append(list->friends, linphone_friend_ref(lf));
+	if (synchronize) {
+		list->dirty_friends_to_update = bctbx_list_append(list->dirty_friends_to_update, linphone_friend_ref(lf));
+	}
+	return LinphoneFriendListOK;
+}
+
+static void carddav_done(LinphoneCardDavContext *cdc, bool_t success, const char *msg) {
+	if (cdc && cdc->friend_list->cbs->sync_state_changed_cb) {
+		cdc->friend_list->cbs->sync_state_changed_cb(cdc->friend_list, success ? LinphoneFriendListSyncSuccessful : LinphoneFriendListSyncFailure, msg);
+	}
+	linphone_carddav_context_destroy(cdc);
+}
+
+static LinphoneFriendListStatus _linphone_friend_list_remove_friend(LinphoneFriendList *list, LinphoneFriend *lf, bool_t remove_from_server) {
+	bctbx_list_t *elem = bctbx_list_find(list->friends, lf);
+	if (elem == NULL) return LinphoneFriendListNonExistentFriend;
+
+#ifdef SQLITE_STORAGE_ENABLED
+	if (lf && lf->lc && lf->lc->friends_db) {
+		linphone_core_remove_friend_from_db(lf->lc, lf);
+	}
+#endif
+	if (remove_from_server) {
+		LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+		if (lvc && linphone_vcard_get_uid(lvc)) {
+			LinphoneCardDavContext *cdc = linphone_carddav_context_new(list);
+			if (cdc) {
+				cdc->sync_done_cb = carddav_done;
+				if (cdc->friend_list->cbs->sync_state_changed_cb) {
+					cdc->friend_list->cbs->sync_state_changed_cb(cdc->friend_list, LinphoneFriendListSyncStarted, NULL);
+				}
+				linphone_carddav_delete_vcard(cdc, lf);
+			}
+		}
+	}
+	if (!list->lc->friends_db_file) {
+		linphone_core_write_friends_config(list->lc);
+	}
+
+	lf->friend_list = NULL;
+	linphone_friend_unref(lf);
+	list->friends = bctbx_list_erase_link(list->friends, elem);
+	return LinphoneFriendListOK;
+}
+
+LinphoneFriendListStatus linphone_friend_list_remove_friend(LinphoneFriendList *list, LinphoneFriend *lf) {
+	return _linphone_friend_list_remove_friend(list, lf, TRUE);
+}
+
+const bctbx_list_t * linphone_friend_list_get_friends(const LinphoneFriendList *list) {
+	return list->friends;
+}
+
+void linphone_friend_list_update_dirty_friends(LinphoneFriendList *list) {
+	bctbx_list_t *dirty_friends = list->dirty_friends_to_update;
+
+	while (dirty_friends) {
+		LinphoneCardDavContext *cdc = linphone_carddav_context_new(list);
+		if (cdc) {
+			LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(dirty_friends);
+			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);
+				}
+				linphone_carddav_put_vcard(cdc, lf);
+			}
+		}
+		dirty_friends = bctbx_list_next(dirty_friends);
+	}
+	list->dirty_friends_to_update = bctbx_list_free_with_data(list->dirty_friends_to_update, (void (*)(void *))linphone_friend_unref);
+}
+
+static void carddav_created(LinphoneCardDavContext *cdc, LinphoneFriend *lf) {
+	if (cdc) {
+		LinphoneFriendList *lfl = cdc->friend_list;
+		linphone_friend_list_import_friend(lfl, lf, FALSE);
+		if (cdc->friend_list->cbs->contact_created_cb) {
+			cdc->friend_list->cbs->contact_created_cb(lfl, lf);
+		}
+	}
+}
+
+static void carddav_removed(LinphoneCardDavContext *cdc, LinphoneFriend *lf) {
+	if (cdc) {
+		LinphoneFriendList *lfl = cdc->friend_list;
+		_linphone_friend_list_remove_friend(lfl, lf, FALSE);
+		if (cdc->friend_list->cbs->contact_deleted_cb) {
+			cdc->friend_list->cbs->contact_deleted_cb(lfl, lf);
+		}
+	}
+}
+
+static void carddav_updated(LinphoneCardDavContext *cdc, LinphoneFriend *lf_new, LinphoneFriend *lf_old) {
+	if (cdc) {
+		LinphoneFriendList *lfl = cdc->friend_list;
+		bctbx_list_t *elem = bctbx_list_find(lfl->friends, lf_old);
+		if (elem) {
+			elem->data = linphone_friend_ref(lf_new);
+		}
+		linphone_core_store_friend_in_db(lf_new->lc, lf_new);
+
+		if (cdc->friend_list->cbs->contact_updated_cb) {
+			cdc->friend_list->cbs->contact_updated_cb(lfl, lf_new, lf_old);
+		}
+		linphone_friend_unref(lf_old);
+	}
+}
+
+void linphone_friend_list_synchronize_friends_from_server(LinphoneFriendList *list) {
+	LinphoneCardDavContext *cdc = NULL;
+
+	if (!list || !list->uri || !list->lc) {
+		ms_error("FATAL");
+		return;
+	}
+
+	cdc = linphone_carddav_context_new(list);
+	if (cdc) {
+		cdc->contact_created_cb = carddav_created;
+		cdc->contact_removed_cb = carddav_removed;
+		cdc->contact_updated_cb = carddav_updated;
+		cdc->sync_done_cb = carddav_done;
+		if (cdc && cdc->friend_list->cbs->sync_state_changed_cb) {
+			cdc->friend_list->cbs->sync_state_changed_cb(cdc->friend_list, LinphoneFriendListSyncStarted, NULL);
+		}
+		linphone_carddav_synchronize(cdc);
+	}
+}
+
+LinphoneFriend * linphone_friend_list_find_friend_by_address(const LinphoneFriendList *list, const LinphoneAddress *address) {
+	LinphoneFriend *result = NULL;
+	const bctbx_list_t *elem;
+	const char *param = linphone_address_get_uri_param(address, "user");
+	bool_t find_phone_number = (param && (strcmp(param, "phone") == 0));
+
+	for (elem = list->friends; (elem != NULL) && (result == NULL); elem = bctbx_list_next(elem)) {
+		bctbx_list_t *iterator;
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		if (find_phone_number == TRUE) {
+			char *uri = linphone_address_as_string_uri_only(address);
+			const char *phone_number = linphone_friend_sip_uri_to_phone_number(lf, uri);
+			bctbx_list_t *phone_numbers = linphone_friend_get_phone_numbers(lf);
+			iterator = phone_numbers;
+			ms_free(uri);
+			if (!phone_number) continue;
+			while (iterator && (result == NULL)) {
+				const char *number = (const char *)bctbx_list_get_data(iterator);
+				if (strcmp(number, phone_number) == 0) result = lf;
+				iterator = bctbx_list_next(iterator);
+			}
+		} else {
+			const bctbx_list_t *addresses = linphone_friend_get_addresses(lf);
+			iterator = (bctbx_list_t *)addresses;
+			while (iterator && (result == NULL)) {
+				LinphoneAddress *lfaddr = (LinphoneAddress *)bctbx_list_get_data(iterator);
+				if (linphone_address_weak_equal(lfaddr, address)) result = lf;
+				iterator = bctbx_list_next(iterator);
+			}
+		}
+	}
+	return result;
+}
+
+LinphoneFriend * linphone_friend_list_find_friend_by_uri(const LinphoneFriendList *list, const char *uri) {
+	LinphoneAddress *address = linphone_address_new(uri);
+	LinphoneFriend *lf = address ? linphone_friend_list_find_friend_by_address(list, address) : NULL;
+	if (address) linphone_address_unref(address);
+	return lf;
+}
+
+LinphoneFriend * linphone_friend_list_find_friend_by_ref_key(const LinphoneFriendList *list, const char *ref_key) {
+	const bctbx_list_t *elem;
+	if (ref_key == NULL) return NULL;
+	for (elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		if ((lf->refkey != NULL) && (strcmp(lf->refkey, ref_key) == 0)) return lf;
+	}
+	return NULL;
+}
+
+LinphoneFriend * linphone_friend_list_find_friend_by_inc_subscribe(const LinphoneFriendList *list, SalOp *op) {
+	const bctbx_list_t *elem;
+	for (elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		if (bctbx_list_find(lf->insubs, op)) return lf;
+	}
+	return NULL;
+}
+
+LinphoneFriend * linphone_friend_list_find_friend_by_out_subscribe(const LinphoneFriendList *list, SalOp *op) {
+	const bctbx_list_t *elem;
+	for (elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		if (lf->outsub && ((lf->outsub == op) || sal_op_is_forked_of(lf->outsub, op))) return lf;
+	}
+	return NULL;
+}
+
+static void linphone_friend_list_close_subscriptions(LinphoneFriendList *list) {
+	/* FIXME we should wait until subscription to complete. */
+	if (list->event) {
+		linphone_event_terminate(list->event);
+		linphone_event_unref(list->event);
+		list->event = NULL;
+	}
+	bctbx_list_for_each(list->friends, (void (*)(void *))linphone_friend_close_subscriptions);
+}
+
+static void linphone_friend_list_send_list_subscription(LinphoneFriendList *list){
+	const LinphoneAddress *address = _linphone_friend_list_get_rls_address(list);
+	char *xml_content = create_resource_list_xml(list);
+	if ((address != NULL) && (xml_content != NULL) && (linphone_friend_list_has_subscribe_inactive(list) == TRUE)) {
+		unsigned char digest[16];
+		bctbx_md5((unsigned char *)xml_content, strlen(xml_content), digest);
+		if ((list->event != NULL) && (list->content_digest != NULL) && (memcmp(list->content_digest, digest, sizeof(digest)) == 0)) {
+			/* The content has not changed, only refresh the event. */
+			linphone_event_refresh_subscribe(list->event);
+		} else {
+			LinphoneContent *content;
+			int expires = lp_config_get_int(list->lc->config, "sip", "rls_presence_expires", 3600);
+			list->expected_notification_version = 0;
+			if (list->content_digest != NULL) ms_free(list->content_digest);
+			list->content_digest = ms_malloc(sizeof(digest));
+			memcpy(list->content_digest, digest, sizeof(digest));
+			if (list->event != NULL) {
+				linphone_event_terminate(list->event);
+				linphone_event_unref(list->event);
+			}
+			list->event = linphone_core_create_subscribe(list->lc, address, "presence", expires);
+			linphone_event_ref(list->event);
+			linphone_event_set_internal(list->event, TRUE);
+			linphone_event_add_custom_header(list->event, "Require", "recipient-list-subscribe");
+			linphone_event_add_custom_header(list->event, "Supported", "eventlist");
+			linphone_event_add_custom_header(list->event, "Accept", "multipart/related, application/pidf+xml, application/rlmi+xml");
+			linphone_event_add_custom_header(list->event, "Content-Disposition", "recipient-list");
+			content = linphone_core_create_content(list->lc);
+			linphone_content_set_type(content, "application");
+			linphone_content_set_subtype(content, "resource-lists+xml");
+			linphone_content_set_string_buffer(content, xml_content);
+			if (linphone_core_content_encoding_supported(list->lc, "deflate")) {
+				linphone_content_set_encoding(content, "deflate");
+				linphone_event_add_custom_header(list->event, "Accept-Encoding", "deflate");
+			}
+			linphone_event_send_subscribe(list->event, content);
+			linphone_content_unref(content);
+			linphone_event_set_user_data(list->event, list);
+		}
+	}
+	if (xml_content != NULL) ms_free(xml_content);
+}
+
+void linphone_friend_list_update_subscriptions(LinphoneFriendList *list){
+	LinphoneProxyConfig *cfg = NULL;
+	const LinphoneAddress *address = _linphone_friend_list_get_rls_address(list);
+	bool_t only_when_registered = FALSE;
+	bool_t should_send_list_subscribe = FALSE;
+	
+	if (list->lc){
+		if (address)
+			cfg = linphone_core_lookup_known_proxy(list->lc, address);
+		only_when_registered = linphone_core_should_subscribe_friends_only_when_registered(list->lc);
+		should_send_list_subscribe = (!only_when_registered || !cfg || cfg->state == LinphoneRegistrationOk);
+	}
+	
+	if (address != NULL) {
+		if (list->enable_subscriptions) {
+			if (should_send_list_subscribe){
+				linphone_friend_list_send_list_subscription(list);
+			}else{
+				if (list->event){
+					linphone_event_terminate(list->event);
+					linphone_event_unref(list->event);
+					list->event = NULL;
+					ms_message("Friends list [%p] subscription terminated because proxy config lost connection", list);
+				}else{
+					ms_message("Friends list [%p] subscription update skipped since dependant proxy config is not yet registered", list);
+				}
+			}
+		} else {
+			ms_message("Friends list [%p] subscription update skipped since subscriptions not enabled yet", list);
+		}
+	} else if (list->enable_subscriptions) {
+		const bctbx_list_t *elem;
+		for (elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
+			LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+			linphone_friend_update_subscribes(lf, only_when_registered);
+		}
+	}
+}
+
+void linphone_friend_list_invalidate_subscriptions(LinphoneFriendList *list) {
+	const bctbx_list_t *elem;
+	for (elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		linphone_friend_invalidate_subscription(lf);
+	}
+}
+
+void linphone_friend_list_notify_presence(LinphoneFriendList *list, LinphonePresenceModel *presence) {
+	const bctbx_list_t *elem;
+	for(elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
+		linphone_friend_notify(lf, presence);
+	}
+}
+
+void linphone_friend_list_notify_presence_received(LinphoneFriendList *list, LinphoneEvent *lev, const LinphoneContent *body) {
+	if (linphone_content_is_multipart(body)) {
+		LinphoneContent *first_part;
+		const char *type = linphone_content_get_type(body);
+		const char *subtype = linphone_content_get_subtype(body);
+
+		if ((strcmp(type, "multipart") != 0) || (strcmp(subtype, "related") != 0)) {
+			ms_warning("multipart presence notified but it is not 'multipart/related'");
+			return;
+		}
+
+		first_part = linphone_content_get_part(body, 0);
+		if (first_part == NULL) {
+			ms_warning("'multipart/related' presence notified but it doesn't contain any part");
+			return;
+		}
+
+		type = linphone_content_get_type(first_part);
+		subtype = linphone_content_get_subtype(first_part);
+		if ((strcmp(type, "application") != 0) || (strcmp(subtype, "rlmi+xml") != 0)) {
+			ms_warning("multipart presence notified but first part is not 'application/rlmi+xml'");
+			linphone_content_unref(first_part);
+			return;
+		}
+
+		linphone_friend_list_parse_multipart_related_body(list, body, linphone_content_get_string_buffer(first_part));
+		linphone_content_unref(first_part);
+	}
+}
+
+const char * linphone_friend_list_get_uri(const LinphoneFriendList *list) {
+	return list->uri;
+}
+
+void linphone_friend_list_set_uri(LinphoneFriendList *list, const char *uri) {
+	if (list->uri != NULL) {
+		ms_free(list->uri);
+		list->uri = NULL;
+	}
+	if (uri != NULL) {
+		list->uri = ms_strdup(uri);
+		linphone_core_store_friends_list_in_db(list->lc, list);
+	}
+}
+
+void linphone_friend_list_update_revision(LinphoneFriendList *list, int rev) {
+	list->revision = rev;
+	linphone_core_store_friends_list_in_db(list->lc, list);
+}
+
+void linphone_friend_list_subscription_state_changed(LinphoneCore *lc, LinphoneEvent *lev, LinphoneSubscriptionState state) {
+	LinphoneFriendList *list = (LinphoneFriendList *)linphone_event_get_user_data(lev);
+	if (!list) {
+		ms_warning("core [%p] Receiving unexpected state [%s] for event [%p], no associated friend list",lc
+					, linphone_subscription_state_to_string(state)
+				   , lev);
+	} else {
+		ms_message("Receiving new state [%s] for event [%p] for friend list [%p]"
+				   , linphone_subscription_state_to_string(state)
+				   , lev
+				   , list);
+
+		if (state == LinphoneSubscriptionOutgoingProgress && linphone_event_get_reason(lev) == LinphoneReasonNoMatch) {
+			ms_message("Resseting version count for friend list [%p]",list);
+			list->expected_notification_version = 0;
+		}
+	}
+}
+
+LinphoneCore* linphone_friend_list_get_core(const LinphoneFriendList *list) {
+	return list->lc;
+}
+
+int linphone_friend_list_import_friends_from_vcard4_file(LinphoneFriendList *list, const char *vcard_file) {
+	bctbx_list_t *vcards = NULL;
+	bctbx_list_t *vcards_iterator = NULL;
+	int count = 0;
+
+	if (!linphone_core_vcard_supported()) {
+		ms_error("vCard support wasn't enabled at compilation time");
+		return -1;
+	}
+	if (!list) {
+		ms_error("Can't import into a NULL list");
+		return -1;
+	}
+
+	vcards = linphone_vcard_context_get_vcard_list_from_file(list->lc->vcard_context, vcard_file);
+	vcards_iterator = vcards;
+	if (!vcards) {
+		ms_error("Failed to parse the file %s", vcard_file);
+		return -1;
+	}
+
+	while (vcards_iterator != NULL && bctbx_list_get_data(vcards_iterator) != NULL) {
+		LinphoneVcard *vcard = (LinphoneVcard *)bctbx_list_get_data(vcards_iterator);
+		LinphoneFriend *lf = linphone_friend_new_from_vcard(vcard);
+		if (lf) {
+			if (LinphoneFriendListOK == linphone_friend_list_import_friend(list, lf, TRUE)) {
+				linphone_friend_save(lf, lf->lc);
+				count++;
+			}
+			linphone_friend_unref(lf);
+		} else {
+			linphone_vcard_free(vcard);
+		}
+		vcards_iterator = bctbx_list_next(vcards_iterator);
+	}
+	bctbx_list_free(vcards);
+	linphone_core_store_friends_list_in_db(list->lc, list);
+	return count;
+}
+
+int linphone_friend_list_import_friends_from_vcard4_buffer(LinphoneFriendList *list, const char *vcard_buffer) {
+	bctbx_list_t *vcards = NULL;
+	bctbx_list_t *vcards_iterator = NULL;
+	int count = 0;
+
+	if (!linphone_core_vcard_supported()) {
+		ms_error("vCard support wasn't enabled at compilation time");
+		return -1;
+	}
+	if (!list) {
+		ms_error("Can't import into a NULL list");
+		return -1;
+	}
+
+	vcards = linphone_vcard_context_get_vcard_list_from_buffer(list->lc->vcard_context, vcard_buffer);
+	vcards_iterator = vcards;
+	if (!vcards) {
+		ms_error("Failed to parse the buffer");
+		return -1;
+	}
+
+	while (vcards_iterator != NULL && bctbx_list_get_data(vcards_iterator) != NULL) {
+		LinphoneVcard *vcard = (LinphoneVcard *)bctbx_list_get_data(vcards_iterator);
+		LinphoneFriend *lf = linphone_friend_new_from_vcard(vcard);
+		if (lf) {
+			if (LinphoneFriendListOK == linphone_friend_list_import_friend(list, lf, TRUE)) {
+				count++;
+			}
+			linphone_friend_unref(lf);
+		} else {
+			linphone_vcard_free(vcard);
+		}
+		vcards_iterator = bctbx_list_next(vcards_iterator);
+	}
+	bctbx_list_free(vcards);
+	linphone_core_store_friends_list_in_db(list->lc, list);
+	return count;
+}
+
+void linphone_friend_list_export_friends_as_vcard4_file(LinphoneFriendList *list, const char *vcard_file) {
+	FILE *file = NULL;
+	const bctbx_list_t *friends;
+
+	if (!linphone_core_vcard_supported()) {
+		ms_error("vCard support wasn't enabled at compilation time");
+		return;
+	}
+
+	file = fopen(vcard_file, "wb");
+	if (file == NULL) {
+		ms_warning("Could not write %s ! Maybe it is read-only. Contacts will not be saved.", vcard_file);
+		return;
+	}
+
+	friends = linphone_friend_list_get_friends(list);
+	while (friends != NULL && bctbx_list_get_data(friends) != NULL) {
+		LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(friends);
+		LinphoneVcard *vcard = linphone_friend_get_vcard(lf);
+		if (vcard) {
+			const char *vcard_text = linphone_vcard_as_vcard4_string(vcard);
+			fprintf(file, "%s", vcard_text);
+		}
+		friends = bctbx_list_next(friends);
+	}
+
+	fclose(file);
+}
+
+void linphone_friend_list_enable_subscriptions(LinphoneFriendList *list, bool_t enabled) {
+	if (list->enable_subscriptions != enabled) {
+		list->enable_subscriptions = enabled;
+		if (enabled) {
+			linphone_friend_list_update_subscriptions(list);
+		} else {
+			linphone_friend_list_close_subscriptions(list);
+		}
+		
+	}
+}
diff --git a/coreapi/friendlist.h b/coreapi/friendlist.h
new file mode 100644
index 000000000..78ff3ca2f
--- /dev/null
+++ b/coreapi/friendlist.h
@@ -0,0 +1,444 @@
+/*
+friendlist.h
+Copyright (C) 2010-2015 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+
+#ifndef LINPHONE_FRIENDLIST_H_
+#define LINPHONE_FRIENDLIST_H_
+
+
+#ifdef IN_LINPHONE
+#include "linphonefriend.h"
+#include "linphonepresence.h"
+#else
+#include "linphone/linphonefriend.h"
+#include "linphone/linphonepresence.h"
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup buddy_list
+ * @{
+ */
+
+/**
+* Enum describing the status of a LinphoneFriendList operation.
+**/
+typedef enum _LinphoneFriendListStatus {
+	LinphoneFriendListOK,
+	LinphoneFriendListNonExistentFriend,
+	LinphoneFriendListInvalidFriend
+} LinphoneFriendListStatus;
+
+/**
+ * Enum describing the status of a CardDAV synchronization
+ */
+typedef enum _LinphoneFriendListSyncStatus {
+	LinphoneFriendListSyncStarted,
+	LinphoneFriendListSyncSuccessful,
+	LinphoneFriendListSyncFailure
+} LinphoneFriendListSyncStatus;
+
+/**
+ * The LinphoneFriendList object representing a list of friends.
+**/
+typedef struct _LinphoneFriendList LinphoneFriendList;
+
+/**
+ * Create a new empty LinphoneFriendList object.
+ * @param[in] lc LinphoneCore object.
+ * @return A new LinphoneFriendList object.
+**/
+LINPHONE_PUBLIC LinphoneFriendList * linphone_core_create_friend_list(LinphoneCore *lc);
+
+/**
+ * Add a friend list.
+ * @param[in] lc LinphoneCore object
+ * @param[in] list LinphoneFriendList object
+ */
+LINPHONE_PUBLIC void linphone_core_add_friend_list(LinphoneCore *lc, LinphoneFriendList *list);
+
+/**
+ * Removes a friend list.
+ * @param[in] lc LinphoneCore object
+ * @param[in] list LinphoneFriendList object
+ */
+LINPHONE_PUBLIC void linphone_core_remove_friend_list(LinphoneCore *lc, LinphoneFriendList *list);
+
+/**
+ * Retrieves the list of LinphoneFriendList from the core.
+ * @param[in] lc LinphoneCore object
+ * @return \mslist{LinphoneFriendList} a list of LinphoneFriendList
+ */
+LINPHONE_PUBLIC const bctbx_list_t * linphone_core_get_friends_lists(const LinphoneCore *lc);
+
+/**
+ * Retrieves the first list of LinphoneFriend from the core.
+ * @param[in] lc LinphoneCore object
+ * @return the first LinphoneFriendList object or NULL
+ */
+LINPHONE_PUBLIC LinphoneFriendList * linphone_core_get_default_friend_list(const LinphoneCore *lc);
+
+/**
+ * Acquire a reference to the friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @return The same LinphoneFriendList object.
+**/
+LINPHONE_PUBLIC LinphoneFriendList * linphone_friend_list_ref(LinphoneFriendList *list);
+
+/**
+ * Release reference to the friend list.
+ * @param[in] list LinphoneFriendList object.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_unref(LinphoneFriendList *list);
+
+/**
+ * Retrieve the user pointer associated with the friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @return The user pointer associated with the friend list.
+**/
+LINPHONE_PUBLIC void * linphone_friend_list_get_user_data(const LinphoneFriendList *list);
+
+/**
+ * Assign a user pointer to the friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] ud The user pointer to associate with the friend list.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_set_user_data(LinphoneFriendList *list, void *ud);
+
+/**
+ * Get the display name of the friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @return The display name of the friend list.
+**/
+LINPHONE_PUBLIC const char * linphone_friend_list_get_display_name(const LinphoneFriendList *list);
+
+/**
+ * Set the display name of the friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] display_name The new display name of the friend list.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_set_display_name(LinphoneFriendList *list, const char *display_name);
+
+/**
+ * Get the RLS (Resource List Server) URI associated with the friend list to subscribe to these friends presence.
+ * @param[in] list LinphoneFriendList object.
+ * @return The RLS URI associated with the friend list.
+**/
+LINPHONE_PUBLIC const char * linphone_friend_list_get_rls_uri(const LinphoneFriendList *list);
+
+/**
+ * Set the RLS (Resource List Server) URI associated with the friend list to subscribe to these friends presence.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] rls_uri The RLS URI to associate with the friend list.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_set_rls_uri(LinphoneFriendList *list, const char *rls_uri);
+
+
+/**
+ * Get the RLS (Resource List Server) URI associated with the friend list to subscribe to these friends presence.
+ * @param[in] list LinphoneFriendList object.
+ * @return The RLS URI associated with the friend list.
+**/
+LINPHONE_PUBLIC const LinphoneAddress * linphone_friend_list_get_rls_address(const LinphoneFriendList *list);
+
+/**
+ * Set the RLS (Resource List Server) URI associated with the friend list to subscribe to these friends presence.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] rls_addr The RLS URI to associate with the friend list.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_set_rls_address(LinphoneFriendList *list, const LinphoneAddress *rls_addr);
+
+/**
+ * Add a friend to a friend list. If or when a remote CardDAV server will be attached to the list, the friend will be sent to the server.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] lf LinphoneFriend object to add to the friend list.
+ * @return LinphoneFriendListOK if successfully added, LinphoneFriendListInvalidFriend if the friend is not valid.
+**/
+LINPHONE_PUBLIC LinphoneFriendListStatus linphone_friend_list_add_friend(LinphoneFriendList *list, LinphoneFriend *lf);
+
+/**
+ * Add a friend to a friend list. The friend will never be sent to a remote CardDAV server.
+ * Warning! LinphoneFriends added this way will be removed on the next synchronization, and the callback contact_deleted will be called.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] lf LinphoneFriend object to add to the friend list.
+ * @return LinphoneFriendListOK if successfully added, LinphoneFriendListInvalidFriend if the friend is not valid.
+**/
+LINPHONE_PUBLIC LinphoneFriendListStatus linphone_friend_list_add_local_friend(LinphoneFriendList *list, LinphoneFriend *lf);
+
+/**
+ * Remove a friend from a friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] lf LinphoneFriend object to remove from the friend list.
+ * @return LinphoneFriendListOK if removed successfully, LinphoneFriendListNonExistentFriend if the friend is not in the list.
+**/
+LINPHONE_PUBLIC LinphoneFriendListStatus linphone_friend_list_remove_friend(LinphoneFriendList *list, LinphoneFriend *lf);
+
+/**
+ * Retrieves the list of LinphoneFriend from this LinphoneFriendList.
+ * @param[in] list LinphoneFriendList object
+ * @return \mslist{LinphoneFriend} a list of LinphoneFriend
+ */
+LINPHONE_PUBLIC const bctbx_list_t * linphone_friend_list_get_friends(const LinphoneFriendList *list);
+
+/**
+ * Find a friend in the friend list using a LinphoneAddress.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] address LinphoneAddress object of the friend we want to search for.
+ * @return A LinphoneFriend if found, NULL otherwise.
+**/
+LINPHONE_PUBLIC LinphoneFriend * linphone_friend_list_find_friend_by_address(const LinphoneFriendList *list, const LinphoneAddress *address);
+
+/**
+ * Find a friend in the friend list using an URI string.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] uri A string containing the URI of the friend we want to search for.
+ * @return A LinphoneFriend if found, NULL otherwise.
+**/
+LINPHONE_PUBLIC LinphoneFriend * linphone_friend_list_find_friend_by_uri(const LinphoneFriendList *list, const char *uri);
+
+/**
+ * Find a friend in the friend list using a ref key.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] ref_key The ref key string of the friend we want to search for.
+ * @return A LinphoneFriend if found, NULL otherwise.
+**/
+LINPHONE_PUBLIC LinphoneFriend * linphone_friend_list_find_friend_by_ref_key(const LinphoneFriendList *list, const char *ref_key);
+
+/**
+ * Update presence subscriptions for the entire list. Calling this function is necessary when list subscriptions are enabled,
+ * ie when a RLS presence server is used.
+ * @param[in] list the friend list
+**/
+LINPHONE_PUBLIC void linphone_friend_list_update_subscriptions(LinphoneFriendList *list);
+
+/**
+ * Notify our presence to all the friends in the friend list that have subscribed to our presence directly (not using a RLS).
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] presence LinphonePresenceModel object.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_notify_presence(LinphoneFriendList *list, LinphonePresenceModel *presence);
+
+/**
+ * Get the URI associated with the friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @return The URI associated with the friend list.
+**/
+LINPHONE_PUBLIC const char * linphone_friend_list_get_uri(const LinphoneFriendList *list);
+
+/**
+ * Set the URI associated with the friend list.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] uri The URI to associate with the friend list.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_set_uri(LinphoneFriendList *list, const char *uri);
+
+/**
+ * Sets the revision from the last synchronization.
+ * @param[in] list LinphoneFriendList object.
+ * @param[in] rev The revision
+ */
+void linphone_friend_list_update_revision(LinphoneFriendList *list, int rev);
+
+/**
+ * An object to handle the callbacks for LinphoneFriend synchronization.
+**/
+typedef struct _LinphoneFriendListCbs LinphoneFriendListCbs;
+
+/**
+ * Callback used to notify a new contact has been created on the CardDAV server and downloaded locally
+ * @param list The LinphoneFriendList object the new contact is added to
+ * @param lf The LinphoneFriend object that has been created
+**/
+typedef void (*LinphoneFriendListCbsContactCreatedCb)(LinphoneFriendList *list, LinphoneFriend *lf);
+
+/**
+ * Callback used to notify a contact has been deleted on the CardDAV server
+ * @param list The LinphoneFriendList object a contact has been removed from
+ * @param lf The LinphoneFriend object that has been deleted
+**/
+typedef void (*LinphoneFriendListCbsContactDeletedCb)(LinphoneFriendList *list, LinphoneFriend *lf);
+
+/**
+ * Callback used to notify a contact has been updated on the CardDAV server
+ * @param list The LinphoneFriendList object in which a contact has been updated
+ * @param new_friend The new LinphoneFriend object corresponding to the updated contact
+ * @param old_friend The old LinphoneFriend object before update
+**/
+typedef void (*LinphoneFriendListCbsContactUpdatedCb)(LinphoneFriendList *list, LinphoneFriend *new_friend, LinphoneFriend *old_friend);
+
+/**
+ * Callback used to notify the status of the synchronization has changed
+ * @param list The LinphoneFriendList object for which the status has changed
+ * @param status The new synchronisation status
+ * @param msg An additional information on the status update
+**/
+typedef void (*LinphoneFriendListCbsSyncStateChangedCb)(LinphoneFriendList *list, LinphoneFriendListSyncStatus status, const char *msg);
+
+/**
+ * Get the LinphoneFriendListCbs object associated with a LinphoneFriendList.
+ * @param[in] list LinphoneFriendList object
+ * @return The LinphoneFriendListCbs object associated with the LinphoneFriendList.
+**/
+LINPHONE_PUBLIC LinphoneFriendListCbs * linphone_friend_list_get_callbacks(const LinphoneFriendList *list);
+
+/**
+ * Acquire a reference to a LinphoneFriendListCbs object.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @return The same LinphoneFriendListCbs object.
+**/
+LINPHONE_PUBLIC LinphoneFriendListCbs * linphone_friend_list_cbs_ref(LinphoneFriendListCbs *cbs);
+
+/**
+ * Release a reference to a LinphoneFriendListCbs object.
+ * @param[in] cbs LinphoneFriendListCbs object.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_cbs_unref(LinphoneFriendListCbs *cbs);
+
+/**
+ * Retrieve the user pointer associated with a LinphoneFriendListCbs object.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @return The user pointer associated with the LinphoneFriendListCbs object.
+**/
+LINPHONE_PUBLIC void *linphone_friend_list_cbs_get_user_data(const LinphoneFriendListCbs *cbs);
+
+/**
+ * Assign a user pointer to a LinphoneFriendListCbs object.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @param[in] ud The user pointer to associate with the LinphoneFriendListCbs object.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_cbs_set_user_data(LinphoneFriendListCbs *cbs, void *ud);
+
+/**
+ * Get the contact created callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @return The current contact created callback.
+**/
+LINPHONE_PUBLIC LinphoneFriendListCbsContactCreatedCb linphone_friend_list_cbs_get_contact_created(const LinphoneFriendListCbs *cbs);
+
+/**
+ * Set the contact created callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @param[in] cb The contact created to be used.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_cbs_set_contact_created(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsContactCreatedCb cb);
+
+/**
+ * Get the contact deleted callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @return The current contact deleted callback.
+**/
+LINPHONE_PUBLIC LinphoneFriendListCbsContactDeletedCb linphone_friend_list_cbs_get_contact_deleted(const LinphoneFriendListCbs *cbs);
+
+/**
+ * Set the contact deleted callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @param[in] cb The contact deleted to be used.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_cbs_set_contact_deleted(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsContactDeletedCb cb);
+
+/**
+ * Get the contact updated callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @return The current contact updated callback.
+**/
+LINPHONE_PUBLIC LinphoneFriendListCbsContactUpdatedCb linphone_friend_list_cbs_get_contact_updated(const LinphoneFriendListCbs *cbs);
+
+/**
+ * Set the contact updated callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @param[in] cb The contact updated to be used.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_cbs_set_contact_updated(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsContactUpdatedCb cb);
+
+/**
+ * Get the sync status changed callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @return The current sync status changedcallback.
+**/
+LINPHONE_PUBLIC LinphoneFriendListCbsSyncStateChangedCb linphone_friend_list_cbs_get_sync_status_changed(const LinphoneFriendListCbs *cbs);
+
+/**
+ * Set the contact updated callback.
+ * @param[in] cbs LinphoneFriendListCbs object.
+ * @param[in] cb The sync status changed to be used.
+**/
+LINPHONE_PUBLIC void linphone_friend_list_cbs_set_sync_status_changed(LinphoneFriendListCbs *cbs, LinphoneFriendListCbsSyncStateChangedCb cb);
+
+/**
+ * Starts a CardDAV synchronization using value set using linphone_friend_list_set_uri.
+ * @param[in] list LinphoneFriendList object.
+ */
+LINPHONE_PUBLIC void linphone_friend_list_synchronize_friends_from_server(LinphoneFriendList *list);
+
+/**
+ * Goes through all the LinphoneFriend that are dirty and does a CardDAV PUT to update the server.
+ * @param[in] list LinphoneFriendList object.
+ */
+void linphone_friend_list_update_dirty_friends(LinphoneFriendList *list);
+
+/**
+ * Returns the LinphoneCore object attached to this LinphoneFriendList.
+ * @param[in] list LinphoneFriendList object.
+ * @return a LinphoneCore object
+ */
+LINPHONE_PUBLIC LinphoneCore* linphone_friend_list_get_core(const LinphoneFriendList *list);
+
+/**
+ * Creates and adds LinphoneFriend objects to LinphoneFriendList from a file that contains the vCard(s) to parse
+ * @param[in] list the LinphoneFriendList object
+ * @param[in] vcard_file the path to a file that contains the vCard(s) to parse
+ * @return the amount of linphone friends created
+ */
+LINPHONE_PUBLIC int linphone_friend_list_import_friends_from_vcard4_file(LinphoneFriendList *list, const char *vcard_file);
+
+/**
+ * Creates and adds LinphoneFriend objects to LinphoneFriendList from a buffer that contains the vCard(s) to parse
+ * @param[in] list the LinphoneFriendList object
+ * @param[in] vcard_buffer the buffer that contains the vCard(s) to parse
+ * @return the amount of linphone friends created
+ */
+LINPHONE_PUBLIC int linphone_friend_list_import_friends_from_vcard4_buffer(LinphoneFriendList *list, const char *vcard_buffer);
+
+/**
+ * Creates and export LinphoneFriend objects from LinphoneFriendList to a file using vCard 4 format
+ * @param[in] list the LinphoneFriendList object
+ * @param[in] vcard_file the path to a file that will contain the vCards
+ */
+LINPHONE_PUBLIC void linphone_friend_list_export_friends_as_vcard4_file(LinphoneFriendList *list, const char *vcard_file);
+
+/**
+ * Enable subscription to NOTIFYes of all friends list
+ * @param[in] list the LinphoneFriendList object
+ * @param[in] enabled should subscription be enabled or not
+ */
+LINPHONE_PUBLIC void linphone_friend_list_enable_subscriptions(LinphoneFriendList *list, bool_t enabled);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LINPHONE_FRIENDLIST_H_ */
diff --git a/coreapi/gitversion.cmake b/coreapi/gitversion.cmake
index e626873a4..ca9284bae 100644
--- a/coreapi/gitversion.cmake
+++ b/coreapi/gitversion.cmake
@@ -21,19 +21,32 @@
 ############################################################################
 
 if(GIT_EXECUTABLE)
-	execute_process(
-		COMMAND ${GIT_EXECUTABLE} describe --always
-		WORKING_DIRECTORY ${WORK_DIR}
-		OUTPUT_VARIABLE GIT_REVISION
-		OUTPUT_STRIP_TRAILING_WHITESPACE
-	)
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E echo "#define LIBLINPHONE_GIT_VERSION \"${GIT_REVISION}\""
-		OUTPUT_FILE ${OUTPUT_DIR}/liblinphone_gitversion.h
-	)
-else()
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E echo "#define LIBLINPHONE_GIT_VERSION \"unknown\""
-		OUTPUT_FILE ${OUTPUT_DIR}/liblinphone_gitversion.h
-	)
+	macro(GIT_COMMAND OUTPUT_VAR)
+		set(GIT_ARGS ${ARGN})
+		execute_process(
+			COMMAND ${GIT_EXECUTABLE} ${ARGN}
+			WORKING_DIRECTORY ${WORK_DIR}
+			OUTPUT_VARIABLE ${OUTPUT_VAR}
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+		)
+	endmacro()
+
+	GIT_COMMAND(GIT_DESCRIBE describe --always)
+	GIT_COMMAND(GIT_TAG describe --abbrev=0)
+	GIT_COMMAND(GIT_REVISION rev-parse HEAD)
+endif()
+
+if(GIT_DESCRIBE)
+	if(NOT GIT_TAG STREQUAL LINPHONE_VERSION)
+		message(FATAL_ERROR "LINPHONE_VERSION (${LINPHONE_VERSION}) and git tag (${GIT_TAG}) differ. Please put them identical")
+	endif()
+	set(LIBLINPHONE_GIT_VERSION "${GIT_DESCRIBE}")
+	configure_file("${WORK_DIR}/gitversion.h.in" "${OUTPUT_DIR}/liblinphone_gitversion.h" @ONLY)
+elseif(GIT_REVISION)
+	set(LIBLINPHONE_GIT_VERSION "${LINPHONE_VERSION}_${GIT_REVISION}")
+	configure_file("${WORK_DIR}/gitversion.h.in" "${OUTPUT_DIR}/liblinphone_gitversion.h" @ONLY)
+else()
+	if(NOT EXISTS "${OUTPUT_DIR}/liblinphone_gitversion.h")
+		execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${OUTPUT_DIR}/liblinphone_gitversion.h")
+	endif()
 endif()
diff --git a/coreapi/gitversion.h.in b/coreapi/gitversion.h.in
new file mode 100644
index 000000000..ab0efd602
--- /dev/null
+++ b/coreapi/gitversion.h.in
@@ -0,0 +1,21 @@
+/*
+linphone
+Copyright (C) 2010-2014  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+
+#define LIBLINPHONE_GIT_VERSION "@LIBLINPHONE_GIT_VERSION@"
\ No newline at end of file
diff --git a/coreapi/help/CMakeLists.txt b/coreapi/help/CMakeLists.txt
index 0ee3b6561..64a18c024 100644
--- a/coreapi/help/CMakeLists.txt
+++ b/coreapi/help/CMakeLists.txt
@@ -20,26 +20,70 @@
 #
 ############################################################################
 
-find_package(Doxygen)
-
-if(DOXYGEN_FOUND)
-	if(DOXYGEN_DOT_FOUND)
-		set(top_srcdir ${CMAKE_SOURCE_DIR})
-		configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-		file(GLOB DOC_INPUT_FILES
-			[^.]*.c
-			[^.]*.dox
-			../[^.]*.h
-			../[^.]*.c
-		)
-		add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html"
-			COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${DOC_INPUT_FILES}
-		)
-		add_custom_target(doc ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html")
-		install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/html" "${CMAKE_CURRENT_BINARY_DIR}/doc/xml"
-			DESTINATION "share/doc/linphone-${LINPHONE_VERSION}")
-	else()
-		message(WARNING "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
+if (ENABLE_DOC)
+	find_package(Doxygen)
+	if(DOXYGEN_FOUND)
+		if(DOXYGEN_DOT_FOUND)
+			set(top_srcdir "${CMAKE_CURRENT_LIST_DIR}/../../")
+			configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+			file(GLOB DOC_INPUT_FILES
+				[^.]*.c
+				[^.]*.dox
+				../[^.]*.h
+				../[^.]*.c
+			)
+			add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html"
+				COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+				DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${DOC_INPUT_FILES}
+			)
+			add_custom_target(linphone-doc ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html")
+			install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/html" "${CMAKE_CURRENT_BINARY_DIR}/doc/xml"
+				DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/linphone-${LINPHONE_VERSION}")
+		else()
+			message(WARNING "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
+		endif()
 	endif()
 endif()
+
+if(ENABLE_JAVADOC)
+	find_package(Java REQUIRED)
+	set(JAVADOC_PACKAGES "org.linphone.core org.linphone.mediastream")
+	set(JAVADOC_CLASSPATHS
+		"${PROJECT_SOURCE_DIR}/java/common"
+		"${PROJECT_SOURCE_DIR}/java/j2se"
+		"${PROJECT_SOURCE_DIR}/mediastreamer2/java/src"
+	)
+	string(REPLACE ";" ":" JAVADOC_CLASSPATHS "${JAVADOC_CLASSPATHS}")
+	set(JAVADOC_TITLE "Linphone SDK ${PROJECT_VERSION} reference documentation")
+	set(JAVADOC_JAVA_REFERENCE "http://docs.oracle.com/javase/8/docs/api/")
+	set(JAVADOC_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc/java")
+	set(JAVADOC_LOGFILE "${CMAKE_CURRENT_BINARY_DIR}/javadoc.log")
+	configure_file("generate_javadoc.sh.in" "generate_javadoc.sh" @ONLY)
+	add_custom_target(javadoc ALL
+		COMMAND "${CMAKE_CURRENT_BINARY_DIR}/generate_javadoc.sh"
+	)
+endif()
+
+if (ENABLE_TOOLS)
+	set(USE_BUNDLE )
+	if (IOS)
+		set(USE_BUNDLE MACOSX_BUNDLE)
+	endif()
+	add_definitions(-DIN_LINPHONE)
+	file(GLOB EXECUTABLES_SOURCE RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
+	foreach(EXECUTABLE ${EXECUTABLES_SOURCE})
+		string(REPLACE ".c" "" EXECUTABLE_NAME ${EXECUTABLE})
+		apply_compile_flags(${EXECUTABLE} "CPP" "C")
+		add_executable(${EXECUTABLE_NAME} ${USE_BUNDLE} ${EXECUTABLE})
+		target_link_libraries(${EXECUTABLE_NAME} ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES})
+		set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+		if (NOT IOS)
+			install(TARGETS ${EXECUTABLE_NAME}
+				RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+				LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+				ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+				PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+			)
+		endif()
+	endforeach()
+endif()
diff --git a/coreapi/help/Doxyfile.in b/coreapi/help/Doxyfile.in
index 12facea9b..b0230913f 100644
--- a/coreapi/help/Doxyfile.in
+++ b/coreapi/help/Doxyfile.in
@@ -1,233 +1,2412 @@
-# Doxyfile 1.4.1
+# Doxyfile 1.8.11
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = liblinphone
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = Liblinphone
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
 PROJECT_NUMBER         = @LINPHONE_VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
 OUTPUT_DIRECTORY       = doc
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
 CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
 OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
 BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
 REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
 ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
 INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
 FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
 SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
 JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
 INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
 TAB_SIZE               = 8
-ALIASES                = mslist{1}="A list of \ref \1 objects. \xmlonly <mslist>\1</mslist> \endxmlonly"
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = "mslist{1}=A list of \ref \1 objects. \xmlonly <mslist>\1</mslist> \endxmlonly"
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
 SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = YES
-HIDE_UNDOC_CLASSES     = YES
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = @top_srcdir@/coreapi @top_srcdir@/coreapi/help
 
-FILE_PATTERNS          = *.h \
-                         *.c \
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = NO
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @top_srcdir@/coreapi \
+                         @top_srcdir@/coreapi/help
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
+# *.vhdl, *.ucf, *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.c \
+                         *.h \
                          *.dox
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
 RECURSIVE              = NO
-EXCLUDE                = 
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = @top_srcdir@ @top_srcdir@/coreapi/help
-EXAMPLE_PATTERNS       = 
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = @top_srcdir@ \
+                         @top_srcdir@/coreapi/help
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
 FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
 SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
 INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
 STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
 REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
 REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
 VERBATIM_HEADERS       = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
 ALPHABETICAL_INDEX     = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
 GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 1
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 1
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = YES
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = YES
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = .
-INCLUDE_FILE_PATTERNS  = *.h
-PREDEFINED             = DOXYGEN MS2_PUBLIC= LINPHONE_PUBLIC=
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = YES
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = .
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = *.h
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = DOXYGEN \
+                         MS2_PUBLIC= \
+                         LINPHONE_PUBLIC=
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/coreapi/help/Makefile.am b/coreapi/help/Makefile.am
index 479d2b31d..895b1e99b 100644
--- a/coreapi/help/Makefile.am
+++ b/coreapi/help/Makefile.am
@@ -46,7 +46,7 @@ clean-local:
 
 if ENABLE_TUTORIALS
 
-noinst_PROGRAMS=helloworld registration buddy_status chatroom notify filetransfer
+noinst_PROGRAMS=helloworld registration buddy_status chatroom notify filetransfer realtimetext_sender realtimetext_receiver
 
 helloworld_SOURCES=helloworld.c
 LINPHONE_TUTOS=$(helloworld_SOURCES)
@@ -81,6 +81,16 @@ LINPHONE_TUTOS+=$(filetransfer_SOURCES)
 
 filetransfer_LDADD=$(helloworld_LDADD)
 
+realtimetext_sender_SOURCES=realtimetext_sender.c
+LINPHONE_TUTOS+=$(realtimetext_sender_SOURCES)
+
+realtimetext_sender_LDADD=$(helloworld_LDADD)
+
+realtimetext_receiver_SOURCES=realtimetext_receiver.c
+LINPHONE_TUTOS+=$(realtimetext_receiver_SOURCES)
+
+realtimetext_receiver_LDADD=$(helloworld_LDADD)
+
 AM_CFLAGS=\
 	-I$(top_srcdir)/coreapi \
 	$(STRICT_OPTIONS) \
diff --git a/coreapi/help/buddy_status.c b/coreapi/help/buddy_status.c
index f4ad385f9..002af3770 100644
--- a/coreapi/help/buddy_status.c
+++ b/coreapi/help/buddy_status.c
@@ -51,18 +51,26 @@ static void stop(int signum){
  * presence state change notification callback
  */
 static void notify_presence_recv_updated (LinphoneCore *lc,  LinphoneFriend *friend) {
-	const LinphonePresenceModel* model = linphone_friend_get_presence_model(friend);
 	const LinphoneAddress* friend_address = linphone_friend_get_address(friend);
-	LinphonePresenceActivity *activity = linphone_presence_model_get_activity(model);
-	char *activity_str = linphone_presence_activity_to_string(activity);
-	printf("New state state [%s] for user id [%s] \n"
-				,activity_str
-				,linphone_address_as_string (friend_address));
+	if (friend_address != NULL) {
+		const LinphonePresenceModel* model = linphone_friend_get_presence_model(friend);
+		LinphonePresenceActivity *activity = linphone_presence_model_get_activity(model);
+		char *activity_str = linphone_presence_activity_to_string(activity);
+		char *str = linphone_address_as_string (friend_address);
+		printf("New state state [%s] for user id [%s] \n"
+					,activity_str
+					,str);
+		ms_free(str);
+	}
 }
 static void new_subscription_requested (LinphoneCore *lc,  LinphoneFriend *friend, const char* url) {
 	const LinphoneAddress* friend_address = linphone_friend_get_address(friend);
-	printf(" [%s] wants to see your status, accepting\n"
-				,linphone_address_as_string (friend_address));
+
+	if (friend_address != NULL) {
+		char *str = linphone_address_as_string (friend_address);
+		printf(" [%s] wants to see your status, accepting\n", str);
+		ms_free(str);
+	}
 	linphone_friend_edit(friend); /* start editing friend */
 	linphone_friend_set_inc_subscribe_policy(friend,LinphoneSPAccept); /* Accept incoming subscription request for this friend*/
 	linphone_friend_done(friend); /*commit change*/
@@ -156,7 +164,7 @@ int main(int argc, char *argv[]){
 	}
 
 	if (dest_friend) {
-		my_friend = linphone_friend_new_with_address(dest_friend); /*creates friend object from dest*/
+		my_friend = linphone_core_create_friend_with_address(lc, dest_friend); /*creates friend object from dest*/
 		if (my_friend == NULL) {
 			printf("bad destination uri for friend [%s]\n",dest_friend);
 			goto end;
diff --git a/coreapi/help/doxygen.dox b/coreapi/help/doxygen.dox
index a8baa5138..69d5dc896 100644
--- a/coreapi/help/doxygen.dox
+++ b/coreapi/help/doxygen.dox
@@ -16,16 +16,16 @@
  *
  * Liblinphone is GPL (see COPYING file). Please understand the licencing details
  * before using it!
- * 
+ *
  * For any use of this library beyond the rights granted to you by the
- * GPL license, please contact Belledonne Communications 
+ * GPL license, please contact Belledonne Communications
  * (contact@belledonne-communications.com)
- * 
+ *
  *
 **/
 
 /**
- * @page liblinphone_license COPYING 
+ * @page liblinphone_license COPYING
  * @include COPYING
  */
 
@@ -54,23 +54,24 @@
 /**
  * @defgroup media_parameters Controlling media parameters
  *<b> Multicast </b>
- *<br> Call using rtp multicast addresses are supported for both audio and video with some limitations. Limitations are, no stun, no ice, no encryption. 
- *<br><li> Incoming call with multicast address are automatically accepted. The called party switches in a media receive only mode.
+ *<br> Call using rtp multicast addresses are supported for both audio and video with some limitations. Limitations are, no stun, no ice, no encryption.
+ *<br><ul><li> Incoming call with multicast address are automatically accepted. The called party switches in a media receive only mode.</li>
  *<br><li> Outgoing call willing to send media to a multicast address can activate multicast using \link linphone_core_enable_video_multicast\endlink or
- *\link linphone_core_enable_audio_multicast\endlink . The calling party switches in a media listen send only mode.
+ *\link linphone_core_enable_audio_multicast\endlink . The calling party switches in a media listen send only mode.</li>
+ *</ul>
 **/
 
 /**
  * @defgroup proxies Managing proxies
- *User registration is controled by  #LinphoneProxyConfig settings.<br> Each #LinphoneProxyConfig object can be configured with registration informations 
- *like \link linphone_proxy_config_set_server_addr() proxy address \endlink , \link linphone_proxy_config_set_identity() user id \endlink, \link linphone_proxy_config_expires() refresh period \endlink, and so on. 
+ *User registration is controled by  #LinphoneProxyConfig settings.<br> Each #LinphoneProxyConfig object can be configured with registration informations
+ *like \link linphone_proxy_config_set_server_addr() proxy address \endlink , \link linphone_proxy_config_set_identity() user id \endlink, \link linphone_proxy_config_expires() refresh period \endlink, and so on.
  *<br> A created proxy config using linphone_proxy_config_new(), once configured, must be added to #LinphoneCore using function linphone_core_add_proxy_config().
- *<br> It is recommended to set a default \link #LinphoneProxyConfig proxy config \endlink using function linphone_core_set_default_proxy(). Once done, if \link #LinphoneProxyConfig a proxy config \endlink has been configured with attribute \link linphone_proxy_config_enable_register() enable register \endlink  , next call to linphone_core_iterate() triggers a SIP register.  
+ *<br> It is recommended to set a default \link #LinphoneProxyConfig proxy config \endlink using function linphone_core_set_default_proxy(). Once done, if \link #LinphoneProxyConfig a proxy config \endlink has been configured with attribute \link linphone_proxy_config_enable_register() enable register \endlink  , next call to linphone_core_iterate() triggers a SIP register.
  *<br> Registration status is reported by LinphoneCoreRegistrationStateChangedCb.
  *<br>
  *<br> This pseudo code demonstrates basic registration operations:
  *<br> \code
- *	
+ *
  *	LinphoneProxyConfig* proxy_cfg;
  *	/*create proxy config*/
  *	proxy_cfg = linphone_proxy_config_new();
@@ -80,14 +81,14 @@
  *	if (password!=NULL){
  * 		info=linphone_auth_info_new(linphone_address_get_username(from),NULL,"secret",NULL,NULL); /*create authentication structure from identity*/
  *		linphone_core_add_auth_info(lc,info); /*add authentication info to LinphoneCore*/
- *	}	
+ *	}
  *	// configure proxy entries
  *	linphone_proxy_config_set_identity(proxy_cfg,identity); /*set identity with user name and domain*/
  *	const char* server_addr = linphone_address_get_domain(from); /*extract domain address from identity*/
  *	linphone_proxy_config_set_server_addr(proxy_cfg,server_addr); /* we assume domain = proxy server address*/
  *	linphone_proxy_config_enable_register(proxy_cfg,TRUE); /*activate registration for this proxy config*/
  *	linphone_address_destroy(from); /*release resource*/
- *	
+ *
  *	linphone_core_add_proxy_config(lc,proxy_cfg); /*add proxy config to linphone core*/
  *	linphone_core_set_default_proxy(lc,proxy_cfg); /*set to default proxy*/ \endcode
  *<br>
@@ -114,7 +115,7 @@
 	linphone_proxy_config_done(proxy_cfg); /*initiate REGISTER with expire = 0*/
 \endcode
 	<br>
-	A complete tutorial can be found at : \ref registration_tutorials "Registration tutorial" 
+	A complete tutorial can be found at : \ref registration_tutorials "Registration tutorial"
 **/
 
 /**
@@ -126,9 +127,9 @@
 **/
 
 /**
-* @defgroup buddy_list Managing Buddies and buddy list and presence 
+* @defgroup buddy_list Managing Buddies and buddy list and presence
 <b>Buddies and buddy list</b>
-<br>Each buddy is represented by a #LinphoneFriend object created by function linphone_friend_new(). 
+<br>Each buddy is represented by a #LinphoneFriend object created by function linphone_friend_new().
 Buddy configuration parameters like \link linphone_friend_set_addr() sip uri \endlink or  \link linphone_friend_set_inc_subscribe_policy() status publication \endlink policy for this \link #LinphoneFriend friend \endlink  are configurable for each buddy.
 <br>Here under a typical buddy creation:
 <br>
@@ -163,21 +164,21 @@ linphone_friend_done(my_friend); /*commit changes triggering an UNSUBSCRIBE mess
 <br> New incoming subscription requests are process according to \link linphone_friend_set_inc_subscribe_policy() the incoming subscription policy state \endlink for subscription initiated by \link linphone_core_add_friend() members of the buddy list. \endlink
 <br> For incoming request comming from an unknown buddy, the call back  LinphoneCoreVTable.new_subscription_request is invoked.
 
-<br> A complete tutorial can be found at : \ref buddy_tutorials "Registration tutorial" 
+<br> A complete tutorial can be found at : \ref buddy_tutorials "Registration tutorial"
 
 
 **/
 
 /**
-* @defgroup chatroom Chat room and Messaging 
+* @defgroup chatroom Chat room and Messaging
 <b> Exchanging text messages</b>
-<br> Messages are sent using #LinphoneChatRoom object. First step is to create a \link linphone_core_create_chat_room() chat room \endlink
+<br> Messages are sent using #LinphoneChatRoom object. First step is to create a \link linphone_core_get_chat_room() chat room \endlink
 from a peer sip uri.
 \code
-LinphoneChatRoom* chat_room = linphone_core_create_chat_room(lc,"sip:joe@sip.linphone.org");
+LinphoneChatRoom* chat_room = linphone_core_get_chat_room(lc,"sip:joe@sip.linphone.org");
 \endcode
 
-<br>Once created, messages are sent using function linphone_chat_room_send_message()  . 
+<br>Once created, messages are sent using function linphone_chat_room_send_message().
 \code
 linphone_chat_room_send_message(chat_room,"Hello world"); /*sending message*/
 \endcode
@@ -187,7 +188,7 @@ void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddre
 	printf(" Message [%s] received from [%s] \n",message,linphone_address_as_string (from));
 }
 \endcode
-<br> A complete tutorial can be found at : \ref chatroom_tuto "Chat room tutorial" 
+<br> A complete tutorial can be found at : \ref chatroom_tuto "Chat room tutorial"
 **/
 
 /**
@@ -204,21 +205,21 @@ void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddre
  * @defgroup conferencing Making an audio conference.
  * This API allows to create a conference entirely managed by the client. No server capabilities are required.
  * The way such conference is created is by doing the following:<br>
- * The application shall makes "normal" calls to several destinations (using linphone_core_invite() ), one after another. 
+ * The application shall makes "normal" calls to several destinations (using linphone_core_invite() ), one after another.
  * While initiating the second call, the first one is automatically paused.
  * Then, once the second call is established, the application has the possibility to merge the two calls to form a conference where each participant
  * (the local participant, the remote destination of the first call, the remote destination of the second call) can talk together.
  * This must be done by adding the two calls to the conference using \link linphone_core_add_to_conference() \endlink
  *
- * Once merged into a conference the LinphoneCall objects representing the calls that were established remain unchanged, except that 
+ * Once merged into a conference the LinphoneCall objects representing the calls that were established remain unchanged, except that
  * they are tagged as part of the conference (see \link linphone_call_is_in_conference() \endlink ). The calls in a conference are in the LinphoneCallStreamsRunning state.
- * 
- * Only a single conference can be created: the purpose of this feature is to allow the local user to create, take part and manage the conference. 
+ *
+ * Only a single conference can be created: the purpose of this feature is to allow the local user to create, take part and manage the conference.
  * This API is not designed to create a conference server application.
  *
  * Up to 10 calls can be merged into the conference, however depending on the CPU usage required for doing the encoding/decoding of the streams of each participants,
  * the effective limit can be lower.
- * 
+ *
 **/
 
 
@@ -232,12 +233,12 @@ void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddre
 **/
 
 /**
- * @defgroup tutorials Tutorials: 
+ * @defgroup tutorials Tutorials:
  *
 **/
 
 /**
- * @defgroup port Portability: 
+ * @defgroup port Portability:
  *
 **/
 /**
@@ -257,8 +258,8 @@ void text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddre
 <br>
 <ul>
 <li><b>SIP socket </b><br>Recommended mode is SIP over TCP, because UDP usually requires frequent keep alives for maintaining NAT association at the IP router level. This can be as frequent as one UDP packet every 15 seconds to maintain the NAT association accross NAT routers. Doing such drains the battery very fast, and furthermore the iOS keep-alive designed by Apple to handle this task can only be called with a minimum of 10 minutes interval.<br>
-For TCP, liblinphone automatically configures SIP socket for voip  (I.E kCFStreamNetworkServiceType set to kCFStreamNetworkServiceTypeVoIP). 
-<br><b>Since IOS > 4.1 Apple disabled voip mode for UDP sockets </b> 
+For TCP, liblinphone automatically configures SIP socket for voip  (I.E kCFStreamNetworkServiceType set to kCFStreamNetworkServiceTypeVoIP).
+<br><b>Since IOS > 4.1 Apple disabled voip mode for UDP sockets </b>
 <li><b>Entering background mode</b>
 <br> Before entering in background mode (through \code - (void)applicationDidEnterBackground:(UIApplication *)application \endcode  ), the application must first refresh sip registration using function #linphone_core_refresh_registers();
 and register a keep-alive handler for periodically refreshing the registration. The speudo code below shows how to register a keep alive handler:
@@ -272,7 +273,7 @@ and register a keep-alive handler for periodically refreshing the registration.
 		usleep(100000);
 	}
 	//register keepalive handler
-	[[UIApplication sharedApplication] setKeepAliveTimeout:600/*minimal interval is 600 s*/ 
+	[[UIApplication sharedApplication] setKeepAliveTimeout:600/*minimal interval is 600 s*/
                                                        handler:^{
                                                                 //refresh sip registration
                                                                 linphone_core_refresh_registers(theLinphoneCore);
@@ -291,7 +292,7 @@ and register a keep-alive handler for periodically refreshing the registration.
 			notif.alertBody =@"New incoming call";
 			notif.alertAction = @"Answer";
 			notif.soundName = @"oldphone-mono-30s.caf";
-			
+
 			[[UIApplication sharedApplication]  presentLocalNotificationNow:notif];
 		}
 \endcode
@@ -312,8 +313,8 @@ and register a keep-alive handler for periodically refreshing the registration.
 	//try to write on this socket
 	CFWriteStreamWrite (writeStream,(const UInt8*)buff,strlen(buff));
 	CFWriteStreamClose (writeStream);
-}	
-\endcode  
+}
+\endcode
 It is recommanded to perform this task each time the application is woken up, including keep alive handler.
 <li><b>Managing IP connection state</b>
 <br>Liblinphone for IOS relies on the application to be informed of network connectivity changes. Network state changes when the IP connection moves from DOWN to UP, or from WIFI to WWAN. Applications using liblinphone must inform libliblinphone of this changes using function #linphone_core_set_network_reachable(). Usually this method is called from the IOS NetworkReachability callback. Here under a sample code:
@@ -339,8 +340,8 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 	}
 }
 }
-	
-\endcode  
+
+\endcode
 </ul>
 <b> Sound cards </b>
 <br> Since IOS 5.0, liblinphone supports 2 sound cards. <i>AU: Audio Unit Receiver</i> based on IO units for voice calls plus <i>AQ: Audio Queue Device</i> dedicated to rings. Here under the recommended settings (I.E default one)
@@ -366,7 +367,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
     -(void) endInterruption {
         ms_message("Sound interruption ended!");
         const MSList* c = linphone_core_get_calls(theLinphoneCore);
-    
+
         if (c) {
             ms_message("Auto resuming call");
             linphone_core_resume_call(theLinphoneCore, (LinphoneCall*) c->data);
@@ -387,7 +388,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 \code
 	UIView* display = [[UIView alloc] init];
 	UIView* preview = [[UIView alloc] init];
-	linphone_core_set_native_video_window_id(lc,(unsigned long)display);	
+	linphone_core_set_native_video_window_id(lc,(unsigned long)display);
 	linphone_core_set_native_preview_window_id(lc,(unsigned long)preview);
 \endcode
 <br> Screen rotations are also handled by liblinphone. 2 positions are currently supported, namely <i>UIInterfaceOrientationPortrait</i> and <i>UIInterfaceOrientationLandscapeRight</i>. Applications may invoke #linphone_core_set_device_rotation() followed by #linphone_core_update_call() to notify liblinphone of an orientation change. Here under a speudo code to handle orientation changes
@@ -396,16 +397,16 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 -(void) configureOrientation:(UIInterfaceOrientation) oritentation  {
 	int oldLinphoneOrientation = linphone_core_get_device_rotation(lc);
 	if (oritentation == UIInterfaceOrientationPortrait ) {
-		linphone_core_set_native_video_window_id(lc,(unsigned long)display-portrait);	
+		linphone_core_set_native_video_window_id(lc,(unsigned long)display-portrait);
 		linphone_core_set_native_preview_window_id(lc,(unsigned long)preview-portrait);
 		linphone_core_set_device_rotation(lc, 0);
-		
+
 	} else if (oritentation == UIInterfaceOrientationLandscapeRight ) {
-		linphone_core_set_native_video_window_id(lc,(unsigned long)display-landscape);	
+		linphone_core_set_native_video_window_id(lc,(unsigned long)display-landscape);
 		linphone_core_set_native_preview_window_id(lc,(unsigned long)preview-landscape);
 		linphone_core_set_device_rotation(lc, 270);
 	}
-	
+
 	if ((oldLinphoneOrientation != linphone_core_get_device_rotation(lc))
 		&& linphone_core_get_current_call(lc)) {
 		//Orientation has changed, must call update call
@@ -416,7 +417,49 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 \endcode
 
 <b>DTMF feebacks</b>
-<br>Liblinphone provides functions \link #linphone_core_play_dtmf() to play dtmf \endlink to the local user. Usually this is used to play a sound when the user presses a digit, inside or outside of any call. On IOS, libLinphone relies on AudioUnits for interfacing with the audio system. Unfortunately the Audio Unit initialization is a quite long operation that may trigger a bad user experience if performed each time a DTMF is played, the sound being delayed half a second after the press. To solve this issue and thus insure real-time precision, liblinphone introduces 2 functions for \link linphone_core_start_dtmf_stream() preloading \endlink and \link #linphone_core_start_dtmf_stream() unloading \endlink the underlying audio graph responsible for playing DTMFs.  
-<br> For an application using function #linphone_core_play_dtmf(), it is recommanded to call #linphone_core_start_dtmf_stream() when entering in foreground and #linphone_core_stop_dtmf_stream() upon entering background mode. 
+<br>Liblinphone provides functions \link #linphone_core_play_dtmf() to play dtmf \endlink to the local user. Usually this is used to play a sound when the user presses a digit, inside or outside of any call. On IOS, libLinphone relies on AudioUnits for interfacing with the audio system. Unfortunately the Audio Unit initialization is a quite long operation that may trigger a bad user experience if performed each time a DTMF is played, the sound being delayed half a second after the press. To solve this issue and thus insure real-time precision, liblinphone introduces 2 functions for \link linphone_core_start_dtmf_stream() preloading \endlink and \link #linphone_core_start_dtmf_stream() unloading \endlink the underlying audio graph responsible for playing DTMFs.
+<br> For an application using function #linphone_core_play_dtmf(), it is recommanded to call #linphone_core_start_dtmf_stream() when entering in foreground and #linphone_core_stop_dtmf_stream() upon entering background mode.
+
+<b>Plugins</b>
+<br>On iOS, plugins are built as static libraries so Liblinphone will not be able to load them at runtime dynamically. Instead, you should declare their prototypes:
+
+\code
+
+extern void libmsamr_init(MSFactory *factory);
+extern void libmsx264_init(MSFactory *factory);
+extern void libmsopenh264_init(MSFactory *factory);
+extern void libmssilk_init(MSFactory *factory);
+extern void libmsbcg729_init(MSFactory *factory);
+extern void libmswebrtc_init(MSFactory *factory);
+
+\endcode
+
+Then you should register them after the instantiation of LinphoneCore:
+
+\code
+
+	theLinphoneCore = linphone_core_new_with_config(/* options ... */);
+
+	// Load plugins if available in the linphone SDK - otherwise these calls will do nothing
+	MSFactory *f = linphone_core_get_ms_factory(theLinphoneCore);
+	libmssilk_init(f);
+	libmsamr_init(f);
+	libmsx264_init(f);
+	libmsopenh264_init(f);
+	libmsbcg729_init(f);
+	libmswebrtc_init(f);
+	linphone_core_reload_ms_plugins(theLinphoneCore, NULL);
+
+\endcode
+
+If the plugin has not been enabled at compilation time, a stubbed library will be generated with only libplugin_init method declared, doing nothing. You should see these trace in logs, if plugin is stubbed:
+
+\code
+
+I/lib/Could not find encoder for SILK
+I/lib/Could not find decoder for SILK
+
+\endcode
+
 */
 
diff --git a/coreapi/help/filetransfer.c b/coreapi/help/filetransfer.c
index bc321d54f..a6bfbd346 100644
--- a/coreapi/help/filetransfer.c
+++ b/coreapi/help/filetransfer.c
@@ -74,12 +74,11 @@ static void file_transfer_received(LinphoneChatMessage *message, const LinphoneC
 	file = (FILE*)linphone_chat_message_get_user_data(message);
 	if (linphone_buffer_is_empty(buffer)) {
 		printf("File transfert completed\n");
-		linphone_chat_room_destroy(linphone_chat_message_get_chat_room(message));
 		linphone_chat_message_destroy(message);
 		fclose(file);
 		running=FALSE;
 	} else { /* store content on a file*/
-		if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
+		if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==0){
 			ms_warning("file_transfer_received() write failed: %s",strerror(errno));
 		}
 	}
@@ -99,7 +98,7 @@ static LinphoneBuffer * file_transfer_send(LinphoneChatMessage *message,  const
 /*
  * Call back to get delivery status of a message
  * */
-static void linphone_file_transfer_state_changed(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud) {
+static void linphone_file_transfer_state_changed(LinphoneChatMessage* msg,LinphoneChatMessageState state) {
 	const LinphoneAddress* to_address = linphone_chat_message_get_to(msg);
 	char *to = linphone_address_as_string(to_address);
 	printf("File transfer sent to [%s] delivery status is [%s] \n"	, to
@@ -114,7 +113,7 @@ static void message_received(LinphoneCore *lc, LinphoneChatRoom *cr, LinphoneCha
 	const LinphoneContent *file_transfer_info = linphone_chat_message_get_file_transfer_information(msg);
 	printf ("Do you really want to download %s (size %ld)?[Y/n]\nOk, let's go\n", linphone_content_get_name(file_transfer_info), (long int)linphone_content_get_size(file_transfer_info));
 
-	linphone_chat_message_start_file_download(msg, linphone_file_transfer_state_changed, NULL);
+	linphone_chat_message_download_file(msg);
 
 }
 
@@ -123,7 +122,7 @@ int main(int argc, char *argv[]){
 	LinphoneCoreVTable vtable={0};
 
 	const char* dest_friend=NULL;
-	int i;
+	size_t i;
 	const char* big_file_content="big file";
 	LinphoneChatRoom* chat_room;
 	LinphoneContent* content;
@@ -183,6 +182,7 @@ int main(int argc, char *argv[]){
 	linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
 	linphone_chat_message_cbs_set_file_transfer_send(cbs, file_transfer_send);
 	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, linphone_file_transfer_state_changed);
 
 	/*initiating file transfer*/
 	linphone_chat_room_send_chat_message(chat_room, chat_message);
diff --git a/coreapi/help/generate_javadoc.sh.in b/coreapi/help/generate_javadoc.sh.in
new file mode 100755
index 000000000..b2af1b048
--- /dev/null
+++ b/coreapi/help/generate_javadoc.sh.in
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+packages='@JAVADOC_PACKAGES@'
+classpaths='@JAVADOC_CLASSPATHS@'
+title='@JAVADOC_TITLE@'
+javaref='@JAVADOC_JAVA_REFERENCE@'
+outputdir='@JAVADOC_OUTPUT_DIR@'
+
+@Java_JAVADOC_EXECUTABLE@ ${packages} -classpath ${classpaths} -doctitle "${title}" -link ${javaref} -d ${outputdir} 2>&1 | tee @JAVADOC_LOGFILE@
+grep -E '^[0-9]{1,3} errors?' @JAVADOC_LOGFILE@ &> /dev/null && exit 1
+exit 0
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
index 9ac59e6d4..16c7cedbc 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialBuddyStatus.java
@@ -33,11 +33,13 @@ import org.linphone.core.LinphoneCore.GlobalState;
 import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
+import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriendList;
 import org.linphone.core.LinphoneFriend.SubscribePolicy;
 import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
@@ -297,10 +299,16 @@ public class TutorialBuddyStatus implements LinphoneCoreListener {
 
 	@Override
 	public void authInfoRequested(LinphoneCore lc, String realm,
-			String username, String Domain) {
+			String username, String domain) {
 		// TODO Auto-generated method stub
 		
 	}
+	
+	@Override
+	public void authenticationRequested(LinphoneCore lc, 
+			LinphoneAuthInfo authInfo, LinphoneCore.AuthMethod method) {
+		// TODO Auto-generated method stub
+	}
 
 	@Override
 	public void fileTransferProgressIndication(LinphoneCore lc,
@@ -335,4 +343,17 @@ public class TutorialBuddyStatus implements LinphoneCoreListener {
 		// TODO Auto-generated method stub
 		
 	}
+	
+        @Override
+        public void friendListCreated(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void friendListRemoved(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
+
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
index 1d4505c71..d3a21f9ce 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialChatRoom.java
@@ -33,11 +33,13 @@ import org.linphone.core.LinphoneCore.GlobalState;
 import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
+import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriendList;
 import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.PublishState;
@@ -77,6 +79,7 @@ public class TutorialChatRoom implements LinphoneCoreListener, LinphoneChatMessa
 	public void show(LinphoneCore lc) {}
 	public void byeReceived(LinphoneCore lc, String from) {}
 	public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {}
+	public void authenticationRequested(LinphoneCore lc, LinphoneAuthInfo authInfo, LinphoneCore.AuthMethod method) {}
 	public void displayStatus(LinphoneCore lc, String message) {}
 	public void displayMessage(LinphoneCore lc, String message) {}
 	public void displayWarning(LinphoneCore lc, String message) {}
@@ -251,5 +254,17 @@ public class TutorialChatRoom implements LinphoneCoreListener, LinphoneChatMessa
 		
 	}
 
+	
+        @Override
+        public void friendListCreated(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void friendListRemoved(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
 
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
index 19fcf860c..45b044456 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialHelloWorld.java
@@ -33,11 +33,13 @@ import org.linphone.core.LinphoneCore.GlobalState;
 import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
+import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriendList;
 import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.PublishState;
@@ -71,6 +73,7 @@ public class TutorialHelloWorld implements LinphoneCoreListener {
 	public void show(LinphoneCore lc) {}
 	public void byeReceived(LinphoneCore lc, String from) {}
 	public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {}
+	public void authenticationRequested(LinphoneCore lc, LinphoneAuthInfo authInfo, LinphoneCore.AuthMethod method) {}
 	public void displayStatus(LinphoneCore lc, String message) {}
 	public void displayMessage(LinphoneCore lc, String message) {}
 	public void displayWarning(LinphoneCore lc, String message) {}
@@ -257,5 +260,17 @@ public class TutorialHelloWorld implements LinphoneCoreListener {
 		
 	}
 
+	
+        @Override
+        public void friendListCreated(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void friendListRemoved(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
 
 }
diff --git a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
index 85cce1e60..d561156cd 100644
--- a/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
+++ b/coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
@@ -33,11 +33,13 @@ import org.linphone.core.LinphoneCore.GlobalState;
 import org.linphone.core.LinphoneCore.LogCollectionUploadState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCore.RemoteProvisioningState;
+import org.linphone.core.LinphoneAuthInfo;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneEvent;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriendList;
 import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.PublishState;
@@ -82,6 +84,7 @@ public class TutorialRegistration implements LinphoneCoreListener {
 	public void show(LinphoneCore lc) {}
 	public void byeReceived(LinphoneCore lc, String from) {}
 	public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {}
+	public void authenticationRequested(LinphoneCore lc, LinphoneAuthInfo authInfo, LinphoneCore.AuthMethod method) {}
 	public void displayStatus(LinphoneCore lc, String message) {}
 	public void displayMessage(LinphoneCore lc, String message) {}
 	public void displayWarning(LinphoneCore lc, String message) {}
@@ -286,4 +289,18 @@ public class TutorialRegistration implements LinphoneCoreListener {
 		// TODO Auto-generated method stub
 		
 	}
+
+	
+        @Override
+        public void friendListCreated(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void friendListRemoved(LinphoneCore lc, LinphoneFriendList list) {
+                // TODO Auto-generated method stub
+
+        }
+
 }
diff --git a/coreapi/help/notify.c b/coreapi/help/notify.c
index df26bfe96..f909d439f 100644
--- a/coreapi/help/notify.c
+++ b/coreapi/help/notify.c
@@ -152,16 +152,16 @@ int main(int argc, char *argv[]){
 		ms_usleep(50000);
 		++i;
 		if (data->ev && i%100==0){
-			LinphoneContentPrivate content;
-			content.type="application";
-			content.subtype="goodxml";
-			content.data="really cool";
-			content.size=strlen((const char*)content.data);
-			linphone_event_notify(data->ev,LINPHONE_CONTENT(&content));
+			LinphoneContent *content = linphone_core_create_content(lc);
+			linphone_content_set_type(content, "application");
+			linphone_content_set_subtype(content, "goodxml");
+			linphone_content_set_string_buffer(content, "really cool");
+			linphone_event_notify(data->ev, content);
+			linphone_content_unref(content);
 		}
 	}
 
-	linphone_core_get_default_proxy(lc,&proxy_cfg); /* get default proxy config*/
+	proxy_cfg = linphone_core_get_default_proxy_config(lc); /* get default proxy config*/
 	linphone_proxy_config_edit(proxy_cfg); /*start editing proxy configuration*/
 	linphone_proxy_config_enable_register(proxy_cfg,FALSE); /*de-activate registration for this proxy config*/
 	linphone_proxy_config_done(proxy_cfg); /*initiate REGISTER with expire = 0*/
diff --git a/coreapi/help/realtimetext_receiver.c b/coreapi/help/realtimetext_receiver.c
new file mode 100644
index 000000000..69f16ef9d
--- /dev/null
+++ b/coreapi/help/realtimetext_receiver.c
@@ -0,0 +1,115 @@
+
+/*
+linphone
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+/**
+ * @defgroup real_time_text Real Time Text Receiver
+ * @ingroup tutorials
+ This program is able to receive chat message in real time on port 5060. Use realtimetext_sender to generate chat message
+ usage: ./realtimetext_receiver
+
+ @include realtimetext_sender.c
+ */
+#ifdef IN_LINPHONE
+#include "linphonecore.h"
+#else
+#include "linphone/linphonecore.h"
+#endif
+
+#include <signal.h>
+
+static bool_t running=TRUE;
+
+static void stop(int signum){
+	running=FALSE;
+}
+
+/*
+ * Call state notification callback
+ */
+static void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){
+	switch(cstate){
+		case LinphoneCallIncomingReceived:
+			printf("It is now ringing remotely !\n");
+			linphone_core_accept_call(lc,call);
+			break;
+		case LinphoneCallReleased:
+			printf("call terminated, exit...\n");
+			running=FALSE;
+		break;
+		default:
+			printf("Unhandled notification %i\n",cstate);
+	}
+}
+
+/*
+ * Completed message received
+ */
+static void  message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *message) {
+	char *from=linphone_address_as_string(linphone_chat_room_get_peer_address(room));
+	printf(" Message [%s] received from [%s] \n",linphone_chat_message_get_text(message),from);
+	ms_free(from);
+}
+
+/*
+ *
+ * Remote is typing
+ */
+static void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
+	LinphoneCall *call = linphone_chat_room_get_call(room); /*get corresponding call*/
+	if (call && linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(call))) /*check if realtime text enabled for this call*/
+		printf("%c",linphone_chat_room_get_char(room));
+	/*else ignored*/
+}
+
+int main(int argc, char *argv[]){
+	LinphoneCoreVTable vtable={0};
+	LinphoneCore *lc;
+
+
+	signal(SIGINT,stop);
+
+#ifdef DEBUG
+	linphone_core_enable_logs(NULL); /*enable liblinphone logs.*/
+#endif
+	/* 
+	 Fill the LinphoneCoreVTable with application callbacks.
+	 All are optional. Here we only use the call_state_changed callbacks
+	 in order to get notifications about the progress of the call.
+	 */
+	vtable.call_state_changed=call_state_changed; /*to receive incoming call*/
+	vtable.message_received=message_received; /*to receive committed messages*/
+	vtable.is_composing_received=is_composing_received; /*to receive char in real time*/
+	/*
+	 Instanciate a LinphoneCore object given the LinphoneCoreVTable
+	*/
+	lc=linphone_core_new(&vtable,NULL,NULL,NULL);
+
+	/* main loop for receiving notifications and doing background linphonecore work: */
+	while(running){
+		linphone_core_iterate(lc);
+		ms_usleep(50000);
+	}
+
+	printf("Shutting down...\n");
+	linphone_core_destroy(lc);
+	printf("Exited\n");
+	return 0;
+}
+
diff --git a/coreapi/help/realtimetext_sender.c b/coreapi/help/realtimetext_sender.c
new file mode 100644
index 000000000..5e4bfdf84
--- /dev/null
+++ b/coreapi/help/realtimetext_sender.c
@@ -0,0 +1,158 @@
+
+/*
+linphone
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+/**
+ * @defgroup real_time_text_sender Real Time Text Sender
+ * @ingroup tutorials
+ This program just send chat message in real time to dest uri. Use realtimetext_receiver to receive  message.
+ usage: ./realtimetext_sender sip:localhost:5060
+
+
+ @include realtimetext_sender.c
+ */
+#ifdef IN_LINPHONE
+#include "linphonecore.h"
+#else
+#include "linphone/linphonecore.h"
+#endif
+
+#include <signal.h>
+
+static bool_t running=TRUE;
+
+static void stop(int signum){
+	running=FALSE;
+}
+
+
+
+int main(int argc, char *argv[]){
+	LinphoneCoreVTable vtable={0};
+	LinphoneCore *lc;
+	LinphoneCall *call=NULL;
+	LinphoneChatRoom *chat_room;
+	LinphoneChatMessage *chat_message=NULL;
+	const char *dest=NULL;
+	LCSipTransports tp;
+	tp.udp_port=LC_SIP_TRANSPORT_RANDOM;
+	tp.tcp_port=LC_SIP_TRANSPORT_RANDOM;
+	tp.tls_port=LC_SIP_TRANSPORT_RANDOM;
+
+	/* take the destination sip uri from the command line arguments */
+	if (argc>1){
+		dest=argv[1];
+	}
+
+	signal(SIGINT,stop);
+
+#ifdef DEBUG
+	linphone_core_enable_logs(NULL); /*enable liblinphone logs.*/
+#endif
+
+	/*
+	 Instanciate a LinphoneCore object given the LinphoneCoreVTable
+	*/
+	lc=linphone_core_new(&vtable,NULL,NULL,NULL);
+
+
+	linphone_core_set_sip_transports(lc,&tp); /*to avoid port colliding with receiver*/
+	if (dest){
+		/*
+		 Place an outgoing call with rtt enabled
+		*/
+		LinphoneCallParams *cp = linphone_core_create_call_params(lc, NULL);
+		linphone_call_params_enable_realtime_text(cp,TRUE); /*enable real time text*/
+		call=linphone_core_invite_with_params(lc,dest,cp);
+		linphone_call_params_destroy(cp);
+		if (call==NULL){
+			printf("Could not place call to %s\n",dest);
+			goto end;
+		}else printf("Call to %s is in progress...",dest);
+		linphone_call_ref(call);
+
+	}
+	/*wait for call to be established*/
+	while 	(running && (linphone_call_get_state(call) == LinphoneCallOutgoingProgress
+						|| linphone_call_get_state(call) == LinphoneCallOutgoingInit)) {
+		linphone_core_iterate(lc);
+		ms_usleep(50000);
+	}
+	/*check if call is established*/
+	switch (linphone_call_get_state(call)) {
+	case LinphoneCallError:
+	case LinphoneCallReleased:
+	case LinphoneCallEnd:
+		printf("Could not place call to %s\n",dest);
+		goto end;
+		break;
+	default:
+		break;
+		/*continue*/
+	}
+
+	chat_room=linphone_call_get_chat_room(call); /*create a chat room associated to this call*/
+
+	/* main loop for sending message and doing background linphonecore work: */
+	while(running){
+		char character;
+		/*to disable terminal buffering*/
+		if (system ("/bin/stty raw") == -1){
+			ms_error("/bin/stty error");
+		}
+		character = getchar();
+		if (system("/bin/stty cooked") == -1){
+			ms_error("/bin/stty error");
+		}
+		if (character==0x03) {/*CTRL C*/
+			running=0;
+			break;
+		}
+		if (character != EOF) {
+			/* user has typed something*/
+			if (chat_message == NULL) {
+				/*create a new message*/
+				chat_message = linphone_chat_room_create_message(chat_room,""); /*create an empty message*/
+			}
+			if (character == '\r') {
+				/*new line, committing message*/
+				linphone_chat_room_send_chat_message(chat_room,chat_message);
+				chat_message = NULL; /*reset message*/
+			} else {
+				linphone_chat_message_put_char(chat_message,character); /*send char in realtime*/
+			}
+		}
+		linphone_core_iterate(lc);
+		ms_usleep(50000);
+	}
+	if (call && linphone_call_get_state(call)!=LinphoneCallEnd){
+		/* terminate the call */
+		printf("Terminating the call...\n");
+		linphone_core_terminate_call(lc,call);
+		/*at this stage we don't need the call object */
+		linphone_call_unref(call);
+	}
+
+end:
+	printf("Shutting down...\n");
+	linphone_core_destroy(lc);
+	printf("Exited\n");
+	return 0;
+}
+
diff --git a/coreapi/help/registration.c b/coreapi/help/registration.c
index 9459f2081..6567f2c49 100644
--- a/coreapi/help/registration.c
+++ b/coreapi/help/registration.c
@@ -125,7 +125,7 @@ int main(int argc, char *argv[]){
 		ms_usleep(50000);
 	}
 
-	linphone_core_get_default_proxy(lc,&proxy_cfg); /* get default proxy config*/
+	proxy_cfg = linphone_core_get_default_proxy_config(lc); /* get default proxy config*/
 	linphone_proxy_config_edit(proxy_cfg); /*start editing proxy configuration*/
 	linphone_proxy_config_enable_register(proxy_cfg,FALSE); /*de-activate registration for this proxy config*/
 	linphone_proxy_config_done(proxy_cfg); /*initiate REGISTER with expire = 0*/
diff --git a/coreapi/info.c b/coreapi/info.c
index f33a16997..87f1bd199 100644
--- a/coreapi/info.c
+++ b/coreapi/info.c
@@ -69,10 +69,10 @@ LinphoneInfoMessage *linphone_core_create_info_message(LinphoneCore *lc){
  * @param call the call
  * @param info the info message
 **/
-int linphone_call_send_info_message(LinphoneCall *call, const LinphoneInfoMessage *info){
-	SalBody body;
-	sal_op_set_sent_custom_header(call->op,info->headers);
-	return sal_send_info(call->op,NULL, NULL, sal_body_from_content(&body,info->content));
+int linphone_call_send_info_message(LinphoneCall *call, const LinphoneInfoMessage *info) {
+	SalBodyHandler *body_handler = sal_body_handler_from_content(info->content);
+	sal_op_set_sent_custom_header(call->op, info->headers);
+	return sal_send_info(call->op,NULL, NULL, body_handler);
 }
 
 /**
@@ -112,12 +112,12 @@ const LinphoneContent * linphone_info_message_get_content(const LinphoneInfoMess
 	return (im->content && linphone_content_get_type(im->content)) ? im->content : NULL;
 }
 
-void linphone_core_notify_info_message(LinphoneCore* lc,SalOp *op, const SalBody *body){
+void linphone_core_notify_info_message(LinphoneCore* lc,SalOp *op, SalBodyHandler *body_handler){
 	LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
 	if (call){
 		LinphoneInfoMessage *info=ms_new0(LinphoneInfoMessage,1);
 		info->headers=sal_custom_header_clone(sal_op_get_recv_custom_header(op));
-		if (body) info->content=linphone_content_from_sal_body(body);
+		if (body_handler) info->content=linphone_content_from_sal_body_handler(body_handler);
 		linphone_core_notify_info_received(lc,call,info);
 		linphone_info_message_destroy(info);
 	}
diff --git a/coreapi/ldap/ldapprovider.c b/coreapi/ldap/ldapprovider.c
index 75b6b19a1..4cd031a88 100644
--- a/coreapi/ldap/ldapprovider.c
+++ b/coreapi/ldap/ldapprovider.c
@@ -40,7 +40,7 @@ struct _LinphoneLDAPContactProvider
 	LinphoneDictionary* config;
 
 	LDAP*   ld;
-	MSList* requests;
+	bctbx_list_t* requests;
 	unsigned int    req_count;
 
 	// bind transaction
@@ -78,7 +78,7 @@ struct _LinphoneLDAPContactSearch
 	int     msgid;
 	char*   filter;
 	bool_t  complete;
-	MSList* found_entries;
+	bctbx_list_t* found_entries;
 	unsigned int found_count;
 };
 
@@ -116,8 +116,8 @@ unsigned int linphone_ldap_contact_search_result_count(LinphoneLDAPContactSearch
 static void linphone_ldap_contact_search_destroy( LinphoneLDAPContactSearch* obj )
 {
 	//ms_message("~LinphoneLDAPContactSearch(%p)", obj);
-	ms_list_for_each(obj->found_entries, linphone_ldap_contact_search_destroy_friend);
-	obj->found_entries = ms_list_free(obj->found_entries);
+	bctbx_list_for_each(obj->found_entries, linphone_ldap_contact_search_destroy_friend);
+	obj->found_entries = bctbx_list_free(obj->found_entries);
 	if( obj->filter ) ms_free(obj->filter);
 }
 
@@ -152,7 +152,7 @@ static void linphone_ldap_contact_provider_destroy( LinphoneLDAPContactProvider*
 	linphone_core_remove_iterate_hook(LINPHONE_CONTACT_PROVIDER(obj)->lc, linphone_ldap_contact_provider_iterate,obj);
 
 	// clean pending requests
-	ms_list_for_each(obj->requests, linphone_ldap_contact_provider_destroy_request_cb);
+	bctbx_list_for_each(obj->requests, linphone_ldap_contact_provider_destroy_request_cb);
 
 	if (obj->ld) ldap_unbind_ext(obj->ld, NULL, NULL);
 	obj->ld = NULL;
@@ -223,7 +223,7 @@ static void linphone_ldap_contact_provider_handle_search_result( LinphoneLDAPCon
 					LinphoneFriend* lf = linphone_core_create_friend(lc);
 					linphone_friend_set_address(lf, la);
 					linphone_friend_set_name(lf, ldap_data.name);
-					req->found_entries = ms_list_append(req->found_entries, lf);
+					req->found_entries = bctbx_list_append(req->found_entries, lf);
 					req->found_count++;
 					//ms_message("Added friend %s / %s", ldap_data.name, ldap_data.sip);
 					ms_free(ldap_data.sip);
@@ -313,7 +313,7 @@ static bool_t linphone_ldap_contact_provider_iterate(void *data)
 		unsigned int i;
 
 		for( i=0; i<obj->req_count; i++){
-			LinphoneLDAPContactSearch* search = (LinphoneLDAPContactSearch*)ms_list_nth_data( obj->requests, i );
+			LinphoneLDAPContactSearch* search = (LinphoneLDAPContactSearch*)bctbx_list_nth_data( obj->requests, i );
 			if( search && search->msgid == 0){
 				int ret;
 				ms_message("Found pending search %p (for %s), launching...", search, search->filter);
@@ -618,10 +618,10 @@ static int linphone_ldap_request_entry_compare_strong(const void*a, const void*
 static inline LinphoneLDAPContactSearch* linphone_ldap_contact_provider_request_search( LinphoneLDAPContactProvider* obj, int msgid )
 {
 	LinphoneLDAPContactSearch dummy = {};
-	MSList* list_entry;
+	bctbx_list_t* list_entry;
 	dummy.msgid = msgid;
 
-	list_entry = ms_list_find_custom(obj->requests, linphone_ldap_request_entry_compare_weak, &dummy);
+	list_entry = bctbx_list_find_custom(obj->requests, linphone_ldap_request_entry_compare_weak, &dummy);
 	if( list_entry ) return list_entry->data;
 	else return NULL;
 }
@@ -632,10 +632,10 @@ static unsigned int linphone_ldap_contact_provider_cancel_search(LinphoneContact
 	LinphoneLDAPContactProvider* ldap_cp = LINPHONE_LDAP_CONTACT_PROVIDER(obj);
 	int ret = 1;
 
-	MSList* list_entry = ms_list_find_custom(ldap_cp->requests, linphone_ldap_request_entry_compare_strong, req);
+	bctbx_list_t* list_entry = bctbx_list_find_custom(ldap_cp->requests, linphone_ldap_request_entry_compare_strong, req);
 	if( list_entry ) {
 		ms_message("Delete search %p", req);
-		ldap_cp->requests = ms_list_remove_link(ldap_cp->requests, list_entry);
+		ldap_cp->requests = bctbx_list_erase_link(ldap_cp->requests, list_entry);
 		ldap_cp->req_count--;
 		ret = 0; // return OK if we found it in the monitored requests
 	} else {
@@ -703,7 +703,7 @@ static LinphoneLDAPContactSearch* linphone_ldap_contact_provider_begin_search (
 	}
 
 	if( request != NULL ) {
-		obj->requests = ms_list_append ( obj->requests, request );
+		obj->requests = bctbx_list_append ( obj->requests, request );
 		obj->req_count++;
 	}
 
diff --git a/coreapi/ldap/ldapprovider.h b/coreapi/ldap/ldapprovider.h
index 066ab7ba8..d45721e7b 100644
--- a/coreapi/ldap/ldapprovider.h
+++ b/coreapi/ldap/ldapprovider.h
@@ -38,4 +38,4 @@ LINPHONE_PUBLIC unsigned int                 linphone_ldap_contact_provider_get_
 LINPHONE_PUBLIC LinphoneLDAPContactProvider* linphone_ldap_contact_provider_ref( void* obj );
 void                         linphone_ldap_contact_provider_unref( void* obj );
 LinphoneLDAPContactProvider* linphone_ldap_contact_provider_cast( void* obj );
-LINPHONE_PUBLIC int                          linphone_ldap_contact_provider_available();
+LINPHONE_PUBLIC int                          linphone_ldap_contact_provider_available(void);
diff --git a/coreapi/lime.c b/coreapi/lime.c
index 190ea6be7..063331bd3 100644
--- a/coreapi/lime.c
+++ b/coreapi/lime.c
@@ -1,29 +1,37 @@
+/*
+linphone
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #include "lime.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_LIME
-
 #include "linphonecore.h"
-#include "ortp/b64.h"
-#include "polarssl/gcm.h"
-
-/* check polarssl version */
-#include <polarssl/version.h>
-
-#if POLARSSL_VERSION_NUMBER >= 0x01030000 /* for Polarssl version 1.3 */
-#include "polarssl/sha256.h"
-#else /* for Polarssl version 1.2 */
-#include "polarssl/sha2.h"
-#endif
+#include "bctoolbox/crypto.h"
 
 /**
  * @brief check at runtime if LIME is available
  *
  * @return TRUE when Lime was fully compiled, FALSE when it wasn't
  */
-bool_t lime_is_available() { return TRUE; }
+bool_t lime_is_available(void) { return TRUE; }
 
 /**
  * @brief	convert an hexa char [0-9a-fA-F] into the corresponding unsigned integer value
@@ -417,13 +425,6 @@ static int lime_deriveKey(limeKey_t *key) {
 		return LIME_UNABLE_TO_DERIVE_KEY;
 	}
 
-#if 0
-	/*not doing anything yet since key and sessionId are array, not pointers*/
-	if ((key->key == NULL) || (key->sessionId == NULL)) {
-		return LIME_UNABLE_TO_DERIVE_KEY;
-	}
-#endif
-
  	/* Derivation is made derived Key = HMAC_SHA256(Key, 0x0000001||"MessageKey"||0x00||SessionId||SessionIndex||0x00000100)*/
 	/* total data to be hashed is       55 bytes  :           4   +      10     +   1 +     32   +   4         +   4 */
 	inputData[0] = 0x00;
@@ -448,11 +449,7 @@ static int lime_deriveKey(limeKey_t *key) {
 	inputData[54] = 0x00;
 
 	/* derive the key in a temp buffer */
-#if POLARSSL_VERSION_NUMBER >= 0x01030000 /* for Polarssl version 1.3 */
-	sha256_hmac(key->key, 32, inputData, 55, derivedKey, 0); /* last param to zero to select SHA256 and not SHA224 */
-#else /* for Polarssl version 1.2 */
-	sha2_hmac(key->key, 32, inputData, 55, derivedKey, 0); /* last param to zero to select SHA256 and not SHA224 */
-#endif /* POLARSSL_VERSION_NUMBER */
+	bctbx_hmacSha256(key->key, 32, inputData, 55, 32, derivedKey);
 
 	/* overwrite the old key with the derived one */
 	memcpy(key->key, derivedKey, 32);
@@ -462,26 +459,28 @@ static int lime_deriveKey(limeKey_t *key) {
 	return 0;
 }
 
-void lime_freeKeys(limeURIKeys_t associatedKeys) {
+void lime_freeKeys(limeURIKeys_t *associatedKeys) {
 	int i;
 
 	/* free all associated keys */
-	for (i=0; i< associatedKeys.associatedZIDNumber; i++) {
-		if (associatedKeys.peerKeys[i] != NULL) {
-			free(associatedKeys.peerKeys[i]);
-			associatedKeys.peerKeys[i] = NULL;
+	for (i=0; i< associatedKeys->associatedZIDNumber; i++) {
+		if (associatedKeys->peerKeys[i] != NULL) {
+			/*shouldn't we memset to zero the content of peerKeys[i] in order clear keys?*/
+			free(associatedKeys->peerKeys[i]);
+			associatedKeys->peerKeys[i] = NULL;
 		}
 	}
 
-	free(associatedKeys.peerKeys);
+	free(associatedKeys->peerKeys);
+	associatedKeys->peerKeys = NULL;
 
 	/* free sipURI string */
-	free(associatedKeys.peerURI);
+	free(associatedKeys->peerURI);
+	associatedKeys->peerURI = NULL;
 }
 
 int lime_encryptMessage(limeKey_t *key, uint8_t *plainMessage, uint32_t messageLength, uint8_t selfZID[12], uint8_t *encryptedMessage) {
 	uint8_t authenticatedData[28];
-	gcm_context gcmContext;
 	/* Authenticated data is senderZID(12 bytes)||receiverZID(12 bytes)||sessionIndex(4 bytes) */
 	memcpy(authenticatedData, selfZID, 12);
 	memcpy(authenticatedData+12, key->peerZID, 12);
@@ -492,31 +491,31 @@ int lime_encryptMessage(limeKey_t *key, uint8_t *plainMessage, uint32_t messageL
 
 	/* AES-GCM : key is 192 bits long, Init Vector 64 bits. 256 bits key given is AES key||IV */
 	/* tag is 16 bytes long and is set in the 16 first bytes of the encrypted message */
-	gcm_init(&gcmContext, POLARSSL_CIPHER_ID_AES, key->key, 192);
-	gcm_crypt_and_tag(&gcmContext, GCM_ENCRYPT, messageLength, key->key+24, 8, authenticatedData, 28, plainMessage, encryptedMessage+16, 16, encryptedMessage);
-	gcm_free(&gcmContext);
+	return bctbx_aes_gcm_encrypt_and_tag(key->key, 24,
+			plainMessage, messageLength,
+			authenticatedData, 28,
+			key->key+24, 8, /* IV is at the end(last 64 bits) of the given key buffer */
+			encryptedMessage, 16, /* the first 16 bytes of output are the authentication tag */
+			encryptedMessage+16); /* actual encrypted message starts after 16 bytes of authentication tag */
 
 	return 0;
 }
 
 int lime_encryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher) {
-	gcm_context *gcmContext;
+	bctbx_aes_gcm_context_t *gcmContext;
 
 	if (*cryptoContext == NULL) { /* first call to the function, allocate a crypto context and initialise it */
-		gcmContext = (gcm_context *)malloc(sizeof(gcm_context));
-		*cryptoContext = (void *)gcmContext;
-		gcm_init(gcmContext, POLARSSL_CIPHER_ID_AES, key, 192);
-		gcm_starts(gcmContext, GCM_ENCRYPT, key+24, 8, NULL, 0); /* key contains 192bits of key || 64 bits of Initialisation Vector */
+		/* key contains 192bits of key || 64 bits of Initialisation Vector, no additional data */
+		gcmContext = bctbx_aes_gcm_context_new(key, 24, NULL, 0, key+24, 8, BCTBX_GCM_ENCRYPT);
+		*cryptoContext = gcmContext;
 	} else { /* this is not the first call, get the context */
-		gcmContext = (gcm_context *)*cryptoContext;
+		gcmContext = (bctbx_aes_gcm_context_t *)*cryptoContext;
 	}
 
 	if (length != 0) {
-		gcm_update(gcmContext, length, (const unsigned char *)plain, (unsigned char *)cipher);
-	} else { /* lenght is 0, finish the stream */
-		gcm_finish(gcmContext, NULL, 0); /* do not generate tag */
-		gcm_free(gcmContext);
-		free(*cryptoContext);
+		bctbx_aes_gcm_process_chunk(gcmContext, (const uint8_t *)plain, length, (uint8_t *)cipher);
+	} else { /* lenght is 0, finish the stream, no tag to be generated */
+		bctbx_aes_gcm_finish(gcmContext, NULL, 0);
 		*cryptoContext = NULL;
 	}
 
@@ -524,23 +523,20 @@ int lime_encryptFile(void **cryptoContext, unsigned char *key, size_t length, ch
 }
 
 int lime_decryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher) {
-	gcm_context *gcmContext;
+	bctbx_aes_gcm_context_t *gcmContext;
 
 	if (*cryptoContext == NULL) { /* first call to the function, allocate a crypto context and initialise it */
-		gcmContext = (gcm_context *)malloc(sizeof(gcm_context));
-		*cryptoContext = (void *)gcmContext;
-		gcm_init(gcmContext, POLARSSL_CIPHER_ID_AES, key, 192);
-		gcm_starts(gcmContext, GCM_DECRYPT, key+24, 8, NULL, 0); /* key contains 192bits of key || 64 bits of Initialisation Vector */
+		/* key contains 192bits of key || 64 bits of Initialisation Vector, no additional data */
+		gcmContext = bctbx_aes_gcm_context_new(key, 24, NULL, 0, key+24, 8, BCTBX_GCM_DECRYPT);
+		*cryptoContext = gcmContext;
 	} else { /* this is not the first call, get the context */
-		gcmContext = (gcm_context *)*cryptoContext;
+		gcmContext = (bctbx_aes_gcm_context_t *)*cryptoContext;
 	}
 
 	if (length != 0) {
-		gcm_update(gcmContext, length, (const unsigned char *)cipher, (unsigned char *)plain);
+		bctbx_aes_gcm_process_chunk(gcmContext, (const unsigned char *)cipher, length, (unsigned char *)plain);
 	} else { /* lenght is 0, finish the stream */
-		gcm_finish(gcmContext, NULL, 0); /* do not generate tag */
-		gcm_free(gcmContext);
-		free(*cryptoContext);
+		bctbx_aes_gcm_finish(gcmContext, NULL, 0);
 		*cryptoContext = NULL;
 	}
 
@@ -550,7 +546,6 @@ int lime_decryptFile(void **cryptoContext, unsigned char *key, size_t length, ch
 
 int lime_decryptMessage(limeKey_t *key, uint8_t *encryptedMessage, uint32_t messageLength, uint8_t selfZID[12], uint8_t *plainMessage) {
 	uint8_t authenticatedData[28];
-	gcm_context gcmContext;
 	int retval;
 
 	/* Authenticated data is senderZID(12 bytes)||receiverZID(12 bytes)||sessionIndex(4 bytes) */
@@ -563,10 +558,13 @@ int lime_decryptMessage(limeKey_t *key, uint8_t *encryptedMessage, uint32_t mess
 
 	/* AES-GCM : key is 192 bits long, Init Vector 64 bits. 256 bits key given is AES key||IV */
 	/* tag is 16 bytes long and is the 16 first bytes of the encrypted message */
-	gcm_init(&gcmContext, POLARSSL_CIPHER_ID_AES, key->key, 192);
-	/* messageLength-16 is the length of encrypted data, messageLength include the 16 bytes tag included at the begining of encryptedMessage */
-	retval = gcm_auth_decrypt(&gcmContext, messageLength-16, key->key+24, 8, authenticatedData, 28, encryptedMessage, 16, encryptedMessage+16, plainMessage);
-	gcm_free(&gcmContext);
+	retval = bctbx_aes_gcm_decrypt_and_auth(key->key, 24, /* key is 192 bits long */
+			encryptedMessage+16,  messageLength-16, /* encrypted message first 16 bytes store the authentication tag, then is the actual message */
+			authenticatedData, 28, /* additionnal data needed for authentication */
+			key->key+24, 8, /* last 8 bytes of key is the initialisation vector */
+			encryptedMessage, 16, /* first 16 bytes of message is the authentication tag */
+			plainMessage);
+
 	/* add the null termination char */
 	plainMessage[messageLength-16] = '\0';
 
@@ -590,7 +588,7 @@ int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t
 	lime_strToUint8(selfZid, selfZidHex, 24);
 
 	/* encrypted message length is plaintext + 16 for tag */
-	encryptedMessageLength = strlen((char *)message) + 16;
+	encryptedMessageLength = (uint32_t)strlen((char *)message) + 16;
 
 	/* retrieve keys associated to the peer URI */
 	associatedKeys.peerURI = (uint8_t *)malloc(strlen((char *)peerURI)+1);
@@ -599,12 +597,12 @@ int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t
 	associatedKeys.peerKeys = NULL;
 
 	if (lime_getCachedSndKeysByURI(cacheBuffer, &associatedKeys) != 0) {
-		lime_freeKeys(associatedKeys);
+		lime_freeKeys(&associatedKeys);
 		return LIME_UNABLE_TO_ENCRYPT_MESSAGE;
 	}
 
 	if (associatedKeys.associatedZIDNumber == 0) {
-		lime_freeKeys(associatedKeys);
+		lime_freeKeys(&associatedKeys);
 		return LIME_NO_VALID_KEY_FOUND_FOR_PEER;
 	}
 
@@ -621,14 +619,14 @@ int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t
 		uint8_t peerZidHex[25];
 		uint8_t sessionIndexHex[9];
 		xmlNodePtr msgNode;
-		int b64Size;
-		char *encryptedMessageb64;
+		size_t b64Size = 0;
+		unsigned char *encryptedMessageb64;
 
 		/* encrypt message with current key */
 		limeKey_t *currentKey = associatedKeys.peerKeys[i];
 		/* encrypted message include a 16 bytes tag */
 		uint8_t *encryptedMessage = (uint8_t *)malloc(encryptedMessageLength);
-		lime_encryptMessage(currentKey, message, strlen((char *)message), selfZid, encryptedMessage);
+		lime_encryptMessage(currentKey, message, (uint32_t)strlen((char *)message), selfZid, encryptedMessage);
 		/* add a "msg" node the the output message, doc node is :
 		 * <msg>
 		 * 		<pzid>peerZID</pzid>
@@ -652,9 +650,9 @@ int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t
 		xmlNewTextChild(msgNode, NULL, (const xmlChar *)"index", sessionIndexHex);
 
 		/* convert the cipherText to base 64 */
-		b64Size =  b64_encode(NULL, encryptedMessageLength, NULL, 0);
-		encryptedMessageb64 = (char *)malloc(b64Size+1);
-		b64Size = b64_encode(encryptedMessage, encryptedMessageLength, encryptedMessageb64, b64Size);
+		bctbx_base64_encode(NULL, &b64Size, encryptedMessage, encryptedMessageLength); /* b64Size is 0, so it is set to the requested output buffer size */
+		encryptedMessageb64 = malloc(b64Size+1); /* allocate a buffer of requested size +1 for NULL termination */
+		bctbx_base64_encode(encryptedMessageb64, &b64Size, encryptedMessage, encryptedMessageLength); /* b64Size is 0, so it is set to the requested output buffer size */
 		encryptedMessageb64[b64Size] = '\0'; /* libxml need a null terminated string */
 		xmlNewTextChild(msgNode, NULL, (const xmlChar *)"text", (const xmlChar *)encryptedMessageb64);
 		free(encryptedMessage);
@@ -672,7 +670,7 @@ int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t
 	xmlDocDumpFormatMemoryEnc(xmlOutputMessage, output, &xmlStringLength, "UTF-8", 0);
 	xmlFreeDoc(xmlOutputMessage);
 
-	lime_freeKeys(associatedKeys);
+	lime_freeKeys(&associatedKeys);
 
 	return 0;
 }
@@ -685,7 +683,7 @@ int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_
 	xmlChar *peerZidHex = NULL;
 	xmlNodePtr cur;
 	uint8_t *encryptedMessage = NULL;
-	uint32_t encryptedMessageLength = 0;
+	size_t encryptedMessageLength = 0;
 	uint32_t usedSessionIndex = 0;
 	xmlDocPtr xmlEncryptedMessage;
 
@@ -715,7 +713,7 @@ int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_
 		if ((!xmlStrcmp(cur->name, (const xmlChar *)"ZID"))){ /* sender ZID found, extract it */
 			peerZidHex = xmlNodeListGetString(xmlEncryptedMessage, cur->xmlChildrenNode, 1);
 			/* convert it from hexa string to bytes string and set the result in the associatedKey structure */
-			lime_strToUint8(associatedKey.peerZID, peerZidHex, strlen((char *)peerZidHex));
+			lime_strToUint8(associatedKey.peerZID, peerZidHex, (uint16_t)strlen((char *)peerZidHex));
 			cur = cur->next;
 		}
 	}
@@ -750,14 +748,19 @@ int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_
 					| (((uint32_t)lime_charToByte(sessionIndexHex[6]))<<4)
 					| (((uint32_t)lime_charToByte(sessionIndexHex[7])));
 				xmlFree(sessionIndexHex);
+
 				/* get the encrypted message */
 				msgChildrenNode = msgChildrenNode->next;
+
 				/* convert the cipherText from base 64 */
 				encryptedMessageb64 = xmlNodeListGetString(cacheBuffer, msgChildrenNode->xmlChildrenNode, 1);
-				encryptedMessageLength = b64_decode((char *)encryptedMessageb64, strlen((char *)encryptedMessageb64), NULL, 0);
+				bctbx_base64_decode(NULL, &encryptedMessageLength, encryptedMessageb64, strlen((char *)encryptedMessageb64)); /* encryptedMessageLength is 0, so it will be set to the requested buffer length */
 				encryptedMessage = (uint8_t *)malloc(encryptedMessageLength);
-				encryptedMessageLength = b64_decode((char *)encryptedMessageb64, strlen((char *)encryptedMessageb64), encryptedMessage, encryptedMessageLength);
+				bctbx_base64_decode(encryptedMessage, &encryptedMessageLength, encryptedMessageb64, strlen((char *)encryptedMessageb64));
+
 				xmlFree(encryptedMessageb64);
+				xmlFree(currentZidHex);
+				break;
 			}
 
 			cur = cur->next;
@@ -792,7 +795,7 @@ int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_
 
 	/* decrypt the message */
 	*output = (uint8_t *)malloc(encryptedMessageLength - 16 +1); /* plain message is same length than encrypted one with 16 bytes less for the tag + 1 to add the null termination char */
-	retval = lime_decryptMessage(&associatedKey, encryptedMessage, encryptedMessageLength, selfZid, *output);
+	retval = lime_decryptMessage(&associatedKey, encryptedMessage, (uint32_t)encryptedMessageLength, selfZid, *output);
 
 	free(encryptedMessage);
 
@@ -817,8 +820,23 @@ int lime_decryptFile(void **cryptoContext, unsigned char *key, size_t length, ch
 int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t **output) { return LIME_NOT_ENABLED;}
 int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t *peerURI, uint8_t **output) { return LIME_NOT_ENABLED;}
 int lime_encryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher) {return LIME_NOT_ENABLED;}
-
-
+void lime_freeKeys(limeURIKeys_t *associatedKeys){
+}
+int lime_getCachedSndKeysByURI(xmlDocPtr cacheBuffer, limeURIKeys_t *associatedKeys){
+	return LIME_NOT_ENABLED;
+}
+int lime_encryptMessage(limeKey_t *key, uint8_t *plainMessage, uint32_t messageLength, uint8_t selfZID[12], uint8_t *encryptedMessage) {
+	return LIME_NOT_ENABLED;
+}
+int lime_setCachedKey(xmlDocPtr cacheBuffer, limeKey_t *associatedKey, uint8_t role) {
+	return LIME_NOT_ENABLED;
+}
+int lime_getCachedRcvKeyByZid(xmlDocPtr cacheBuffer, limeKey_t *associatedKey) {
+	return LIME_NOT_ENABLED;
+}
+int lime_decryptMessage(limeKey_t *key, uint8_t *encryptedMessage, uint32_t messageLength, uint8_t selfZID[12], uint8_t *plainMessage) {
+	return LIME_NOT_ENABLED;
+}
 #endif /* HAVE_LIME */
 
 char *lime_error_code_to_string(int errorCode) {
diff --git a/coreapi/lime.h b/coreapi/lime.h
index c196a6410..277f57cbe 100644
--- a/coreapi/lime.h
+++ b/coreapi/lime.h
@@ -1,3 +1,22 @@
+/*
+linphone
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef LIME_H
 #define LIME_H
 
@@ -48,7 +67,7 @@ typedef struct limeURIKeys_struct {
  * Structure content must then be freed using lime_freeKeys function
  *
  * @param[in]		cacheBuffer		The xmlDoc containing current cache
- * @param[in/out]	associatedKeys	Structure containing the peerURI. After this call contains all key material associated to the given URI. Must be then freed through lime_freeKeys function
+ * @param[in,out]	associatedKeys	Structure containing the peerURI. After this call contains all key material associated to the given URI. Must be then freed through lime_freeKeys function
  *
  * @return 0 on success, error code otherwise
  */
@@ -58,7 +77,7 @@ LINPHONE_PUBLIC int lime_getCachedSndKeysByURI(xmlDocPtr cacheBuffer, limeURIKey
  * @brief Get the receiver key associated to the ZID given in the associatedKey parameter
  *
  * @param[in]		cacheBuffer		The xmlDoc containing current cache
- * @param[in/out]	associatedKey	Structure containing the peerZID and will store the retrieved key
+ * @param[in,out]	associatedKey	Structure containing the peerZID and will store the retrieved key
  *
  * @return 0 on success, error code otherwise
  */
@@ -68,8 +87,8 @@ LINPHONE_PUBLIC int lime_getCachedRcvKeyByZid(xmlDocPtr cacheBuffer, limeKey_t *
  * @brief Set in cache the given key material, association is made by ZID contained in the associatedKey parameter
  *
  * @param[out]		cacheBuffer		The xmlDoc containing current cache to be updated
- * @param[in/out]	associatedKey	Structure containing the key and ZID to identify the peer node to be updated
- * @param[in]		role			Can be LIME_SENDER or LIME_RECEIVER, specify which key we want to update 
+ * @param[in,out]	associatedKey	Structure containing the key and ZID to identify the peer node to be updated
+ * @param[in]		role			Can be LIME_SENDER or LIME_RECEIVER, specify which key we want to update
  *
  * @return 0 on success, error code otherwise
  */
@@ -79,31 +98,32 @@ LINPHONE_PUBLIC int lime_setCachedKey(xmlDocPtr cacheBuffer, limeKey_t *associat
 /**
  * @brief Free all allocated data in the associated keys structure
  * Note, this will also free the peerURI string which then must have been allocated
+ * This does not free the memory area pointed by associatedKeys.
  *
- * @param[in/out]	associatedKeys	The structure to be cleaned
+ * @param[in,out]	associatedKeys	The structure to be cleaned
  *
  */
-LINPHONE_PUBLIC void lime_freeKeys(limeURIKeys_t associatedKeys);
+LINPHONE_PUBLIC void lime_freeKeys(limeURIKeys_t *associatedKeys);
 
 /**
  * @brief encrypt a message with the given key
- * 
+ *
  * @param[in]	key					Key to use: first 192 bits are used as key, last 64 bits as init vector
- * @param[in]	message				The string to be encrypted
+ * @param[in]	plainMessage		The string to be encrypted
  * @param[in]	messageLength		The length in bytes of the message to be encrypted
  * @param[in]	selfZID				The self ZID is use in authentication tag computation
  * @param[out]	encryptedMessage	A buffer to hold the output, ouput length is input's one + 16 for the authentication tag
  * 									Authentication tag is set at the begining of the encrypted Message
  *
  * @return 0 on success, error code otherwise
- * 
+ *
  */
 LINPHONE_PUBLIC int lime_encryptMessage(limeKey_t *key, uint8_t *plainMessage, uint32_t messageLength, uint8_t selfZID[12], uint8_t *encryptedMessage);
 
 /**
  * @brief Encrypt a file before transfering it to the server, encryption is done in several call, first one will be done with cryptoContext null, last one with length = 0
  *
- * @param[in/out]	cryptoContext		The context used to encrypt the file using AES-GCM. Is created at first call(if null)
+ * @param[in,out]	cryptoContext		The context used to encrypt the file using AES-GCM. Is created at first call(if null)
  * @param[in]		key					256 bits : 192 bits of key || 64 bits of Initial Vector
  * @param[in]		length				Length of data to be encrypted, if 0 it will conclude the encryption
  * @param[in]		plain				Plain data to be encrypted (length bytes)
@@ -117,7 +137,7 @@ LINPHONE_PUBLIC int lime_encryptFile(void **cryptoContext, unsigned char *key, s
 /**
  * @brief Decrypt a file retrieved from server, decryption is done in several call, first one will be done with cryptoContext null, last one with length = 0
  *
- * @param[in/out]	cryptoContext		The context used to decrypt the file using AES-GCM. Is created at first call(if null)
+ * @param[in,out]	cryptoContext		The context used to decrypt the file using AES-GCM. Is created at first call(if null)
  * @param[in]		key					256 bits : 192 bits of key || 64 bits of Initial Vector
  * @param[in]		length				Length of data to be decrypted, if 0 it will conclude the decryption
  * @param[out]		plain				Output to a buffer allocated by caller, at least length bytes available
@@ -130,16 +150,16 @@ LINPHONE_PUBLIC int lime_decryptFile(void **cryptoContext, unsigned char *key, s
 
 /**
  * @brief decrypt and authentify a message with the given key
- * 
+ *
  * @param[in]	key					Key to use: first 192 bits are used as key, last 64 bits as init vector
- * @param[in]	message				The string to be decrypted
+ * @param[in]	encryptedMessage	The string to be decrypted
  * @param[in]	messageLength		The length in bytes of the message to be decrypted (this include the 16 bytes tag at the begining of the message)
  * @param[in]	selfZID				The self ZID is use in authentication tag computation
  * @param[out]	plainMessage		A buffer to hold the output, ouput length is input's one - 16 for the authentication tag + 1 for null termination char
  * 									Authentication tag is retrieved at the begining of the encrypted Message
  *
  * @return 0 on success, error code otherwise
- * 
+ *
  */
 
 LINPHONE_PUBLIC int lime_decryptMessage(limeKey_t *key, uint8_t *encryptedMessage, uint32_t messageLength, uint8_t selfZID[12], uint8_t *plainMessage);
@@ -148,7 +168,7 @@ LINPHONE_PUBLIC int lime_decryptMessage(limeKey_t *key, uint8_t *encryptedMessag
  * @brief create the encrypted multipart xml message from plain text and destination URI
  * Retrieve in cache the needed keys which are then updated. Output buffer is allocated and must be freed by caller
  *
- * @param[in/out]	cacheBuffer		The xmlDoc containing current cache, get the keys and selfZID from it, updated by this function with derivated keys
+ * @param[in,out]	cacheBuffer		The xmlDoc containing current cache, get the keys and selfZID from it, updated by this function with derivated keys
  * @param[in]		message			The plain text message to be encrypted
  * @param[in]		peerURI			The destination URI, associated keys will be found in cache
  * @param[out]		output			The output buffer, allocated and set with the encrypted message xml body(null terminated string). Must be freed by caller
@@ -161,7 +181,7 @@ LINPHONE_PUBLIC int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *
  * @brief decrypt a multipart xml message
  * Retrieve in cache the needed key which is then updated. Output buffer is allocated and must be freed by caller
  *
- * @param[in/out]	cacheBuffer		The xmlDoc containing current cache, get the key and selfZID from it, updated by this function with derivated keys
+ * @param[in,out]	cacheBuffer		The xmlDoc containing current cache, get the key and selfZID from it, updated by this function with derivated keys
  * @param[in]		message			The multipart message, contain one or several part identified by destination ZID, one shall match the self ZID retrieved from cache
  * @param[out]		output			The output buffer, allocated and set with the decrypted message(null terminated string). Must be freed by caller
  *
@@ -182,5 +202,5 @@ LINPHONE_PUBLIC char *lime_error_code_to_string(int errorCode);
  *
  * @return TRUE if Lime is available, FALSE if not
  */
-LINPHONE_PUBLIC bool_t lime_is_available();
+LINPHONE_PUBLIC bool_t lime_is_available(void);
 #endif /* LIME_H */
diff --git a/coreapi/linphone_proxy_config.h b/coreapi/linphone_proxy_config.h
index 08557feaa..f437bcc50 100644
--- a/coreapi/linphone_proxy_config.h
+++ b/coreapi/linphone_proxy_config.h
@@ -87,6 +87,7 @@ LINPHONE_PUBLIC int linphone_proxy_config_set_identity_address(LinphoneProxyConf
  * Sets a SIP route.
  * When a route is set, all outgoing calls will go to the route's destination if this proxy
  * is the default one (see linphone_core_set_default_proxy() ).
+ * @return -1 if route is invalid, 0 otherwise.
 **/
 LINPHONE_PUBLIC int linphone_proxy_config_set_route(LinphoneProxyConfig *cfg, const char *route);
 
@@ -393,23 +394,23 @@ LINPHONE_PUBLIC SipSetup *linphone_proxy_config_get_sip_setup(LinphoneProxyConfi
 LINPHONE_PUBLIC bool_t linphone_proxy_config_is_phone_number(LinphoneProxyConfig *proxy, const char *username);
 
 /**
- * Normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222
- * or +33888444222 depending on the #LinphoneProxyConfig object. However this argument is OPTIONNAL
- * and if not provided, a default one will be used.
- * This function will always generate a normalized username; if input is not a phone number, output will be a copy of input.
+ * See linphone_proxy_config_normalize_phone_number
  * @param proxy #LinphoneProxyConfig object containing country code and/or escape symbol. If NULL passed, will use default configuration.
  * @param username the string to parse
  * @param result the newly normalized number
  * @param result_len the size of the normalized number \a result
  * @return TRUE if a phone number was recognized, FALSE otherwise.
+ * @deprecated use linphone_proxy_config_normalize_phone_number()
  */
 LINPHONE_PUBLIC bool_t linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username, char *result, size_t result_len);
 
 /**
- * Same objective as linphone_proxy_config_normalize_number but allocates a new string
+ * Normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222
+ * or +33888444222 depending on the #LinphoneProxyConfig object.
+ * This function will always generate a normalized username if input is a phone number.
  * @param proxy #LinphoneProxyConfig object containing country code and/or escape symbol. If NULL passed, will use default configuration.
  * @param username the string to parse
- * @return NULL if invalid phone number, normalized phone number from username input otherwise.
+ * @return NULL if input is an invalid phone number, normalized phone number from username input otherwise.
 */
 LINPHONE_PUBLIC char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, const char *username);
 
@@ -516,6 +517,54 @@ LINPHONE_PUBLIC const char *linphone_proxy_config_get_custom_header(LinphoneProx
 **/
 LINPHONE_PUBLIC void linphone_proxy_config_set_custom_header(LinphoneProxyConfig *cfg, const char *header_name, const char *header_value);
 
+/**
+ * Find authentication info matching proxy config, if any, similarly to linphone_core_find_auth_info.
+ * @param[in] cfg #LinphoneProxyConfig object.
+ * @return a #LinphoneAuthInfo matching proxy config criteria if possible, NULL if nothing can be found.
+**/
+LINPHONE_PUBLIC const LinphoneAuthInfo* linphone_proxy_config_find_auth_info(const LinphoneProxyConfig *cfg);
+
+
+/**
+ * Get the persistent reference key associated to the proxy config.
+ *
+ * The reference key can be for example an id to an external database.
+ * It is stored in the config file, thus can survive to process exits/restarts.
+ *
+ * @param[in] cfg #LinphoneProxyConfig object.
+ * @return The reference key string that has been associated to the proxy config, or NULL if none has been associated.
+**/
+LINPHONE_PUBLIC const char * linphone_proxy_config_get_ref_key(const LinphoneProxyConfig *cfg);
+
+/**
+ * Associate a persistent reference key to the proxy config.
+ *
+ * The reference key can be for example an id to an external database.
+ * It is stored in the config file, thus can survive to process exits/restarts.
+ *
+ * @param[in] cfg #LinphoneProxyConfig object.
+ * @param[in] refkey The reference key string to associate to the proxy config.
+**/
+LINPHONE_PUBLIC void linphone_proxy_config_set_ref_key(LinphoneProxyConfig *cfg, const char *refkey);
+
+/**
+ * Get The policy that is used to pass through NATs/firewalls when using this proxy config.
+ * If it is set to NULL, the default NAT policy from the core will be used instead.
+ * @param[in] cfg #LinphoneProxyConfig object
+ * @return LinphoneNatPolicy object in use.
+ * @see linphone_core_get_nat_policy()
+ */
+LINPHONE_PUBLIC LinphoneNatPolicy * linphone_proxy_config_get_nat_policy(const LinphoneProxyConfig *cfg);
+
+/**
+ * Set the policy to use to pass through NATs/firewalls when using this proxy config.
+ * If it is set to NULL, the default NAT policy from the core will be used instead.
+ * @param[in] cfg #LinphoneProxyConfig object
+ * @param[in] policy LinphoneNatPolicy object
+ * @see linphone_core_set_nat_policy()
+ */
+LINPHONE_PUBLIC void linphone_proxy_config_set_nat_policy(LinphoneProxyConfig *cfg, LinphoneNatPolicy *policy);
+
 /**
  * @}
  */
diff --git a/coreapi/linphone_tunnel.cc b/coreapi/linphone_tunnel.cc
index 7dd27d890..699de87b5 100644
--- a/coreapi/linphone_tunnel.cc
+++ b/coreapi/linphone_tunnel.cc
@@ -35,7 +35,7 @@ LinphoneTunnel* linphone_core_get_tunnel(const LinphoneCore *lc){
 
 struct _LinphoneTunnel {
 	belledonnecomm::TunnelManager *manager;
-	MSList *config_list;
+	bctbx_list_t *config_list;
 };
 
 extern "C" LinphoneTunnel* linphone_core_tunnel_new(LinphoneCore *lc){
@@ -55,7 +55,7 @@ static inline _LpConfig *config(const LinphoneTunnel *tunnel){
 void linphone_tunnel_destroy(LinphoneTunnel *tunnel){
 	delete tunnel->manager;
 
-	ms_list_free_with_data(tunnel->config_list, (void (*)(void *))linphone_tunnel_config_destroy);
+	bctbx_list_free_with_data(tunnel->config_list, (void (*)(void *))linphone_tunnel_config_destroy);
 
 	ms_free(tunnel);
 }
@@ -129,7 +129,7 @@ static LinphoneTunnelConfig *linphone_tunnel_config_from_string(const char *str)
 
 
 static void linphone_tunnel_save_config(const LinphoneTunnel *tunnel) {
-	MSList *elem = NULL;
+	bctbx_list_t *elem = NULL;
 	char *tmp = NULL, *old_tmp = NULL, *tc_str = NULL;
 	for(elem = tunnel->config_list; elem != NULL; elem = elem->next) {
 		LinphoneTunnelConfig *tunnel_config = (LinphoneTunnelConfig *)elem->data;
@@ -162,7 +162,7 @@ static void linphone_tunnel_add_server_intern(LinphoneTunnel *tunnel, LinphoneTu
 			linphone_tunnel_config_get_remote_udp_mirror_port(tunnel_config),
 			linphone_tunnel_config_get_delay(tunnel_config));
 	}
-	tunnel->config_list = ms_list_append(tunnel->config_list, tunnel_config);
+	tunnel->config_list = bctbx_list_append(tunnel->config_list, linphone_tunnel_config_ref(tunnel_config));
 }
 
 
@@ -192,12 +192,13 @@ static void linphone_tunnel_load_config(LinphoneTunnel *tunnel){
 }
 
 static void linphone_tunnel_refresh_config(LinphoneTunnel *tunnel) {
-	MSList *old_list = tunnel->config_list;
+	bctbx_list_t *old_list = tunnel->config_list;
 	tunnel->config_list = NULL;
 	bcTunnel(tunnel)->cleanServers();
 	while(old_list != NULL) {
 		LinphoneTunnelConfig *tunnel_config = (LinphoneTunnelConfig *)old_list->data;
 		linphone_tunnel_add_server_intern(tunnel, tunnel_config);
+		linphone_tunnel_config_unref(tunnel_config);
 		old_list = old_list->next;
 	}
 }
@@ -208,16 +209,16 @@ void linphone_tunnel_add_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tu
 }
 
 void linphone_tunnel_remove_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config) {
-	MSList *elem = ms_list_find(tunnel->config_list, tunnel_config);
+	bctbx_list_t *elem = bctbx_list_find(tunnel->config_list, tunnel_config);
 	if(elem != NULL) {
-		tunnel->config_list = ms_list_remove(tunnel->config_list, tunnel_config);
-		linphone_tunnel_config_destroy(tunnel_config);
+		tunnel->config_list = bctbx_list_remove(tunnel->config_list, tunnel_config);
+		linphone_tunnel_config_unref(tunnel_config);
 		linphone_tunnel_refresh_config(tunnel);
 		linphone_tunnel_save_config(tunnel);
 	}
 }
 
-const MSList *linphone_tunnel_get_servers(const LinphoneTunnel *tunnel){
+const bctbx_list_t *linphone_tunnel_get_servers(const LinphoneTunnel *tunnel){
 	return tunnel->config_list;
 }
 
@@ -225,7 +226,7 @@ void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel){
 	bcTunnel(tunnel)->cleanServers();
 
 	/* Free the list */
-	ms_list_free_with_data(tunnel->config_list, (void (*)(void *))linphone_tunnel_config_destroy);
+	bctbx_list_free_with_data(tunnel->config_list, (void (*)(void *))linphone_tunnel_config_destroy);
 	tunnel->config_list = NULL;
 
 	linphone_tunnel_save_config(tunnel);
@@ -289,13 +290,13 @@ static void tunnelLogHandler(int level, const char *fmt, va_list l){
 				ms_fatal("Unexepcted tunnel log %i: %s",level,fmt);
 			break;
 		}
-		tunnelOrtpLogHandler(ortp_level,fmt,l);
+		tunnelOrtpLogHandler("tunnel", ortp_level,fmt,l);
 	}
 }
 
 void linphone_tunnel_enable_logs_with_handler(LinphoneTunnel *tunnel, bool_t enabled, OrtpLogFunc logHandler){
 	tunnelOrtpLogHandler=logHandler;
-	bcTunnel(tunnel)->enableLogs(enabled, tunnelLogHandler);
+	bcTunnel(tunnel)->enableLogs(enabled == FALSE ? false : true, tunnelLogHandler);
 }
 
 void linphone_tunnel_set_http_proxy_auth_info(LinphoneTunnel *tunnel, const char* username,const char* passwd){
@@ -322,7 +323,7 @@ void linphone_tunnel_reconnect(LinphoneTunnel *tunnel){
 }
 
 void linphone_tunnel_enable_sip(LinphoneTunnel *tunnel, bool_t enable) {
-	bcTunnel(tunnel)->tunnelizeSipPackets(enable);
+	bcTunnel(tunnel)->tunnelizeSipPackets(enable == FALSE ? false : true);
 	lp_config_set_int(config(tunnel), "tunnel", "sip", (enable ? TRUE : FALSE));
 }
 
@@ -330,8 +331,17 @@ bool_t linphone_tunnel_sip_enabled(const LinphoneTunnel *tunnel) {
 	return bcTunnel(tunnel)->tunnelizeSipPacketsEnabled() ? TRUE : FALSE;
 }
 
-static void my_ortp_logv(OrtpLogLevel level, const char *fmt, va_list args){
-	ortp_logv(level,fmt,args);
+void linphone_tunnel_verify_server_certificate(LinphoneTunnel *tunnel, bool_t enable) {
+	bcTunnel(tunnel)->verifyServerCertificate(enable == FALSE ? false : true);
+	lp_config_set_int(config(tunnel), "tunnel", "verify_cert", (enable ? TRUE : FALSE));
+}
+
+bool_t linphone_tunnel_verify_server_certificate_enabled(const LinphoneTunnel *tunnel) {
+	return bcTunnel(tunnel)->verifyServerCertificateEnabled() ? TRUE : FALSE;
+}
+
+static void my_ortp_logv(const char *domain, OrtpLogLevel level, const char *fmt, va_list args){
+	ortp_logv(domain, level,fmt,args);
 }
 
 
@@ -342,14 +352,19 @@ static void my_ortp_logv(OrtpLogLevel level, const char *fmt, va_list args){
 void linphone_tunnel_configure(LinphoneTunnel *tunnel){
 	LinphoneTunnelMode mode = linphone_tunnel_mode_from_string(lp_config_get_string(config(tunnel), "tunnel", "mode", NULL));
 	bool_t tunnelizeSIPPackets = (bool_t)lp_config_get_int(config(tunnel), "tunnel", "sip", TRUE);
+	bool_t tunnelVerifyServerCertificate = (bool_t)lp_config_get_int(config(tunnel), "tunnel", "verify_cert", FALSE);
 	linphone_tunnel_enable_logs_with_handler(tunnel,TRUE,my_ortp_logv);
 	linphone_tunnel_load_config(tunnel);
 	linphone_tunnel_enable_sip(tunnel, tunnelizeSIPPackets);
+	linphone_tunnel_verify_server_certificate(tunnel, tunnelVerifyServerCertificate);
+	/*Tunnel is started here if mode equals true*/
 	linphone_tunnel_set_mode(tunnel, mode);
+
 }
 
 /* Deprecated functions */
 void linphone_tunnel_enable(LinphoneTunnel *tunnel, bool_t enabled) {
+	ms_warning("linphone_tunnel_enable is deprecated - please use linphone_tunnel_set_mode instead.");
 	if(enabled) linphone_tunnel_set_mode(tunnel, LinphoneTunnelModeEnable);
 	else linphone_tunnel_set_mode(tunnel, LinphoneTunnelModeDisable);
 }
@@ -365,3 +380,7 @@ void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel) {
 bool_t linphone_tunnel_auto_detect_enabled(LinphoneTunnel *tunnel) {
 	return linphone_tunnel_get_mode(tunnel) == LinphoneTunnelModeAuto;
 }
+
+void linphone_tunnel_simulate_udp_loss(LinphoneTunnel *tunnel, bool_t enabled) {
+	bcTunnel(tunnel)->simulateUdpLoss(enabled == FALSE ? false : true);
+}
diff --git a/coreapi/linphone_tunnel.h b/coreapi/linphone_tunnel.h
index ecaaf2227..399875f46 100644
--- a/coreapi/linphone_tunnel.h
+++ b/coreapi/linphone_tunnel.h
@@ -176,12 +176,40 @@ LINPHONE_PUBLIC void linphone_tunnel_config_set_delay(LinphoneTunnelConfig *tunn
  */
 LINPHONE_PUBLIC int linphone_tunnel_config_get_delay(const LinphoneTunnelConfig *tunnel);
 
+/**
+ * Increment the refcount of LinphoneTunnelConfig object.
+ * @param cfg the LinphoneTunnelConfig object.
+ * @return the same cfg object.
+**/
+LINPHONE_PUBLIC LinphoneTunnelConfig * linphone_tunnel_config_ref(LinphoneTunnelConfig *cfg);
+
+
+/**
+ * Decrement the refcount of LinphoneTunnelConfig object.
+ * @param cfg the LinphoneTunnelConfig object.
+**/
+LINPHONE_PUBLIC void linphone_tunnel_config_unref(LinphoneTunnelConfig *cfg);
 /**
  * Destroy a tunnel configuration
  * @param tunnel LinphoneTunnelConfig object
+ * @deprecated use linphone_tunnel_config_unref().
  */
 LINPHONE_PUBLIC void linphone_tunnel_config_destroy(LinphoneTunnelConfig *tunnel);
 
+/**
+ * Store a user data in the tunnel config object
+ * @param cfg the tunnel config
+ * @param ud the user data
+**/
+LINPHONE_PUBLIC void linphone_tunnel_config_set_user_data(LinphoneTunnelConfig *cfg, void *ud);
+
+/**
+ * Retrieve user data from the tunnel config
+ * @param cfg the tunnel config
+ * @return the user data
+**/
+LINPHONE_PUBLIC void *linphone_tunnel_config_get_user_data(LinphoneTunnelConfig *cfg);
+
 /**
  * Add a tunnel server configuration.
  * @param tunnel LinphoneTunnel object
@@ -201,7 +229,7 @@ LINPHONE_PUBLIC void linphone_tunnel_remove_server(LinphoneTunnel *tunnel, Linph
  * @param tunnel LinphoneTunnel object
  * @return \mslist{LinphoneTunnelConfig}
  */
-LINPHONE_PUBLIC const MSList *linphone_tunnel_get_servers(const LinphoneTunnel *tunnel);
+LINPHONE_PUBLIC const bctbx_list_t *linphone_tunnel_get_servers(const LinphoneTunnel *tunnel);
 
 /**
  * Remove all tunnel server addresses previously entered with linphone_tunnel_add_server()
@@ -294,6 +322,7 @@ LINPHONE_PUBLIC void linphone_tunnel_get_http_proxy(LinphoneTunnel*tunnel,const
  */
 LINPHONE_PUBLIC void linphone_tunnel_set_http_proxy_auth_info(LinphoneTunnel*tunnel, const char* username,const char* passwd);
 
+
 /**
  * Sets whether tunneling of SIP and RTP is required.
  * @param tunnel object
@@ -329,6 +358,8 @@ LINPHONE_PUBLIC void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel);
  */
 LINPHONE_PUBLIC bool_t linphone_tunnel_auto_detect_enabled(LinphoneTunnel *tunnel);
 
+LINPHONE_PUBLIC void linphone_tunnel_simulate_udp_loss(LinphoneTunnel *tunnel, bool_t enabled);
+
 /**
  * @}
 **/
diff --git a/coreapi/linphone_tunnel_config.c b/coreapi/linphone_tunnel_config.c
index f38568016..988b114a1 100644
--- a/coreapi/linphone_tunnel_config.c
+++ b/coreapi/linphone_tunnel_config.c
@@ -21,18 +21,23 @@
  */
 
 #include "linphone_tunnel.h"
+#include "private.h"
+
 
 struct _LinphoneTunnelConfig {
+	belle_sip_object_t base;
 	char *host;
 	int port;
 	int remote_udp_mirror_port;
-	int delay;	
+	int delay;
+	void *user_data;
 };
 
 LinphoneTunnelConfig *linphone_tunnel_config_new() {
-	LinphoneTunnelConfig *ltc = ms_new0(LinphoneTunnelConfig,1);
+	LinphoneTunnelConfig *ltc = belle_sip_object_new(LinphoneTunnelConfig);
 	ltc->remote_udp_mirror_port = 12345;
 	ltc->delay = 1000;
+	ltc->port = 443;
 	return ltc;
 }
 
@@ -74,10 +79,40 @@ int linphone_tunnel_config_get_delay(const LinphoneTunnelConfig *tunnel) {
 	return tunnel->delay;
 }
 
-void linphone_tunnel_config_destroy(LinphoneTunnelConfig *tunnel) {
+static void _linphone_tunnel_config_destroy(LinphoneTunnelConfig *tunnel) {
 	if(tunnel->host != NULL) {
 		ms_free(tunnel->host);
 	}
-	ms_free(tunnel);
 }
 
+LinphoneTunnelConfig * linphone_tunnel_config_ref(LinphoneTunnelConfig *cfg){
+	return (LinphoneTunnelConfig*)belle_sip_object_ref(cfg);
+}
+
+void linphone_tunnel_config_unref(LinphoneTunnelConfig *cfg){
+	belle_sip_object_unref(cfg);
+}
+
+void linphone_tunnel_config_destroy(LinphoneTunnelConfig *tunnel){
+	linphone_tunnel_config_unref(tunnel);
+}
+
+void linphone_tunnel_config_set_user_data(LinphoneTunnelConfig *cfg, void *ud){
+	cfg->user_data = ud;
+}
+
+void *linphone_tunnel_config_get_user_data(LinphoneTunnelConfig *cfg){
+	return cfg->user_data;
+}
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneTunnelConfig);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneTunnelConfig, belle_sip_object_t,
+	(belle_sip_object_destroy_t)_linphone_tunnel_config_destroy,
+	NULL, // clone
+	NULL, // marshal
+	FALSE
+);
+
+
+
diff --git a/coreapi/linphone_tunnel_stubs.c b/coreapi/linphone_tunnel_stubs.c
index bfe793be6..02d2ac1c2 100644
--- a/coreapi/linphone_tunnel_stubs.c
+++ b/coreapi/linphone_tunnel_stubs.c
@@ -40,22 +40,28 @@ void linphone_tunnel_destroy(LinphoneTunnel *tunnel){
 
 
 void linphone_tunnel_add_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config){
+	ms_warning("linphone_tunnel_add_server() - stubbed, no implementation");
 }
 
 void linphone_tunnel_remove_server(LinphoneTunnel *tunnel, LinphoneTunnelConfig *tunnel_config){
+	ms_warning("linphone_tunnel_remove_server() - stubbed, no implementation");
 }
 
 const MSList *linphone_tunnel_get_servers(const LinphoneTunnel *tunnel){
+	ms_warning("linphone_tunnel_get_servers() - stubbed, no implementation");
 	return NULL;
 }
 
 void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel){
+	ms_warning("linphone_tunnel_clean_servers() - stubbed, no implementation");
 }
 
 void linphone_tunnel_set_mode(LinphoneTunnel *tunnel, LinphoneTunnelMode mode) {
+	ms_warning("linphone_tunnel_set_mode() - stubbed, no implementation");
 }
 
 LinphoneTunnelMode linphone_tunnel_get_mode(const LinphoneTunnel *tunnel){
+	ms_warning("linphone_tunnel_get_mode() - stubbed, no implementation");
 	return LinphoneTunnelModeDisable;
 }
 
@@ -83,9 +89,12 @@ void linphone_tunnel_reconnect(LinphoneTunnel *tunnel){
 }
 
 void linphone_tunnel_configure(LinphoneTunnel *tunnel){
+	ms_warning("linphone_tunnel_configure() - stubbed, no implementation");
 }
 
-void linphone_tunnel_enable_sip(LinphoneTunnel *tunnel, bool_t enable) {}
+void linphone_tunnel_enable_sip(LinphoneTunnel *tunnel, bool_t enable) {
+	ms_warning("linphone_tunnel_enable_sip() - stubbed, no implementation");
+}
 bool_t linphone_tunnel_sip_enabled(const LinphoneTunnel *tunnel) { return FALSE; }
 
 /* Deprecated functions */
@@ -93,3 +102,4 @@ void linphone_tunnel_enable(LinphoneTunnel *tunnel, bool_t enabled) {}
 bool_t linphone_tunnel_enabled(const LinphoneTunnel *tunnel) { return FALSE; }
 void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel) {}
 bool_t linphone_tunnel_auto_detect_enabled(LinphoneTunnel *tunnel) { return FALSE; }
+void linphone_tunnel_simulate_udp_loss(LinphoneTunnel *tunnel, bool_t enabled) {}
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 26525d3ca..4838e89e6 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sipsetup.h"
 #include "lpconfig.h"
 #include "private.h"
+#include "conference_private.h"
+
 #include <ortp/event.h>
 #include <ortp/b64.h>
 #include <math.h>
@@ -36,25 +38,57 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mediastreamer2/msjpegwriter.h"
 #include "mediastreamer2/mseventqueue.h"
 #include "mediastreamer2/mssndcard.h"
+#include "mediastreamer2/msrtt4103.h"
 
 static const char *EC_STATE_STORE = ".linphone.ecstate";
 #define EC_STATE_MAX_LEN 1048576 // 1Mo
 
 static void linphone_call_stats_uninit(LinphoneCallStats *stats);
 static void linphone_call_get_local_ip(LinphoneCall *call, const LinphoneAddress *remote_addr);
+static void _linphone_call_set_next_video_frame_decoded_trigger(LinphoneCall *call);
+void linphone_call_handle_stream_events(LinphoneCall *call, int stream_index);
 
 
-MSWebCam *get_nowebcam_device(){
+bool_t linphone_call_state_is_early(LinphoneCallState state){
+	switch (state){
+		case LinphoneCallIdle:
+		case LinphoneCallOutgoingInit:
+		case LinphoneCallOutgoingEarlyMedia:
+		case LinphoneCallOutgoingRinging:
+		case LinphoneCallOutgoingProgress:
+		case LinphoneCallIncomingReceived:
+		case LinphoneCallIncomingEarlyMedia:
+		case LinphoneCallEarlyUpdatedByRemote:
+		case LinphoneCallEarlyUpdating:
+			return TRUE;
+		case LinphoneCallResuming:
+		case LinphoneCallEnd:
+		case LinphoneCallUpdating:
+		case LinphoneCallRefered:
+		case LinphoneCallPausing:
+		case LinphoneCallPausedByRemote:
+		case LinphoneCallPaused:
+		case LinphoneCallConnected:
+		case LinphoneCallError:
+		case LinphoneCallUpdatedByRemote:
+		case LinphoneCallReleased:
+		case LinphoneCallStreamsRunning:
+		break;
+	}
+	return FALSE;
+}
+
+MSWebCam *get_nowebcam_device(MSFactory* f){
 #ifdef VIDEO_ENABLED
-	return ms_web_cam_manager_get_cam(ms_web_cam_manager_get(),"StaticImage: Static picture");
+	return ms_web_cam_manager_get_cam(ms_factory_get_web_cam_manager(f),"StaticImage: Static picture");
 #else
 	return NULL;
 #endif
 }
 
 
-static bool_t generate_b64_crypto_key(int key_length, char* key_out, size_t key_out_size) {
-	int b64_size;
+static bool_t generate_b64_crypto_key(size_t key_length, char* key_out, size_t key_out_size) {
+	size_t b64_size;
 	uint8_t* tmp = (uint8_t*) ms_malloc0(key_length);
 	if (sal_get_random_bytes(tmp, key_length)==NULL) {
 		ms_error("Failed to generate random key");
@@ -84,6 +118,14 @@ static bool_t generate_b64_crypto_key(int key_length, char* key_out, size_t key_
 	return TRUE;
 }
 
+static bool_t linphone_call_encryption_mandatory(LinphoneCall *call){
+	if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
+		ms_message("Forced encryption mandatory on call [%p] due to SRTP-DTLS",call);
+		return TRUE;
+	}
+	return call->params->encryption_mandatory;
+}
+
 LinphoneCore *linphone_call_get_core(const LinphoneCall *call){
 	return call->core;
 }
@@ -104,20 +146,30 @@ bool_t linphone_call_get_authentication_token_verified(LinphoneCall *call){
 	return call->auth_token_verified;
 }
 
+static bool_t at_least_one_stream_started(const LinphoneCall *call){
+	return (call->audiostream && media_stream_get_state((MediaStream *)call->audiostream) == MSStreamStarted )
+		|| (call->videostream && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted)
+		|| (call->textstream && media_stream_get_state((MediaStream *)call->textstream) == MSStreamStarted);
+}
+
 static bool_t linphone_call_all_streams_encrypted(const LinphoneCall *call) {
 	int number_of_encrypted_stream = 0;
 	int number_of_active_stream = 0;
-	if (call) {
-		if (call->audiostream && media_stream_get_state((MediaStream *)call->audiostream) == MSStreamStarted) {
-			number_of_active_stream++;
-			if(media_stream_secured((MediaStream *)call->audiostream))
-				number_of_encrypted_stream++;
-		}
-		if (call->videostream && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
-			number_of_active_stream++;
-			if (media_stream_secured((MediaStream *)call->videostream))
-				number_of_encrypted_stream++;
-		}
+
+	if (call->audiostream && media_stream_get_state((MediaStream *)call->audiostream) == MSStreamStarted) {
+		number_of_active_stream++;
+		if(media_stream_secured((MediaStream *)call->audiostream))
+			number_of_encrypted_stream++;
+	}
+	if (call->videostream && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
+		number_of_active_stream++;
+		if (media_stream_secured((MediaStream *)call->videostream))
+			number_of_encrypted_stream++;
+	}
+	if (call->textstream && media_stream_get_state((MediaStream *)call->textstream) == MSStreamStarted) {
+		number_of_active_stream++;
+		if (media_stream_secured((MediaStream *)call->textstream))
+			number_of_encrypted_stream++;
 	}
 	return number_of_active_stream>0 && number_of_active_stream==number_of_encrypted_stream;
 }
@@ -171,6 +223,11 @@ static void propagate_encryption_changed(LinphoneCall *call){
 		}
 		ms_message("All streams are encrypted key exchanged using %s", call->current_params->media_encryption==LinphoneMediaEncryptionZRTP?"ZRTP":call->current_params->media_encryption==LinphoneMediaEncryptionDTLS?"DTLS":"Unknown mechanism");
 		linphone_core_notify_call_encryption_changed(call->core, call, TRUE, call->auth_token);
+#ifdef VIDEO_ENABLED
+		if (linphone_call_encryption_mandatory(call) && call->videostream && media_stream_started((MediaStream *)call->videostream)) {
+			video_stream_send_vfu(call->videostream); /*nothing could have been sent yet so generating key frame*/
+		}
+#endif
 	}
 }
 
@@ -192,13 +249,11 @@ static void linphone_call_audiostream_encryption_changed(void *data, bool_t encr
 
 #ifdef VIDEO_ENABLED
 	// Enable video encryption
-	{
+	if (call->params->media_encryption==LinphoneMediaEncryptionZRTP) {
 		const LinphoneCallParams *params=linphone_call_get_current_params(call);
 		if (params->has_video) {
-			MSZrtpParams params;
-			ms_message("Trying to enable encryption on video stream");
-			params.zid_file=NULL; //unused
-			video_stream_enable_zrtp(call->videostream,call->audiostream,&params);
+			ms_message("Trying to start ZRTP encryption on video stream");
+			video_stream_start_zrtp(call->videostream);
 		}
 	}
 #endif
@@ -224,11 +279,13 @@ static void linphone_call_audiostream_auth_token_ready(void *data, const char* a
  * @ingroup call_control
 **/
 void linphone_call_set_authentication_token_verified(LinphoneCall *call, bool_t verified){
-	if (call->audiostream==NULL){
-		ms_error("linphone_call_set_authentication_token_verified(): No audio stream");
+	if (call->audiostream==NULL || !media_stream_started(&call->audiostream->ms)){
+		ms_error("linphone_call_set_authentication_token_verified(): No audio stream or not started");
+		return;
 	}
 	if (call->audiostream->ms.sessions.zrtp_context==NULL){
 		ms_error("linphone_call_set_authentication_token_verified(): No zrtp context.");
+		return;
 	}
 	if (!call->auth_token_verified && verified){
 		ms_zrtp_sas_verified(call->audiostream->ms.sessions.zrtp_context);
@@ -239,9 +296,9 @@ void linphone_call_set_authentication_token_verified(LinphoneCall *call, bool_t
 	propagate_encryption_changed(call);
 }
 
-static int get_max_codec_sample_rate(const MSList *codecs){
+static int get_max_codec_sample_rate(const bctbx_list_t *codecs){
 	int max_sample_rate=0;
-	const MSList *it;
+	const bctbx_list_t *it;
 	for(it=codecs;it!=NULL;it=it->next){
 		PayloadType *pt=(PayloadType*)it->data;
 		int sample_rate;
@@ -255,8 +312,8 @@ static int get_max_codec_sample_rate(const MSList *codecs){
 	return max_sample_rate;
 }
 
-static int find_payload_type_number(const MSList *assigned, const PayloadType *pt){
-	const MSList *elem;
+static int find_payload_type_number(const bctbx_list_t *assigned, const PayloadType *pt){
+	const bctbx_list_t *elem;
 	const PayloadType *candidate=NULL;
 	for(elem=assigned;elem!=NULL;elem=elem->next){
 		const PayloadType *it=(const PayloadType*)elem->data;
@@ -273,8 +330,8 @@ static int find_payload_type_number(const MSList *assigned, const PayloadType *p
 	return candidate ? payload_type_get_number(candidate) : -1;
 }
 
-bool_t is_payload_type_number_available(const MSList *l, int number, const PayloadType *ignore){
-	const MSList *elem;
+bool_t is_payload_type_number_available(const bctbx_list_t *l, int number, const PayloadType *ignore){
+	const bctbx_list_t *elem;
 	for (elem=l; elem!=NULL; elem=elem->next){
 		const PayloadType *pt=(PayloadType*)elem->data;
 		if (pt!=ignore && payload_type_get_number(pt)==number) return FALSE;
@@ -282,9 +339,11 @@ bool_t is_payload_type_number_available(const MSList *l, int number, const Paylo
 	return TRUE;
 }
 
-static void linphone_core_assign_payload_type_numbers(LinphoneCore *lc, MSList *codecs){
-	MSList *elem;
+static void linphone_core_assign_payload_type_numbers(LinphoneCore *lc, bctbx_list_t *codecs){
+	bctbx_list_t *elem;
 	int dyn_number=lc->codecs_conf.dyn_pt;
+	PayloadType *red = NULL, *t140 = NULL;
+
 	for (elem=codecs; elem!=NULL; elem=elem->next){
 		PayloadType *pt=(PayloadType*)elem->data;
 		int number=payload_type_get_number(pt);
@@ -311,11 +370,24 @@ static void linphone_core_assign_payload_type_numbers(LinphoneCore *lc, MSList *
 				payload_type_set_enable(pt, FALSE);
 			}
 		}
+
+		if (strcmp(pt->mime_type, payload_type_t140_red.mime_type) == 0) {
+			red = pt;
+		} else if (strcmp(pt->mime_type, payload_type_t140.mime_type) == 0) {
+			t140 = pt;
+		}
+	}
+
+	if (t140 && red) {
+		int t140_payload_type_number = payload_type_get_number(t140);
+		char *red_fmtp = ms_strdup_printf("%i/%i/%i", t140_payload_type_number, t140_payload_type_number, t140_payload_type_number);
+		payload_type_set_recv_fmtp(red, red_fmtp);
+		ms_free(red_fmtp);
 	}
 }
 
-static bool_t has_telephone_event_at_rate(const MSList *tev, int rate){
-	const MSList *it;
+static bool_t has_telephone_event_at_rate(const bctbx_list_t *tev, int rate){
+	const bctbx_list_t *it;
 	for(it=tev;it!=NULL;it=it->next){
 		const PayloadType *pt=(PayloadType*)it->data;
 		if (pt->clock_rate==rate) return TRUE;
@@ -323,9 +395,9 @@ static bool_t has_telephone_event_at_rate(const MSList *tev, int rate){
 	return FALSE;
 }
 
-static MSList * create_telephone_events(LinphoneCore *lc, const MSList *codecs){
-	const MSList *it;
-	MSList *ret=NULL;
+static bctbx_list_t * create_telephone_events(LinphoneCore *lc, const bctbx_list_t *codecs){
+	const bctbx_list_t *it;
+	bctbx_list_t *ret=NULL;
 	for(it=codecs;it!=NULL;it=it->next){
 		const PayloadType *pt=(PayloadType*)it->data;
 		if (!has_telephone_event_at_rate(ret,pt->clock_rate)){
@@ -339,18 +411,18 @@ static MSList * create_telephone_events(LinphoneCore *lc, const MSList *codecs){
 					payload_type_set_number(tev, lc->codecs_conf.telephone_event_pt);
 				}
 			}
-			ret=ms_list_append(ret,tev);
+			ret=bctbx_list_append(ret,tev);
 		}
 	}
 	return ret;
 }
 
-static MSList *create_special_payload_types(LinphoneCore *lc, const MSList *codecs){
-	MSList *ret=create_telephone_events(lc, codecs);
+static bctbx_list_t *create_special_payload_types(LinphoneCore *lc, const bctbx_list_t *codecs){
+	bctbx_list_t *ret=create_telephone_events(lc, codecs);
 	if (linphone_core_generic_confort_noise_enabled(lc)){
 		PayloadType *cn=payload_type_clone(&payload_type_cn);
 		payload_type_set_number(cn, 13);
-		ret=ms_list_append(ret, cn);
+		ret=bctbx_list_append(ret, cn);
 	}
 	return ret;
 }
@@ -358,20 +430,21 @@ static MSList *create_special_payload_types(LinphoneCore *lc, const MSList *code
 typedef struct _CodecConstraints{
 	int bandwidth_limit;
 	int max_codecs;
-	MSList *previously_used;
+	bctbx_list_t *previously_used;
 }CodecConstraints;
 
-static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, SalStreamType stype, const MSList *codecs){
-	MSList *l=NULL;
-	const MSList *it;
+static bctbx_list_t *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, SalStreamType stype, const bctbx_list_t *codecs){
+	bctbx_list_t *l=NULL;
+	const bctbx_list_t *it;
 	int nb = 0;
 
 	for(it=codecs;it!=NULL;it=it->next){
 		PayloadType *pt=(PayloadType*)it->data;
 		int num;
 
-		if (!(pt->flags & PAYLOAD_TYPE_ENABLED))
+		if (!payload_type_enabled(pt)) {
 			continue;
+		}
 		if (hints->bandwidth_limit>0 && !linphone_core_is_payload_type_usable_for_bandwidth(lc,pt,hints->bandwidth_limit)){
 			ms_message("Codec %s/%i eliminated because of audio bandwidth constraint of %i kbit/s",
 					pt->mime_type,pt->clock_rate,hints->bandwidth_limit);
@@ -389,38 +462,40 @@ static MSList *make_codec_list(LinphoneCore *lc, CodecConstraints * hints, SalSt
 			payload_type_set_flag(pt, PAYLOAD_TYPE_FROZEN_NUMBER);
 		}
 
-		l=ms_list_append(l, pt);
+		l=bctbx_list_append(l, pt);
 		nb++;
 		if ((hints->max_codecs > 0) && (nb >= hints->max_codecs)) break;
 	}
 	if (stype==SalAudio){
-		MSList *specials=create_special_payload_types(lc,l);
-		l=ms_list_concat(l,specials);
+		bctbx_list_t *specials=create_special_payload_types(lc,l);
+		l=bctbx_list_concat(l,specials);
 	}
 	linphone_core_assign_payload_type_numbers(lc, l);
 	return l;
 }
 
-static void update_media_description_from_stun(SalMediaDescription *md, const StunCandidate *ac, const StunCandidate *vc){
+static void update_media_description_from_stun(SalMediaDescription *md, const StunCandidate *ac, const StunCandidate *vc, const StunCandidate *tc){
 	int i;
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		if ((md->streams[i].type == SalAudio) && (ac->port != 0)) {
-			strcpy(md->streams[0].rtp_addr,ac->addr);
-			md->streams[0].rtp_port=ac->port;
+			strcpy(md->streams[i].rtp_addr,ac->addr);
+			md->streams[i].rtp_port=ac->port;
 			if ((ac->addr[0]!='\0' && vc->addr[0]!='\0' && strcmp(ac->addr,vc->addr)==0) || sal_media_description_get_nb_active_streams(md)==1){
 				strcpy(md->addr,ac->addr);
 			}
-		}
-		if ((md->streams[i].type == SalVideo) && (vc->port != 0)) {
-			strcpy(md->streams[1].rtp_addr,vc->addr);
-			md->streams[1].rtp_port=vc->port;
+		} else if ((md->streams[i].type == SalVideo) && (vc->port != 0)) {
+			strcpy(md->streams[i].rtp_addr,vc->addr);
+			md->streams[i].rtp_port=vc->port;
+		} else if ((md->streams[i].type == SalText) && (tc->port != 0)) {
+			strcpy(md->streams[i].rtp_addr,tc->addr);
+			md->streams[i].rtp_port=tc->port;
 		}
 	}
 }
 
 static int setup_encryption_key(SalSrtpCryptoAlgo *crypto, MSCryptoSuite suite, unsigned int tag){
-	int keylen=0;
+	size_t keylen=0;
 	crypto->tag=tag;
 	crypto->algo=suite;
 	switch(suite){
@@ -431,13 +506,14 @@ static int setup_encryption_key(SalSrtpCryptoAlgo *crypto, MSCryptoSuite suite,
 			keylen=30;
 		break;
 		case MS_AES_256_SHA1_80:
+		case MS_AES_CM_256_SHA1_80:
 		case MS_AES_256_SHA1_32:
 			keylen=46;
 		break;
 		case MS_CRYPTO_SUITE_INVALID:
 		break;
 	}
-	if (keylen==0 || !generate_b64_crypto_key(30, crypto->master_key, SAL_SRTP_KEY_SIZE)){
+	if (keylen==0 || !generate_b64_crypto_key(keylen, crypto->master_key, SAL_SRTP_KEY_SIZE)){
 		ms_error("Could not generate SRTP key.");
 		crypto->algo = 0;
 		return -1;
@@ -446,7 +522,7 @@ static int setup_encryption_key(SalSrtpCryptoAlgo *crypto, MSCryptoSuite suite,
 }
 static void setup_dtls_keys(LinphoneCall *call, SalMediaDescription *md){
 	int i;
-	for(i=0; i<md->nb_streams; i++) {
+	for(i=0; i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		/* if media encryption is set to DTLS check presence of fingerprint in the call which shall have been set at stream init but it may have failed when retrieving certificate resulting in no fingerprint present and then DTLS not usable */
 		if (sal_stream_description_has_dtls(&md->streams[i]) == TRUE) {
@@ -466,7 +542,7 @@ static void setup_encryption_keys(LinphoneCall *call, SalMediaDescription *md){
 	SalMediaDescription *old_md=call->localdesc;
 	bool_t keep_srtp_keys=lp_config_get_int(lc->config,"sip","keep_srtp_keys",1);
 
-	for(i=0; i<md->nb_streams; i++) {
+	for(i=0; i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		if (sal_stream_description_has_srtp(&md->streams[i]) == TRUE) {
 			if (keep_srtp_keys && old_md && (sal_stream_description_active(&old_md->streams[i]) == TRUE) && (sal_stream_description_has_srtp(&old_md->streams[i]) == TRUE)) {
@@ -485,26 +561,49 @@ static void setup_encryption_keys(LinphoneCall *call, SalMediaDescription *md){
 	}
 }
 
+
+static void setup_zrtp_hash(LinphoneCall *call, SalMediaDescription *md) {
+	int i;
+	if (linphone_core_media_encryption_supported(call->core, LinphoneMediaEncryptionZRTP)) { /* set the hello hash for all streams */
+		for(i=0; i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+			if (!sal_stream_description_active(&md->streams[i])) continue;
+			if (call->sessions[i].zrtp_context!=NULL) {
+				ms_zrtp_getHelloHash(call->sessions[i].zrtp_context, md->streams[i].zrtphash, 128);
+				if (call->params->media_encryption==LinphoneMediaEncryptionZRTP) { /* turn on the flag to use it if ZRTP is set */
+					md->streams[i].haveZrtpHash = 1;
+				} else {
+					md->streams[i].haveZrtpHash = 0;
+				}
+			} else {
+				md->streams[i].haveZrtpHash = 0;
+			}
+		}
+	}
+}
+
 static void setup_rtcp_fb(LinphoneCall *call, SalMediaDescription *md) {
-	MSList *pt_it;
+	bctbx_list_t *pt_it;
 	PayloadType *pt;
 	PayloadTypeAvpfParams avpf_params;
 	LinphoneCore *lc = call->core;
 	int i;
 
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		md->streams[i].rtcp_fb.generic_nack_enabled = lp_config_get_int(lc->config, "rtp", "rtcp_fb_generic_nack_enabled", 0);
 		md->streams[i].rtcp_fb.tmmbr_enabled = lp_config_get_int(lc->config, "rtp", "rtcp_fb_tmmbr_enabled", 0);
+		md->streams[i].implicit_rtcp_fb = call->params->implicit_rtcp_fb;
+
 		for (pt_it = md->streams[i].payloads; pt_it != NULL; pt_it = pt_it->next) {
 			pt = (PayloadType *)pt_it->data;
-			if (call->params->avpf_enabled == TRUE) {
+
+			if (call->params->avpf_enabled == FALSE && call->params->implicit_rtcp_fb == FALSE)  {
+				payload_type_unset_flag(pt, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED);
+				memset(&avpf_params, 0, sizeof(avpf_params));
+			}else {
 				payload_type_set_flag(pt, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED);
 				avpf_params = payload_type_get_avpf_params(pt);
 				avpf_params.trr_interval = call->params->avpf_rr_interval;
-			} else {
-				payload_type_unset_flag(pt, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED);
-				memset(&avpf_params, 0, sizeof(avpf_params));
 			}
 			payload_type_set_avpf_params(pt, avpf_params);
 		}
@@ -530,7 +629,7 @@ static void setup_rtcp_xr(LinphoneCall *call, SalMediaDescription *md) {
 		}
 		md->rtcp_xr.voip_metrics_enabled = lp_config_get_int(lc->config, "rtp", "rtcp_xr_voip_metrics_enabled", 1);
 	}
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		memcpy(&md->streams[i].rtcp_xr, &md->rtcp_xr, sizeof(md->streams[i].rtcp_xr));
 	}
@@ -542,8 +641,11 @@ void linphone_call_increment_local_media_description(LinphoneCall *call){
 }
 
 void linphone_call_update_local_media_description_from_ice_or_upnp(LinphoneCall *call){
+	LinphoneCore *lc = call->core;
 	if (call->ice_session != NULL) {
-		_update_local_media_description_from_ice(call->localdesc, call->ice_session);
+		/*set this to FALSE once flexisip are updated everywhere, let's say in December 2016.*/
+		bool_t use_nortpproxy = lp_config_get_int(lc->config, "sip", "ice_uses_nortpproxy", TRUE);
+		_update_local_media_description_from_ice(call->localdesc, call->ice_session, use_nortpproxy);
 		linphone_core_update_ice_state_in_call_stats(call);
 	}
 #ifdef BUILD_UPNP
@@ -556,19 +658,23 @@ void linphone_call_update_local_media_description_from_ice_or_upnp(LinphoneCall
 
 static void transfer_already_assigned_payload_types(SalMediaDescription *old, SalMediaDescription *md){
 	int i;
-	for(i=0;i<old->nb_streams;++i){
+	for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
 		md->streams[i].already_assigned_payloads=old->streams[i].already_assigned_payloads;
 		old->streams[i].already_assigned_payloads=NULL;
 	}
 }
 
 static const char *linphone_call_get_bind_ip_for_stream(LinphoneCall *call, int stream_index){
-	const char *bind_ip = lp_config_get_string(call->core->config,"rtp","bind_address",call->af==AF_INET6 ? "::0" : "0.0.0.0");
-
-	if (stream_index<2 && call->media_ports[stream_index].multicast_ip[0]!='\0'){
+	const char *bind_ip = lp_config_get_string(call->core->config,"rtp","bind_address",
+				call->af == AF_INET6 ? "::0" : "0.0.0.0");
+	PortConfig *pc = &call->media_ports[stream_index];
+	if (stream_index<2 && pc->multicast_ip[0]!='\0'){
 		if (call->dir==LinphoneCallOutgoing){
 			/*as multicast sender, we must decide a local interface to use to send multicast, and bind to it*/
-			bind_ip=call->media_localip;
+			linphone_core_get_local_ip_for(strchr(pc->multicast_ip,':') ? AF_INET6 : AF_INET,
+				NULL, pc->multicast_bind_ip);
+			bind_ip = pc->multicast_bind_ip;
+
 		}
 	}
 	return bind_ip;
@@ -582,9 +688,21 @@ static const char *linphone_call_get_public_ip_for_stream(LinphoneCall *call, in
 	return public_ip;
 }
 
+void linphone_call_update_biggest_desc(LinphoneCall *call, SalMediaDescription *md){
+	if (call->biggestdesc==NULL || md->nb_streams>call->biggestdesc->nb_streams){
+		/*we have been offered and now are ready to proceed, or we added a new stream*/
+		/*store the media description to remember the mapping of calls*/
+		if (call->biggestdesc){
+			sal_media_description_unref(call->biggestdesc);
+			call->biggestdesc=NULL;
+		}
+		call->biggestdesc=sal_media_description_ref(md);
+	}
+}
+
 static void force_streams_dir_according_to_state(LinphoneCall *call, SalMediaDescription *md){
 	int i;
-	
+
 	switch (call->state){
 		case LinphoneCallPausing:
 		case LinphoneCallPaused:
@@ -593,40 +711,42 @@ static void force_streams_dir_according_to_state(LinphoneCall *call, SalMediaDes
 			return;
 		break;
 	}
-	
-	for (i=0; i<2; ++i){
+
+	for (i=0; i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++i){
 		SalStreamDescription *sd = &md->streams[i];
-		sd->dir = SalStreamSendOnly;
-		if (sd->type == SalVideo){
-			if (lp_config_get_int(call->core->config, "sip", "inactive_video_on_pause", 0)) {
-				sd->dir = SalStreamInactive;
+		if (sd->dir != SalStreamInactive) {
+			sd->dir = SalStreamSendOnly;
+			if (sd->type == SalVideo){
+				if (lp_config_get_int(call->core->config, "sip", "inactive_video_on_pause", 0)) {
+					sd->dir = SalStreamInactive;
+				}
 			}
 		}
 	}
 }
 
 void linphone_call_make_local_media_description(LinphoneCall *call) {
-	MSList *l;
+	bctbx_list_t *l;
 	SalMediaDescription *old_md=call->localdesc;
 	int i;
-	int nb_active_streams = 0;
+	int max_index = 0;
 	SalMediaDescription *md=sal_media_description_new();
 	LinphoneAddress *addr;
 	const char *subject;
 	CodecConstraints codec_hints={0};
 	LinphoneCallParams *params = call->params;
 	LinphoneCore *lc = call->core;
-
+	bool_t rtcp_mux = lp_config_get_int(lc->config, "rtp", "rtcp_mux", 0);
 
 	/*multicast is only set in case of outgoing call*/
 	if (call->dir == LinphoneCallOutgoing && linphone_call_params_audio_multicast_enabled(params)) {
-		md->streams[0].ttl=linphone_core_get_audio_multicast_ttl(lc);
-		md->streams[0].multicast_role = SalMulticastSender;
+		md->streams[call->main_audio_stream_index].ttl=linphone_core_get_audio_multicast_ttl(lc);
+		md->streams[call->main_audio_stream_index].multicast_role = SalMulticastSender;
 	}
 
 	if (call->dir == LinphoneCallOutgoing && linphone_call_params_video_multicast_enabled(params)) {
-		md->streams[1].ttl=linphone_core_get_video_multicast_ttl(lc);
-		md->streams[1].multicast_role = SalMulticastSender;
+		md->streams[call->main_video_stream_index].ttl=linphone_core_get_video_multicast_ttl(lc);
+		md->streams[call->main_video_stream_index].multicast_role = SalMulticastSender;
 	}
 
 	subject=linphone_call_params_get_session_name(params);
@@ -654,84 +774,139 @@ void linphone_call_make_local_media_description(LinphoneCall *call) {
 		md->bandwidth=params->down_bw;
 	else md->bandwidth=linphone_core_get_download_bandwidth(lc);
 
+	if (params->custom_sdp_attributes)
+		md->custom_sdp_attributes = sal_custom_sdp_attribute_clone(params->custom_sdp_attributes);
+
 	/*set audio capabilities */
-	strncpy(md->streams[0].rtp_addr,linphone_call_get_public_ip_for_stream(call,0),sizeof(md->streams[0].rtp_addr));
-	strncpy(md->streams[0].rtcp_addr,linphone_call_get_public_ip_for_stream(call,0),sizeof(md->streams[0].rtcp_addr));
-	strncpy(md->streams[0].name,"Audio",sizeof(md->streams[0].name)-1);
-	md->streams[0].rtp_port=call->media_ports[0].rtp_port;
-	md->streams[0].rtcp_port=call->media_ports[0].rtcp_port;
-	md->streams[0].proto=get_proto_from_call_params(params);
-	md->streams[0].dir=get_audio_dir_from_call_params(params);
-	md->streams[0].type=SalAudio;
-	if (params->down_ptime)
-		md->streams[0].ptime=params->down_ptime;
-	else
-		md->streams[0].ptime=linphone_core_get_download_ptime(lc);
+
 	codec_hints.bandwidth_limit=params->audio_bw;
 	codec_hints.max_codecs=-1;
-	codec_hints.previously_used=old_md ? old_md->streams[0].already_assigned_payloads : NULL;
+	codec_hints.previously_used=old_md ? old_md->streams[call->main_audio_stream_index].already_assigned_payloads : NULL;
 	l=make_codec_list(lc, &codec_hints, SalAudio, lc->codecs_conf.audio_codecs);
-	md->streams[0].max_rate=get_max_codec_sample_rate(l);
-	md->streams[0].payloads=l;
-	if (call->audiostream && call->audiostream->ms.sessions.rtp_session) {
-		char* me = linphone_address_as_string_uri_only(call->me);
-		md->streams[0].rtp_ssrc=rtp_session_get_send_ssrc(call->audiostream->ms.sessions.rtp_session);
-		strncpy(md->streams[0].rtcp_cname,me,sizeof(md->streams[0].rtcp_cname));
-		ms_free(me);
-	}
-	else
-		ms_warning("Cannot get audio local ssrc for call [%p]",call);
-	nb_active_streams++;
 
-	if (params->has_video && (!params->internal_call_update || !call->current_params->video_declined)){
-		strncpy(md->streams[1].rtp_addr,linphone_call_get_public_ip_for_stream(call,1),sizeof(md->streams[1].rtp_addr));
-		strncpy(md->streams[1].rtcp_addr,linphone_call_get_public_ip_for_stream(call,1),sizeof(md->streams[1].rtcp_addr));
-		strncpy(md->streams[1].name,"Video",sizeof(md->streams[1].name)-1);
-		md->streams[1].rtp_port=call->media_ports[1].rtp_port;
-		md->streams[1].rtcp_port=call->media_ports[1].rtcp_port;
-		md->streams[1].proto=md->streams[0].proto;
-		md->streams[1].dir=get_video_dir_from_call_params(params);
-		md->streams[1].type=SalVideo;
-		codec_hints.bandwidth_limit=0;
-		codec_hints.max_codecs=-1;
-		codec_hints.previously_used=old_md ? old_md->streams[1].already_assigned_payloads : NULL;
-		l=make_codec_list(lc, &codec_hints, SalVideo, lc->codecs_conf.video_codecs);
-		md->streams[1].payloads=l;
+	if (params->has_audio && l != NULL) {
+		strncpy(md->streams[call->main_audio_stream_index].rtp_addr,linphone_call_get_public_ip_for_stream(call,call->main_audio_stream_index),sizeof(md->streams[call->main_audio_stream_index].rtp_addr));
+		strncpy(md->streams[call->main_audio_stream_index].rtcp_addr,linphone_call_get_public_ip_for_stream(call,call->main_audio_stream_index),sizeof(md->streams[call->main_audio_stream_index].rtcp_addr));
+		strncpy(md->streams[call->main_audio_stream_index].name,"Audio",sizeof(md->streams[call->main_audio_stream_index].name)-1);
+		md->streams[call->main_audio_stream_index].rtp_port=call->media_ports[call->main_audio_stream_index].rtp_port;
+		md->streams[call->main_audio_stream_index].rtcp_port=call->media_ports[call->main_audio_stream_index].rtcp_port;
+		md->streams[call->main_audio_stream_index].proto=get_proto_from_call_params(params);
+		md->streams[call->main_audio_stream_index].dir=get_audio_dir_from_call_params(params);
+		md->streams[call->main_audio_stream_index].type=SalAudio;
+		md->streams[call->main_audio_stream_index].rtcp_mux = rtcp_mux;
+		if (params->down_ptime)
+			md->streams[call->main_audio_stream_index].ptime=params->down_ptime;
+		else
+			md->streams[call->main_audio_stream_index].ptime=linphone_core_get_download_ptime(lc);
+		md->streams[call->main_audio_stream_index].max_rate=get_max_codec_sample_rate(l);
+		md->streams[call->main_audio_stream_index].payloads=l;
+		if (call->audiostream && call->audiostream->ms.sessions.rtp_session) {
+			char* me = linphone_address_as_string_uri_only(call->me);
+			md->streams[call->main_audio_stream_index].rtp_ssrc=rtp_session_get_send_ssrc(call->audiostream->ms.sessions.rtp_session);
+			strncpy(md->streams[call->main_audio_stream_index].rtcp_cname,me,sizeof(md->streams[call->main_audio_stream_index].rtcp_cname));
+			ms_free(me);
+		}
+		else
+			ms_warning("Cannot get audio local ssrc for call [%p]",call);
+		if (call->main_audio_stream_index > max_index)
+			max_index = call->main_audio_stream_index;
+	} else {
+		ms_message("Don't put audio stream on local offer for call [%p]",call);
+		md->streams[call->main_audio_stream_index].dir = SalStreamInactive;
+		if(l) l=bctbx_list_free_with_data(l, (void (*)(void *))payload_type_destroy);
+	}
+	if (params->custom_sdp_media_attributes[LinphoneStreamTypeAudio])
+		md->streams[call->main_audio_stream_index].custom_sdp_attributes = sal_custom_sdp_attribute_clone(params->custom_sdp_media_attributes[LinphoneStreamTypeAudio]);
+
+	md->streams[call->main_video_stream_index].proto=md->streams[call->main_audio_stream_index].proto;
+	md->streams[call->main_video_stream_index].dir=get_video_dir_from_call_params(params);
+	md->streams[call->main_video_stream_index].type=SalVideo;
+	md->streams[call->main_video_stream_index].rtcp_mux = rtcp_mux;
+	strncpy(md->streams[call->main_video_stream_index].name,"Video",sizeof(md->streams[call->main_video_stream_index].name)-1);
+
+	codec_hints.bandwidth_limit=0;
+	codec_hints.max_codecs=-1;
+	codec_hints.previously_used=old_md ? old_md->streams[call->main_video_stream_index].already_assigned_payloads : NULL;
+	l=make_codec_list(lc, &codec_hints, SalVideo, lc->codecs_conf.video_codecs);
+
+	if (params->has_video && l != NULL){
+		strncpy(md->streams[call->main_video_stream_index].rtp_addr,linphone_call_get_public_ip_for_stream(call,call->main_video_stream_index),sizeof(md->streams[call->main_video_stream_index].rtp_addr));
+		strncpy(md->streams[call->main_video_stream_index].rtcp_addr,linphone_call_get_public_ip_for_stream(call,call->main_video_stream_index),sizeof(md->streams[call->main_video_stream_index].rtcp_addr));
+		md->streams[call->main_video_stream_index].rtp_port=call->media_ports[call->main_video_stream_index].rtp_port;
+		md->streams[call->main_video_stream_index].rtcp_port=call->media_ports[call->main_video_stream_index].rtcp_port;
+		md->streams[call->main_video_stream_index].payloads=l;
 		if (call->videostream && call->videostream->ms.sessions.rtp_session) {
 			char* me = linphone_address_as_string_uri_only(call->me);
-			md->streams[1].rtp_ssrc=rtp_session_get_send_ssrc(call->videostream->ms.sessions.rtp_session);
-			strncpy(md->streams[1].rtcp_cname,me,sizeof(md->streams[1].rtcp_cname));
+			md->streams[call->main_video_stream_index].rtp_ssrc=rtp_session_get_send_ssrc(call->videostream->ms.sessions.rtp_session);
+			strncpy(md->streams[call->main_video_stream_index].rtcp_cname,me,sizeof(md->streams[call->main_video_stream_index].rtcp_cname));
 			ms_free(me);
 		}
 		else
 			ms_warning("Cannot get video local ssrc for call [%p]",call);
-		nb_active_streams++;
+		if (call->main_video_stream_index > max_index)
+			max_index = call->main_video_stream_index;
 	} else {
 		ms_message("Don't put video stream on local offer for call [%p]",call);
+		md->streams[call->main_video_stream_index].dir = SalStreamInactive;
+		if(l) l=bctbx_list_free_with_data(l, (void (*)(void *))payload_type_destroy);
 	}
+	if (params->custom_sdp_media_attributes[LinphoneStreamTypeVideo])
+		md->streams[call->main_video_stream_index].custom_sdp_attributes = sal_custom_sdp_attribute_clone(params->custom_sdp_media_attributes[LinphoneStreamTypeVideo]);
 
-	if (md->nb_streams < nb_active_streams)
-		md->nb_streams = nb_active_streams;
+	md->streams[call->main_text_stream_index].proto=md->streams[call->main_audio_stream_index].proto;
+	md->streams[call->main_text_stream_index].dir=SalStreamSendRecv;
+	md->streams[call->main_text_stream_index].type=SalText;
+	md->streams[call->main_text_stream_index].rtcp_mux = rtcp_mux;
+	strncpy(md->streams[call->main_text_stream_index].name,"Text",sizeof(md->streams[call->main_text_stream_index].name)-1);
+	if (params->realtimetext_enabled) {
+		strncpy(md->streams[call->main_text_stream_index].rtp_addr,linphone_call_get_public_ip_for_stream(call,call->main_text_stream_index),sizeof(md->streams[call->main_text_stream_index].rtp_addr));
+		strncpy(md->streams[call->main_text_stream_index].rtcp_addr,linphone_call_get_public_ip_for_stream(call,call->main_text_stream_index),sizeof(md->streams[call->main_text_stream_index].rtcp_addr));
+
+		md->streams[call->main_text_stream_index].rtp_port=call->media_ports[call->main_text_stream_index].rtp_port;
+		md->streams[call->main_text_stream_index].rtcp_port=call->media_ports[call->main_text_stream_index].rtcp_port;
 
-	/* Deactivate inactive streams. */
-	for (i = nb_active_streams; i < md->nb_streams; i++) {
-		md->streams[i].rtp_port = 0;
-		md->streams[i].rtcp_port = 0;
-		md->streams[i].proto = call->biggestdesc->streams[i].proto;
-		md->streams[i].type = call->biggestdesc->streams[i].type;
-		md->streams[i].dir = SalStreamInactive;
 		codec_hints.bandwidth_limit=0;
-		codec_hints.max_codecs=1;
-		codec_hints.previously_used=NULL;
-		l = make_codec_list(lc, &codec_hints, SalVideo, lc->codecs_conf.video_codecs);
-		md->streams[i].payloads = l;
+		codec_hints.max_codecs=-1;
+		codec_hints.previously_used=old_md ? old_md->streams[call->main_text_stream_index].already_assigned_payloads : NULL;
+		l=make_codec_list(lc, &codec_hints, SalText, lc->codecs_conf.text_codecs);
+		md->streams[call->main_text_stream_index].payloads=l;
+		if (call->textstream && call->textstream->ms.sessions.rtp_session) {
+			char* me = linphone_address_as_string_uri_only(call->me);
+			md->streams[call->main_text_stream_index].rtp_ssrc=rtp_session_get_send_ssrc(call->textstream->ms.sessions.rtp_session);
+			strncpy(md->streams[call->main_text_stream_index].rtcp_cname,me,sizeof(md->streams[call->main_text_stream_index].rtcp_cname));
+			ms_free(me);
+		}
+		else
+			ms_warning("Cannot get text local ssrc for call [%p]",call);
+		if (call->main_text_stream_index > max_index)
+			max_index = call->main_text_stream_index;
+	} else {
+		ms_message("Don't put text stream on local offer for call [%p]",call);
+		md->streams[call->main_text_stream_index].dir = SalStreamInactive;
+	}
+	if (params->custom_sdp_media_attributes[LinphoneStreamTypeText])
+		md->streams[call->main_text_stream_index].custom_sdp_attributes = sal_custom_sdp_attribute_clone(params->custom_sdp_media_attributes[LinphoneStreamTypeText]);
+
+	md->nb_streams = MAX(md->nb_streams,max_index+1);
+
+	/* Deactivate unused streams. */
+	for (i = md->nb_streams; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+		if (md->streams[i].rtp_port == 0) {
+			md->streams[i].dir = SalStreamInactive;
+			if (call->biggestdesc && i < call->biggestdesc->nb_streams) {
+				md->streams[i].proto = call->biggestdesc->streams[i].proto;
+				md->streams[i].type = call->biggestdesc->streams[i].type;
+			}
+		}
 	}
 	setup_encryption_keys(call,md);
 	setup_dtls_keys(call,md);
+	setup_zrtp_hash(call, md);
+
 	setup_rtcp_fb(call, md);
 	setup_rtcp_xr(call, md);
 
-	update_media_description_from_stun(md,&call->ac,&call->vc);
+	update_media_description_from_stun(md, &call->ac, &call->vc, &call->tc);
 	call->localdesc=md;
 	linphone_call_update_local_media_description_from_ice_or_upnp(call);
 	linphone_address_destroy(addr);
@@ -739,13 +914,21 @@ void linphone_call_make_local_media_description(LinphoneCall *call) {
 		transfer_already_assigned_payload_types(old_md,md);
 		call->localdesc_changed=sal_media_description_equals(md,old_md);
 		sal_media_description_unref(old_md);
+		if (call->params->internal_call_update){
+			/*
+			 * An internal call update (ICE reINVITE) is not expected to modify the actual media stream parameters.
+			 * However, the localdesc may change between first INVITE and ICE reINVITE, for example if the remote party has declined a video stream.
+			 * We use the internal_call_update flag to prevent trigger an unnecessary media restart.
+			 */
+			call->localdesc_changed = 0;
+		}
 	}
 	force_streams_dir_according_to_state(call, md);
 }
 
 static int find_port_offset(LinphoneCore *lc, int stream_index, int base_port){
 	int offset;
-	MSList *elem;
+	bctbx_list_t *elem;
 	int tried_port;
 	int existing_port;
 	bool_t already_used=FALSE;
@@ -771,7 +954,7 @@ static int find_port_offset(LinphoneCore *lc, int stream_index, int base_port){
 }
 
 static int select_random_port(LinphoneCore *lc, int stream_index, int min_port, int max_port) {
-	MSList *elem;
+	bctbx_list_t *elem;
 	int nb_tries;
 	int tried_port = 0;
 	int existing_port = 0;
@@ -824,6 +1007,10 @@ static void port_config_set(LinphoneCall *call, int stream_index, int min_port,
 static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from, LinphoneAddress *to){
 	int min_port, max_port;
 	ms_message("New LinphoneCall [%p] initialized (LinphoneCore version: %s)",call,linphone_core_get_version());
+	call->core->send_call_stats_periodical_updates = lp_config_get_int(call->core->config, "misc", "send_call_stats_periodical_updates", 0);
+	call->main_audio_stream_index = LINPHONE_CALL_STATS_AUDIO;
+	call->main_video_stream_index = LINPHONE_CALL_STATS_VIDEO;
+	call->main_text_stream_index = LINPHONE_CALL_STATS_TEXT;
 	call->state=LinphoneCallIdle;
 	call->transfer_state = LinphoneCallIdle;
 	call->log=linphone_call_log_new(call->dir, from, to);
@@ -838,13 +1025,17 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 	linphone_address_ref(call->me);
 
 	linphone_core_get_audio_port_range(call->core, &min_port, &max_port);
-	port_config_set(call,0,min_port,max_port);
+	port_config_set(call,call->main_audio_stream_index,min_port,max_port);
 
 	linphone_core_get_video_port_range(call->core, &min_port, &max_port);
-	port_config_set(call,1,min_port,max_port);
+	port_config_set(call,call->main_video_stream_index,min_port,max_port);
+
+	linphone_core_get_text_port_range(call->core, &min_port, &max_port);
+	port_config_set(call,call->main_text_stream_index,min_port,max_port);
 
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], LINPHONE_CALL_STATS_AUDIO);
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], LINPHONE_CALL_STATS_VIDEO);
+	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_TEXT], LINPHONE_CALL_STATS_TEXT);
 }
 
 void linphone_call_init_stats(LinphoneCallStats *stats, int type) {
@@ -866,9 +1057,9 @@ static void discover_mtu(LinphoneCore *lc, const char *remote){
 		/*attempt to discover mtu*/
 		mtu=ms_discover_mtu(remote);
 		if (mtu>0){
-			ms_set_mtu(mtu);
+			ms_factory_set_mtu(lc->factory, mtu);
 			ms_message("Discovered mtu is %i, RTP payload max size is %i",
-				mtu, ms_get_payload_max_size());
+				mtu, ms_factory_get_payload_max_size(lc->factory));
 		}
 	}
 }
@@ -886,7 +1077,7 @@ void linphone_call_create_op(LinphoneCall *call){
 }
 
 /*
- * Choose IP version we are going to use for RTP socket.
+ * Choose IP version we are going to use for RTP streams IP address advertised in SDP.
  * The algorithm is as follows:
  * - if ipv6 is disabled at the core level, it is always AF_INET
  * - Otherwise, if the destination address for the call is an IPv6 address, use IPv6.
@@ -895,11 +1086,36 @@ void linphone_call_create_op(LinphoneCall *call){
 **/
 static void linphone_call_outgoing_select_ip_version(LinphoneCall *call, LinphoneAddress *to, LinphoneProxyConfig *cfg){
 	if (linphone_core_ipv6_enabled(call->core)){
-		call->af=AF_INET;
 		if (sal_address_is_ipv6((SalAddress*)to)){
 			call->af=AF_INET6;
 		}else if (cfg && cfg->op){
-			call->af=sal_op_is_ipv6(cfg->op) ? AF_INET6 : AF_INET;
+			call->af=sal_op_get_address_family(cfg->op);
+		}else{
+			call->af=AF_UNSPEC;
+		}
+		if (call->af == AF_UNSPEC) {
+			char ipv4[LINPHONE_IPADDR_SIZE];
+			char ipv6[LINPHONE_IPADDR_SIZE];
+			bool_t have_ipv6 = FALSE;
+			bool_t have_ipv4 = FALSE;
+			/*check connectivity for IPv4 and IPv6*/
+			if (linphone_core_get_local_ip_for(AF_INET6, NULL, ipv6) == 0){
+				have_ipv6 = TRUE;
+			}
+			if (linphone_core_get_local_ip_for(AF_INET, NULL, ipv4) == 0){
+				have_ipv4 = TRUE;
+			}
+			if (have_ipv6){
+				if (!have_ipv4) {
+					call->af = AF_INET6;
+				}else if (lp_config_get_int(call->core->config, "rtp", "prefer_ipv6", 1)){ /*this property tells whether ipv6 is prefered if two versions are available*/
+					call->af = AF_INET6;
+				}else{
+					call->af = AF_INET;
+				}
+			}else call->af = AF_INET;
+			/*fill the media_localip default value since we have it here*/
+			strncpy(call->media_localip,call->af == AF_INET6 ? ipv6 : ipv4, LINPHONE_IPADDR_SIZE);
 		}
 	}else call->af=AF_INET;
 }
@@ -908,13 +1124,44 @@ static void linphone_call_outgoing_select_ip_version(LinphoneCall *call, Linphon
  * Fill the local ip that routes to the internet according to the destination, or guess it by other special means (upnp).
  */
 static void linphone_call_get_local_ip(LinphoneCall *call, const LinphoneAddress *remote_addr){
-	const char *ip;
+	const char *ip = NULL;
 	int af = call->af;
 	const char *dest = NULL;
+
+	if (linphone_core_get_firewall_policy(call->core)==LinphonePolicyUseNatAddress
+		&& (ip=linphone_core_get_nat_address_resolved(call->core))!=NULL){
+		strncpy(call->media_localip,ip,LINPHONE_IPADDR_SIZE);
+		return;
+	}
+#ifdef BUILD_UPNP
+	else if (call->core->upnp != NULL && linphone_core_get_firewall_policy(call->core)==LinphonePolicyUseUpnp &&
+			linphone_upnp_context_get_state(call->core->upnp) == LinphoneUpnpStateOk) {
+		ip = linphone_upnp_context_get_external_ipaddress(call->core->upnp);
+		strncpy(call->media_localip,ip,LINPHONE_IPADDR_SIZE);
+		goto found;
+	}
+#endif //BUILD_UPNP
+
+	/*next, sometime, override from config*/
+	if ((ip=lp_config_get_string(call->core->config,"rtp","bind_address",NULL)) != NULL)
+		goto found;
+
+	/*if a known proxy was identified for this call, then we may have a chance to take the local ip address
+	* from the socket that connect to this proxy */
+	if (call->dest_proxy && call->dest_proxy->op){
+		if ((ip = sal_op_get_local_address(call->dest_proxy->op, NULL)) != NULL){
+			ms_message("Found media local-ip from signaling.");
+			goto found;
+		}
+	}
+
+	/*in last resort, attempt to find the local ip that routes to destination if given as an IP address,
+	 or the default route (dest=NULL)*/
 	if (call->dest_proxy == NULL) {
 		struct addrinfo hints;
 		struct addrinfo *res = NULL;
 		int err;
+		/*FIXME the following doesn't work for IPv6 address because of brakets*/
 		const char *domain = linphone_address_get_domain(remote_addr);
 		memset(&hints, 0, sizeof(hints));
 		hints.ai_family = AF_UNSPEC;
@@ -926,27 +1173,14 @@ static void linphone_call_get_local_ip(LinphoneCall *call, const LinphoneAddress
 		}
 		if (res != NULL) freeaddrinfo(res);
 	}
-	if (linphone_core_get_firewall_policy(call->core)==LinphonePolicyUseNatAddress
-		&& (ip=linphone_core_get_nat_address_resolved(call->core))!=NULL){
-		strncpy(call->media_localip,ip,LINPHONE_IPADDR_SIZE);
-		return;
-	}
-#ifdef BUILD_UPNP
-	else if (call->core->upnp != NULL && linphone_core_get_firewall_policy(call->core)==LinphonePolicyUseUpnp &&
-			linphone_upnp_context_get_state(call->core->upnp) == LinphoneUpnpStateOk) {
-		ip = linphone_upnp_context_get_external_ipaddress(call->core->upnp);
-		strncpy(call->media_localip,ip,LINPHONE_IPADDR_SIZE);
-		return;
-	}
-#endif //BUILD_UPNP
-	/*first nominal use case*/
-	linphone_core_get_local_ip(call->core, af, dest, call->media_localip);
-
-	/*next, sometime, override from config*/
-	if ((ip=lp_config_get_string(call->core->config,"rtp","bind_address",NULL)))
-		strncpy(call->media_localip,ip,LINPHONE_IPADDR_SIZE);
 
+	if (dest != NULL || call->media_localip[0] == '\0' || call->need_localip_refresh){
+		call->need_localip_refresh = FALSE;
+		linphone_core_get_local_ip(call->core, af, dest, call->media_localip);
+	}
 	return;
+found:
+	strncpy(call->media_localip,ip,LINPHONE_IPADDR_SIZE);
 }
 
 static void linphone_call_destroy(LinphoneCall *obj);
@@ -959,38 +1193,59 @@ BELLE_SIP_INSTANCIATE_VPTR(LinphoneCall, belle_sip_object_t,
 	NULL, // marshal
 	FALSE
 );
+
 void linphone_call_fill_media_multicast_addr(LinphoneCall *call) {
 	if (linphone_call_params_audio_multicast_enabled(call->params)){
-		strncpy(call->media_ports[0].multicast_ip,
-				linphone_core_get_audio_multicast_addr(call->core), sizeof(call->media_ports[0].multicast_ip));
+		strncpy(call->media_ports[call->main_audio_stream_index].multicast_ip,
+				linphone_core_get_audio_multicast_addr(call->core), sizeof(call->media_ports[call->main_audio_stream_index].multicast_ip));
 	} else
-		call->media_ports[0].multicast_ip[0]='\0';
+		call->media_ports[call->main_audio_stream_index].multicast_ip[0]='\0';
 
 	if (linphone_call_params_video_multicast_enabled(call->params)){
-		strncpy(call->media_ports[1].multicast_ip,
-				linphone_core_get_video_multicast_addr(call->core), sizeof(call->media_ports[1].multicast_ip));
+		strncpy(call->media_ports[call->main_video_stream_index].multicast_ip,
+				linphone_core_get_video_multicast_addr(call->core), sizeof(call->media_ports[call->main_video_stream_index].multicast_ip));
 	} else
-		call->media_ports[1].multicast_ip[0]='\0';
+		call->media_ports[call->main_video_stream_index].multicast_ip[0]='\0';
+}
+
+void linphone_call_check_ice_session(LinphoneCall *call, IceRole role, bool_t is_reinvite){
+	if (call->ice_session) return; /*already created*/
+
+	if (!linphone_nat_policy_ice_enabled(linphone_core_get_nat_policy(call->core))){
+		return;
+	}
+
+	if (is_reinvite && lp_config_get_int(call->core->config, "net", "allow_late_ice", 0) == 0) return;
+
+	call->ice_session = ice_session_new();
+	/*for backward compatibility purposes, shall be enabled by default in futur*/
+	ice_session_enable_message_integrity_check(call->ice_session,lp_config_get_int(call->core->config,"net","ice_session_enable_message_integrity_check",1));
+	if (lp_config_get_int(call->core->config, "net", "dont_default_to_stun_candidates", 0)){
+		IceCandidateType types[ICT_CandidateTypeMax];
+		types[0] = ICT_HostCandidate;
+		types[1] = ICT_RelayedCandidate;
+		types[2] = ICT_CandidateInvalid;
+		ice_session_set_default_candidates_types(call->ice_session, types);
+	}
+	ice_session_set_role(call->ice_session, role);
 }
 
 LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddress *from, LinphoneAddress *to, const LinphoneCallParams *params, LinphoneProxyConfig *cfg){
 	LinphoneCall *call = belle_sip_object_new(LinphoneCall);
-
 	call->dir=LinphoneCallOutgoing;
 	call->core=lc;
+	call->dest_proxy=cfg;
 	linphone_call_outgoing_select_ip_version(call,to,cfg);
 	linphone_call_get_local_ip(call, to);
-	linphone_call_init_common(call, from, to);
 	call->params = linphone_call_params_copy(params);
+	linphone_call_init_common(call, from, to);
+
+	call->current_params->update_call_when_ice_completed = call->params->update_call_when_ice_completed; /*copy param*/
 
 	linphone_call_fill_media_multicast_addr(call);
 
-	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) {
-		call->ice_session = ice_session_new();
-		/*for backward compatibility purposes, shall be enabled by default in futur*/
-		ice_session_enable_message_integrity_check(call->ice_session,lp_config_get_int(lc->config,"net","ice_session_enable_message_integrity_check",0));
-		ice_session_set_role(call->ice_session, IR_Controlling);
-	}
+	linphone_call_check_ice_session(call, IR_Controlling, FALSE);
+
 	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseStun) {
 		call->ping_time=linphone_core_run_stun_tests(call->core,call);
 	}
@@ -1006,31 +1261,42 @@ LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddr
 	if (params->referer){
 		call->referer=linphone_call_ref(params->referer);
 	}
-	call->dest_proxy=cfg;
+
 	linphone_call_create_op(call);
 	return call;
 }
 
-static void linphone_call_incoming_select_ip_version(LinphoneCall *call){
+/*Select IP version to use for advertising local addresses of RTP streams, for an incoming call.
+ *If the call is received through a know proxy that is IPv6, use IPv6.
+ *Otherwise check the remote contact address.
+ *If later the resulting media description tells that we have to send IPv4, it won't be a problem because the RTP sockets
+ * are dual stack.
+ */
+static void linphone_call_incoming_select_ip_version(LinphoneCall *call, LinphoneProxyConfig *cfg){
 	if (linphone_core_ipv6_enabled(call->core)){
-		call->af=sal_op_is_ipv6(call->op) ? AF_INET6 : AF_INET;
+		if (cfg && cfg->op){
+			call->af=sal_op_get_address_family(cfg->op);
+		}else{
+			call->af=sal_op_get_address_family(call->op);
+		}
 	}else call->af=AF_INET;
 }
 
 /**
  * Fix call parameters on incoming call to eg. enable AVPF if the incoming call propose it and it is not enabled locally.
  */
-void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, const SalMediaDescription *md) {
+void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, SalMediaDescription *md) {
 	/* Handle AVPF, SRTP and DTLS. */
 	call->params->avpf_enabled = sal_media_description_has_avpf(md);
-	if (call->params->avpf_enabled == TRUE) {
-		if (call->dest_proxy != NULL) {
-			call->params->avpf_rr_interval = linphone_proxy_config_get_avpf_rr_interval(call->dest_proxy) * 1000;
-		} else {
-			call->params->avpf_rr_interval = linphone_core_get_avpf_rr_interval(call->core)*1000;
-		}
+	if (call->dest_proxy != NULL) {
+		call->params->avpf_rr_interval = linphone_proxy_config_get_avpf_rr_interval(call->dest_proxy) * 1000;
+	} else {
+		call->params->avpf_rr_interval = linphone_core_get_avpf_rr_interval(call->core)*1000;
 	}
-	if ((sal_media_description_has_dtls(md) == TRUE) && (media_stream_dtls_supported() == TRUE)) {
+
+	if ((sal_media_description_has_zrtp(md) == TRUE) && (linphone_core_media_encryption_supported(call->core, LinphoneMediaEncryptionZRTP) == TRUE)) {
+		call->params->media_encryption = LinphoneMediaEncryptionZRTP;
+	}else if ((sal_media_description_has_dtls(md) == TRUE) && (media_stream_dtls_supported() == TRUE)) {
 		call->params->media_encryption = LinphoneMediaEncryptionDTLS;
 	}else if ((sal_media_description_has_srtp(md) == TRUE) && (ms_srtp_supported() == TRUE)) {
 		call->params->media_encryption = LinphoneMediaEncryptionSRTP;
@@ -1038,23 +1304,133 @@ void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, c
 		call->params->media_encryption = LinphoneMediaEncryptionNone;
 	}
 
+	/*in case of nat64, even ipv4 addresses are reachable from v6. Should be enhanced to manage stream by stream connectivity (I.E v6 or v4)*/
+	/*if (!sal_media_description_has_ipv6(md)){
+		ms_message("The remote SDP doesn't seem to offer any IPv6 connectivity, so disabling IPv6 for this call.");
+		call->af = AF_INET;
+	}*/
+	linphone_call_fix_call_parameters(call, md);
+}
+
+static void linphone_call_compute_streams_indexes(LinphoneCall *call, const SalMediaDescription *md) {
+	int i, j;
+	bool_t audio_found = FALSE, video_found = FALSE, text_found = FALSE;
+
+	for (i = 0; i < md->nb_streams; i++) {
+		if (md->streams[i].type == SalAudio) {
+			if (!audio_found) {
+				call->main_audio_stream_index = i;
+				audio_found = TRUE;
+				ms_message("audio stream index found: %i, updating main audio stream index", i);
+			} else {
+				ms_message("audio stream index found: %i, but main audio stream already set to %i", i, call->main_audio_stream_index);
+			}
+
+			// Check that the default value of a another stream doesn't match the new one
+			if (i == call->main_video_stream_index) {
+				for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; j++) {
+					if (sal_stream_description_active(&md->streams[j])) continue;
+					if (j != call->main_video_stream_index && j != call->main_text_stream_index) {
+						ms_message("%i was used for video stream ; now using %i", i, j);
+						call->main_video_stream_index = j;
+						break;
+					}
+				}
+			}
+			if (i == call->main_text_stream_index) {
+				for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; j++) {
+					if (sal_stream_description_active(&md->streams[j])) continue;
+					if (j != call->main_video_stream_index && j != call->main_text_stream_index) {
+						ms_message("%i was used for text stream ; now using %i", i, j);
+						call->main_text_stream_index = j;
+						break;
+					}
+				}
+			}
+		} else if (md->streams[i].type == SalVideo) {
+			if (!video_found) {
+				call->main_video_stream_index = i;
+				video_found = TRUE;
+				ms_message("video stream index found: %i, updating main video stream index", i);
+			} else {
+				ms_message("video stream index found: %i, but main video stream already set to %i", i, call->main_video_stream_index);
+			}
+
+			// Check that the default value of a another stream doesn't match the new one
+			if (i == call->main_audio_stream_index) {
+				for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; j++) {
+					if (sal_stream_description_active(&md->streams[j])) continue;
+					if (j != call->main_audio_stream_index && j != call->main_text_stream_index) {
+						ms_message("%i was used for audio stream ; now using %i", i, j);
+						call->main_audio_stream_index = j;
+						break;
+					}
+				}
+			}
+			if (i == call->main_text_stream_index) {
+				for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; j++) {
+					if (sal_stream_description_active(&md->streams[j])) continue;
+					if (j != call->main_audio_stream_index && j != call->main_text_stream_index) {
+						ms_message("%i was used for text stream ; now using %i", i, j);
+						call->main_text_stream_index = j;
+						break;
+					}
+				}
+			}
+		} else if (md->streams[i].type == SalText) {
+			if (!text_found) {
+				call->main_text_stream_index = i;
+				text_found = TRUE;
+				ms_message("text stream index found: %i, updating main text stream index", i);
+			} else {
+				ms_message("text stream index found: %i, but main text stream already set to %i", i, call->main_text_stream_index);
+			}
+
+			// Check that the default value of a another stream doesn't match the new one
+			if (i == call->main_audio_stream_index) {
+				for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; j++) {
+					if (sal_stream_description_active(&md->streams[j])) continue;
+					if (j != call->main_video_stream_index && j != call->main_audio_stream_index) {
+						ms_message("%i was used for audio stream ; now using %i", i, j);
+						call->main_audio_stream_index = j;
+						break;
+					}
+				}
+			}
+			if (i == call->main_video_stream_index) {
+				for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; j++) {
+					if (sal_stream_description_active(&md->streams[j])) continue;
+					if (j != call->main_video_stream_index && j != call->main_audio_stream_index) {
+						ms_message("%i was used for video stream ; now using %i", i, j);
+						call->main_video_stream_index = j;
+						break;
+					}
+				}
+			}
+		}
+	}
 }
 
 LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *from, LinphoneAddress *to, SalOp *op){
 	LinphoneCall *call = belle_sip_object_new(LinphoneCall);
 	SalMediaDescription *md;
-	LinphoneFirewallPolicy fpol;
+	LinphoneNatPolicy *nat_policy = NULL;
 	int i;
-
 	call->dir=LinphoneCallIncoming;
 	sal_op_set_user_pointer(op,call);
 	call->op=op;
 	call->core=lc;
 
-	linphone_call_incoming_select_ip_version(call);
+	call->dest_proxy = linphone_core_lookup_known_proxy(call->core, to);
+	linphone_call_incoming_select_ip_version(call, call->dest_proxy);
+	/*note that the choice of IP version for streams is later refined by
+	 * linphone_call_set_compatible_incoming_call_parameters() when examining the remote offer, if any.
+	 * If the remote offer contains IPv4 addresses, we should propose IPv4 as well*/
 
 	sal_op_cnx_ip_to_0000_if_sendonly_enable(op,lp_config_get_default_int(lc->config,"sip","cnx_ip_to_0000_if_sendonly_enabled",0));
 
+	md = sal_call_get_remote_media_description(op);
+
 	if (lc->sip_conf.ping_with_options){
 #ifdef BUILD_UPNP
 		if (lc->upnp != NULL && linphone_core_get_firewall_policy(lc)==LinphonePolicyUseUpnp &&
@@ -1077,10 +1453,9 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 
 	linphone_address_clean(from);
 	linphone_call_get_local_ip(call, from);
-	linphone_call_init_common(call, from, to);
 	call->params = linphone_call_params_new();
+	linphone_call_init_common(call, from, to);
 	call->log->call_id=ms_strdup(sal_op_get_call_id(op)); /*must be known at that time*/
-	call->dest_proxy = linphone_core_lookup_known_proxy(call->core, to);
 	linphone_core_init_default_params(lc, call->params);
 
 	/*
@@ -1089,8 +1464,10 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 	 */
 	/*set privacy*/
 	call->current_params->privacy=(LinphonePrivacyMask)sal_op_get_privacy(call->op);
+	/*config params*/
+	call->current_params->update_call_when_ice_completed = call->params->update_call_when_ice_completed; /*copy config params*/
+
 	/*set video support */
-	md=sal_call_get_remote_media_description(op);
 	call->params->has_video = linphone_core_video_enabled(lc) && lc->video_policy.automatically_accept;
 	if (md) {
 		// It is licit to receive an INVITE without SDP
@@ -1098,7 +1475,11 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		linphone_call_set_compatible_incoming_call_parameters(call, md);
 		/* set multicast role & address if any*/
 		if (!sal_call_is_offerer(op)){
-			for (i=0;i<md->nb_streams;i++){
+			for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+				if (md->streams[i].dir == SalStreamInactive) {
+					continue;
+				}
+
 				if (md->streams[i].rtp_addr[0]!='\0' && ms_is_multicast(md->streams[i].rtp_addr)){
 					md->streams[i].multicast_role = SalMulticastReceiver;
 					strncpy(call->media_ports[i].multicast_ip,md->streams[i].rtp_addr,sizeof(call->media_ports[i].multicast_ip));
@@ -1107,31 +1488,26 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		}
 	}
 
-	fpol=linphone_core_get_firewall_policy(call->core);
-	/*create the ice session now if ICE is required*/
-	if (fpol==LinphonePolicyUseIce){
+	if (call->dest_proxy != NULL) nat_policy = linphone_proxy_config_get_nat_policy(call->dest_proxy);
+	if (nat_policy == NULL) nat_policy = linphone_core_get_nat_policy(call->core);
+	if ((nat_policy != NULL) && linphone_nat_policy_ice_enabled(nat_policy)) {
+		/* Create the ice session now if ICE is required */
 		if (md){
-			call->ice_session = ice_session_new();
-			/*for backward compatibility purposes, shall be enabled by default in futur*/
-			ice_session_enable_message_integrity_check(call->ice_session,lp_config_get_int(lc->config,"net","ice_session_enable_message_integrity_check",0));
-			ice_session_set_role(call->ice_session, IR_Controlled);
+			linphone_call_check_ice_session(call, IR_Controlled, FALSE);
 		}else{
-			fpol=LinphonePolicyNoFirewall;
+			nat_policy = NULL;
 			ms_warning("ICE not supported for incoming INVITE without SDP.");
 		}
 	}
 
 	/*reserve the sockets immediately*/
 	linphone_call_init_media_streams(call);
-	switch (fpol) {
-		case LinphonePolicyUseIce:
-			linphone_call_prepare_ice(call,TRUE);
-			break;
-		case LinphonePolicyUseStun:
+	if (nat_policy != NULL) {
+		if (linphone_nat_policy_ice_enabled(nat_policy)) {
+			call->defer_notify_incoming = linphone_call_prepare_ice(call,TRUE) == 1;
+		} else if (linphone_nat_policy_stun_enabled(nat_policy)) {
 			call->ping_time=linphone_core_run_stun_tests(call->core,call);
-			/* No break to also destroy ice session in this case. */
-			break;
-		case LinphonePolicyUseUpnp:
+		} else if (linphone_nat_policy_upnp_enabled(nat_policy)) {
 #ifdef BUILD_UPNP
 			if(!lc->rtp_conf.disable_upnp) {
 				call->upnp_session = linphone_upnp_session_new(call);
@@ -1143,9 +1519,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 				}
 			}
 #endif //BUILD_UPNP
-			break;
-		default:
-			break;
+		}
 	}
 
 	discover_mtu(lc,linphone_address_get_domain(from));
@@ -1159,13 +1533,17 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
  * (_linphone_call_destroy) if the call was never notified to the application.
  */
 void linphone_call_free_media_resources(LinphoneCall *call){
+	int i;
+
 	linphone_call_stop_media_streams(call);
-	ms_media_stream_sessions_uninit(&call->sessions[0]);
-	ms_media_stream_sessions_uninit(&call->sessions[1]);
 	linphone_call_delete_upnp_session(call);
 	linphone_call_delete_ice_session(call);
-	linphone_call_stats_uninit(&call->stats[0]);
-	linphone_call_stats_uninit(&call->stats[1]);
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++i){
+		ms_media_stream_sessions_uninit(&call->sessions[i]);
+	}
+	linphone_call_stats_uninit(&call->stats[LINPHONE_CALL_STATS_AUDIO]);
+	linphone_call_stats_uninit(&call->stats[LINPHONE_CALL_STATS_VIDEO]);
+	linphone_call_stats_uninit(&call->stats[LINPHONE_CALL_STATS_TEXT]);
 }
 
 /*
@@ -1192,6 +1570,10 @@ static void linphone_call_set_released(LinphoneCall *call){
 		linphone_call_unref(call->transfer_target);
 		call->transfer_target=NULL;
 	}
+	if (call->chat_room){
+		linphone_chat_room_unref(call->chat_room);
+		call->chat_room = NULL;
+	}
 	linphone_call_unref(call);
 }
 
@@ -1215,18 +1597,55 @@ static void linphone_call_set_terminated(LinphoneCall *call){
 	if (linphone_core_del_call(lc,call) != 0){
 		ms_error("Could not remove the call from the list !!!");
 	}
-	linphone_core_conference_check_uninit(lc);
+	if(lc->conf_ctx) linphone_conference_on_call_terminating(lc->conf_ctx, call);
 	if (call->ringing_beep){
 		linphone_core_stop_dtmf(lc);
 		call->ringing_beep=FALSE;
 	}
+	if (call->chat_room){
+		call->chat_room->call = NULL;
+	}
 }
 
-void linphone_call_fix_call_parameters(LinphoneCall *call){
-	if (sal_call_is_offerer(call->op)) {
-		/*get remote params*/
-		const LinphoneCallParams* rcp = linphone_call_get_remote_params(call);
-		call->current_params->video_declined = call->params->has_video && !rcp->has_video;
+/*function to be called at each incoming reINVITE, in order to adjust various local parameters to what is being offered by remote:
+ * - the video enablement parameter according to what is offered and our local policy.
+ * Fixing the call->params to proper values avoid request video by accident during internal call updates, pauses and resumes
+ * - the stream indexes.
+ */
+void linphone_call_fix_call_parameters(LinphoneCall *call, SalMediaDescription *rmd){
+	const LinphoneCallParams* rcp;
+
+	if (rmd) {
+		linphone_call_compute_streams_indexes(call, rmd);
+		linphone_call_update_biggest_desc(call, rmd);
+		/* Why disabling implicit_rtcp_fb ? It is a local policy choice actually. It doesn't disturb to propose it again and again
+		 * even if the other end apparently doesn't support it.
+		 * The following line of code is causing trouble, while for example making an audio call, then adding video.
+		 * Due to the 200Ok response of the audio-only offer where no rtcp-fb attribute is present, implicit_rtcp_fb is set to
+		 * FALSE, which is then preventing it to be eventually used when video is later added to the call.
+		 * I did the choice of commenting it out.
+		 */
+		/*call->params->implicit_rtcp_fb &= sal_media_description_has_implicit_avpf(rmd);*/
+	}
+	rcp = linphone_call_get_remote_params(call);
+	if (rcp){
+		if (call->params->has_audio && !rcp->has_audio){
+			ms_message("Call [%p]: disabling audio in our call params because the remote doesn't want it.", call);
+			call->params->has_audio = FALSE;
+		}
+		if (call->params->has_video && !rcp->has_video){
+			ms_message("Call [%p]: disabling video in our call params because the remote doesn't want it.", call);
+			call->params->has_video = FALSE;
+		}
+
+		if (rcp->has_video && call->core->video_policy.automatically_accept && linphone_core_video_enabled(call->core) && !call->params->has_video){
+			ms_message("Call [%p]: re-enabling video in our call params because the remote wants it and the policy allows to automatically accept.", call);
+			linphone_call_params_enable_video(call->params, TRUE);
+		}
+
+		if (rcp->realtimetext_enabled && !call->params->realtimetext_enabled) {
+			call->params->realtimetext_enabled = TRUE;
+		}
 	}
 }
 
@@ -1311,11 +1730,11 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 			break;
 		case LinphoneCallEnd:
 		case LinphoneCallError:
-			switch(call->non_op_error.reason){
-			case SalReasonDeclined:
+			switch(linphone_error_info_get_reason(linphone_call_get_error_info(call))) {
+			case LinphoneReasonDeclined:
 				call->log->status=LinphoneCallDeclined;
 				break;
-			case SalReasonRequestTimeout:
+			case LinphoneReasonNotAnswered:
 				call->log->status=LinphoneCallMissed;
 				break;
 			default:
@@ -1325,7 +1744,7 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 			break;
 		case LinphoneCallConnected:
 			call->log->status=LinphoneCallSuccess;
-			call->log->connected_date_time=time(NULL);
+			call->log->connected_date_time = ms_time(NULL);
 			break;
 		case LinphoneCallReleased:
 #ifdef ANDROID
@@ -1336,7 +1755,15 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 			break;
 		case LinphoneCallStreamsRunning:
 			if (call->prevstate == LinphoneCallUpdating || call->prevstate == LinphoneCallUpdatedByRemote) {
-				linphone_core_notify_display_status(lc,_("Call parameters were successfully modified."));
+				LinphoneReason reason = linphone_call_get_reason(call);
+				char *msg;
+				if (reason != LinphoneReasonNone) {
+					msg = ms_strdup_printf(_("Call parameters could not be modified: %s."), linphone_reason_to_string(reason));
+				} else {
+					msg = ms_strdup(_("Call parameters were successfully modified."));
+				}
+				linphone_core_notify_display_status(lc, msg);
+				ms_free(msg);
 			}
 			break;
 		default:
@@ -1349,12 +1776,17 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 				linphone_call_cancel_dtmfs(call);
 			}
 		}
-		linphone_core_notify_call_state_changed(lc,call,cstate,message);
+		if (!message) {
+			ms_error("%s(): You must fill a reason when changing call state (from %s o %s)."
+					, __FUNCTION__
+					, linphone_call_state_to_string(call->prevstate)
+					, linphone_call_state_to_string(call->state));
+		}
+		linphone_core_notify_call_state_changed(lc,call,cstate,message?message:"");
 		linphone_reporting_call_state_updated(call);
 		if (cstate==LinphoneCallReleased) {/*shall be performed after  app notification*/
 			linphone_call_set_released(call);
 		}
-		linphone_core_soundcard_hint_check(lc);
 	}
 }
 
@@ -1426,6 +1858,7 @@ static void linphone_call_destroy(LinphoneCall *obj){
 		linphone_address_unref(obj->me);
 		obj->me = NULL;
 	}
+	if (obj->onhold_file) ms_free(obj->onhold_file);
 
 	sal_error_info_reset(&obj->non_op_error);
 }
@@ -1443,13 +1876,14 @@ LinphoneCall * linphone_call_ref(LinphoneCall *obj){
 void linphone_call_unref(LinphoneCall *obj){
 	belle_sip_object_unref(obj);
 }
+
 static unsigned int linphone_call_get_n_active_streams(const LinphoneCall *call) {
 	SalMediaDescription *md=NULL;
 	if (call->op)
 		md = sal_call_get_remote_media_description(call->op);
 	if (!md)
 		return 0;
-	return sal_media_description_nb_active_streams_of_type(md, SalAudio) + sal_media_description_nb_active_streams_of_type(md, SalVideo);
+	return sal_media_description_nb_active_streams_of_type(md, SalAudio) + sal_media_description_nb_active_streams_of_type(md, SalVideo) + sal_media_description_nb_active_streams_of_type(md, SalText);
 }
 
 /**
@@ -1457,6 +1891,7 @@ static unsigned int linphone_call_get_n_active_streams(const LinphoneCall *call)
 **/
 const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 	SalMediaDescription *md=call->resultdesc;
+	int all_streams_encrypted = 0;
 #ifdef VIDEO_ENABLED
 	VideoStream *vstream;
 #endif
@@ -1483,26 +1918,40 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 
 	switch (call->params->media_encryption) {
 	case LinphoneMediaEncryptionZRTP:
-		if (linphone_call_all_streams_encrypted(call) && linphone_call_get_authentication_token(call)) {
-			call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
-		} else {
-			call->current_params->media_encryption=LinphoneMediaEncryptionNone;
-		}
+		if (at_least_one_stream_started(call)){
+			if ((all_streams_encrypted = linphone_call_all_streams_encrypted(call)) && linphone_call_get_authentication_token(call)) {
+				call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
+			} else {
+				/*to avoid to many traces*/
+				ms_debug("Encryption was requested to be %s, but isn't effective (all_streams_encrypted=%i, auth_token=%s)",
+					linphone_media_encryption_to_string(call->params->media_encryption), all_streams_encrypted, call->auth_token == NULL ? "" : call->auth_token);
+				call->current_params->media_encryption=LinphoneMediaEncryptionNone;
+			}
+		}//else don't update the state if all streams are shutdown.
 		break;
 	case LinphoneMediaEncryptionDTLS:
 	case LinphoneMediaEncryptionSRTP:
-		if (linphone_call_get_n_active_streams(call)==0 || linphone_call_all_streams_encrypted(call)) {
-			call->current_params->media_encryption = call->params->media_encryption;
+		if (at_least_one_stream_started(call)){
+			if (linphone_call_get_n_active_streams(call)==0 || (all_streams_encrypted = linphone_call_all_streams_encrypted(call))) {
+				call->current_params->media_encryption = call->params->media_encryption;
+			} else {
+				/*to avoid to many traces*/
+				ms_debug("Encryption was requested to be %s, but isn't effective (all_streams_encrypted=%i)",
+					linphone_media_encryption_to_string(call->params->media_encryption), all_streams_encrypted);
+				call->current_params->media_encryption=LinphoneMediaEncryptionNone;
+			}
+		}//else don't update the state if all streams are shutdown.
+		break;
+	case LinphoneMediaEncryptionNone:
+		/* check if we actually switched to ZRTP */
+		if (at_least_one_stream_started(call) && (all_streams_encrypted = linphone_call_all_streams_encrypted(call)) && linphone_call_get_authentication_token(call)) {
+				call->current_params->media_encryption=LinphoneMediaEncryptionZRTP;
 		} else {
 			call->current_params->media_encryption=LinphoneMediaEncryptionNone;
 		}
 		break;
-	case LinphoneMediaEncryptionNone:
-		call->current_params->media_encryption=LinphoneMediaEncryptionNone;
-		break;
 	}
-
-	call->current_params->avpf_enabled = linphone_call_all_streams_avpf_enabled(call);
+	call->current_params->avpf_enabled = linphone_call_all_streams_avpf_enabled(call) && sal_media_description_has_avpf(md);
 	if (call->current_params->avpf_enabled == TRUE) {
 		call->current_params->avpf_rr_interval = linphone_call_get_avpf_rr_interval(call);
 	} else {
@@ -1512,6 +1961,7 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 		const char *rtp_addr;
 
 		SalStreamDescription *sd=sal_media_description_find_best_stream(md,SalAudio);
+
 		call->current_params->audio_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneMediaDirectionInactive;
 		if (call->current_params->audio_dir != LinphoneMediaDirectionInactive) {
 			rtp_addr = sd->rtp_addr[0]!='\0' ? sd->rtp_addr : call->resultdesc->addr;
@@ -1520,12 +1970,14 @@ const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
 			call->current_params->audio_multicast_enabled = FALSE;
 
 		sd=sal_media_description_find_best_stream(md,SalVideo);
+		call->current_params->implicit_rtcp_fb = sd ? sal_stream_description_has_implicit_avpf(sd): FALSE;
 		call->current_params->video_dir=sd ? media_direction_from_sal_stream_dir(sd->dir) : LinphoneMediaDirectionInactive;
 		if (call->current_params->video_dir != LinphoneMediaDirectionInactive) {
 			rtp_addr = sd->rtp_addr[0]!='\0' ? sd->rtp_addr : call->resultdesc->addr;
 			call->current_params->video_multicast_enabled = ms_is_multicast(rtp_addr);
 		} else
 			call->current_params->video_multicast_enabled = FALSE;
+
 	}
 
 	return call->current_params;
@@ -1541,14 +1993,17 @@ const LinphoneCallParams * linphone_call_get_remote_params(LinphoneCall *call){
 	if (call->op){
 		LinphoneCallParams *cp;
 		SalMediaDescription *md;
-		if (call->remote_params != NULL) linphone_call_params_unref(call->remote_params);
-		cp = call->remote_params = linphone_call_params_new();
+		const SalCustomHeader *ch;
+
 		md=sal_call_get_remote_media_description(call->op);
 		if (md) {
 			SalStreamDescription *sd;
 			unsigned int i;
 			unsigned int nb_audio_streams = sal_media_description_nb_active_streams_of_type(md, SalAudio);
 			unsigned int nb_video_streams = sal_media_description_nb_active_streams_of_type(md, SalVideo);
+			unsigned int nb_text_streams = sal_media_description_nb_active_streams_of_type(md, SalText);
+			if (call->remote_params != NULL) linphone_call_params_unref(call->remote_params);
+			cp = call->remote_params = linphone_call_params_new();
 
 			for (i = 0; i < nb_video_streams; i++) {
 				sd = sal_media_description_get_active_stream_of_type(md, SalVideo, i);
@@ -1559,15 +2014,30 @@ const LinphoneCallParams * linphone_call_get_remote_params(LinphoneCall *call){
 				sd = sal_media_description_get_active_stream_of_type(md, SalAudio, i);
 				if (sal_stream_description_has_srtp(sd) == TRUE) cp->media_encryption = LinphoneMediaEncryptionSRTP;
 			}
+			for (i = 0; i < nb_text_streams; i++) {
+				sd = sal_media_description_get_active_stream_of_type(md, SalText, i);
+				if (sal_stream_description_has_srtp(sd) == TRUE) cp->media_encryption = LinphoneMediaEncryptionSRTP;
+				cp->realtimetext_enabled = TRUE;
+			}
 			if (!cp->has_video){
 				if (md->bandwidth>0 && md->bandwidth<=linphone_core_get_edge_bw(call->core)){
 					cp->low_bandwidth=TRUE;
 				}
 			}
 			if (md->name[0]!='\0') linphone_call_params_set_session_name(cp,md->name);
+
+			linphone_call_params_set_custom_sdp_attributes(call->remote_params, md->custom_sdp_attributes);
+			linphone_call_params_set_custom_sdp_media_attributes(call->remote_params, LinphoneStreamTypeAudio, md->streams[call->main_audio_stream_index].custom_sdp_attributes);
+			linphone_call_params_set_custom_sdp_media_attributes(call->remote_params, LinphoneStreamTypeVideo, md->streams[call->main_video_stream_index].custom_sdp_attributes);
+			linphone_call_params_set_custom_sdp_media_attributes(call->remote_params, LinphoneStreamTypeText, md->streams[call->main_text_stream_index].custom_sdp_attributes);
 		}
-		cp->custom_headers=sal_custom_header_clone((SalCustomHeader*)sal_op_get_recv_custom_header(call->op));
-		return cp;
+		ch = sal_op_get_recv_custom_header(call->op);
+		if (ch){
+			/*instanciate a remote_params only if a SIP message was received before (custom headers indicates this).*/
+			if (call->remote_params == NULL) call->remote_params = linphone_call_params_new();
+			linphone_call_params_set_custom_headers(call->remote_params, ch);
+		}
+		return call->remote_params;
 	}
 	return NULL;
 }
@@ -1589,6 +2059,14 @@ char *linphone_call_get_remote_address_as_string(const LinphoneCall *call){
 	return linphone_address_as_string(linphone_call_get_remote_address(call));
 }
 
+/**
+ * Returns the diversion address associated to this call
+ *
+**/
+const LinphoneAddress * linphone_call_get_diversion_address(const LinphoneCall *call){
+	return call->op?(const LinphoneAddress *)sal_op_get_diversion_address(call->op):NULL;
+}
+
 /**
  * Retrieves the call's current state.
 **/
@@ -1612,24 +2090,11 @@ const LinphoneErrorInfo *linphone_call_get_error_info(const LinphoneCall *call){
 	}else return linphone_error_info_from_sal_op(call->op);
 }
 
-/**
- * Get the user pointer associated with the LinphoneCall
- *
- * @ingroup call_control
- * @return  an opaque user pointer that can be retrieved at any time
-**/
 void *linphone_call_get_user_data(const LinphoneCall *call)
 {
 	return call->user_data;
 }
 
-/**
- * Set the user pointer associated with the LinphoneCall
- *
- * @ingroup call_control
- *
- * the user pointer is an opaque user pointer that can be retrieved at any time in the LinphoneCall
-**/
 void linphone_call_set_user_data(LinphoneCall *call, void *user_pointer)
 {
 	call->user_data = user_pointer;
@@ -1685,12 +2150,9 @@ const char *linphone_call_get_remote_user_agent(LinphoneCall *call){
  * Returns the far end's sip contact as a string, if available.
 **/
 const char *linphone_call_get_remote_contact(LinphoneCall *call){
-	const LinphoneCallParams* lcp = linphone_call_get_remote_params(call);
-	if( lcp ){
-		// we're not using sal_op_get_remote_contact() here because the returned value is stripped from
-		// params that we need, like the instanceid. Getting it from the headers will make sure we
-		// get everything
-		return linphone_call_params_get_custom_header(lcp, "Contact");
+	if( call->op ){
+		/*sal_op_get_remote_contact preserves header params*/
+		return sal_op_get_remote_contact(call->op);
 	}
 	return NULL;
 }
@@ -1713,7 +2175,7 @@ bool_t linphone_call_has_transfer_pending(const LinphoneCall *call){
 **/
 int linphone_call_get_duration(const LinphoneCall *call){
 	if (call->log->connected_date_time==0) return 0;
-	return time(NULL)-call->log->connected_date_time;
+	return (int)(ms_time(NULL) - call->log->connected_date_time);
 }
 
 /**
@@ -1736,15 +2198,23 @@ LinphoneCall *linphone_call_get_replaced_call(LinphoneCall *call){
 void linphone_call_enable_camera (LinphoneCall *call, bool_t enable){
 #ifdef VIDEO_ENABLED
 	call->camera_enabled=enable;
-	if ((call->state==LinphoneCallStreamsRunning || call->state==LinphoneCallOutgoingEarlyMedia || call->state==LinphoneCallIncomingEarlyMedia)
-		&& call->videostream!=NULL && video_stream_started(call->videostream) ){
-		if (video_stream_get_camera(call->videostream) != linphone_call_get_video_device(call)) {
-			const char *cur_cam, *new_cam;
-			cur_cam = video_stream_get_camera(call->videostream) ? ms_web_cam_get_name(video_stream_get_camera(call->videostream)) : "NULL";
-			new_cam = linphone_call_get_video_device(call) ? ms_web_cam_get_name(linphone_call_get_video_device(call)) : "NULL";
-			ms_message("Switching video cam from [%s] to [%s] on call [%p]"	, cur_cam, new_cam, call);
-			video_stream_change_camera(call->videostream, linphone_call_get_video_device(call));
-		}
+	switch(call->state) {
+		case LinphoneCallStreamsRunning:
+		case LinphoneCallOutgoingEarlyMedia:
+		case LinphoneCallIncomingEarlyMedia:
+		case LinphoneCallConnected:
+			if(call->videostream!=NULL
+				&& video_stream_started(call->videostream)
+				&& video_stream_get_camera(call->videostream) != linphone_call_get_video_device(call)) {
+				const char *cur_cam, *new_cam;
+				cur_cam = video_stream_get_camera(call->videostream) ? ms_web_cam_get_name(video_stream_get_camera(call->videostream)) : "NULL";
+				new_cam = linphone_call_get_video_device(call) ? ms_web_cam_get_name(linphone_call_get_video_device(call)) : "NULL";
+				ms_message("Switching video cam from [%s] to [%s] on call [%p]"	, cur_cam, new_cam, call);
+				video_stream_change_camera(call->videostream, linphone_call_get_video_device(call));
+			}
+			break;
+
+		default: break;
 	}
 #endif
 }
@@ -1755,10 +2225,11 @@ void linphone_call_enable_camera (LinphoneCall *call, bool_t enable){
 void linphone_call_send_vfu_request(LinphoneCall *call) {
 #ifdef VIDEO_ENABLED
 	const LinphoneCallParams *current_params = linphone_call_get_current_params(call);
-	if (current_params->avpf_enabled && call->videostream && media_stream_get_state((const MediaStream *)call->videostream) == MSStreamStarted) {
+	if ((current_params->avpf_enabled || current_params->implicit_rtcp_fb  )&& call->videostream && media_stream_get_state((const MediaStream *)call->videostream) == MSStreamStarted) { // || sal_media_description_has_implicit_avpf((const SalMediaDescription *)call->resultdesc)
 		ms_message("Request Full Intra Request on call [%p]", call);
 		video_stream_send_fir(call->videostream);
 	} else if (call->core->sip_conf.vfu_with_info) {
+		ms_message("Request SIP INFO FIR on call [%p]", call);
 		if (LinphoneCallStreamsRunning == linphone_call_get_state(call))
 			sal_call_send_vfu_request(call->op);
 	} else {
@@ -1860,8 +2331,11 @@ static void video_stream_event_cb(void *user_pointer, const MSFilter *f, const u
 			break;
 		case MS_VIDEO_DECODER_FIRST_IMAGE_DECODED:
 			ms_message("First video frame decoded successfully");
-			if (call->nextVideoFrameDecoded._func != NULL)
+			if (call->nextVideoFrameDecoded._func != NULL){
 				call->nextVideoFrameDecoded._func(call, call->nextVideoFrameDecoded._user_data);
+				call->nextVideoFrameDecoded._func = NULL;
+				call->nextVideoFrameDecoded._user_data = NULL;
+			}
 			break;
 		case MS_VIDEO_DECODER_SEND_PLI:
 		case MS_VIDEO_DECODER_SEND_SLI:
@@ -1875,13 +2349,17 @@ static void video_stream_event_cb(void *user_pointer, const MSFilter *f, const u
 }
 #endif
 
+static void _linphone_call_set_next_video_frame_decoded_trigger(LinphoneCall *call){
+#ifdef VIDEO_ENABLED
+	if (call->nextVideoFrameDecoded._func && call->videostream && call->videostream->ms.decoder)
+		ms_filter_call_method_noarg(call->videostream->ms.decoder, MS_VIDEO_DECODER_RESET_FIRST_IMAGE_NOTIFICATION);
+#endif
+}
+
 void linphone_call_set_next_video_frame_decoded_callback(LinphoneCall *call, LinphoneCallCbFunc cb, void* user_data) {
 	call->nextVideoFrameDecoded._func = cb;
 	call->nextVideoFrameDecoded._user_data = user_data;
-#ifdef VIDEO_ENABLED
-	if (call->videostream && call->videostream->ms.decoder)
-		ms_filter_call_method_noarg(call->videostream->ms.decoder, MS_VIDEO_DECODER_RESET_FIRST_IMAGE_NOTIFICATION);
-#endif
+	_linphone_call_set_next_video_frame_decoded_trigger(call);
 }
 
 static void port_config_set_random_choosed(LinphoneCall *call, int stream_index, RtpSession *session){
@@ -1890,7 +2368,7 @@ static void port_config_set_random_choosed(LinphoneCall *call, int stream_index,
 }
 
 static void _linphone_call_prepare_ice_for_stream(LinphoneCall *call, int stream_index, bool_t create_checklist){
-	MediaStream *ms=stream_index == 0 ? (MediaStream*)call->audiostream : (MediaStream*)call->videostream;
+	MediaStream *ms = stream_index == call->main_audio_stream_index ? (MediaStream*)call->audiostream : stream_index == call->main_video_stream_index ? (MediaStream*)call->videostream : (MediaStream*)call->textstream;
 	if ((linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
 		IceCheckList *cl;
 		rtp_session_set_pktinfo(ms->sessions.rtp_session, TRUE);
@@ -1900,15 +2378,15 @@ static void _linphone_call_prepare_ice_for_stream(LinphoneCall *call, int stream
 			ice_session_add_check_list(call->ice_session, cl, stream_index);
 			ms_message("Created new ICE check list for stream [%i]",stream_index);
 		}
-		if (cl){
-			ms->ice_check_list = cl;
-			ice_check_list_set_rtp_session(ms->ice_check_list, ms->sessions.rtp_session);
+		if (cl) {
+			media_stream_set_ice_check_list(ms, cl);
 		}
 	}
 }
 
 int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer){
 	SalMediaDescription *remote = NULL;
+	int err;
 	bool_t has_video=FALSE;
 
 	if ((linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
@@ -1917,11 +2395,12 @@ int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer){
 			has_video=linphone_core_video_enabled(call->core) && linphone_core_media_description_contains_video_stream(remote);
 		}else has_video=call->params->has_video;
 
-		_linphone_call_prepare_ice_for_stream(call,0,TRUE);
-		if (has_video) _linphone_call_prepare_ice_for_stream(call,1,TRUE);
+		_linphone_call_prepare_ice_for_stream(call,call->main_audio_stream_index,TRUE);
+		if (has_video) _linphone_call_prepare_ice_for_stream(call,call->main_video_stream_index,TRUE);
+		if (call->params->realtimetext_enabled) _linphone_call_prepare_ice_for_stream(call,call->main_text_stream_index,TRUE);
 		/*start ICE gathering*/
 		if (incoming_offer)
-			linphone_call_update_ice_from_remote_media_description(call,remote); /*this may delete the ice session*/
+			linphone_call_update_ice_from_remote_media_description(call, remote, TRUE); /*this may delete the ice session*/
 		if (call->ice_session && !ice_session_candidates_gathered(call->ice_session)){
 			if (call->audiostream->ms.state==MSStreamInitialized)
 				audio_stream_prepare_sound(call->audiostream, NULL, NULL);
@@ -1930,13 +2409,18 @@ int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer){
 				video_stream_prepare_video(call->videostream);
 			}
 #endif
-			if (linphone_core_gather_ice_candidates(call->core,call)<0) {
-				/* Ice candidates gathering failed, proceed with the call anyway. */
-				linphone_call_delete_ice_session(call);
-				linphone_call_stop_media_streams_for_ice_gathering(call);
-				return -1;
+			if (call->params->realtimetext_enabled && call->textstream->ms.state==MSStreamInitialized) {
+				text_stream_prepare_text(call->textstream);
 			}
-			return 1;/*gathering in progress, wait*/
+			err = linphone_core_gather_ice_candidates(call->core,call);
+			if (err == 0) {
+				/* Ice candidates gathering wasn't started, but we can proceed with the call anyway. */
+				linphone_call_stop_media_streams_for_ice_gathering(call);
+			}else if (err == -1) {
+				linphone_call_stop_media_streams_for_ice_gathering(call);
+				linphone_call_delete_ice_session(call);
+			}
+			return err;/* 1= gathering in progress, wait; 0=proceed*/
 		}
 	}
 	return 0;
@@ -1968,12 +2452,11 @@ static SalMulticastRole linphone_call_get_multicast_role(const LinphoneCall *cal
 		stream_desc = sal_media_description_find_best_stream(remotedesc, type);
 
 	if (stream_desc)
-		multicast_role=stream_desc->multicast_role;
-	else
-		ms_message("Cannot determine multicast role for stream type [%s] on call [%p]",sal_stream_type_to_string(type),call);
-
+		multicast_role = stream_desc->multicast_role;
 
 	end:
+	ms_message("Call [%p], stream type [%s], multicast role is [%s]",call, sal_stream_type_to_string(type),
+		sal_multicast_role_to_string(multicast_role));
 	return multicast_role;
 
 }
@@ -2003,19 +2486,74 @@ static void setup_dtls_params(LinphoneCall *call, MediaStream* stream) {
 	}
 }
 
+static void setZrtpCryptoTypesParameters(MSZrtpParams *params, LinphoneCore *lc)
+{
+	int i;
+	const MSCryptoSuite *srtp_suites;
+	MsZrtpCryptoTypesCount ciphersCount, authTagsCount;
+
+	if (params == NULL) return;
+	if (lc == NULL) return;
+
+	srtp_suites = linphone_core_get_srtp_crypto_suites(lc);
+	if (srtp_suites!=NULL) {
+		for(i=0; srtp_suites[i]!=MS_CRYPTO_SUITE_INVALID && i<SAL_CRYPTO_ALGO_MAX && i<MS_MAX_ZRTP_CRYPTO_TYPES; ++i){
+			switch (srtp_suites[i]) {
+				case MS_AES_128_SHA1_32:
+					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES1;
+					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS32;
+					break;
+				case MS_AES_128_NO_AUTH:
+					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES1;
+					break;
+				case MS_NO_CIPHER_SHA1_80:
+					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
+					break;
+				case MS_AES_128_SHA1_80:
+					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES1;
+					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
+					break;
+				case MS_AES_CM_256_SHA1_80:
+				    ms_warning("Deprecated crypto suite MS_AES_CM_256_SHA1_80, use MS_AES_256_SHA1_80 instead");
+				case MS_AES_256_SHA1_80:
+				    params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES3;
+                    params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
+                    break;
+				case MS_AES_256_SHA1_32:
+					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES3;
+					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS32;
+					break;
+				case MS_CRYPTO_SUITE_INVALID:
+					break;
+			}
+		}
+	}
+
+	/* linphone_core_get_srtp_crypto_suites is used to determine sensible defaults; here each can be overridden */
+	ciphersCount = linphone_core_get_zrtp_cipher_suites(lc, params->ciphers); /* if not present in config file, params->ciphers is not modified */
+	if (ciphersCount!=0) { /* use zrtp_cipher_suites config only when present, keep config from srtp_crypto_suite otherwise */
+		params->ciphersCount = ciphersCount;
+	}
+	params->hashesCount = linphone_core_get_zrtp_hash_suites(lc, params->hashes);
+	authTagsCount = linphone_core_get_zrtp_auth_suites(lc, params->authTags); /* if not present in config file, params->authTags is not modified */
+	if (authTagsCount!=0) {
+		params->authTagsCount = authTagsCount; /* use zrtp_auth_suites config only when present, keep config from srtp_crypto_suite otherwise */
+	}
+	params->sasTypesCount = linphone_core_get_zrtp_sas_suites(lc, params->sasTypes);
+	params->keyAgreementsCount = linphone_core_get_zrtp_key_agreement_suites(lc, params->keyAgreements);
+}
+
+
 void linphone_call_init_audio_stream(LinphoneCall *call){
 	LinphoneCore *lc=call->core;
 	AudioStream *audiostream;
 	const char *location;
 	int dscp;
-	char rtcp_tool[128]={0};
+	const char *rtcp_tool=linphone_core_get_user_agent(call->core);
 	char* cname;
 
-
-	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
-
 	if (call->audiostream != NULL) return;
-	if (call->sessions[0].rtp_session==NULL){
+	if (call->sessions[call->main_audio_stream_index].rtp_session==NULL){
 		SalMulticastRole multicast_role = linphone_call_get_multicast_role(call,SalAudio);
 		SalMediaDescription *remotedesc=NULL;
 		SalStreamDescription *stream_desc = NULL;
@@ -2023,24 +2561,39 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 		if (remotedesc)
 				stream_desc = sal_media_description_find_best_stream(remotedesc, SalAudio);
 
-		call->audiostream=audiostream=audio_stream_new2(linphone_call_get_bind_ip_for_stream(call,0),
-				multicast_role ==  SalMulticastReceiver ? stream_desc->rtp_port : call->media_ports[0].rtp_port,
-				multicast_role ==  SalMulticastReceiver ? 0 /*disabled for now*/ : call->media_ports[0].rtcp_port);
+		call->audiostream=audiostream=audio_stream_new2(lc->factory, linphone_call_get_bind_ip_for_stream(call,call->main_audio_stream_index),
+				multicast_role ==  SalMulticastReceiver ? stream_desc->rtp_port : call->media_ports[call->main_audio_stream_index].rtp_port,
+				multicast_role ==  SalMulticastReceiver ? 0 /*disabled for now*/ : call->media_ports[call->main_audio_stream_index].rtcp_port);
 		if (multicast_role == SalMulticastReceiver)
-			linphone_call_join_multicast_group(call, 0, &audiostream->ms);
+			linphone_call_join_multicast_group(call, call->main_audio_stream_index, &audiostream->ms);
 		rtp_session_enable_network_simulation(call->audiostream->ms.sessions.rtp_session, &lc->net_conf.netsim_params);
 		cname = linphone_address_as_string_uri_only(call->me);
 		audio_stream_set_rtcp_information(call->audiostream, cname, rtcp_tool);
 		ms_free(cname);
 		rtp_session_set_symmetric_rtp(audiostream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
 		setup_dtls_params(call, &audiostream->ms);
-		media_stream_reclaim_sessions(&audiostream->ms, &call->sessions[0]);
+
+		/* init zrtp even if we didn't explicitely set it, just in case peer offers it */
+		if (linphone_core_media_encryption_supported(lc, LinphoneMediaEncryptionZRTP)) {
+			char *uri = linphone_address_as_string_uri_only((call->dir==LinphoneCallIncoming) ? call->log->from : call->log->to);
+			MSZrtpParams params;
+			memset(&params,0,sizeof(MSZrtpParams));
+			/*call->current_params.media_encryption will be set later when zrtp is activated*/
+			params.zid_file=lc->zrtp_secrets_cache;
+			params.uri=uri;
+			setZrtpCryptoTypesParameters(&params,call->core);
+			audio_stream_enable_zrtp(call->audiostream,&params);
+			if (uri != NULL) ms_free(uri);
+		}
+
+		media_stream_reclaim_sessions(&audiostream->ms, &call->sessions[call->main_audio_stream_index]);
 	}else{
-		call->audiostream=audio_stream_new_with_sessions(&call->sessions[0]);
+		call->audiostream=audio_stream_new_with_sessions(lc->factory, &call->sessions[call->main_audio_stream_index]);
+
 	}
 	audiostream=call->audiostream;
-	if (call->media_ports[0].rtp_port==-1){
-		port_config_set_random_choosed(call,0,audiostream->ms.sessions.rtp_session);
+	if (call->media_ports[call->main_audio_stream_index].rtp_port==-1){
+		port_config_set_random_choosed(call,call->main_audio_stream_index,audiostream->ms.sessions.rtp_session);
 	}
 	dscp=linphone_core_get_audio_dscp(lc);
 	if (dscp!=-1)
@@ -2089,34 +2642,32 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 
 		rtp_session_get_transports(audiostream->ms.sessions.rtp_session,&meta_rtp,&meta_rtcp);
 		if (meta_rtp_transport_get_endpoint(meta_rtp) == NULL) {
-			meta_rtp_transport_set_endpoint(meta_rtp,lc->rtptf->audio_rtp_func(lc->rtptf->audio_rtp_func_data, call->media_ports[0].rtp_port));
+			ms_message("LinphoneCall[%p]: using custom audio RTP transport endpoint.", call);
+			meta_rtp_transport_set_endpoint(meta_rtp,lc->rtptf->audio_rtp_func(lc->rtptf->audio_rtp_func_data, call->media_ports[call->main_audio_stream_index].rtp_port));
 		}
 		if (meta_rtp_transport_get_endpoint(meta_rtcp) == NULL) {
-			meta_rtp_transport_set_endpoint(meta_rtcp,lc->rtptf->audio_rtcp_func(lc->rtptf->audio_rtcp_func_data, call->media_ports[0].rtcp_port));
+			meta_rtp_transport_set_endpoint(meta_rtcp,lc->rtptf->audio_rtcp_func(lc->rtptf->audio_rtcp_func_data, call->media_ports[call->main_audio_stream_index].rtcp_port));
 		}
 	}
 
 	call->audiostream_app_evq = ortp_ev_queue_new();
 	rtp_session_register_event_queue(audiostream->ms.sessions.rtp_session,call->audiostream_app_evq);
 
-	_linphone_call_prepare_ice_for_stream(call,0,FALSE);
+	_linphone_call_prepare_ice_for_stream(call,call->main_audio_stream_index,FALSE);
 }
 
 void linphone_call_init_video_stream(LinphoneCall *call){
 #ifdef VIDEO_ENABLED
 	LinphoneCore *lc=call->core;
 	char* cname;
-	char rtcp_tool[128];
-
-
-	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
+	const char *rtcp_tool = linphone_core_get_user_agent(call->core);
 
 	if (call->videostream == NULL){
 		int video_recv_buf_size=lp_config_get_int(lc->config,"video","recv_buf_size",0);
 		int dscp=linphone_core_get_video_dscp(lc);
 		const char *display_filter=linphone_core_get_video_display_filter(lc);
 
-		if (call->sessions[1].rtp_session==NULL){
+		if (call->sessions[call->main_video_stream_index].rtp_session==NULL){
 			SalMulticastRole multicast_role = linphone_call_get_multicast_role(call,SalVideo);
 			SalMediaDescription *remotedesc=NULL;
 			SalStreamDescription *stream_desc = NULL;
@@ -2124,24 +2675,29 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 			if (remotedesc)
 					stream_desc = sal_media_description_find_best_stream(remotedesc, SalVideo);
 
-			call->videostream=video_stream_new2(linphone_call_get_bind_ip_for_stream(call,1),
-					multicast_role ==  SalMulticastReceiver ? stream_desc->rtp_port : call->media_ports[1].rtp_port,
-					multicast_role ==  SalMulticastReceiver ?  0 /*disabled for now*/ : call->media_ports[1].rtcp_port);
+			call->videostream=video_stream_new2(lc->factory, linphone_call_get_bind_ip_for_stream(call,call->main_video_stream_index),
+					multicast_role ==  SalMulticastReceiver ? stream_desc->rtp_port : call->media_ports[call->main_video_stream_index].rtp_port,
+					multicast_role ==  SalMulticastReceiver ?  0 /*disabled for now*/ : call->media_ports[call->main_video_stream_index].rtcp_port);
 			if (multicast_role == SalMulticastReceiver)
-				linphone_call_join_multicast_group(call, 1, &call->videostream->ms);
+				linphone_call_join_multicast_group(call, call->main_video_stream_index, &call->videostream->ms);
 			rtp_session_enable_network_simulation(call->videostream->ms.sessions.rtp_session, &lc->net_conf.netsim_params);
 			cname = linphone_address_as_string_uri_only(call->me);
 			video_stream_set_rtcp_information(call->videostream, cname, rtcp_tool);
 			ms_free(cname);
 			rtp_session_set_symmetric_rtp(call->videostream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
 			setup_dtls_params(call, &call->videostream->ms);
-			media_stream_reclaim_sessions(&call->videostream->ms, &call->sessions[1]);
+			/* init zrtp even if we didn't explicitely set it, just in case peer offers it */
+			if (linphone_core_media_encryption_supported(lc, LinphoneMediaEncryptionZRTP)) {
+				video_stream_enable_zrtp(call->videostream, call->audiostream);
+			}
+
+			media_stream_reclaim_sessions(&call->videostream->ms, &call->sessions[call->main_video_stream_index]);
 		}else{
-			call->videostream=video_stream_new_with_sessions(&call->sessions[1]);
+			call->videostream=video_stream_new_with_sessions(lc->factory, &call->sessions[call->main_video_stream_index]);
 		}
 
-		if (call->media_ports[1].rtp_port==-1){
-			port_config_set_random_choosed(call,1,call->videostream->ms.sessions.rtp_session);
+		if (call->media_ports[call->main_video_stream_index].rtp_port==-1){
+			port_config_set_random_choosed(call,call->main_video_stream_index,call->videostream->ms.sessions.rtp_session);
 		}
 		if (dscp!=-1)
 			video_stream_set_dscp(call->videostream,dscp);
@@ -2158,15 +2714,16 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 
 			rtp_session_get_transports(call->videostream->ms.sessions.rtp_session,&meta_rtp,&meta_rtcp);
 			if (meta_rtp_transport_get_endpoint(meta_rtp) == NULL) {
-				meta_rtp_transport_set_endpoint(meta_rtp,lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->media_ports[1].rtp_port));
+				ms_message("LinphoneCall[%p]: using custom video RTP transport endpoint.", call);
+				meta_rtp_transport_set_endpoint(meta_rtp,lc->rtptf->video_rtp_func(lc->rtptf->video_rtp_func_data, call->media_ports[call->main_video_stream_index].rtp_port));
 			}
 			if (meta_rtp_transport_get_endpoint(meta_rtcp) == NULL) {
-				meta_rtp_transport_set_endpoint(meta_rtcp,lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->media_ports[1].rtcp_port));
+				meta_rtp_transport_set_endpoint(meta_rtcp,lc->rtptf->video_rtcp_func(lc->rtptf->video_rtcp_func_data, call->media_ports[call->main_video_stream_index].rtcp_port));
 			}
 		}
 		call->videostream_app_evq = ortp_ev_queue_new();
 		rtp_session_register_event_queue(call->videostream->ms.sessions.rtp_session,call->videostream_app_evq);
-		_linphone_call_prepare_ice_for_stream(call,1,FALSE);
+		_linphone_call_prepare_ice_for_stream(call,call->main_video_stream_index,FALSE);
 #ifdef TEST_EXT_RENDERER
 		video_stream_set_render_callback(call->videostream,rendercb,NULL);
 #endif
@@ -2176,9 +2733,61 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 #endif
 }
 
+void linphone_call_init_text_stream(LinphoneCall *call){
+	TextStream *textstream;
+	LinphoneCore *lc=call->core;
+	char* cname;
+
+	if (call->textstream != NULL) return;
+	if (call->sessions[call->main_text_stream_index].rtp_session == NULL) {
+		SalMulticastRole multicast_role = linphone_call_get_multicast_role(call, SalText);
+		SalMediaDescription *remotedesc = NULL;
+		SalStreamDescription *stream_desc = NULL;
+		if (call->op) remotedesc = sal_call_get_remote_media_description(call->op);
+		if (remotedesc) stream_desc = sal_media_description_find_best_stream(remotedesc, SalText);
+
+		call->textstream = textstream = text_stream_new2(lc->factory, linphone_call_get_bind_ip_for_stream(call,call->main_text_stream_index),
+				multicast_role ==  SalMulticastReceiver ? stream_desc->rtp_port : call->media_ports[call->main_text_stream_index].rtp_port,
+				multicast_role ==  SalMulticastReceiver ? 0 /*disabled for now*/ : call->media_ports[call->main_text_stream_index].rtcp_port);
+		if (multicast_role == SalMulticastReceiver)
+			linphone_call_join_multicast_group(call, call->main_text_stream_index, &textstream->ms);
+		rtp_session_enable_network_simulation(call->textstream->ms.sessions.rtp_session, &lc->net_conf.netsim_params);
+		cname = linphone_address_as_string_uri_only(call->me);
+		ms_free(cname);
+		rtp_session_set_symmetric_rtp(textstream->ms.sessions.rtp_session,linphone_core_symmetric_rtp_enabled(lc));
+		setup_dtls_params(call, &textstream->ms);
+		media_stream_reclaim_sessions(&textstream->ms, &call->sessions[call->main_text_stream_index]);
+	} else {
+		call->textstream = text_stream_new_with_sessions(lc->factory, &call->sessions[call->main_text_stream_index]);
+	}
+	textstream = call->textstream;
+	if (call->media_ports[call->main_text_stream_index].rtp_port == -1) {
+		port_config_set_random_choosed(call, call->main_text_stream_index, textstream->ms.sessions.rtp_session);
+	}
+
+	if (lc->rtptf){
+		RtpTransport *meta_rtp;
+		RtpTransport *meta_rtcp;
+
+		rtp_session_get_transports(textstream->ms.sessions.rtp_session, &meta_rtp, &meta_rtcp);
+		if (meta_rtp_transport_get_endpoint(meta_rtp) == NULL) {
+			meta_rtp_transport_set_endpoint(meta_rtp,lc->rtptf->audio_rtp_func(lc->rtptf->audio_rtp_func_data, call->media_ports[call->main_text_stream_index].rtp_port));
+		}
+		if (meta_rtp_transport_get_endpoint(meta_rtcp) == NULL) {
+			meta_rtp_transport_set_endpoint(meta_rtcp,lc->rtptf->audio_rtcp_func(lc->rtptf->audio_rtcp_func_data, call->media_ports[call->main_text_stream_index].rtcp_port));
+		}
+	}
+
+	call->textstream_app_evq = ortp_ev_queue_new();
+	rtp_session_register_event_queue(textstream->ms.sessions.rtp_session, call->textstream_app_evq);
+
+	_linphone_call_prepare_ice_for_stream(call, call->main_text_stream_index, FALSE);
+}
+
 void linphone_call_init_media_streams(LinphoneCall *call){
 	linphone_call_init_audio_stream(call);
 	linphone_call_init_video_stream(call);
+	linphone_call_init_text_stream(call);
 }
 
 
@@ -2193,23 +2802,41 @@ static void linphone_core_dtmf_received(LinphoneCall *call, int dtmf){
 }
 
 static void parametrize_equalizer(LinphoneCore *lc, AudioStream *st){
-	if (st->equalizer){
-		MSFilter *f=st->equalizer;
-		int enabled=lp_config_get_int(lc->config,"sound","eq_active",0);
-		const char *gains=lp_config_get_string(lc->config,"sound","eq_gains",NULL);
+	const char *eq_active = lp_config_get_string(lc->config, "sound", "eq_active", NULL);
+	const char *eq_gains = lp_config_get_string(lc->config, "sound", "eq_gains", NULL);
+
+	if(eq_active) ms_warning("'eq_active' linphonerc parameter has not effect anymore. Please use 'mic_eq_active' or 'spk_eq_active' instead");
+	if(eq_gains) ms_warning("'eq_gains' linphonerc parameter has not effect anymore. Please use 'mic_eq_gains' or 'spk_eq_gains' instead");
+	if (st->mic_equalizer){
+		MSFilter *f=st->mic_equalizer;
+		int enabled=lp_config_get_int(lc->config,"sound","mic_eq_active",0);
+		const char *gains=lp_config_get_string(lc->config,"sound","mic_eq_gains",NULL);
 		ms_filter_call_method(f,MS_EQUALIZER_SET_ACTIVE,&enabled);
-		if (enabled){
-			if (gains){
-				do{
-					int bytes;
-					MSEqualizerGain g;
-					if (sscanf(gains,"%f:%f:%f %n",&g.frequency,&g.gain,&g.width,&bytes)==3){
-						ms_message("Read equalizer gains: %f(~%f) --> %f",g.frequency,g.width,g.gain);
-						ms_filter_call_method(f,MS_EQUALIZER_SET_GAIN,&g);
-						gains+=bytes;
-					}else break;
-				}while(1);
+		if (enabled && gains){
+			bctbx_list_t *gains_list = ms_parse_equalizer_string(gains);
+			bctbx_list_t *it;
+			for(it=gains_list; it; it=it->next) {
+				MSEqualizerGain *g = (MSEqualizerGain *)it->data;
+				ms_message("Read microphone equalizer gains: %f(~%f) --> %f",g->frequency,g->width,g->gain);
+				ms_filter_call_method(f,MS_EQUALIZER_SET_GAIN, g);
 			}
+			if(gains_list) bctbx_list_free_with_data(gains_list, ms_free);
+		}
+	}
+	if (st->spk_equalizer){
+		MSFilter *f=st->spk_equalizer;
+		int enabled=lp_config_get_int(lc->config,"sound","spk_eq_active",0);
+		const char *gains=lp_config_get_string(lc->config,"sound","spk_eq_gains",NULL);
+		ms_filter_call_method(f,MS_EQUALIZER_SET_ACTIVE,&enabled);
+		if (enabled && gains){
+			bctbx_list_t *gains_list = ms_parse_equalizer_string(gains);
+			bctbx_list_t *it;
+			for(it=gains_list; it; it=it->next) {
+				MSEqualizerGain *g = (MSEqualizerGain *)it->data;
+				ms_message("Read speaker equalizer gains: %f(~%f) --> %f",g->frequency,g->width,g->gain);
+				ms_filter_call_method(f,MS_EQUALIZER_SET_GAIN, g);
+			}
+			if(gains_list) bctbx_list_free_with_data(gains_list, ms_free);
 		}
 	}
 }
@@ -2229,7 +2856,7 @@ void _post_configure_audio_stream(AudioStream *st, LinphoneCore *lc, bool_t mute
 	float mic_gain=lc->sound_conf.soft_mic_lev;
 	float thres = 0;
 	float recv_gain;
-	float ng_thres=lp_config_get_float(lc->config,"sound","ng_thres",0.05);
+	float ng_thres=lp_config_get_float(lc->config,"sound","ng_thres",0.05f);
 	float ng_floorgain=lp_config_get_float(lc->config,"sound","ng_floorgain",0);
 	int dc_removal=lp_config_get_int(lc->config,"sound","dc_removal",0);
 	float speed;
@@ -2258,7 +2885,7 @@ void _post_configure_audio_stream(AudioStream *st, LinphoneCore *lc, bool_t mute
 		sustain=lp_config_get_int(lc->config,"sound","el_sustain",-1);
 		transmit_thres=lp_config_get_float(lc->config,"sound","el_transmit_thres",-1);
 		f=st->volsend;
-		if (speed==-1) speed=0.03;
+		if (speed==-1) speed=0.03f;
 		if (force==-1) force=25;
 		ms_filter_call_method(f,MS_VOLUME_SET_EA_SPEED,&speed);
 		ms_filter_call_method(f,MS_VOLUME_SET_EA_FORCE,&force);
@@ -2274,7 +2901,7 @@ void _post_configure_audio_stream(AudioStream *st, LinphoneCore *lc, bool_t mute
 	}
 	if (st->volrecv){
 		/* parameters for a limited noise-gate effect, using echo limiter threshold */
-		floorgain = 1/pow(10,(mic_gain)/10);
+		floorgain = (float)(1/pow(10,mic_gain/10));
 		spk_agc=lp_config_get_int(lc->config,"sound","speaker_agc_enabled",0);
 		ms_filter_call_method(st->volrecv, MS_VOLUME_ENABLE_AGC, &spk_agc);
 		ms_filter_call_method(st->volrecv,MS_VOLUME_SET_NOISE_GATE_THRESHOLD,&ng_thres);
@@ -2342,7 +2969,7 @@ static int get_video_bw(LinphoneCall *call, const SalMediaDescription *md, const
 
 static RtpProfile *make_profile(LinphoneCall *call, const SalMediaDescription *md, const SalStreamDescription *desc, int *used_pt){
 	int bw=0;
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	RtpProfile *prof=rtp_profile_new("Call profile");
 	bool_t first=TRUE;
 	LinphoneCore *lc=call->core;
@@ -2355,6 +2982,8 @@ static RtpProfile *make_profile(LinphoneCall *call, const SalMediaDescription *m
 		bw=get_ideal_audio_bw(call,md,desc);
 	else if (desc->type==SalVideo)
 		bw=get_video_bw(call,md,desc);
+	//else if (desc->type== SalText)
+
 
 	for(elem=desc->payloads;elem!=NULL;elem=elem->next){
 		PayloadType *pt=(PayloadType*)elem->data;
@@ -2443,7 +3072,7 @@ static void configure_rtp_session_for_rtcp_fb(LinphoneCall *call, const SalStrea
 }
 
 static void configure_rtp_session_for_rtcp_xr(LinphoneCore *lc, LinphoneCall *call, SalStreamType type) {
-	RtpSession *session;
+	RtpSession *session = NULL;
 	const OrtpRtcpXrConfiguration *localconfig;
 	const OrtpRtcpXrConfiguration *remoteconfig;
 	OrtpRtcpXrConfiguration currentconfig;
@@ -2471,12 +3100,15 @@ static void configure_rtp_session_for_rtcp_xr(LinphoneCore *lc, LinphoneCall *ca
 	}
 	if (type == SalAudio) {
 		session = call->audiostream->ms.sessions.rtp_session;
-	} else {
+	} else if (type == SalVideo) {
 		session = call->videostream->ms.sessions.rtp_session;
+	} else if (type == SalText) {
+		session = call->textstream->ms.sessions.rtp_session;
 	}
 	rtp_session_configure_rtcp_xr(session, &currentconfig);
 }
-void static start_dtls( MSMediaStreamSessions *sessions,  const SalStreamDescription *sd,const SalStreamDescription *remote) {
+
+static void start_dtls( MSMediaStreamSessions *sessions,  const SalStreamDescription *sd,const SalStreamDescription *remote) {
 	if (sal_stream_description_has_dtls(sd) == TRUE) {
 		/*DTLS*/
 		SalDtlsRole salRole = sd->dtls_role;
@@ -2490,7 +3122,8 @@ void static start_dtls( MSMediaStreamSessions *sessions,  const SalStreamDescrip
 		}
 	}
 }
-void static start_dtls_on_all_streams(LinphoneCall *call) {
+
+static void start_dtls_on_all_streams(LinphoneCall *call) {
 	SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
 	SalMediaDescription *result_desc = sal_call_get_final_media_description(call->op);
 	if( remote_desc == NULL || result_desc == NULL ){
@@ -2508,10 +3141,14 @@ void static start_dtls_on_all_streams(LinphoneCall *call) {
 						,sal_media_description_find_best_stream(result_desc,SalVideo)
 						,sal_media_description_find_best_stream(remote_desc,SalVideo));
 #endif
+	if (call->textstream && (media_stream_get_state((const MediaStream *)call->textstream) == MSStreamStarted))/*dtls must start at the end of ice*/
+	start_dtls(&call->textstream->ms.sessions
+					,sal_media_description_find_best_stream(result_desc,SalText)
+					,sal_media_description_find_best_stream(remote_desc,SalText));
 	return;
 }
 
-void static set_dtls_fingerprint( MSMediaStreamSessions *sessions,  const SalStreamDescription *sd,const SalStreamDescription *remote) {
+static void set_dtls_fingerprint( MSMediaStreamSessions *sessions,  const SalStreamDescription *sd,const SalStreamDescription *remote) {
 	if (sal_stream_description_has_dtls(sd) == TRUE) {
 		/*DTLS*/
 		SalDtlsRole salRole = sd->dtls_role;
@@ -2524,7 +3161,7 @@ void static set_dtls_fingerprint( MSMediaStreamSessions *sessions,  const SalStr
 	}
 }
 
-void static set_dtls_fingerprint_on_all_streams(LinphoneCall *call) {
+static void set_dtls_fingerprint_on_all_streams(LinphoneCall *call) {
 	SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
 	SalMediaDescription *result_desc = sal_call_get_final_media_description(call->op);
 
@@ -2543,6 +3180,10 @@ void static set_dtls_fingerprint_on_all_streams(LinphoneCall *call) {
 						,sal_media_description_find_best_stream(result_desc,SalVideo)
 						,sal_media_description_find_best_stream(remote_desc,SalVideo));
 #endif
+	if (call->textstream && (media_stream_get_state((const MediaStream *)call->textstream) == MSStreamStarted))/*dtls must start at the end of ice*/
+	set_dtls_fingerprint(&call->textstream->ms.sessions
+					,sal_media_description_find_best_stream(result_desc,SalText)
+					,sal_media_description_find_best_stream(remote_desc,SalText));
 	return;
 }
 
@@ -2556,26 +3197,37 @@ static RtpSession * create_audio_rtp_io_session(LinphoneCall *call) {
 	int ptnum = lp_config_get_int(lc->config, "sound", "rtp_ptnum", 0);
 	const char *rtpmap = lp_config_get_string(lc->config, "sound", "rtp_map", "pcmu/8000/1");
 	int symmetric = lp_config_get_int(lc->config, "sound", "rtp_symmetric", 0);
+	int jittcomp = lp_config_get_int(lc->config, "sound", "rtp_jittcomp", 0); /* 0 means no jitter buffer*/
 	RtpSession *rtp_session = NULL;
 	pt = rtp_profile_get_payload_from_rtpmap(call->audio_profile, rtpmap);
 	if (pt != NULL) {
 		call->rtp_io_audio_profile = rtp_profile_new("RTP IO audio profile");
 		rtp_profile_set_payload(call->rtp_io_audio_profile, ptnum, payload_type_clone(pt));
-		rtp_session = ms_create_duplex_rtp_session(local_ip, local_port, -1);
+		rtp_session = ms_create_duplex_rtp_session(local_ip, local_port, -1, ms_factory_get_mtu(lc->factory));
 		rtp_session_set_profile(rtp_session, call->rtp_io_audio_profile);
 		rtp_session_set_remote_addr_and_port(rtp_session, remote_ip, remote_port, -1);
 		rtp_session_enable_rtcp(rtp_session, FALSE);
 		rtp_session_set_payload_type(rtp_session, ptnum);
-		rtp_session_set_jitter_compensation(rtp_session, linphone_core_get_audio_jittcomp(lc));
+		rtp_session_set_jitter_compensation(rtp_session, jittcomp);
+		rtp_session_enable_jitter_buffer(rtp_session, jittcomp>0);
 		rtp_session_set_symmetric_rtp(rtp_session, (bool_t)symmetric);
 	}
 	return rtp_session;
 }
 
+static void linphone_call_set_on_hold_file(LinphoneCall *call, const char *file){
+	if (call->onhold_file){
+		ms_free(call->onhold_file);
+		call->onhold_file = NULL;
+	}
+	if (file){
+		call->onhold_file = ms_strdup(file);
+	}
+}
+
 static void linphone_call_start_audio_stream(LinphoneCall *call, LinphoneCallState next_state, bool_t use_arc){
 	LinphoneCore *lc=call->core;
 	int used_pt=-1;
-	char rtcp_tool[128]={0};
 	const SalStreamDescription *stream;
 	MSSndCard *playcard;
 	MSSndCard *captcard;
@@ -2583,15 +3235,18 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, LinphoneCallSta
 	bool_t mute;
 	const char *playfile;
 	const char *recfile;
+	const char *file_to_play = NULL;
 	const SalStreamDescription *local_st_desc;
 	int crypto_idx;
 	MSMediaStreamIO io = MS_MEDIA_STREAM_IO_INITIALIZER;
 	bool_t use_rtp_io = lp_config_get_int(lc->config, "sound", "rtp_io", FALSE);
 
-	snprintf(rtcp_tool,sizeof(rtcp_tool)-1,"%s-%s",linphone_core_get_user_agent_name(),linphone_core_get_user_agent_version());
-
 	stream = sal_media_description_find_best_stream(call->resultdesc, SalAudio);
 	if (stream && stream->dir!=SalStreamInactive && stream->rtp_port!=0){
+		/* get remote stream description to check for zrtp-hash presence */
+		SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+		const SalStreamDescription *remote_stream = sal_media_description_find_best_stream(remote_desc, SalAudio);
+
 		const char *rtp_addr=stream->rtp_addr[0]!='\0' ? stream->rtp_addr : call->resultdesc->addr;
 		bool_t is_multicast=ms_is_multicast(rtp_addr);
 		playcard=lc->sound_conf.lsd_card ?
@@ -2654,6 +3309,7 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, LinphoneCallSta
 								ms_qos_analyzer_algorithm_from_string(linphone_core_get_adaptive_rate_algorithm(lc)));
 			audio_stream_enable_adaptive_jittcomp(call->audiostream, linphone_core_audio_adaptive_jittcomp_enabled(lc));
 			rtp_session_set_jitter_compensation(call->audiostream->ms.sessions.rtp_session,linphone_core_get_audio_jittcomp(lc));
+			rtp_session_enable_rtcp_mux(call->audiostream->ms.sessions.rtp_session, stream->rtcp_mux);
 			if (!call->params->in_conference && call->params->record_file){
 				audio_stream_mixed_record_open(call->audiostream,call->params->record_file);
 				call->current_params->record_file=ms_strdup(call->params->record_file);
@@ -2694,24 +3350,26 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, LinphoneCallSta
 					io.input.soundcard = captcard;
 				}else{
 					io.input.type = MSResourceFile;
-					io.input.file = playfile;
+					file_to_play = playfile;
+					io.input.file = NULL; /*we prefer to use the remote_play api, that allows to play multimedia files */
 				}
-				
+
 			}
 			if (ok == TRUE) {
-				audio_stream_start_from_io(call->audiostream,
+				int err = audio_stream_start_from_io(call->audiostream,
 					call->audio_profile,
 					rtp_addr,
 					stream->rtp_port,
 					stream->rtcp_addr[0]!='\0' ? stream->rtcp_addr : call->resultdesc->addr,
 					(linphone_core_rtcp_enabled(lc) && !is_multicast) ? (stream->rtcp_port ? stream->rtcp_port : stream->rtp_port+1) : 0,
 					used_pt,
-					&io
-				);
-				post_configure_audio_streams(call, (call->all_muted || call->audio_muted) && !call->playing_ringbacktone);
+					&io);
+				if (err == 0){
+					post_configure_audio_streams(call, (call->all_muted || call->audio_muted) && !call->playing_ringbacktone);
+				}
 			}
 
-			ms_media_stream_sessions_set_encryption_mandatory(&call->audiostream->ms.sessions,linphone_core_is_media_encryption_mandatory(call->core));
+			ms_media_stream_sessions_set_encryption_mandatory(&call->audiostream->ms.sessions, linphone_call_encryption_mandatory(call));
 
 			if (next_state == LinphoneCallPaused && captcard == NULL && playfile != NULL){
 				int pause_time=500;
@@ -2724,12 +3382,26 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, LinphoneCallSta
 			if (call->params->in_conference){
 				/*transform the graph to connect it to the conference filter */
 				mute = stream->dir==SalStreamRecvOnly;
-				linphone_call_add_to_conf(call, mute);
+				linphone_conference_on_call_stream_starting(lc->conf_ctx, call, mute);
 			}
 			call->current_params->in_conference=call->params->in_conference;
 			call->current_params->low_bandwidth=call->params->low_bandwidth;
+
+			/* start ZRTP engine if needed : set here or remote have a zrtp-hash attribute */
+			if (linphone_core_media_encryption_supported(lc, LinphoneMediaEncryptionZRTP) &&
+				(call->params->media_encryption == LinphoneMediaEncryptionZRTP || remote_stream->haveZrtpHash==1) ){
+				audio_stream_start_zrtp(call->audiostream);
+				if (remote_stream->haveZrtpHash == 1) {
+					int retval;
+					if ((retval = ms_zrtp_setPeerHelloHash(call->audiostream->ms.sessions.zrtp_context, (uint8_t *)remote_stream->zrtphash, strlen((const char *)(remote_stream->zrtphash)))) != 0) {
+						ms_error("Zrtp hash mismatch 0x%x", retval);
+					}
+				}
+			}
 		}else ms_warning("No audio stream accepted ?");
 	}
+	linphone_call_set_on_hold_file(call, file_to_play);
+
 }
 
 #ifdef VIDEO_ENABLED
@@ -2743,17 +3415,20 @@ static RtpSession * create_video_rtp_io_session(LinphoneCall *call) {
 	int ptnum = lp_config_get_int(lc->config, "video", "rtp_ptnum", 0);
 	const char *rtpmap = lp_config_get_string(lc->config, "video", "rtp_map", "vp8/90000/1");
 	int symmetric = lp_config_get_int(lc->config, "video", "rtp_symmetric", 0);
+	int jittcomp = lp_config_get_int(lc->config, "video", "rtp_jittcomp", 0); /* 0 means no jitter buffer*/
 	RtpSession *rtp_session = NULL;
 	pt = rtp_profile_get_payload_from_rtpmap(call->video_profile, rtpmap);
 	if (pt != NULL) {
 		call->rtp_io_video_profile = rtp_profile_new("RTP IO video profile");
 		rtp_profile_set_payload(call->rtp_io_video_profile, ptnum, payload_type_clone(pt));
-		rtp_session = ms_create_duplex_rtp_session(local_ip, local_port, -1);
+		rtp_session = ms_create_duplex_rtp_session(local_ip, local_port, -1, ms_factory_get_mtu(lc->factory));
 		rtp_session_set_profile(rtp_session, call->rtp_io_video_profile);
 		rtp_session_set_remote_addr_and_port(rtp_session, remote_ip, remote_port, -1);
 		rtp_session_enable_rtcp(rtp_session, FALSE);
 		rtp_session_set_payload_type(rtp_session, ptnum);
 		rtp_session_set_symmetric_rtp(rtp_session, (bool_t)symmetric);
+		rtp_session_set_jitter_compensation(rtp_session, jittcomp);
+		rtp_session_enable_jitter_buffer(rtp_session, jittcomp>0);
 	}
 	return rtp_session;
 }
@@ -2788,7 +3463,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, LinphoneCallSta
 			MediaStreamDir dir= MediaStreamSendRecv;
 			bool_t is_inactive=FALSE;
 			MSWebCam *cam;
-			
+
 			call->current_params->video_codec = rtp_profile_get_payload(call->video_profile, used_pt);
 			call->current_params->has_video=TRUE;
 
@@ -2798,9 +3473,12 @@ static void linphone_call_start_video_stream(LinphoneCall *call, LinphoneCallSta
 													  ms_qos_analyzer_algorithm_from_string(linphone_core_get_adaptive_rate_algorithm(lc)));
 			video_stream_enable_adaptive_jittcomp(call->videostream, linphone_core_video_adaptive_jittcomp_enabled(lc));
 			rtp_session_set_jitter_compensation(call->videostream->ms.sessions.rtp_session, linphone_core_get_video_jittcomp(lc));
+			rtp_session_enable_rtcp_mux(call->videostream->ms.sessions.rtp_session, vstream->rtcp_mux);
 			if (lc->video_conf.preview_vsize.width!=0)
 				video_stream_set_preview_size(call->videostream,lc->video_conf.preview_vsize);
 			video_stream_set_fps(call->videostream,linphone_core_get_preferred_framerate(lc));
+			if (lp_config_get_int(lc->config, "video", "nowebcam_uses_normal_fps", 0))
+				call->videostream->staticimage_webcam_fps_optimization = FALSE;
 			video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
 			video_stream_enable_self_view(call->videostream,lc->video_conf.selfview);
 			if (call->video_window_id != NULL)
@@ -2834,6 +3512,10 @@ static void linphone_call_start_video_stream(LinphoneCall *call, LinphoneCallSta
 			}
 			cam = linphone_call_get_video_device(call);
 			if (!is_inactive){
+				/* get remote stream description to check for zrtp-hash presence */
+				SalMediaDescription *remote_desc = sal_call_get_remote_media_description(call->op);
+				const SalStreamDescription *remote_stream = sal_media_description_find_best_stream(remote_desc, SalVideo);
+
 				if (sal_stream_description_has_srtp(vstream) == TRUE) {
 					int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, vstream->crypto_local_tag);
 					if (crypto_idx >= 0) {
@@ -2848,7 +3530,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, LinphoneCallSta
 				video_stream_set_direction (call->videostream, dir);
 				ms_message("%s lc rotation:%d\n", __FUNCTION__, lc->device_rotation);
 				video_stream_set_device_rotation(call->videostream, lc->device_rotation);
-				video_stream_set_freeze_on_error(call->videostream, lp_config_get_int(lc->config, "video", "freeze_on_error", 0));
+				video_stream_set_freeze_on_error(call->videostream, lp_config_get_int(lc->config, "video", "freeze_on_error", 1));
 				if (is_multicast)
 					rtp_session_set_multicast_ttl(call->videostream->ms.sessions.rtp_session,vstream->ttl);
 
@@ -2883,7 +3565,23 @@ static void linphone_call_start_video_stream(LinphoneCall *call, LinphoneCallSta
 							used_pt, &io);
 					}
 				}
-				ms_media_stream_sessions_set_encryption_mandatory(&call->videostream->ms.sessions,linphone_core_is_media_encryption_mandatory(call->core));
+				ms_media_stream_sessions_set_encryption_mandatory(&call->videostream->ms.sessions,
+					linphone_call_encryption_mandatory(call));
+				_linphone_call_set_next_video_frame_decoded_trigger(call);
+
+				/* start ZRTP engine if needed : set here or remote have a zrtp-hash attribute */
+				if (call->params->media_encryption==LinphoneMediaEncryptionZRTP || remote_stream->haveZrtpHash==1) {
+					/*audio stream is already encrypted and video stream is active*/
+					if (media_stream_secured((MediaStream *)call->audiostream) && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
+						video_stream_start_zrtp(call->videostream);
+						if (remote_stream->haveZrtpHash == 1) {
+							int retval;
+							if ((retval = ms_zrtp_setPeerHelloHash(call->videostream->ms.sessions.zrtp_context, (uint8_t *)remote_stream->zrtphash, strlen((const char *)(remote_stream->zrtphash)))) != 0) {
+								ms_error("video stream ZRTP hash mismatch 0x%x", retval);
+							}
+						}
+					}
+				}
 			}
 		}else ms_warning("No video stream accepted.");
 	}else{
@@ -2894,64 +3592,72 @@ static void linphone_call_start_video_stream(LinphoneCall *call, LinphoneCallSta
 		ms_warning("Video preview (%p) not reused: destroying it.", source);
 		ms_filter_destroy(source);
 	}
+
 #endif
 }
 
-static void setZrtpCryptoTypesParameters(MSZrtpParams *params, LinphoneCore *lc)
-{
-	int i;
-	const MSCryptoSuite *srtp_suites;
-	MsZrtpCryptoTypesCount ciphersCount, authTagsCount;
+static void real_time_text_character_received(void *userdata, struct _MSFilter *f, unsigned int id, void *arg) {
+	if (id == MS_RTT_4103_RECEIVED_CHAR) {
+		LinphoneCall *call = (LinphoneCall *)userdata;
+		RealtimeTextReceivedCharacter *data = (RealtimeTextReceivedCharacter *)arg;
+		LinphoneChatRoom * chat_room = linphone_call_get_chat_room(call);
+		linphone_core_real_time_text_received(call->core, chat_room, data->character, call);
+	}
+}
 
-	if (params == NULL) return;
-	if (lc == NULL) return;
+static void linphone_call_start_text_stream(LinphoneCall *call) {
+	LinphoneCore *lc = call->core;
+	int used_pt = -1;
+	const SalStreamDescription *tstream;
 
-	srtp_suites = linphone_core_get_srtp_crypto_suites(lc);
-	if (srtp_suites!=NULL) {
-		for(i=0; srtp_suites[i]!=MS_CRYPTO_SUITE_INVALID && i<SAL_CRYPTO_ALGO_MAX && i<MS_MAX_ZRTP_CRYPTO_TYPES; ++i){
-			switch (srtp_suites[i]) {
-				case MS_AES_128_SHA1_32:
-					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES1;
-					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS32;
-					break;
-				case MS_AES_128_NO_AUTH:
-					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES1;
-					break;
-				case MS_NO_CIPHER_SHA1_80:
-					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
-					break;
-				case MS_AES_128_SHA1_80:
-					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES1;
-					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
-					break;
-				case MS_AES_256_SHA1_80:
-					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES3;
-					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
-					break;
-				case MS_AES_256_SHA1_32:
-					params->ciphers[params->ciphersCount++] = MS_ZRTP_CIPHER_AES3;
-					params->authTags[params->authTagsCount++] = MS_ZRTP_AUTHTAG_HS80;
-					break;
-				case MS_CRYPTO_SUITE_INVALID:
-					break;
+	tstream = sal_media_description_find_best_stream(call->resultdesc, SalText);
+	if (tstream != NULL && tstream->dir != SalStreamInactive && tstream->rtp_port != 0) {
+		const char *rtp_addr = tstream->rtp_addr[0] != '\0' ? tstream->rtp_addr : call->resultdesc->addr;
+		const char *rtcp_addr = tstream->rtcp_addr[0] != '\0' ? tstream->rtcp_addr : call->resultdesc->addr;
+		const SalStreamDescription *local_st_desc = sal_media_description_find_stream(call->localdesc, tstream->proto, SalText);
+		bool_t is_multicast = ms_is_multicast(rtp_addr);
+		call->text_profile = make_profile(call, call->resultdesc, tstream, &used_pt);
+
+		if (used_pt != -1) {
+			call->current_params->text_codec = rtp_profile_get_payload(call->text_profile, used_pt);
+			call->current_params->realtimetext_enabled = TRUE;
+
+			if (sal_stream_description_has_srtp(tstream) == TRUE) {
+				int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, tstream->crypto_local_tag);
+				if (crypto_idx >= 0) {
+					ms_media_stream_sessions_set_srtp_recv_key_b64(&call->textstream->ms.sessions, tstream->crypto[0].algo, tstream->crypto[0].master_key);
+					ms_media_stream_sessions_set_srtp_send_key_b64(&call->textstream->ms.sessions, tstream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key);
+				}
 			}
+
+			configure_rtp_session_for_rtcp_fb(call, tstream);
+			configure_rtp_session_for_rtcp_xr(lc, call, SalText);
+			rtp_session_enable_rtcp_mux(call->textstream->ms.sessions.rtp_session, tstream->rtcp_mux);
+
+			if (is_multicast) rtp_session_set_multicast_ttl(call->textstream->ms.sessions.rtp_session,tstream->ttl);
+
+			text_stream_start(call->textstream, call->text_profile, rtp_addr, tstream->rtp_port, rtcp_addr, (linphone_core_rtcp_enabled(lc) && !is_multicast)  ? (tstream->rtcp_port ? tstream->rtcp_port : tstream->rtp_port + 1) : 0, used_pt);
+			ms_filter_add_notify_callback(call->textstream->rttsink, real_time_text_character_received, call, FALSE);
+
+			ms_media_stream_sessions_set_encryption_mandatory(&call->textstream->ms.sessions,
+				linphone_call_encryption_mandatory(call));
+		} else ms_warning("No text stream accepted.");
+	} else {
+		ms_message("No valid text stream defined.");
+	}
+}
+
+void linphone_call_set_symmetric_rtp(LinphoneCall *call, bool_t val){
+	int i;
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++i){
+		MSMediaStreamSessions *mss = &call->sessions[i];
+		if (mss->rtp_session){
+			rtp_session_set_symmetric_rtp(mss->rtp_session, val);
 		}
 	}
-
-	/* linphone_core_get_srtp_crypto_suites is used to determine sensible defaults; here each can be overridden */
-	ciphersCount = linphone_core_get_zrtp_cipher_suites(lc, params->ciphers); /* if not present in config file, params->ciphers is not modified */
-	if (ciphersCount!=0) { /* use zrtp_cipher_suites config only when present, keep config from srtp_crypto_suite otherwise */
-		params->ciphersCount = ciphersCount;
-	}
-	params->hashesCount = linphone_core_get_zrtp_hash_suites(lc, params->hashes);
-	authTagsCount = linphone_core_get_zrtp_auth_suites(lc, params->authTags); /* if not present in config file, params->authTags is not modified */
-	if (authTagsCount!=0) {
-		params->authTagsCount = authTagsCount; /* use zrtp_auth_suites config only when present, keep config from srtp_crypto_suite otherwise */
-	}
-	params->sasTypesCount = linphone_core_get_zrtp_sas_suites(lc, params->sasTypes);
-	params->keyAgreementsCount = linphone_core_get_zrtp_key_agreement_suites(lc, params->keyAgreements);
 }
 
+
 void linphone_call_start_media_streams(LinphoneCall *call, LinphoneCallState next_state){
 	LinphoneCore *lc=call->core;
 	bool_t use_arc = linphone_core_adaptive_rate_control_enabled(lc);
@@ -2974,14 +3680,23 @@ void linphone_call_start_media_streams(LinphoneCall *call, LinphoneCallState nex
 			call->all_muted = FALSE;
 		break;
 	}
-	
+
 	call->current_params->audio_codec = NULL;
 	call->current_params->video_codec = NULL;
+	call->current_params->text_codec = NULL;
 
 	if ((call->audiostream == NULL) && (call->videostream == NULL)) {
 		ms_fatal("start_media_stream() called without prior init !");
 		return;
 	}
+
+	if (call->ice_session != NULL){
+		/*if there is an ICE session when we are about to start streams, then ICE will conduct the media path checking and authentication properly.
+		 * Symmetric RTP must be turned off*/
+		linphone_call_set_symmetric_rtp(call, FALSE);
+	}
+
+	call->nb_media_starts++;
 #if defined(VIDEO_ENABLED)
 	if (vstream!=NULL && vstream->dir!=SalStreamInactive && vstream->payloads!=NULL){
 		/*when video is used, do not make adaptive rate control on audio, it is stupid.*/
@@ -2994,37 +3709,36 @@ void linphone_call_start_media_streams(LinphoneCall *call, LinphoneCallState nex
 	if (call->audiostream!=NULL) {
 		linphone_call_start_audio_stream(call, next_state, use_arc);
 	} else {
-		ms_warning("DTLS no audio stream!");
+		ms_warning("linphone_call_start_media_streams(): no audio stream!");
 	}
 	call->current_params->has_video=FALSE;
 	if (call->videostream!=NULL) {
 		if (call->audiostream) audio_stream_link_video(call->audiostream,call->videostream);
 		linphone_call_start_video_stream(call, next_state);
 	}
+	/*the onhold file is to be played once both audio and video are ready.*/
+	if (call->onhold_file && !call->params->in_conference && call->audiostream){
+		MSFilter *player = audio_stream_open_remote_play(call->audiostream, call->onhold_file);
+		if (player){
+			int pause_time=500;
+			ms_filter_call_method(player, MS_PLAYER_SET_LOOP, &pause_time);
+			ms_filter_call_method_noarg(player, MS_PLAYER_START);
+		}
+	}
 
 	call->up_bw=linphone_core_get_upload_bandwidth(lc);
 
-	/*might be moved in audio/video stream_start*/
-	if (call->params->media_encryption==LinphoneMediaEncryptionZRTP) {
-		MSZrtpParams params;
-		memset(&params,0,sizeof(MSZrtpParams));
-		/*call->current_params.media_encryption will be set later when zrtp is activated*/
-		params.zid_file=lc->zrtp_secrets_cache;
-		params.uri= linphone_address_as_string_uri_only((call->dir==LinphoneCallIncoming) ? call->log->from : call->log->to);
-		setZrtpCryptoTypesParameters(&params,call->core);
-		audio_stream_enable_zrtp(call->audiostream,&params);
-#if VIDEO_ENABLED
-		if (media_stream_secured((MediaStream *)call->audiostream) && media_stream_get_state((MediaStream *)call->videostream) == MSStreamStarted) {
-			/*audio stream is already encrypted and video stream is active*/
-			memset(&params,0,sizeof(MSZrtpParams));
-			video_stream_enable_zrtp(call->videostream,call->audiostream,&params);
-		}
-#endif
+	if (call->params->realtimetext_enabled) {
+		linphone_call_start_text_stream(call);
 	}
 
 	set_dtls_fingerprint_on_all_streams(call);
 
 	if ((call->ice_session != NULL) && (ice_session_state(call->ice_session) != IS_Completed)) {
+		if (call->params->media_encryption==LinphoneMediaEncryptionDTLS) {
+			call->current_params->update_call_when_ice_completed = FALSE;
+			ms_message("Disabling update call when ice completed on call [%p]",call);
+		}
 		ice_session_start_connectivity_checks(call->ice_session);
 	} else {
 		/*should not start dtls until ice is completed*/
@@ -3040,6 +3754,9 @@ void linphone_call_stop_media_streams_for_ice_gathering(LinphoneCall *call){
 		video_stream_unprepare_video(call->videostream);
 	}
 #endif
+	if (call->textstream && call->textstream->ms.state == MSStreamPreparing) {
+		text_stream_unprepare_text(call->textstream);
+	}
 }
 
 static bool_t update_stream_crypto_params(LinphoneCall *call, const SalStreamDescription *local_st_desc, SalStreamDescription *old_stream, SalStreamDescription *new_stream, MediaStream *ms){
@@ -3069,6 +3786,13 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
 		update_stream_crypto_params(call,local_st_desc,old_stream,new_stream,&call->audiostream->ms)){
 	}
 
+	local_st_desc = sal_media_description_find_secure_stream_of_type(call->localdesc, SalText);
+	old_stream = sal_media_description_find_secure_stream_of_type(old_md, SalText);
+	new_stream = sal_media_description_find_secure_stream_of_type(new_md, SalText);
+	if (call->textstream && local_st_desc && old_stream && new_stream &&
+		update_stream_crypto_params(call,local_st_desc,old_stream,new_stream,&call->textstream->ms)){
+	}
+
 	start_dtls_on_all_streams(call);
 
 #ifdef VIDEO_ENABLED
@@ -3095,8 +3819,10 @@ void linphone_call_delete_ice_session(LinphoneCall *call){
 		call->ice_session = NULL;
 		if (call->audiostream != NULL) call->audiostream->ms.ice_check_list = NULL;
 		if (call->videostream != NULL) call->videostream->ms.ice_check_list = NULL;
+		if (call->textstream != NULL) call->textstream->ms.ice_check_list = NULL;
 		call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateNotActivated;
 		call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateNotActivated;
+		call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateNotActivated;
 	}
 }
 
@@ -3115,7 +3841,7 @@ static void linphone_call_log_fill_stats(LinphoneCallLog *log, MediaStream *st){
 	float quality=media_stream_get_average_quality_rating(st);
 	if (quality>=0){
 		if (log->quality!=-1){
-			log->quality*=quality/5.0;
+			log->quality*=quality/5.0f;
 		}else log->quality=quality;
 	}
 }
@@ -3124,7 +3850,7 @@ static void update_rtp_stats(LinphoneCall *call, int stream_index) {
 	if (stream_index >= linphone_call_get_stream_count(call)) {
 		return;
 	}
-		
+
 	if (call->sessions[stream_index].rtp_session) {
 		const rtp_stats_t *stats = rtp_session_get_stats(call->sessions[stream_index].rtp_session);
 		memcpy(&call->stats[stream_index].rtp_stats, stats, sizeof(*stats));
@@ -3132,12 +3858,13 @@ static void update_rtp_stats(LinphoneCall *call, int stream_index) {
 }
 
 static void linphone_call_stop_audio_stream(LinphoneCall *call) {
+	LinphoneCore *lc = call->core;
 	if (call->audiostream!=NULL) {
 		linphone_reporting_update_media_info(call, LINPHONE_CALL_STATS_AUDIO);
-		media_stream_reclaim_sessions(&call->audiostream->ms,&call->sessions[0]);
+		media_stream_reclaim_sessions(&call->audiostream->ms,&call->sessions[call->main_audio_stream_index]);
 
 		if (call->audiostream->ec){
-			const char *state_str=NULL;
+			char *state_str=NULL;
 			ms_filter_call_method(call->audiostream->ec,MS_ECHO_CANCELLER_GET_STATE_STRING,&state_str);
 			if (state_str){
 				ms_message("Writing echo canceler state, %i bytes",(int)strlen(state_str));
@@ -3147,15 +3874,17 @@ static void linphone_call_stop_audio_stream(LinphoneCall *call) {
 		audio_stream_get_local_rtp_stats(call->audiostream,&call->log->local_stats);
 		linphone_call_log_fill_stats (call->log,(MediaStream*)call->audiostream);
 		if (call->endpoint){
-			linphone_call_remove_from_conf(call);
+			linphone_conference_on_call_stream_stopping(lc->conf_ctx, call);
 		}
+		update_rtp_stats(call, call->main_audio_stream_index);
 		audio_stream_stop(call->audiostream);
-		update_rtp_stats(call, 0);
-		rtp_session_unregister_event_queue(call->sessions[0].rtp_session, call->audiostream_app_evq);
+		call->audiostream=NULL;
+		linphone_call_handle_stream_events(call, call->main_audio_stream_index);
+		rtp_session_unregister_event_queue(call->sessions[call->main_audio_stream_index].rtp_session, call->audiostream_app_evq);
 		ortp_ev_queue_flush(call->audiostream_app_evq);
 		ortp_ev_queue_destroy(call->audiostream_app_evq);
 		call->audiostream_app_evq=NULL;
-		call->audiostream=NULL;
+
 		call->current_params->audio_codec = NULL;
 	}
 }
@@ -3164,12 +3893,13 @@ static void linphone_call_stop_video_stream(LinphoneCall *call) {
 #ifdef VIDEO_ENABLED
 	if (call->videostream!=NULL){
 		linphone_reporting_update_media_info(call, LINPHONE_CALL_STATS_VIDEO);
-		media_stream_reclaim_sessions(&call->videostream->ms,&call->sessions[1]);
+		media_stream_reclaim_sessions(&call->videostream->ms,&call->sessions[call->main_video_stream_index]);
 		linphone_call_log_fill_stats(call->log,(MediaStream*)call->videostream);
+		update_rtp_stats(call, call->main_video_stream_index);
 		video_stream_stop(call->videostream);
 		call->videostream=NULL;
-		update_rtp_stats(call, 1);
-		rtp_session_unregister_event_queue(call->sessions[1].rtp_session, call->videostream_app_evq);
+		linphone_call_handle_stream_events(call, call->main_video_stream_index);
+		rtp_session_unregister_event_queue(call->sessions[call->main_video_stream_index].rtp_session, call->videostream_app_evq);
 		ortp_ev_queue_flush(call->videostream_app_evq);
 		ortp_ev_queue_destroy(call->videostream_app_evq);
 		call->videostream_app_evq=NULL;
@@ -3183,12 +3913,30 @@ static void unset_rtp_profile(LinphoneCall *call, int i){
 		rtp_session_set_profile(call->sessions[i].rtp_session,&av_profile);
 }
 
+static void linphone_call_stop_text_stream(LinphoneCall *call) {
+	if (call->textstream != NULL) {
+		linphone_reporting_update_media_info(call, LINPHONE_CALL_STATS_TEXT);
+		media_stream_reclaim_sessions(&call->textstream->ms, &call->sessions[call->main_text_stream_index]);
+		linphone_call_log_fill_stats(call->log, (MediaStream*)call->textstream);
+		update_rtp_stats(call, call->main_text_stream_index);
+		text_stream_stop(call->textstream);
+		call->textstream = NULL;
+		linphone_call_handle_stream_events(call, call->main_text_stream_index);
+		rtp_session_unregister_event_queue(call->sessions[call->main_text_stream_index].rtp_session, call->textstream_app_evq);
+		ortp_ev_queue_flush(call->textstream_app_evq);
+		ortp_ev_queue_destroy(call->textstream_app_evq);
+		call->textstream_app_evq = NULL;
+		call->current_params->text_codec = NULL;
+	}
+}
+
 void linphone_call_stop_media_streams(LinphoneCall *call){
-	if (call->audiostream || call->videostream) {
+	if (call->audiostream || call->videostream || call->textstream) {
 		if (call->audiostream && call->videostream)
 			audio_stream_unlink_video(call->audiostream, call->videostream);
 		linphone_call_stop_audio_stream(call);
 		linphone_call_stop_video_stream(call);
+		linphone_call_stop_text_stream(call);
 
 		if (call->core->msevq != NULL) {
 			ms_event_queue_skip(call->core->msevq);
@@ -3198,12 +3946,17 @@ void linphone_call_stop_media_streams(LinphoneCall *call){
 	if (call->audio_profile){
 		rtp_profile_destroy(call->audio_profile);
 		call->audio_profile=NULL;
-		unset_rtp_profile(call,0);
+		unset_rtp_profile(call,call->main_audio_stream_index);
 	}
 	if (call->video_profile){
 		rtp_profile_destroy(call->video_profile);
 		call->video_profile=NULL;
-		unset_rtp_profile(call,1);
+		unset_rtp_profile(call,call->main_video_stream_index);
+	}
+	if (call->text_profile){
+		rtp_profile_destroy(call->text_profile);
+		call->text_profile=NULL;
+		unset_rtp_profile(call,call->main_text_stream_index);
 	}
 	if (call->rtp_io_audio_profile) {
 		rtp_profile_destroy(call->rtp_io_audio_profile);
@@ -3213,6 +3966,8 @@ void linphone_call_stop_media_streams(LinphoneCall *call){
 		rtp_profile_destroy(call->rtp_io_video_profile);
 		call->rtp_io_video_profile = NULL;
 	}
+
+	linphone_core_soundcard_hint_check(call->core);
 }
 
 
@@ -3315,7 +4070,14 @@ void linphone_call_set_microphone_volume_gain(LinphoneCall *call, float volume)
 	if(call->audiostream) audio_stream_set_sound_card_input_gain(call->audiostream, volume);
 	else ms_error("Could not set record volume: no audio stream");
 }
-
+static float agregate_ratings(float audio_rating, float video_rating){
+	float result;
+	if (audio_rating<0 && video_rating<0) result=-1;
+	else if (audio_rating<0) result=video_rating*5.0f;
+	else if (video_rating<0) result=audio_rating*5.0f;
+	else result=audio_rating*video_rating*5.0f;
+	return result;
+}
 /**
  * Obtain real-time quality rating of the call
  *
@@ -3334,20 +4096,16 @@ void linphone_call_set_microphone_volume_gain(LinphoneCall *call, float volume)
  * active audio stream exist. Otherwise it returns the quality rating.
 **/
 float linphone_call_get_current_quality(LinphoneCall *call){
-	float audio_rating=-1;
-	float video_rating=-1;
-	float result;
+	float audio_rating=-1.f;
+	float video_rating=-1.f;
+
 	if (call->audiostream){
-		audio_rating=media_stream_get_quality_rating((MediaStream*)call->audiostream)/5.0;
+		audio_rating=media_stream_get_quality_rating((MediaStream*)call->audiostream)/5.0f;
 	}
 	if (call->videostream){
-		video_rating=media_stream_get_quality_rating((MediaStream*)call->videostream)/5.0;
+		video_rating=media_stream_get_quality_rating((MediaStream*)call->videostream)/5.0f;
 	}
-	if (audio_rating<0 && video_rating<0) result=-1;
-	else if (audio_rating<0) result=video_rating*5.0;
-	else if (video_rating<0) result=audio_rating*5.0;
-	else result=audio_rating*video_rating*5.0;
-	return result;
+	return agregate_ratings(audio_rating, video_rating);
 }
 
 /**
@@ -3356,10 +4114,16 @@ float linphone_call_get_current_quality(LinphoneCall *call){
  * See linphone_call_get_current_quality() for more details about quality measurement.
 **/
 float linphone_call_get_average_quality(LinphoneCall *call){
+	float audio_rating=-1.f;
+	float video_rating=-1.f;
+
 	if (call->audiostream){
-		return audio_stream_get_average_quality_rating(call->audiostream);
+		audio_rating = media_stream_get_average_quality_rating((MediaStream*)call->audiostream)/5.0f;
 	}
-	return -1;
+	if (call->videostream){
+		video_rating = media_stream_get_average_quality_rating((MediaStream*)call->videostream)/5.0f;
+	}
+	return agregate_ratings(audio_rating, video_rating);
 }
 
 static void update_local_stats(LinphoneCallStats *stats, MediaStream *stream) {
@@ -3393,13 +4157,24 @@ const LinphoneCallStats *linphone_call_get_video_stats(LinphoneCall *call) {
 	return stats;
 }
 
+/**
+ * Access last known statistics for video stream, for a given call.
+**/
+const LinphoneCallStats *linphone_call_get_text_stats(LinphoneCall *call) {
+	LinphoneCallStats *stats = &call->stats[LINPHONE_CALL_STATS_TEXT];
+	if (call->textstream){
+		update_local_stats(stats,(MediaStream*)call->textstream);
+	}
+	return stats;
+}
+
 static bool_t ice_in_progress(LinphoneCallStats *stats){
 	return stats->ice_state==LinphoneIceStateInProgress;
 }
 
 /**
  * Indicates whether an operation is in progress at the media side.
- * It can a bad idea to initiate signaling operations (adding video, pausing the call, removing video, changing video parameters) while
+ * It can be a bad idea to initiate signaling operations (adding video, pausing the call, removing video, changing video parameters) while
  * the media is busy in establishing the connection (typically ICE connectivity checks). It can result in failures generating loss of time
  * in future operations in the call.
  * Applications are invited to check this function after each call state change to decide whether certain operations are permitted or not.
@@ -3408,7 +4183,7 @@ static bool_t ice_in_progress(LinphoneCallStats *stats){
 **/
 bool_t linphone_call_media_in_progress(LinphoneCall *call){
 	bool_t ret=FALSE;
-	if (ice_in_progress(&call->stats[LINPHONE_CALL_STATS_AUDIO]) || ice_in_progress(&call->stats[LINPHONE_CALL_STATS_VIDEO]))
+	if (ice_in_progress(&call->stats[LINPHONE_CALL_STATS_AUDIO]) || ice_in_progress(&call->stats[LINPHONE_CALL_STATS_VIDEO]) || ice_in_progress(&call->stats[LINPHONE_CALL_STATS_TEXT]))
 		ret=TRUE;
 	/*TODO: could check zrtp state, upnp state*/
 	return ret;
@@ -3432,7 +4207,7 @@ float linphone_call_stats_get_sender_loss_rate(const LinphoneCallStats *stats) {
 		srb = rtcp_RR_get_report_block(stats->sent_rtcp, 0);
 	if (!srb)
 		return 0.0;
-	return 100.0 * report_block_get_fraction_lost(srb) / 256.0;
+	return 100.0f * report_block_get_fraction_lost(srb) / 256.0f;
 }
 
 /**
@@ -3453,7 +4228,7 @@ float linphone_call_stats_get_receiver_loss_rate(const LinphoneCallStats *stats)
 		rrb = rtcp_SR_get_report_block(stats->received_rtcp, 0);
 	if (!rrb)
 		return 0.0;
-	return 100.0 * report_block_get_fraction_lost(rrb) / 256.0;
+	return 100.0f * report_block_get_fraction_lost(rrb) / 256.0f;
 }
 
 /**
@@ -3527,7 +4302,7 @@ rtp_stats_t linphone_call_stats_get_rtp_stats(const LinphoneCallStats *stats) {
 	if (stats) {
 		memcpy(&rtp_stats, &stats->rtp_stats, sizeof(stats->rtp_stats));
 	}
-	
+
 	return rtp_stats;
 }
 
@@ -3604,147 +4379,136 @@ void linphone_call_stop_recording(LinphoneCall *call){
  * @}
 **/
 
-static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *vs){
+static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *vs, MediaStream *ts){
 	bool_t as_active =  as ? (media_stream_get_state(as) == MSStreamStarted) : FALSE;
 	bool_t vs_active =  vs ? (media_stream_get_state(vs) == MSStreamStarted) : FALSE;
+	bool_t ts_active =  ts ? (media_stream_get_state(ts) == MSStreamStarted) : FALSE;
 
-	call->stats[LINPHONE_CALL_STATS_AUDIO].download_bandwidth=(as_active) ? (media_stream_get_down_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth=(as_active) ? (media_stream_get_up_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth=(vs_active) ? (media_stream_get_down_bw(vs)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth=(vs_active) ? (media_stream_get_up_bw(vs)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth=(as_active) ? (media_stream_get_rtcp_down_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=(as_active) ? (media_stream_get_rtcp_up_bw(as)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth=(vs_active) ? (media_stream_get_rtcp_down_bw(vs)*1e-3) : 0;
-	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth=(vs_active) ? (media_stream_get_rtcp_up_bw(vs)*1e-3) : 0;
-	if (as_active) {
+	call->stats[LINPHONE_CALL_STATS_AUDIO].download_bandwidth=(as_active) ? (float)(media_stream_get_down_bw(as)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth=(as_active) ? (float)(media_stream_get_up_bw(as)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth=(vs_active) ? (float)(media_stream_get_down_bw(vs)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth=(vs_active) ? (float)(media_stream_get_up_bw(vs)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_TEXT].download_bandwidth=(ts_active) ? (float)(media_stream_get_down_bw(ts)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_TEXT].upload_bandwidth=(ts_active) ? (float)(media_stream_get_up_bw(ts)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth=(as_active) ? (float)(media_stream_get_rtcp_down_bw(as)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth=(as_active) ? (float)(media_stream_get_rtcp_up_bw(as)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth=(vs_active) ? (float)(media_stream_get_rtcp_down_bw(vs)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth=(vs_active) ? (float)(media_stream_get_rtcp_up_bw(vs)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_TEXT].rtcp_download_bandwidth=(ts_active) ? (float)(media_stream_get_rtcp_down_bw(ts)*1e-3) : 0.f;
+	call->stats[LINPHONE_CALL_STATS_TEXT].rtcp_upload_bandwidth=(ts_active) ? (float)(media_stream_get_rtcp_up_bw(ts)*1e-3) : 0.f;
+	/* If not ipV6, it's not necessary IpV4, should be UNSPEC, TODO */
+	call->stats[LINPHONE_CALL_STATS_AUDIO].rtp_remote_family=(as_active)
+		? ((ortp_stream_is_ipv6((OrtpStream*)&(as->sessions.rtp_session->rtp.gs))) ? LinphoneAddressFamilyInet6 : LinphoneAddressFamilyInet) : LinphoneAddressFamilyUnspec;
+	call->stats[LINPHONE_CALL_STATS_VIDEO].rtp_remote_family=(vs_active)
+		? ((ortp_stream_is_ipv6((OrtpStream*)&(vs->sessions.rtp_session->rtp.gs))) ? LinphoneAddressFamilyInet6 : LinphoneAddressFamilyInet) : LinphoneAddressFamilyUnspec;
+	call->stats[LINPHONE_CALL_STATS_TEXT].rtp_remote_family=(ts_active)
+		? ((ortp_stream_is_ipv6((OrtpStream*)&(ts->sessions.rtp_session->rtp.gs))) ? LinphoneAddressFamilyInet6 : LinphoneAddressFamilyInet) : LinphoneAddressFamilyUnspec;
+
+	if (call->core->send_call_stats_periodical_updates){
 		call->stats[LINPHONE_CALL_STATS_AUDIO].updated|=LINPHONE_CALL_STATS_PERIODICAL_UPDATE;
 		linphone_core_notify_call_stats_updated(call->core, call, &call->stats[LINPHONE_CALL_STATS_AUDIO]);
 		call->stats[LINPHONE_CALL_STATS_AUDIO].updated=0;
-		update_local_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], as);
-	}
-	if (vs_active) {
+		if (as_active) update_local_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], as);
+
 		call->stats[LINPHONE_CALL_STATS_VIDEO].updated|=LINPHONE_CALL_STATS_PERIODICAL_UPDATE;
 		linphone_core_notify_call_stats_updated(call->core, call, &call->stats[LINPHONE_CALL_STATS_VIDEO]);
 		call->stats[LINPHONE_CALL_STATS_VIDEO].updated=0;
-		update_local_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], vs);
+		if (vs_active) update_local_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], vs);
+
+		call->stats[LINPHONE_CALL_STATS_TEXT].updated|=LINPHONE_CALL_STATS_PERIODICAL_UPDATE;
+		linphone_core_notify_call_stats_updated(call->core, call, &call->stats[LINPHONE_CALL_STATS_TEXT]);
+		call->stats[LINPHONE_CALL_STATS_TEXT].updated=0;
+		if (ts_active) update_local_stats(&call->stats[LINPHONE_CALL_STATS_TEXT], ts);
 	}
 
+
 	ms_message(	"Bandwidth usage for call [%p]:\n"
-				"\tRTP  audio=[d=%5.1f,u=%5.1f], video=[d=%5.1f,u=%5.1f] kbits/sec\n"
-				"\tRTCP audio=[d=%5.1f,u=%5.1f], video=[d=%5.1f,u=%5.1f] kbits/sec",
+				"\tRTP  audio=[d=%5.1f,u=%5.1f], video=[d=%5.1f,u=%5.1f], text=[d=%5.1f,u=%5.1f] kbits/sec\n"
+				"\tRTCP audio=[d=%5.1f,u=%5.1f], video=[d=%5.1f,u=%5.1f], text=[d=%5.1f,u=%5.1f] kbits/sec",
 				call,
 				call->stats[LINPHONE_CALL_STATS_AUDIO].download_bandwidth,
 				call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth,
 				call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth,
 				call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth,
+				call->stats[LINPHONE_CALL_STATS_TEXT].download_bandwidth,
+				call->stats[LINPHONE_CALL_STATS_TEXT].upload_bandwidth,
 				call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_download_bandwidth,
 				call->stats[LINPHONE_CALL_STATS_AUDIO].rtcp_upload_bandwidth,
 				call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_download_bandwidth,
-				call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth
+				call->stats[LINPHONE_CALL_STATS_VIDEO].rtcp_upload_bandwidth,
+				call->stats[LINPHONE_CALL_STATS_TEXT].rtcp_download_bandwidth,
+				call->stats[LINPHONE_CALL_STATS_TEXT].rtcp_upload_bandwidth
 	);
 
 }
 
-static void linphone_core_disconnected(LinphoneCore *lc, LinphoneCall *call){
-	char temp[256]={0};
+static void linphone_call_lost(LinphoneCall *call, LinphoneReason reason){
+	LinphoneCore *lc = call->core;
+	char *temp = NULL;
 	char *from=NULL;
 
 	from = linphone_call_get_remote_address_as_string(call);
-	snprintf(temp,sizeof(temp)-1,"Remote end %s seems to have disconnected, the call is going to be closed.",from ? from : "");
+	switch(reason){
+		case LinphoneReasonIOError:
+			temp = ms_strdup_printf("Call with %s disconnected because of network, it is going to be closed.", from ? from : "?");
+		break;
+		default:
+			temp = ms_strdup_printf("Media connectivity with %s is lost, call is going to be closed.", from ? from : "?");
+		break;
+	}
 	if (from) ms_free(from);
-
-	ms_message("On call [%p]: %s",call,temp);
-	linphone_core_notify_display_warning(lc,temp);
+	ms_message("LinphoneCall [%p]: %s",call, temp);
+	linphone_core_notify_display_warning(lc, temp);
 	linphone_core_terminate_call(lc,call);
 	linphone_core_play_named_tone(lc,LinphoneToneCallLost);
+	ms_free(temp);
 }
 
-static void change_ice_media_destinations(LinphoneCall *call) {
-    const char *rtp_addr;
-    const char *rtcp_addr;
-    int rtp_port;
-    int rtcp_port;
-    bool_t result;
 
-    if (call->audiostream && ice_session_check_list(call->ice_session, 0)) {
-        result = ice_check_list_selected_valid_remote_candidate(ice_session_check_list(call->ice_session, 0), &rtp_addr, &rtp_port, &rtcp_addr, &rtcp_port);
-        if (result == TRUE) {
-            ms_message("Change audio stream destination: RTP=%s:%d RTCP=%s:%d", rtp_addr, rtp_port, rtcp_addr, rtcp_port);
-            rtp_session_set_symmetric_rtp(call->audiostream->ms.sessions.rtp_session, FALSE);
-            rtp_session_set_remote_addr_full(call->audiostream->ms.sessions.rtp_session, rtp_addr, rtp_port, rtcp_addr, rtcp_port);
-        }
-    }
-#ifdef VIDEO_ENABLED
-    if (call->videostream && ice_session_check_list(call->ice_session, 1)) {
-        result = ice_check_list_selected_valid_remote_candidate(ice_session_check_list(call->ice_session, 1), &rtp_addr, &rtp_port, &rtcp_addr, &rtcp_port);
-        if (result == TRUE) {
-            ms_message("Change video stream destination: RTP=%s:%d RTCP=%s:%d", rtp_addr, rtp_port, rtcp_addr, rtcp_port);
-            rtp_session_set_symmetric_rtp(call->videostream->ms.sessions.rtp_session, FALSE);
-            rtp_session_set_remote_addr_full(call->videostream->ms.sessions.rtp_session, rtp_addr, rtp_port, rtcp_addr, rtcp_port);
-        }
-    }
-#endif
+static void linphone_call_on_ice_gathering_finished(LinphoneCall *call){
+	int ping_time;
+	const SalMediaDescription *rmd = sal_call_get_remote_media_description(call->op);
+	if (rmd){
+		linphone_call_clear_unused_ice_candidates(call, rmd);
+	}
+	ice_session_compute_candidates_foundations(call->ice_session);
+	ice_session_eliminate_redundant_candidates(call->ice_session);
+	ice_session_choose_default_candidates(call->ice_session);
+	ping_time = ice_session_average_gathering_round_trip_time(call->ice_session);
+	if (ping_time >=0) {
+		call->ping_time=ping_time;
+	}
 }
 
 static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
 	OrtpEventType evt=ortp_event_get_type(ev);
 	OrtpEventData *evd=ortp_event_get_data(ev);
-	int ping_time;
 
 	if (evt == ORTP_EVENT_ICE_SESSION_PROCESSING_FINISHED) {
-		LinphoneCallParams *params = linphone_call_params_copy(call->current_params);
-		switch (call->params->media_encryption) {
-			case LinphoneMediaEncryptionZRTP:
-			case LinphoneMediaEncryptionDTLS:
-			/* preserve media encryption param because at that time ZRTP/SRTP-DTLS negociation may still be ongoing*/
-			params->media_encryption=call->params->media_encryption;
-			break;
-			case LinphoneMediaEncryptionSRTP:
-			case LinphoneMediaEncryptionNone:
-			/*keep all values to make sure a warning will be generated by compiler if new enum value is added*/
-				break;
-		}
-
 		switch (ice_session_state(call->ice_session)) {
 			case IS_Completed:
-				ice_session_select_candidates(call->ice_session);
-				if (ice_session_role(call->ice_session) == IR_Controlling
-						&& lp_config_get_int(call->core->config, "sip", "update_call_when_ice_completed", TRUE)) {
-					params->internal_call_update = TRUE;
-					linphone_core_update_call(call->core, call, params);
-				}
-				change_ice_media_destinations(call);
-				start_dtls_on_all_streams(call);
-				break;
 			case IS_Failed:
+				/* At least one ICE session has succeeded, so perform a call update. */
 				if (ice_session_has_completed_check_list(call->ice_session) == TRUE) {
-					ice_session_select_candidates(call->ice_session);
-					if (ice_session_role(call->ice_session) == IR_Controlling) {
-						/* At least one ICE session has succeeded, so perform a call update. */
+					const LinphoneCallParams *current_param =  linphone_call_get_current_params(call);
+					if (ice_session_role(call->ice_session) == IR_Controlling && current_param->update_call_when_ice_completed ) {
+						LinphoneCallParams *params = linphone_core_create_call_params(call->core, call);
 						params->internal_call_update = TRUE;
 						linphone_core_update_call(call->core, call, params);
+						linphone_call_params_unref(params);
 					}
+					start_dtls_on_all_streams(call);
 				}
 				break;
 			default:
 				break;
 		}
 		linphone_core_update_ice_state_in_call_stats(call);
-		linphone_call_params_unref(params);
 	} else if (evt == ORTP_EVENT_ICE_GATHERING_FINISHED) {
-
-		if (evd->info.ice_processing_successful==TRUE) {
-			ice_session_compute_candidates_foundations(call->ice_session);
-			ice_session_eliminate_redundant_candidates(call->ice_session);
-			ice_session_choose_default_candidates(call->ice_session);
-			ping_time = ice_session_average_gathering_round_trip_time(call->ice_session);
-			if (ping_time >=0) {
-				call->ping_time=ping_time;
-			}
-		} else {
-			ms_warning("No STUN answer from [%s], disabling ICE",linphone_core_get_stun_server(call->core));
-			linphone_call_delete_ice_session(call);
+		if (evd->info.ice_processing_successful==FALSE) {
+			ms_warning("No STUN answer from [%s], continuing without STUN",linphone_core_get_stun_server(call->core));
 		}
+		linphone_call_on_ice_gathering_finished(call);
 		switch (call->state) {
 			case LinphoneCallUpdating:
 				linphone_core_start_update_call(call->core, call);
@@ -3771,8 +4535,7 @@ static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
 			linphone_core_update_ice_state_in_call_stats(call);
 		}
 	} else if (evt == ORTP_EVENT_ICE_RESTART_NEEDED) {
-		ice_session_restart(call->ice_session);
-		ice_session_set_role(call->ice_session, IR_Controlling);
+		ice_session_restart(call->ice_session, IR_Controlling);
 		linphone_core_update_call(call->core, call, call->current_params);
 	}
 }
@@ -3788,6 +4551,7 @@ void linphone_call_stats_fill(LinphoneCallStats *stats, MediaStream *ms, OrtpEve
 		if(stats->received_rtcp != NULL)
 			freemsg(stats->received_rtcp);
 		stats->received_rtcp = evd->packet;
+		stats->rtcp_received_via_mux = evd->info.socket_type == OrtpRTPSocket;
 		evd->packet = NULL;
 		stats->updated = LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE;
 		update_local_stats(stats,ms);
@@ -3814,68 +4578,103 @@ void linphone_call_stats_uninit(LinphoneCallStats *stats){
 }
 
 void linphone_call_notify_stats_updated(LinphoneCall *call, int stream_index){
-	LinphoneCallStats *stats=&call->stats[stream_index];
-	LinphoneCore *lc=call->core;
+	LinphoneCallStats *stats = &call->stats[stream_index];
+	LinphoneCore *lc = call->core;
 	if (stats->updated){
 		switch(stats->updated) {
 			case LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE:
 			case LINPHONE_CALL_STATS_SENT_RTCP_UPDATE:
-				linphone_reporting_on_rtcp_update(call, stream_index);
+				linphone_reporting_on_rtcp_update(call, stream_index == call->main_audio_stream_index ? SalAudio : stream_index == call->main_video_stream_index ? SalVideo : SalText);
+				break;
+			default:
 				break;
-			default:break;
 		}
 		linphone_core_notify_call_stats_updated(lc, call, stats);
 		stats->updated = 0;
 	}
 }
 
+static MediaStream * linphone_call_get_media_stream(LinphoneCall *call, int stream_index){
+	if (stream_index == call->main_audio_stream_index)
+		return (MediaStream*)call->audiostream;
+	if (stream_index == call->main_video_stream_index)
+		return (MediaStream*)call->videostream;
+	if (stream_index == call->main_text_stream_index)
+		return (MediaStream*)call->textstream;
+	ms_error("linphone_call_get_media_stream(): no stream index %i", stream_index);
+	return NULL;
+}
+
+static OrtpEvQueue *linphone_call_get_event_queue(LinphoneCall *call, int stream_index){
+	if (stream_index == call->main_audio_stream_index)
+		return call->audiostream_app_evq;
+	if (stream_index == call->main_video_stream_index)
+		return call->videostream_app_evq;
+	if (stream_index == call->main_text_stream_index)
+		return call->textstream_app_evq;
+	ms_error("linphone_call_get_event_queue(): no stream index %i", stream_index);
+	return NULL;
+}
+
 void linphone_call_handle_stream_events(LinphoneCall *call, int stream_index){
-	MediaStream *ms=stream_index==0 ? (MediaStream *)call->audiostream : (MediaStream *)call->videostream; /*assumption to remove*/
+	MediaStream *ms = stream_index == call->main_audio_stream_index ? (MediaStream *)call->audiostream : (stream_index == call->main_video_stream_index ? (MediaStream *)call->videostream : (MediaStream *)call->textstream);
 	OrtpEvQueue *evq;
 	OrtpEvent *ev;
 
-	if (ms==NULL) return;
-	/* Ensure there is no dangling ICE check list. */
-	if (call->ice_session == NULL) ms->ice_check_list = NULL;
+	if (ms){
+		/* Ensure there is no dangling ICE check list. */
+		if (call->ice_session == NULL) {
+			media_stream_set_ice_check_list(ms, NULL);
+		}
 
-	switch(ms->type){
-		case MSAudio:
-			audio_stream_iterate((AudioStream*)ms);
-		break;
-		case MSVideo:
-#ifdef VIDEO_ENABLED
-			video_stream_iterate((VideoStream*)ms);
-#endif
-		break;
-		default:
-			ms_error("linphone_call_handle_stream_events(): unsupported stream type.");
-			return;
-		break;
+		switch(ms->type){
+			case MSAudio:
+				audio_stream_iterate((AudioStream*)ms);
+			break;
+			case MSVideo:
+	#ifdef VIDEO_ENABLED
+				video_stream_iterate((VideoStream*)ms);
+	#endif
+			break;
+			case MSText:
+				text_stream_iterate((TextStream*)ms);
+			break;
+			default:
+				ms_error("linphone_call_handle_stream_events(): unsupported stream type.");
+				return;
+			break;
+		}
 	}
 	/*yes the event queue has to be taken at each iteration, because ice events may perform operations re-creating the streams*/
-	while ((evq=stream_index==0 ? call->audiostream_app_evq : call->videostream_app_evq)  && (NULL != (ev=ortp_ev_queue_get(evq)))){
+	while((evq = linphone_call_get_event_queue(call, stream_index)) != NULL && NULL != (ev=ortp_ev_queue_get(evq))){
 		OrtpEventType evt=ortp_event_get_type(ev);
 		OrtpEventData *evd=ortp_event_get_data(ev);
+		int stats_index = stream_index == call->main_audio_stream_index ? LINPHONE_CALL_STATS_AUDIO : (stream_index == call->main_video_stream_index ? LINPHONE_CALL_STATS_VIDEO : LINPHONE_CALL_STATS_TEXT);
 
-		linphone_call_stats_fill(&call->stats[stream_index],ms,ev);
-		linphone_call_notify_stats_updated(call,stream_index);
+		/*and yes the MediaStream must be taken at each iteration, because it may have changed due to the handling of events
+		 * in this loop*/
+		ms = linphone_call_get_media_stream(call, stream_index);
+
+		if (ms) linphone_call_stats_fill(&call->stats[stats_index],ms,ev);
+		linphone_call_notify_stats_updated(call,stats_index);
 
 		if (evt == ORTP_EVENT_ZRTP_ENCRYPTION_CHANGED){
-			if (ms->type==MSAudio)
+			if (stream_index == call->main_audio_stream_index)
 				linphone_call_audiostream_encryption_changed(call, evd->info.zrtp_stream_encrypted);
-			else if (ms->type==MSVideo)
+			else if (stream_index == call->main_video_stream_index) {
 				propagate_encryption_changed(call);
+			}
 		} else if (evt == ORTP_EVENT_ZRTP_SAS_READY) {
-			if (ms->type==MSAudio)
+			if (stream_index == call->main_audio_stream_index)
 				linphone_call_audiostream_auth_token_ready(call, evd->info.zrtp_sas.sas, evd->info.zrtp_sas.verified);
 		} else if (evt == ORTP_EVENT_DTLS_ENCRYPTION_CHANGED) {
-			if (ms->type==MSAudio)
+			if (stream_index == call->main_audio_stream_index)
 				linphone_call_audiostream_encryption_changed(call, evd->info.dtls_stream_encrypted);
-			else if (ms->type==MSVideo)
+			else if (stream_index == call->main_video_stream_index)
 				propagate_encryption_changed(call);
 		}else if ((evt == ORTP_EVENT_ICE_SESSION_PROCESSING_FINISHED) || (evt == ORTP_EVENT_ICE_GATHERING_FINISHED)
 			|| (evt == ORTP_EVENT_ICE_LOSING_PAIRS_COMPLETED) || (evt == ORTP_EVENT_ICE_RESTART_NEEDED)) {
-			handle_ice_events(call, ev);
+			if (ms) handle_ice_events(call, ev);
 		} else if (evt==ORTP_EVENT_TELEPHONE_EVENT){
 			linphone_core_dtmf_received(call,evd->info.telephone_event);
 		}
@@ -3894,17 +4693,21 @@ void linphone_call_background_tasks(LinphoneCall *call, bool_t one_second_elapse
 	case LinphoneCallPausedByRemote:
 	case LinphoneCallPaused:
 		if (one_second_elapsed){
-			float audio_load=0, video_load=0;
-			if (call->audiostream!=NULL){
+			float audio_load=0, video_load=0, text_load=0;
+			if (call->audiostream != NULL) {
 				if (call->audiostream->ms.sessions.ticker)
-					audio_load=ms_ticker_get_average_load(call->audiostream->ms.sessions.ticker);
+					audio_load = ms_ticker_get_average_load(call->audiostream->ms.sessions.ticker);
 			}
-			if (call->videostream!=NULL){
+			if (call->videostream != NULL) {
 				if (call->videostream->ms.sessions.ticker)
-					video_load=ms_ticker_get_average_load(call->videostream->ms.sessions.ticker);
+					video_load = ms_ticker_get_average_load(call->videostream->ms.sessions.ticker);
 			}
-			report_bandwidth(call,(MediaStream*)call->audiostream,(MediaStream*)call->videostream);
-			ms_message("Thread processing load: audio=%f\tvideo=%f",audio_load,video_load);
+			if (call->textstream != NULL) {
+				if (call->textstream->ms.sessions.ticker)
+					text_load = ms_ticker_get_average_load(call->textstream->ms.sessions.ticker);
+			}
+			report_bandwidth(call, (MediaStream*)call->audiostream, (MediaStream*)call->videostream,  (MediaStream*)call->textstream);
+			ms_message("Thread processing load: audio=%f\tvideo=%f\ttext=%f", audio_load, video_load, text_load);
 		}
 		break;
 	default:
@@ -3916,17 +4719,20 @@ void linphone_call_background_tasks(LinphoneCall *call, bool_t one_second_elapse
 	linphone_upnp_call_process(call);
 #endif //BUILD_UPNP
 
-	linphone_call_handle_stream_events(call,0);
-	linphone_call_handle_stream_events(call,1);
-	if (call->state==LinphoneCallStreamsRunning && one_second_elapsed && call->audiostream!=NULL
+	linphone_call_handle_stream_events(call, call->main_audio_stream_index);
+	linphone_call_handle_stream_events(call, call->main_video_stream_index);
+	linphone_call_handle_stream_events(call, call->main_text_stream_index);
+	if ((call->state == LinphoneCallStreamsRunning ||
+		call->state == LinphoneCallPausedByRemote) && one_second_elapsed && call->audiostream!=NULL
 		&& call->audiostream->ms.state==MSStreamStarted && disconnect_timeout>0 )
 		disconnected=!audio_stream_alive(call->audiostream,disconnect_timeout);
 	if (disconnected)
-		linphone_core_disconnected(call->core,call);
+		linphone_call_lost(call, LinphoneReasonUnknown);
 }
 
 void linphone_call_log_completed(LinphoneCall *call){
 	LinphoneCore *lc=call->core;
+	bool_t call_logs_sqlite_db_found = FALSE;
 
 	call->log->duration=linphone_call_get_duration(call); /*store duration since connected*/
 
@@ -3939,19 +4745,28 @@ void linphone_call_log_completed(LinphoneCall *call){
 		linphone_core_notify_display_status(lc,info);
 		ms_free(info);
 	}
-	lc->call_logs=ms_list_prepend(lc->call_logs,linphone_call_log_ref(call->log));
-	if (ms_list_size(lc->call_logs)>lc->max_call_logs){
-		MSList *elem,*prevelem=NULL;
-		/*find the last element*/
-		for(elem=lc->call_logs;elem!=NULL;elem=elem->next){
-			prevelem=elem;
+
+#ifdef SQLITE_STORAGE_ENABLED
+	if (lc->logs_db) {
+		call_logs_sqlite_db_found = TRUE;
+		linphone_core_store_call_log(lc, call->log);
+	}
+#endif
+	if (!call_logs_sqlite_db_found) {
+		lc->call_logs=bctbx_list_prepend(lc->call_logs,linphone_call_log_ref(call->log));
+		if (bctbx_list_size(lc->call_logs)>(size_t)lc->max_call_logs){
+			bctbx_list_t *elem,*prevelem=NULL;
+			/*find the last element*/
+			for(elem=lc->call_logs;elem!=NULL;elem=elem->next){
+				prevelem=elem;
+			}
+			elem=prevelem;
+			linphone_call_log_unref((LinphoneCallLog*)elem->data);
+			lc->call_logs=bctbx_list_erase_link(lc->call_logs,elem);
 		}
-		elem=prevelem;
-		linphone_call_log_unref((LinphoneCallLog*)elem->data);
-		lc->call_logs=ms_list_remove_link(lc->call_logs,elem);
+		call_logs_write_to_config_file(lc);
 	}
 	linphone_core_notify_call_log_updated(lc,call->log);
-	call_logs_write_to_config_file(lc);
 }
 
 /**
@@ -3977,6 +4792,10 @@ bool_t linphone_call_is_in_conference(const LinphoneCall *call) {
 	return call->params->in_conference;
 }
 
+LinphoneConference *linphone_call_get_conference(const LinphoneCall *call) {
+	return call->conf_ref;
+}
+
 /**
  * Perform a zoom of the video displayed during a call.
  * @param call the call.
@@ -3994,7 +4813,7 @@ void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx,
 
 		if (zoom_factor < 1)
 			zoom_factor = 1;
-		halfsize = 0.5 * 1.0 / zoom_factor;
+		halfsize = 0.5f * 1.0f / zoom_factor;
 
 		if ((*cx - halfsize) < 0)
 			*cx = 0 + halfsize;
@@ -4121,7 +4940,7 @@ int linphone_call_send_dtmf(LinphoneCall *call,char dtmf){
 	return 0;
 }
 
-int linphone_call_send_dtmfs(LinphoneCall *call,char *dtmfs) {
+int linphone_call_send_dtmfs(LinphoneCall *call,const char *dtmfs) {
 	if (call==NULL){
 		ms_warning("linphone_call_send_dtmfs(): invalid call, canceling DTMF sequence.");
 		return -1;
@@ -4175,8 +4994,10 @@ void linphone_call_set_native_video_window_id(LinphoneCall *call, void *id) {
 }
 
 MSWebCam *linphone_call_get_video_device(const LinphoneCall *call) {
-	if (call->all_muted || call->camera_enabled == FALSE)
-		return get_nowebcam_device();
+	LinphoneCallState state = linphone_call_get_state(call);
+	bool_t paused = (state == LinphoneCallPausing) || (state == LinphoneCallPaused);
+	if (paused || call->all_muted || (call->camera_enabled == FALSE))
+		return get_nowebcam_device(call->core->factory);
 	else
 		return call->core->video_conf.device;
 }
@@ -4188,27 +5009,46 @@ void linphone_call_set_audio_route(LinphoneCall *call, LinphoneAudioRoute route)
 	}
 }
 
+LinphoneChatRoom * linphone_call_get_chat_room(LinphoneCall *call) {
+	if (!call->chat_room){
+		if (call->state != LinphoneCallReleased && call->state != LinphoneCallEnd){
+			call->chat_room = _linphone_core_create_chat_room_from_call(call);
+		}
+	}
+	return call->chat_room;
+}
+
 int linphone_call_get_stream_count(LinphoneCall *call) {
 	// Revisit when multiple media streams will be implemented
 #ifdef VIDEO_ENABLED
+	if (linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(call))) {
+		return 3;
+	}
 	return 2;
 #else
+	if (linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(call))) {
+		return 2;
+	}
 	return 1;
 #endif
 }
 
 MSFormatType linphone_call_get_stream_type(LinphoneCall *call, int stream_index) {
 	// Revisit when multiple media streams will be implemented
-	if (stream_index == 0) {
+	if (stream_index == call->main_video_stream_index) {
+		return MSVideo;
+	} else if (stream_index == call->main_text_stream_index) {
+		return MSText;
+	} else if (stream_index == call->main_audio_stream_index){
 		return MSAudio;
 	}
-	return MSVideo;
+	return MSUnknownMedia;
 }
 
 RtpTransport* linphone_call_get_meta_rtp_transport(LinphoneCall *call, int stream_index) {
 	RtpTransport *meta_rtp;
 	RtpTransport *meta_rtcp;
-	
+
 	if (!call || stream_index < 0 || stream_index >= linphone_call_get_stream_count(call)) {
 		return NULL;
 	}
@@ -4220,11 +5060,148 @@ RtpTransport* linphone_call_get_meta_rtp_transport(LinphoneCall *call, int strea
 RtpTransport* linphone_call_get_meta_rtcp_transport(LinphoneCall *call, int stream_index) {
 	RtpTransport *meta_rtp;
 	RtpTransport *meta_rtcp;
-	
+
 	if (!call || stream_index < 0 || stream_index >= linphone_call_get_stream_count(call)) {
 		return NULL;
 	}
 
 	rtp_session_get_transports(call->sessions[stream_index].rtp_session, &meta_rtp, &meta_rtcp);
 	return meta_rtcp;
-}
\ No newline at end of file
+}
+
+void linphone_call_set_broken(LinphoneCall *call){
+	switch(call->state){
+		/*for all the early states, we prefer to drop the call*/
+		case LinphoneCallOutgoingInit:
+		case LinphoneCallOutgoingRinging:
+		case LinphoneCallOutgoingEarlyMedia:
+		case LinphoneCallIncomingReceived:
+		case LinphoneCallIncomingEarlyMedia:
+			/*during the early states, the SAL layer reports the failure from the dialog or transaction layer,
+			 * hence, there is nothing special to do*/
+		//break;
+		case LinphoneCallStreamsRunning:
+		case LinphoneCallUpdating:
+		case LinphoneCallPausing:
+		case LinphoneCallResuming:
+		case LinphoneCallPaused:
+		case LinphoneCallPausedByRemote:
+		case LinphoneCallUpdatedByRemote:
+			/*during these states, the dialog is established. A failure of a transaction is not expected to close it.
+			 * Instead we have to repair the dialog by sending a reINVITE*/
+			call->broken = TRUE;
+			call->need_localip_refresh = TRUE;
+		break;
+		default:
+			ms_error("linphone_call_set_broken() unimplemented case.");
+		break;
+	}
+}
+
+static void linphone_call_repair_by_invite_with_replaces(LinphoneCall *call) {
+	const char *call_id = sal_op_get_call_id(call->op);
+	const char *from_tag = sal_call_get_local_tag(call->op);
+	const char *to_tag = sal_call_get_remote_tag(call->op);
+	sal_op_kill_dialog(call->op);
+	linphone_call_create_op(call);
+	sal_call_set_replaces(call->op, call_id, from_tag, to_tag);
+	linphone_core_start_invite(call->core, call, NULL);
+}
+
+void linphone_call_reinvite_to_recover_from_connection_loss(LinphoneCall *call) {
+	LinphoneCallParams *params;
+	ms_message("LinphoneCall[%p] is going to be updated (reINVITE) in order to recover from lost connectivity", call);
+	if (call->ice_session){
+		ice_session_restart(call->ice_session, IR_Controlling);
+	}
+	params = linphone_core_create_call_params(call->core, call);
+	linphone_core_update_call(call->core, call, params);
+	linphone_call_params_unref(params);
+}
+
+void linphone_call_repair_if_broken(LinphoneCall *call){
+	if (!call->broken) return;
+	if (!call->core->media_network_reachable) return;
+
+	/*Make sure that the proxy from which we received this call, or to which we routed this call is registered first*/
+	if (call->dest_proxy){
+		/*in all other cases, ie no proxy config, or a proxy config for which no registration was requested, we can start the
+		 * call repair immediately.*/
+		if (linphone_proxy_config_register_enabled(call->dest_proxy)
+			&& linphone_proxy_config_get_state(call->dest_proxy) != LinphoneRegistrationOk) return;
+	}
+
+
+	switch (call->state){
+		case LinphoneCallUpdating:
+		case LinphoneCallPausing:
+			if (sal_call_dialog_request_pending(call->op)) {
+				/* Need to cancel first re-INVITE as described in section 5.5 of RFC 6141 */
+				sal_call_cancel_invite(call->op);
+				call->reinvite_on_cancel_response_requested = TRUE;
+			}
+			break;
+		case LinphoneCallStreamsRunning:
+		case LinphoneCallPaused:
+		case LinphoneCallPausedByRemote:
+			if (!sal_call_dialog_request_pending(call->op)) {
+				linphone_call_reinvite_to_recover_from_connection_loss(call);
+			}
+			break;
+		case LinphoneCallUpdatedByRemote:
+			if (sal_call_dialog_request_pending(call->op)) {
+				sal_call_decline(call->op, SalReasonServiceUnavailable, NULL);
+			}
+			linphone_call_reinvite_to_recover_from_connection_loss(call);
+			break;
+		case LinphoneCallOutgoingEarlyMedia:
+		case LinphoneCallOutgoingInit:
+		case LinphoneCallOutgoingProgress:
+		case LinphoneCallOutgoingRinging:
+			linphone_call_repair_by_invite_with_replaces(call);
+			break;
+		default:
+			ms_warning("linphone_call_repair_if_broken(): don't know what to do in state [%s]", linphone_call_state_to_string(call->state));
+			call->broken = FALSE;
+		break;
+	}
+}
+
+void linphone_call_refresh_sockets(LinphoneCall *call){
+	int i;
+	for (i=0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++i){
+		MSMediaStreamSessions *mss = &call->sessions[i];
+		if (mss->rtp_session){
+			rtp_session_refresh_sockets(mss->rtp_session);
+		}
+	}
+}
+
+void linphone_call_replace_op(LinphoneCall *call, SalOp *op) {
+	switch (linphone_call_get_state(call)) {
+		case LinphoneCallConnected:
+		case LinphoneCallStreamsRunning:
+			sal_call_terminate(call->op);
+			break;
+		default:
+			break;
+	}
+	sal_op_kill_dialog(call->op);
+	sal_op_release(call->op);
+	call->op = op;
+	sal_op_set_user_pointer(call->op, call);
+	sal_call_set_local_media_description(call->op, call->localdesc);
+	switch (linphone_call_get_state(call)) {
+		case LinphoneCallIncomingEarlyMedia:
+		case LinphoneCallIncomingReceived:
+			sal_call_notify_ringing(call->op, (linphone_call_get_state(call) == LinphoneCallIncomingEarlyMedia) ? TRUE : FALSE);
+			break;
+		case LinphoneCallConnected:
+		case LinphoneCallStreamsRunning:
+			sal_call_accept(call->op);
+			break;
+		default:
+			ms_warning("linphone_call_replace_op(): don't know what to do in state [%s]", linphone_call_state_to_string(call->state));
+			break;
+	}
+}
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 2af387dd6..e98633ca7 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -24,6 +24,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "private.h"
 #include "quality_reporting.h"
 #include "lime.h"
+#include "conference_private.h"
+
+#ifdef SQLITE_STORAGE_ENABLED
+#include "sqlite3_bctbx_vfs.h"
+#endif
 
 #include <math.h>
 #include <sys/types.h>
@@ -32,10 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <mediastreamer2/zrtp.h>
 #include <mediastreamer2/dtls_srtp.h>
 #include "mediastreamer2/mediastream.h"
+#include "mediastreamer2/msfactory.h"
 #include "mediastreamer2/mseventqueue.h"
 #include "mediastreamer2/msvolume.h"
 #include "mediastreamer2/msequalizer.h"
 #include "mediastreamer2/dtmfgen.h"
+#include "mediastreamer2/msjpegwriter.h"
 
 #ifdef INET6
 #ifndef _WIN32
@@ -45,13 +52,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#ifndef ANDROID /*on Android LIBLINPHONE version is passed from root Makefile*/
-	#include "liblinphone_gitversion.h"
-#endif
-#else
-#ifndef LIBLINPHONE_GIT_VERSION
-#define LIBLINPHONE_GIT_VERSION "unknown"
-#endif
+#include "liblinphone_gitversion.h"
 #endif
 
 #ifdef __APPLE__
@@ -95,10 +96,14 @@ static OrtpLogFunc liblinphone_log_func = NULL;
 static LinphoneLogCollectionState liblinphone_log_collection_state = LinphoneLogCollectionDisabled;
 static char * liblinphone_log_collection_path = NULL;
 static char * liblinphone_log_collection_prefix = NULL;
-static int liblinphone_log_collection_max_file_size = LOG_COLLECTION_DEFAULT_MAX_FILE_SIZE;
+static size_t liblinphone_log_collection_max_file_size = LOG_COLLECTION_DEFAULT_MAX_FILE_SIZE;
 static ortp_mutex_t liblinphone_log_collection_mutex;
+static FILE * liblinphone_log_collection_file = NULL;
+static size_t liblinphone_log_collection_file_size = 0;
 static bool_t liblinphone_serialize_logs = FALSE;
 static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t curtime);
+static void set_sip_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t curtime);
+static void set_media_network_reachable(LinphoneCore* lc,bool_t isReachable);
 static void linphone_core_run_hooks(LinphoneCore *lc);
 
 #include "enum.h"
@@ -114,11 +119,13 @@ static void toggle_video_preview(LinphoneCore *lc, bool_t val);
 #define SOUNDS_PREFIX
 #endif
 /* relative path where is stored local ring*/
-#define LOCAL_RING SOUNDS_PREFIX "rings/oldphone.wav"
+#define LOCAL_RING SOUNDS_PREFIX "rings/oldphone-mono.wav"
+#define LOCAL_RING_MKV SOUNDS_PREFIX "rings/notes_of_the_optimistic.mkv"
 /* same for remote ring (ringback)*/
 #define REMOTE_RING SOUNDS_PREFIX "ringback.wav"
-#define HOLD_MUSIC SOUNDS_PREFIX "rings/toy-mono.wav"
 
+#define HOLD_MUSIC SOUNDS_PREFIX "toy-mono.wav"
+#define HOLD_MUSIC_MKV SOUNDS_PREFIX "dont_wait_too_long.mkv"
 
 extern SalCallbacks linphone_sal_callbacks;
 
@@ -158,10 +165,10 @@ const LinphoneAddress *linphone_core_get_current_call_remote_address(struct _Lin
 	return linphone_call_get_remote_address(call);
 }
 
-static void linphone_core_log_collection_handler(OrtpLogLevel level, const char *fmt, va_list args);
+static void linphone_core_log_collection_handler(const char *domain, OrtpLogLevel level, const char *fmt, va_list args);
 
 void linphone_core_set_log_handler(OrtpLogFunc logfunc) {
-	if (ortp_logv_out == linphone_core_log_collection_handler) {
+	if (ortp_get_log_handler() == linphone_core_log_collection_handler) {
 		ms_message("There is already a log collection handler, keep it");
 		liblinphone_log_func = logfunc;
 	} else
@@ -195,7 +202,8 @@ void linphone_core_set_log_level(OrtpLogLevel loglevel) {
 }
 
 void linphone_core_set_log_level_mask(OrtpLogLevel loglevel) {
-	ortp_set_log_level_mask(loglevel);
+	ortp_set_log_level_mask(NULL, loglevel);
+	bctbx_set_log_level_mask(NULL, loglevel);
 	if (loglevel == 0) {
 		sal_disable_log();
 	} else {
@@ -203,53 +211,31 @@ void linphone_core_set_log_level_mask(OrtpLogLevel loglevel) {
 	}
 }
 
-static void linphone_core_log_collection_handler(OrtpLogLevel level, const char *fmt, va_list args) {
-	const char *lname="undef";
-	char *msg;
+static int _open_log_collection_file_with_idx(int idx) {
+	struct stat statbuf;
+	char *log_filename;
+
+	log_filename = ortp_strdup_printf("%s/%s%d.log",
+		liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH,
+		liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX,
+		idx);
+	liblinphone_log_collection_file = fopen(log_filename, "a");
+	ortp_free(log_filename);
+	if (liblinphone_log_collection_file == NULL) return -1;
+
+	fstat(fileno(liblinphone_log_collection_file), &statbuf);
+	if ((size_t)statbuf.st_size > liblinphone_log_collection_max_file_size) {
+		fclose(liblinphone_log_collection_file);
+		return -1;
+	}
+
+	liblinphone_log_collection_file_size = statbuf.st_size;
+	return 0;
+}
+
+static void _rotate_log_collection_files(void) {
 	char *log_filename1;
 	char *log_filename2;
-	FILE *log_file;
-	struct timeval tp;
-	struct tm *lt;
-	time_t tt;
-	struct stat statbuf;
-
-	if (liblinphone_log_func != NULL) {
-#ifndef _WIN32
-		va_list args_copy;
-		va_copy(args_copy, args);
-		liblinphone_log_func(level, fmt, args_copy);
-		va_end(args_copy);
-#else
-		/* This works on 32 bits, luckily. */
-		/* TODO: va_copy is available in Visual Studio 2013. */
-		liblinphone_log_func(level, fmt, args);
-#endif
-	}
-
-	ortp_gettimeofday(&tp, NULL);
-	tt = (time_t)tp.tv_sec;
-	lt = localtime((const time_t*)&tt);
-	switch(level){
-		case ORTP_DEBUG:
-			lname = "DEBUG";
-			break;
-		case ORTP_MESSAGE:
-			lname = "MESSAGE";
-			break;
-		case ORTP_WARNING:
-			lname = "WARNING";
-			break;
-		case ORTP_ERROR:
-			lname = "ERROR";
-			break;
-		case ORTP_FATAL:
-			lname = "FATAL";
-			break;
-		default:
-			ortp_fatal("Bad level !");
-	}
-	msg = ortp_strdup_vprintf(fmt, args);
 
 	log_filename1 = ortp_strdup_printf("%s/%s1.log",
 		liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH,
@@ -257,28 +243,89 @@ static void linphone_core_log_collection_handler(OrtpLogLevel level, const char
 	log_filename2 = ortp_strdup_printf("%s/%s2.log",
 		liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH,
 		liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX);
-	ortp_mutex_lock(&liblinphone_log_collection_mutex);
-	log_file = fopen(log_filename1, "a");
-	fstat(fileno(log_file), &statbuf);
-	if (statbuf.st_size > liblinphone_log_collection_max_file_size) {
-		fclose(log_file);
-		log_file = fopen(log_filename2, "a");
-		fstat(fileno(log_file), &statbuf);
-		if (statbuf.st_size > liblinphone_log_collection_max_file_size) {
-			fclose(log_file);
-			unlink(log_filename1);
-			rename(log_filename2, log_filename1);
-			log_file = fopen(log_filename2, "a");
-		}
-	}
-	fprintf(log_file,"%i-%.2i-%.2i %.2i:%.2i:%.2i:%.3i %s %s\n",
-		1900 + lt->tm_year, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min, lt->tm_sec, (int)(tp.tv_usec / 1000), lname, msg);
-	fflush(log_file);
-	fclose(log_file);
-	ortp_mutex_unlock(&liblinphone_log_collection_mutex);
-
+	unlink(log_filename1);
+	rename(log_filename2, log_filename1);
 	ortp_free(log_filename1);
 	ortp_free(log_filename2);
+}
+
+static void _open_log_collection_file(void) {
+	if (_open_log_collection_file_with_idx(1) < 0) {
+		if (_open_log_collection_file_with_idx(2) < 0) {
+			_rotate_log_collection_files();
+			_open_log_collection_file_with_idx(2);
+		}
+	}
+}
+
+static void _close_log_collection_file(void) {
+	if (liblinphone_log_collection_file) {
+		fclose(liblinphone_log_collection_file);
+		liblinphone_log_collection_file = NULL;
+		liblinphone_log_collection_file_size = 0;
+	}
+}
+
+static void linphone_core_log_collection_handler(const char *domain, OrtpLogLevel level, const char *fmt, va_list args) {
+	const char *lname="undef";
+	char *msg;
+	struct timeval tp;
+	struct tm *lt;
+	time_t tt;
+	int ret;
+
+	if (liblinphone_log_func != NULL && liblinphone_log_func != linphone_core_log_collection_handler) {
+#ifndef _WIN32
+		va_list args_copy;
+		va_copy(args_copy, args);
+		liblinphone_log_func(domain, level, fmt, args_copy);
+		va_end(args_copy);
+#else
+		/* This works on 32 bits, luckily. */
+		/* TODO: va_copy is available in Visual Studio 2013. */
+		liblinphone_log_func(domain, level, fmt, args);
+#endif
+	}
+
+	ortp_gettimeofday(&tp, NULL);
+	tt = (time_t)tp.tv_sec;
+	lt = localtime((const time_t*)&tt);
+
+	if ((level & ORTP_DEBUG) != 0) {
+		lname = "DEBUG";
+	} else if ((level & ORTP_MESSAGE) != 0) {
+		lname = "MESSAGE";
+	} else if ((level & ORTP_WARNING) != 0) {
+		lname = "WARNING";
+	} else if ((level & ORTP_ERROR) != 0) {
+		lname = "ERROR";
+	} else if ((level & ORTP_FATAL) != 0) {
+		lname = "FATAL";
+	} else {
+		ortp_fatal("Bad level !");
+	}
+	msg = ortp_strdup_vprintf(fmt, args);
+
+	if (liblinphone_log_collection_file == NULL) {
+		ortp_mutex_lock(&liblinphone_log_collection_mutex);
+		_open_log_collection_file();
+		ortp_mutex_unlock(&liblinphone_log_collection_mutex);
+	}
+	if (liblinphone_log_collection_file) {
+		ortp_mutex_lock(&liblinphone_log_collection_mutex);
+		ret = fprintf(liblinphone_log_collection_file,"%i-%.2i-%.2i %.2i:%.2i:%.2i:%.3i %s %s\n",
+			1900 + lt->tm_year, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min, lt->tm_sec, (int)(tp.tv_usec / 1000), lname, msg);
+		fflush(liblinphone_log_collection_file);
+		if (ret > 0) {
+			liblinphone_log_collection_file_size += ret;
+			if (liblinphone_log_collection_file_size > liblinphone_log_collection_max_file_size) {
+				_close_log_collection_file();
+				_open_log_collection_file();
+			}
+		}
+		ortp_mutex_unlock(&liblinphone_log_collection_mutex);
+	}
+
 	ortp_free(msg);
 }
 
@@ -316,11 +363,11 @@ void linphone_core_set_log_collection_prefix(const char *prefix) {
 	}
 }
 
-int linphone_core_get_log_collection_max_file_size(void) {
+size_t linphone_core_get_log_collection_max_file_size(void) {
 	return liblinphone_log_collection_max_file_size;
 }
 
-void linphone_core_set_log_collection_max_file_size(int size) {
+void linphone_core_set_log_collection_max_file_size(size_t size) {
 	liblinphone_log_collection_max_file_size = size;
 }
 
@@ -342,7 +389,7 @@ void linphone_core_enable_log_collection(LinphoneLogCollectionState state) {
 	/* at first call of this function, set liblinphone_log_func to the current
 	 * ortp log function */
 	if( liblinphone_log_func == NULL ){
-		liblinphone_log_func = ortp_logv_out;
+		liblinphone_log_func = ortp_get_log_handler();
 	}
 	liblinphone_log_collection_state = state;
 	if (state != LinphoneLogCollectionDisabled) {
@@ -350,7 +397,7 @@ void linphone_core_enable_log_collection(LinphoneLogCollectionState state) {
 		if (state == LinphoneLogCollectionEnabledWithoutPreviousLogHandler) {
 			liblinphone_log_func = NULL;
 		} else {
-			liblinphone_log_func = ortp_logv_out;
+			liblinphone_log_func = ortp_get_log_handler();
 		}
 		ortp_set_log_handler(linphone_core_log_collection_handler);
 	} else {
@@ -366,7 +413,7 @@ static void clean_log_collection_upload_context(LinphoneCore *lc) {
 	unlink(filename);
 	ms_free(filename);
 	if (lc && lc->log_collection_upload_information) {
-		ms_free(lc->log_collection_upload_information);
+		linphone_content_unref(lc->log_collection_upload_information);
 		lc->log_collection_upload_information=NULL;
 	}
 }
@@ -410,7 +457,7 @@ static int log_collection_upload_on_send_body(belle_sip_user_body_handler_t *bh,
 #else
 		FILE *log_file = fopen(log_filename, "r");
 #endif
-		if (fseek(log_file, offset, SEEK_SET)) {
+		if (fseek(log_file, (long)offset, SEEK_SET)) {
 			ms_error("Cannot seek file [%s] at position [%lu] errno [%s]",log_filename,(unsigned long)offset,strerror(errno));
 
 		} else {
@@ -474,8 +521,8 @@ static void process_response_from_post_file_log_collection(void *data, const bel
 				(belle_sip_header_t *)belle_sip_header_content_type_create(linphone_content_get_type(core->log_collection_upload_information), linphone_content_get_subtype(core->log_collection_upload_information)));
 
 			/* Insert it in a multipart body handler which will manage the boundaries of multipart message */
-			bh = belle_sip_multipart_body_handler_new(log_collection_upload_on_progress, core, (belle_sip_body_handler_t *)first_part_bh);
-			ua = ms_strdup_printf("%s/%s", linphone_core_get_user_agent_name(), linphone_core_get_user_agent_version());
+			bh = belle_sip_multipart_body_handler_new(log_collection_upload_on_progress, core, (belle_sip_body_handler_t *)first_part_bh, NULL);
+			ua = ms_strdup_printf("%s/%s", linphone_core_get_user_agent(core), linphone_core_get_version());
 			uri = belle_generic_uri_parse(linphone_core_get_log_collection_upload_server_url(core));
 			req = belle_http_request_create("POST", uri, belle_sip_header_create("User-Agent", ua), NULL);
 			ms_free(ua);
@@ -484,6 +531,7 @@ static void process_response_from_post_file_log_collection(void *data, const bel
 			cbs.process_io_error = process_io_error_upload_log_collection;
 			cbs.process_auth_requested = process_auth_requested_upload_log_collection;
 			l = belle_http_request_listener_create_from_callbacks(&cbs, core);
+			belle_sip_object_data_set(BELLE_SIP_OBJECT(req), "http_request_listener", l, belle_sip_object_unref); // Ensure the listener object is destroyed when the request is destroyed
 			belle_http_provider_send_request(core->http_provider, req, l);
 		}
 		if (code == 200) { /* The file has been uploaded correctly, get the server reply */
@@ -537,18 +585,19 @@ static void process_response_from_post_file_log_collection(void *data, const bel
  */
 static int compress_file(FILE *input_file, COMPRESS_FILE_PTR output_file) {
 	char buffer[131072]; /* 128kB */
-	int bytes;
+	size_t bytes;
+	size_t total_bytes = 0;
 
 	while ((bytes = fread(buffer, 1, sizeof(buffer), input_file)) > 0) {
-		if (bytes < 0) return bytes;
 #ifdef HAVE_ZLIB
-		bytes = gzwrite(output_file, buffer, bytes);
+		int res = gzwrite(output_file, buffer, (unsigned int)bytes);
+		if (res < 0) return 0;
+		total_bytes += (size_t)res;
 #else
-		bytes = fwrite(buffer, 1, bytes, output_file);
+		total_bytes += fwrite(buffer, 1, bytes, output_file);
 #endif
-		if (bytes < 0) return bytes;
 	}
-	return 0;
+	return (int)total_bytes;
 }
 
 static int prepare_log_collection_file_to_upload(const char *filename) {
@@ -561,24 +610,24 @@ static int prepare_log_collection_file_to_upload(const char *filename) {
 	ortp_mutex_lock(&liblinphone_log_collection_mutex);
 	output_filename = ms_strdup_printf("%s/%s",
 		liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH, filename);
-	output_file = COMPRESS_OPEN(output_filename, "w");
+	output_file = COMPRESS_OPEN(output_filename, "wb");
 	if (output_file == NULL) goto error;
 	input_filename = ms_strdup_printf("%s/%s1.log",
 		liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH,
 		liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX);
-	input_file = fopen(input_filename, "r");
+	input_file = fopen(input_filename, "rb");
 	if (input_file == NULL) goto error;
 	ret = compress_file(input_file, output_file);
-	if (ret < 0) goto error;
+	if (ret <= 0) goto error;
 	fclose(input_file);
 	ms_free(input_filename);
 	input_filename = ms_strdup_printf("%s/%s2.log",
 		liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH,
 		liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX);
-	input_file = fopen(input_filename, "r");
+	input_file = fopen(input_filename, "rb");
 	if (input_file != NULL) {
 		ret = compress_file(input_file, output_file);
-		if (ret < 0) goto error;
+		if (ret <= 0) goto error;
 	}
 
 error:
@@ -610,8 +659,7 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
 		belle_http_request_t *req;
 		char *name;
 
-		core->log_collection_upload_information = (LinphoneContent *)malloc(sizeof(LinphoneContent));
-		memset(core->log_collection_upload_information, 0, sizeof(LinphoneContent));
+		core->log_collection_upload_information = linphone_core_create_content(core);
 #ifdef HAVE_ZLIB
 		linphone_content_set_type(core->log_collection_upload_information, "application");
 		linphone_content_set_subtype(core->log_collection_upload_information, "gzip");
@@ -623,7 +671,12 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
 			liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX,
 			COMPRESSED_LOG_COLLECTION_EXTENSION);
 		linphone_content_set_name(core->log_collection_upload_information, name);
-		if (prepare_log_collection_file_to_upload(name) < 0) return;
+		if (prepare_log_collection_file_to_upload(name) <= 0) {
+			linphone_content_unref(core->log_collection_upload_information);
+			core->log_collection_upload_information = NULL;
+			ms_error("prepare_log_collection_file_to_upload(): error.");
+			return;
+		}
 		linphone_content_set_size(core->log_collection_upload_information, get_size_of_file_to_upload(name));
 		uri = belle_generic_uri_parse(linphone_core_get_log_collection_upload_server_url(core));
 		req = belle_http_request_create("POST", uri, NULL, NULL, NULL);
@@ -631,18 +684,22 @@ void linphone_core_upload_log_collection(LinphoneCore *core) {
 		cbs.process_io_error = process_io_error_upload_log_collection;
 		cbs.process_auth_requested = process_auth_requested_upload_log_collection;
 		l = belle_http_request_listener_create_from_callbacks(&cbs, core);
+		belle_sip_object_data_set(BELLE_SIP_OBJECT(req), "http_request_listener", l, belle_sip_object_unref); // Ensure the listener object is destroyed when the request is destroyed
 		belle_http_provider_send_request(core->http_provider, req, l);
 		ms_free(name);
+	} else {
+		ms_warning("Could not upload log collection: log_collection_upload_information=%p, server_url=%s, log_collection_state=%d",
+			core->log_collection_upload_information, linphone_core_get_log_collection_upload_server_url(core), liblinphone_log_collection_state);
 	}
 }
 
-char * linphone_core_compress_log_collection() {
+char * linphone_core_compress_log_collection(void) {
 	char *filename = NULL;
 	if (liblinphone_log_collection_state == LinphoneLogCollectionDisabled) return NULL;
 	filename = ms_strdup_printf("%s_log.%s",
 		liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX,
 		COMPRESSED_LOG_COLLECTION_EXTENSION);
-	if (prepare_log_collection_file_to_upload(filename) < 0) {
+	if (prepare_log_collection_file_to_upload(filename) <= 0) {
 		ms_free(filename);
 		return NULL;
 	}
@@ -653,9 +710,10 @@ char * linphone_core_compress_log_collection() {
 		COMPRESSED_LOG_COLLECTION_EXTENSION);
 }
 
-void linphone_core_reset_log_collection() {
+void linphone_core_reset_log_collection(void) {
 	char *filename;
 	ortp_mutex_lock(&liblinphone_log_collection_mutex);
+	_close_log_collection_file();
 	clean_log_collection_upload_context(NULL);
 	filename = ms_strdup_printf("%s/%s1.log",
 			liblinphone_log_collection_path ? liblinphone_log_collection_path : LOG_COLLECTION_DEFAULT_PATH,
@@ -667,45 +725,22 @@ void linphone_core_reset_log_collection() {
 		liblinphone_log_collection_prefix ? liblinphone_log_collection_prefix : LOG_COLLECTION_DEFAULT_PREFIX);
 	unlink(filename);
 	ms_free(filename);
+	liblinphone_log_collection_file = NULL;
+	liblinphone_log_collection_file_size = 0;
 	ortp_mutex_unlock(&liblinphone_log_collection_mutex);
 }
 
-/**
- * Enable logs in supplied FILE*.
- *
- * @ingroup misc
- * @deprecated Use #linphone_core_set_log_file and #linphone_core_set_log_level instead.
- *
- * @param file a C FILE* where to fprintf logs. If null stdout is used.
- *
-**/
 void linphone_core_enable_logs(FILE *file){
 	if (file==NULL) file=stdout;
 	ortp_set_log_file(file);
 	linphone_core_set_log_level(ORTP_MESSAGE);
 }
 
-/**
- * Enable logs through the user's supplied log callback.
- *
- * @ingroup misc
- * @deprecated Use #linphone_core_set_log_handler and #linphone_core_set_log_level instead.
- *
- * @param logfunc The address of a OrtpLogFunc callback whose protoype is
- *            	  typedef void (*OrtpLogFunc)(OrtpLogLevel lev, const char *fmt, va_list args);
- *
-**/
 void linphone_core_enable_logs_with_cb(OrtpLogFunc logfunc){
 	linphone_core_set_log_level(ORTP_MESSAGE);
 	linphone_core_set_log_handler(logfunc);
 }
 
-/**
- * Entirely disable logging.
- *
- * @ingroup misc
- * @deprecated Use #linphone_core_set_log_level instead.
-**/
 void linphone_core_disable_logs(void){
 	linphone_core_set_log_level(ORTP_ERROR);
 }
@@ -720,13 +755,23 @@ static void net_config_read (LinphoneCore *lc)
 	int tmp;
 	const char *tmpstr;
 	LpConfig *config=lc->config;
+	const char *nat_policy_ref;
+
+	nat_policy_ref = lp_config_get_string(lc->config, "net", "nat_policy_ref", NULL);
+	if (nat_policy_ref != NULL) {
+		lc->nat_policy = linphone_core_create_nat_policy_from_config(lc, nat_policy_ref);
+	}
+	if (lc->nat_policy == NULL){
+		/*this will create a default nat policy according to deprecated config keys, or an empty nat policy otherwise*/
+		linphone_core_set_firewall_policy(lc, linphone_core_get_firewall_policy(lc));
+	}
 
 	lc->net_conf.nat_address_ip = NULL;
 	tmp=lp_config_get_int(config,"net","download_bw",0);
 	linphone_core_set_download_bandwidth(lc,tmp);
 	tmp=lp_config_get_int(config,"net","upload_bw",0);
 	linphone_core_set_upload_bandwidth(lc,tmp);
-	linphone_core_set_stun_server(lc,lp_config_get_string(config,"net","stun_server",NULL));
+
 	tmpstr=lp_config_get_string(lc->config,"net","nat_address",NULL);
 	if (tmpstr!=NULL && (strlen(tmpstr)<1)) tmpstr=NULL;
 	linphone_core_set_nat_address(lc,tmpstr);
@@ -741,18 +786,17 @@ static void net_config_read (LinphoneCore *lc)
 	}
 	tmp = lp_config_get_int(lc->config, "net", "dns_srv_enabled", 1);
 	linphone_core_enable_dns_srv(lc, tmp);
-
-	/* This is to filter out unsupported firewall policies */
-	linphone_core_set_firewall_policy(lc, linphone_core_get_firewall_policy(lc));
+	tmp = lp_config_get_int(lc->config, "net", "dns_search_enabled", 1);
+	linphone_core_enable_dns_search(lc, tmp);
 }
 
 static void build_sound_devices_table(LinphoneCore *lc){
 	const char **devices;
 	const char **old;
-	int ndev;
+	size_t ndev;
 	int i;
-	const MSList *elem=ms_snd_card_manager_get_list(ms_snd_card_manager_get());
-	ndev=ms_list_size(elem);
+	const bctbx_list_t *elem=ms_snd_card_manager_get_list(ms_factory_get_snd_card_manager(lc->factory));
+	ndev=bctbx_list_size(elem);
 	devices=ms_malloc((ndev+1)*sizeof(const char *));
 	for (i=0;elem!=NULL;elem=elem->next,i++){
 		devices[i]=ms_snd_card_get_string_id((MSSndCard *)elem->data);
@@ -760,7 +804,21 @@ static void build_sound_devices_table(LinphoneCore *lc){
 	devices[ndev]=NULL;
 	old=lc->sound_conf.cards;
 	lc->sound_conf.cards=devices;
-	if (old!=NULL) ms_free(old);
+	if (old!=NULL) ms_free((void *)old);
+}
+
+static const char *get_default_local_ring(LinphoneCore * lc){
+	if (linphone_core_file_format_supported(lc, "mkv")){
+		return PACKAGE_SOUND_DIR "/" LOCAL_RING_MKV;
+	}
+	return PACKAGE_SOUND_DIR "/" LOCAL_RING;
+}
+
+static const char *get_default_onhold_music(LinphoneCore * lc){
+	if (linphone_core_file_format_supported(lc, "mkv")){
+		return PACKAGE_SOUND_DIR "/" HOLD_MUSIC_MKV;
+	}
+	return PACKAGE_SOUND_DIR "/" HOLD_MUSIC;
 }
 
 static void sound_config_read(LinphoneCore *lc)
@@ -782,13 +840,13 @@ static void sound_config_read(LinphoneCore *lc)
 			char s=*i;
 			*i='\0';
 			card=ms_alsa_card_new_custom(d+l,d+l);
-			ms_snd_card_manager_add_card(ms_snd_card_manager_get(),card);
+			ms_snd_card_manager_add_card(ms_factory_get_snd_card_manager(lc->factory),card);
 			*i=s;
 			l=i-d+1;
 		}
 		if(d[l]!='\0') {
 			card=ms_alsa_card_new_custom(d+l,d+l);
-			ms_snd_card_manager_add_card(ms_snd_card_manager_get(),card);
+			ms_snd_card_manager_add_card(ms_factory_get_snd_card_manager(lc->factory),card);
 		}
 		free(d);
 	}
@@ -818,15 +876,10 @@ static void sound_config_read(LinphoneCore *lc)
 	linphone_core_set_sound_source(lc,tmpbuf[0]);
 */
 
-	tmpbuf=PACKAGE_SOUND_DIR "/" LOCAL_RING;
-	tmpbuf=lp_config_get_string(lc->config,"sound","local_ring",tmpbuf);
-	if (ortp_file_exist(tmpbuf)==-1) {
-		ms_warning("%s does not exist",tmpbuf);
-		tmpbuf=PACKAGE_SOUND_DIR "/" LOCAL_RING;
-	}
-	if (strstr(tmpbuf,".wav")==NULL){
-		/* it currently uses old sound files, so replace them */
-		tmpbuf=PACKAGE_SOUND_DIR "/" LOCAL_RING;
+	tmpbuf=lp_config_get_string(lc->config,"sound","local_ring",NULL);
+	if (tmpbuf==NULL||ortp_file_exist(tmpbuf)!=0) {
+		if (tmpbuf) ms_warning("%s does not exist",tmpbuf);
+		tmpbuf = get_default_local_ring(lc);
 	}
 	linphone_core_set_ring(lc,tmpbuf);
 
@@ -841,7 +894,7 @@ static void sound_config_read(LinphoneCore *lc)
 	}
 	linphone_core_set_ringback(lc,tmpbuf);
 
-	linphone_core_set_play_file(lc,lp_config_get_string(lc->config,"sound","hold_music",PACKAGE_SOUND_DIR "/" HOLD_MUSIC));
+	linphone_core_set_play_file(lc,lp_config_get_string(lc->config,"sound","hold_music", get_default_onhold_music(lc)));
 	lc->sound_conf.latency=0;
 #ifndef __ios
 	tmp=TRUE;
@@ -868,18 +921,19 @@ static void sound_config_read(LinphoneCore *lc)
 
 static void certificates_config_read(LinphoneCore *lc)
 {
-	const char *rootca;
+	const char *rootca = lp_config_get_string(lc->config,"sip","root_ca", NULL);
+	// If rootca is not existing anymore, we reset it to the default value
+	if (rootca == NULL || (bctbx_file_exist(rootca) != 0)) {
 #ifdef __linux
-	struct stat sb;
-	rootca=lp_config_get_string(lc->config,"sip","root_ca", "/etc/ssl/certs");
-	if (stat("/etc/ssl/certs", &sb) != 0 || !S_ISDIR(sb.st_mode))
-	{
-		ms_warning("/etc/ssl/certs not found, using %s instead", ROOT_CA_FILE);
-		rootca=lp_config_get_string(lc->config,"sip","root_ca", ROOT_CA_FILE);
-	}
-#else
-	rootca=lp_config_get_string(lc->config,"sip","root_ca", ROOT_CA_FILE);
+		struct stat sb;
+		if (stat("/etc/ssl/certs", &sb) == 0 && S_ISDIR(sb.st_mode)) {
+			rootca = "/etc/ssl/certs";
+		} else
 #endif
+		if (bctbx_file_exist(ROOT_CA_FILE) == 0) {
+			rootca = ROOT_CA_FILE;
+		}
+	}
 	linphone_core_set_root_ca(lc,rootca);
 	linphone_core_verify_server_certificates(lc,lp_config_get_int(lc->config,"sip","verify_server_certs",TRUE));
 	linphone_core_verify_server_cn(lc,lp_config_get_int(lc->config,"sip","verify_server_cn",TRUE));
@@ -891,7 +945,7 @@ static void sip_config_read(LinphoneCore *lc)
 	const char *tmpstr;
 	LCSipTransports tr;
 	int i,tmp;
-	int ipv6;
+	int ipv6_default = TRUE;
 
 	if (lp_config_get_int(lc->config,"sip","use_session_timers",0)==1){
 		sal_use_session_timers(lc->sal,200);
@@ -900,11 +954,14 @@ static void sip_config_read(LinphoneCore *lc)
 	sal_use_no_initial_route(lc->sal,lp_config_get_int(lc->config,"sip","use_no_initial_route",0));
 	sal_use_rport(lc->sal,lp_config_get_int(lc->config,"sip","use_rport",1));
 
-	ipv6=lp_config_get_int(lc->config,"sip","use_ipv6",-1);
-	if (ipv6==-1){
-		ipv6=0;
+	if (!lp_config_get_int(lc->config,"sip","ipv6_migration_done",FALSE) && lp_config_has_entry(lc->config,"sip","use_ipv6")) {
+		lp_config_clean_entry(lc->config,"sip","use_ipv6");
+		lp_config_set_int(lc->config, "sip", "ipv6_migration_done", TRUE);
+		ms_message("IPV6 settings migration done.");
 	}
-	linphone_core_enable_ipv6(lc,ipv6);
+	
+	lc->sip_conf.ipv6_enabled=lp_config_get_int(lc->config,"sip","use_ipv6",ipv6_default);
+	
 	memset(&tr,0,sizeof(tr));
 
 	tr.udp_port=lp_config_get_int(lc->config,"sip","sip_port",5060);
@@ -930,7 +987,7 @@ static void sip_config_read(LinphoneCore *lc)
 		if (hostname==NULL)
 			hostname="unknown-host";
 		if (username==NULL){
-			username="toto";
+			username="linphone";
 		}
 		contact=ortp_strdup_printf("sip:%s@%s",username,hostname);
 		linphone_core_set_primary_contact(lc,contact);
@@ -997,6 +1054,8 @@ static void sip_config_read(LinphoneCore *lc)
 	linphone_core_set_sip_transport_timeout(lc, lp_config_get_int(lc->config, "sip", "transport_timeout", 63000));
 	sal_set_supported_tags(lc->sal,lp_config_get_string(lc->config,"sip","supported","replaces, outbound"));
 	lc->sip_conf.save_auth_info = lp_config_get_int(lc->config, "sip", "save_auth_info", 1);
+	if (lp_config_get_string(lc->config, "sip", "rls_uri", NULL))
+		lc->default_rls_addr = linphone_address_new(lp_config_get_string(lc->config, "sip", "rls_uri", NULL));
 }
 
 static void rtp_config_read(LinphoneCore *lc)
@@ -1027,6 +1086,15 @@ static void rtp_config_read(LinphoneCore *lc)
 		linphone_core_set_video_port(lc, min_port);
 	}
 
+	if (lp_config_get_range(lc->config, "rtp", "text_rtp_port", &min_port, &max_port, 11078, 11078) == TRUE) {
+		if (min_port <= 0) min_port = 1;
+		if (max_port > 65535) max_port = 65535;
+		linphone_core_set_text_port_range(lc, min_port, max_port);
+	} else {
+		min_port = lp_config_get_int(lc->config, "rtp", "text_rtp_port", 11078);
+		linphone_core_set_text_port(lc, min_port);
+	}
+
 	jitt_comp=lp_config_get_int(lc->config,"rtp","audio_jitt_comp",60);
 	linphone_core_set_audio_jittcomp(lc,jitt_comp);
 	jitt_comp=lp_config_get_int(lc->config,"rtp","video_jitt_comp",60);
@@ -1064,10 +1132,10 @@ static void rtp_config_read(LinphoneCore *lc)
 		linphone_core_enable_video_multicast(lc,tmp_int);
 }
 
-static PayloadType * find_payload(const MSList *default_list, const char *mime_type, int clock_rate, int channels, const char *recv_fmtp){
+static PayloadType * find_payload(const bctbx_list_t *default_list, const char *mime_type, int clock_rate, int channels, const char *recv_fmtp){
 	PayloadType *candidate=NULL;
 	PayloadType *it;
-	const MSList *elem;
+	const bctbx_list_t *elem;
 
 	for(elem=default_list;elem!=NULL;elem=elem->next){
 		it=(PayloadType*)elem->data;
@@ -1092,8 +1160,8 @@ static PayloadType * find_payload(const MSList *default_list, const char *mime_t
 	return candidate;
 }
 
-static PayloadType* find_payload_type_from_list(const char* type, int rate, int channels, const MSList* from) {
-	const MSList *elem;
+static PayloadType* find_payload_type_from_list(const char* type, int rate, int channels, const bctbx_list_t* from) {
+	const bctbx_list_t *elem;
 	for(elem=from;elem!=NULL;elem=elem->next){
 		PayloadType *pt=(PayloadType*)elem->data;
 		if ((strcasecmp(type, payload_type_get_mime(pt)) == 0)
@@ -1108,8 +1176,10 @@ static PayloadType* find_payload_type_from_list(const char* type, int rate, int
 static bool_t linphone_core_codec_supported(LinphoneCore *lc, SalStreamType type, const char *mime){
 	if (type == SalVideo && lp_config_get_int(lc->config, "video", "rtp_io", FALSE)){
 		return TRUE; /*in rtp io mode, we don't transcode video, thus we can support a format for which we have no encoder nor decoder.*/
+	} else if (type == SalText) {
+		return TRUE;
 	}
-	return ms_filter_codec_supported(mime);
+	return ms_factory_codec_supported(lc->factory, mime);
 }
 
 
@@ -1121,7 +1191,7 @@ static bool_t get_codec(LinphoneCore *lc, SalStreamType type, int index, Payload
 	LpConfig *config=lc->config;
 
 	*ret=NULL;
-	snprintf(codeckey,50,"%s_codec_%i",type==SalAudio ? "audio" : "video", index);
+	snprintf(codeckey,50,"%s_codec_%i",type == SalAudio ? "audio" : type == SalVideo ? "video" : "text", index);
 	mime=lp_config_get_string(config,codeckey,"mime",NULL);
 	if (mime==NULL || strlen(mime)==0 ) return FALSE;
 
@@ -1133,21 +1203,23 @@ static bool_t get_codec(LinphoneCore *lc, SalStreamType type, int index, Payload
 		ms_warning("Codec %s/%i read from conf is not supported by mediastreamer2, ignored.",mime,rate);
 		return TRUE;
 	}
-	pt=find_payload(type==SalAudio ? lc->default_audio_codecs : lc->default_video_codecs,mime,rate,channels,fmtp);
+	pt = find_payload(type == SalAudio ? lc->default_audio_codecs : type == SalVideo ? lc->default_video_codecs : lc->default_text_codecs ,mime,rate,channels,fmtp);
 	if (!pt){
-		MSList **default_list=(type==SalAudio) ? &lc->default_audio_codecs :  &lc->default_video_codecs;
-		if (type==SalAudio)
+		bctbx_list_t **default_list = (type==SalAudio) ? &lc->default_audio_codecs : type == SalVideo ? &lc->default_video_codecs : &lc->default_text_codecs;
+		if (type == SalAudio)
 			ms_warning("Codec %s/%i/%i read from conf is not in the default list.",mime,rate,channels);
-		else
+		else if (type == SalVideo)
 			ms_warning("Codec %s/%i read from conf is not in the default list.",mime,rate);
+		else
+			ms_warning("Codec %s read from conf is not in the default list.",mime);
 		pt=payload_type_new();
-		pt->type=(type==SalAudio) ? PAYLOAD_AUDIO_PACKETIZED :  PAYLOAD_VIDEO;
+		pt->type=(type==SalAudio) ? PAYLOAD_AUDIO_PACKETIZED : type == SalVideo ? PAYLOAD_VIDEO : PAYLOAD_TEXT;
 		pt->mime_type=ortp_strdup(mime);
 		pt->clock_rate=rate;
 		pt->channels=channels;
 		payload_type_set_number(pt,-1); /*dynamic assignment*/
 		payload_type_set_recv_fmtp(pt,fmtp);
-		*default_list=ms_list_append(*default_list, pt);
+		*default_list=bctbx_list_append(*default_list, pt);
 	}
 	if (enabled ) pt->flags|=PAYLOAD_TYPE_ENABLED;
 	else pt->flags&=~PAYLOAD_TYPE_ENABLED;
@@ -1155,50 +1227,104 @@ static bool_t get_codec(LinphoneCore *lc, SalStreamType type, int index, Payload
 	return TRUE;
 }
 
+static SalStreamType payload_type_get_stream_type(const PayloadType *pt){
+	switch(pt->type){
+		case PAYLOAD_AUDIO_PACKETIZED:
+		case PAYLOAD_AUDIO_CONTINUOUS:
+			return SalAudio;
+		break;
+		case PAYLOAD_VIDEO:
+			return SalVideo;
+		break;
+		case PAYLOAD_TEXT:
+			return SalText;
+		break;
+	}
+	return SalOther;
+}
+
 /*this function merges the payload types from the codec default list with the list read from configuration file.
  * If a new codec becomes supported in Liblinphone or if the list from configuration file is empty or incomplete, all the supported codecs are added
  * automatically. This 'l' list is entirely destroyed and rewritten.*/
-static MSList *add_missing_codecs(const MSList *default_list, MSList *l){
-	const MSList *elem;
-	MSList *newlist;
+static bctbx_list_t *add_missing_supported_codecs(LinphoneCore *lc, const bctbx_list_t *default_list, bctbx_list_t *l){
+	const bctbx_list_t *elem;
+	bctbx_list_t *newlist;
+	PayloadType *last_seen = NULL;
 
 	for(elem=default_list; elem!=NULL; elem=elem->next){
-		MSList *elem2=ms_list_find(l,elem->data);
+		bctbx_list_t *elem2=bctbx_list_find(l,elem->data);
 		if (!elem2){
 			PayloadType *pt=(PayloadType*)elem->data;
-			/*this codec from default list should be inserted in the list*/
-			if (!elem->prev){
-				l=ms_list_prepend(l,pt);
+			/*this codec from default list should be inserted in the list, with respect to the default_list order*/
+
+			if (!linphone_core_codec_supported(lc, payload_type_get_stream_type(pt), pt->mime_type)) continue;
+			if (!last_seen){
+				l=bctbx_list_prepend(l,pt);
 			}else{
-				const MSList *after=ms_list_find(l,elem->prev->data);
-				l=ms_list_insert(l, after->next, pt);
+				const bctbx_list_t *after=bctbx_list_find(l,last_seen);
+				l=bctbx_list_insert(l, after->next, pt);
 			}
+			last_seen = pt;
 			ms_message("Supported codec %s/%i fmtp=%s automatically added to codec list.", pt->mime_type,
 				   pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : "");
+		}else{
+			last_seen = (PayloadType*)elem2->data;
 		}
 	}
-	newlist=ms_list_copy_with_data(l,(void *(*)(void*))payload_type_clone);
-	ms_list_free(l);
+	newlist=bctbx_list_copy_with_data(l,(void *(*)(void*))payload_type_clone);
+	bctbx_list_free(l);
 	return newlist;
 }
 
-static MSList *codec_append_if_new(MSList *l, PayloadType *pt){
-	MSList *elem;
+/*
+ * This function adds missing codecs, if required by configuration.
+ * This 'l' list is entirely destroyed and a new list is returned.
+ */
+static bctbx_list_t *handle_missing_codecs(LinphoneCore *lc, const bctbx_list_t *default_list, bctbx_list_t *l, MSFormatType ft){
+	const char *name = "unknown";
+	int add_missing;
+	bctbx_list_t *ret;
+
+	switch(ft){
+		case MSAudio:
+			name = "add_missing_audio_codecs";
+		break;
+		case MSVideo:
+			name = "add_missing_video_codecs";
+		break;
+		case MSText:
+			name = "add_missing_text_codecs";
+		break;
+		case MSUnknownMedia:
+		break;
+	}
+	add_missing = lp_config_get_int(lc->config, "misc", name, 1);
+	if (add_missing){
+		ret = add_missing_supported_codecs(lc, default_list, l);
+	}else{
+		ret = bctbx_list_copy_with_data(l,(void *(*)(void*))payload_type_clone);
+		bctbx_list_free(l);
+	}
+	return ret;
+}
+
+static bctbx_list_t *codec_append_if_new(bctbx_list_t *l, PayloadType *pt){
+	bctbx_list_t *elem;
 	for (elem=l;elem!=NULL;elem=elem->next){
 		PayloadType *ept=(PayloadType*)elem->data;
 		if (pt==ept)
 			return l;
 	}
-	l=ms_list_append(l,pt);
+	l=bctbx_list_append(l,pt);
 	return l;
 }
 
-static void codecs_config_read(LinphoneCore *lc)
-{
+static void codecs_config_read(LinphoneCore *lc){
 	int i;
 	PayloadType *pt;
-	MSList *audio_codecs=NULL;
-	MSList *video_codecs=NULL;
+	bctbx_list_t *audio_codecs=NULL;
+	bctbx_list_t *video_codecs=NULL;
+	bctbx_list_t *text_codecs=NULL;
 
 	lc->codecs_conf.dyn_pt=96;
 	lc->codecs_conf.telephone_event_pt=lp_config_get_int(lc->config,"misc","telephone_event_pt",101);
@@ -1208,33 +1334,39 @@ static void codecs_config_read(LinphoneCore *lc)
 			audio_codecs=codec_append_if_new(audio_codecs, pt);
 		}
 	}
-	if( lp_config_get_int(lc->config, "misc", "add_missing_audio_codecs", 1) == 1 ){
-		audio_codecs=add_missing_codecs(lc->default_audio_codecs,audio_codecs);
-	}
+	audio_codecs = handle_missing_codecs(lc, lc->default_audio_codecs,audio_codecs, MSAudio);
 
 	for (i=0;get_codec(lc,SalVideo,i,&pt);i++){
 		if (pt){
 			video_codecs=codec_append_if_new(video_codecs, pt);
 		}
 	}
-	if( lp_config_get_int(lc->config, "misc", "add_missing_video_codecs", 1) == 1 ){
-		video_codecs=add_missing_codecs(lc->default_video_codecs,video_codecs);
+
+	video_codecs = handle_missing_codecs(lc, lc->default_video_codecs, video_codecs, MSVideo);
+
+	for (i=0;get_codec(lc,SalText,i,&pt);i++){
+		if (pt){
+			text_codecs=codec_append_if_new(text_codecs, pt);
+		}
 	}
+	text_codecs = add_missing_supported_codecs(lc, lc->default_text_codecs, text_codecs);
+
 	linphone_core_set_audio_codecs(lc,audio_codecs);
 	linphone_core_set_video_codecs(lc,video_codecs);
+	linphone_core_set_text_codecs(lc, text_codecs);
 	linphone_core_update_allocated_audio_bandwidth(lc);
 }
 
 static void build_video_devices_table(LinphoneCore *lc){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	int i;
-	int ndev;
+	size_t ndev;
 	const char **devices;
 	if (lc->video_conf.cams)
-		ms_free(lc->video_conf.cams);
+		ms_free((void *)lc->video_conf.cams);
 	/* retrieve all video devices */
-	elem=ms_web_cam_manager_get_list(ms_web_cam_manager_get());
-	ndev=ms_list_size(elem);
+	elem=ms_web_cam_manager_get_list(ms_factory_get_web_cam_manager(lc->factory));
+	ndev=bctbx_list_size(elem);
 	devices=ms_malloc((ndev+1)*sizeof(const char *));
 	for (i=0;elem!=NULL;elem=elem->next,i++){
 		devices[i]=ms_web_cam_get_string_id((MSWebCam *)elem->data);
@@ -1247,12 +1379,9 @@ static void video_config_read(LinphoneCore *lc){
 #ifdef VIDEO_ENABLED
 	int capture, display, self_view, reuse_source;
 	int automatic_video=1;
-#endif
 	const char *str;
-#ifdef VIDEO_ENABLED
 	LinphoneVideoPolicy vpol;
 	memset(&vpol, 0, sizeof(LinphoneVideoPolicy));
-#endif
 	build_video_devices_table(lc);
 
 	str=lp_config_get_string(lc->config,"video","device",NULL);
@@ -1267,7 +1396,6 @@ static void video_config_read(LinphoneCore *lc){
 
 	linphone_core_set_preferred_framerate(lc,lp_config_get_float(lc->config,"video","framerate",0));
 
-#ifdef VIDEO_ENABLED
 #if defined(ANDROID) || defined(__ios)
 	automatic_video=0;
 #endif
@@ -1286,14 +1414,26 @@ static void video_config_read(LinphoneCore *lc){
 #endif
 }
 
-static void ui_config_read(LinphoneCore *lc)
+static void read_friends_from_rc(LinphoneCore *lc)
 {
-	LinphoneFriend *lf;
+	LinphoneFriend *lf = NULL;
 	int i;
-	for (i=0;(lf=linphone_friend_new_from_config_file(lc,i))!=NULL;i++){
-		linphone_core_add_friend(lc,lf);
+	for (i = 0; (lf = linphone_friend_new_from_config_file(lc, i)) != NULL; i++) {
+		linphone_core_add_friend(lc, lf);
 		linphone_friend_unref(lf);
 	}
+}
+
+static void ui_config_read(LinphoneCore *lc)
+{
+#ifndef SQLITE_STORAGE_ENABLED
+	read_friends_from_rc(lc);
+#else
+	if (!lc->friends_db) {
+		read_friends_from_rc(lc);
+	}
+#endif
+
 	call_logs_read_from_config_file(lc);
 }
 
@@ -1360,6 +1500,10 @@ int linphone_core_get_sip_transport_timeout(LinphoneCore *lc) {
 	return sal_get_transport_timeout(lc->sal);
 }
 
+void linphone_core_set_dns_servers(LinphoneCore *lc, const bctbx_list_t *servers){
+	sal_set_dns_servers(lc->sal, servers);
+}
+
 void linphone_core_enable_dns_srv(LinphoneCore *lc, bool_t enable) {
 	sal_enable_dns_srv(lc->sal, enable);
 	if (linphone_core_ready(lc))
@@ -1370,6 +1514,16 @@ bool_t linphone_core_dns_srv_enabled(const LinphoneCore *lc) {
 	return sal_dns_srv_enabled(lc->sal);
 }
 
+void linphone_core_enable_dns_search(LinphoneCore *lc, bool_t enable) {
+	sal_enable_dns_search(lc->sal, enable);
+	if (linphone_core_ready(lc))
+		lp_config_set_int(lc->config, "net", "dns_search_enabled", enable ? 1 : 0);
+}
+
+bool_t linphone_core_dns_search_enabled(const LinphoneCore *lc) {
+	return sal_dns_search_enabled(lc->sal);
+}
+
 int linphone_core_get_download_bandwidth(const LinphoneCore *lc){
 	return lc->net_conf.download_bw;
 }
@@ -1398,21 +1552,19 @@ const char * linphone_core_get_version(void){
 }
 
 static void linphone_core_register_payload_type(LinphoneCore *lc, const PayloadType *const_pt, const char *recv_fmtp, bool_t enabled){
-	MSList **codec_list=const_pt->type==PAYLOAD_VIDEO ? &lc->default_video_codecs : &lc->default_audio_codecs;
-	if (linphone_core_codec_supported(lc, (const_pt->type == PAYLOAD_VIDEO) ? SalVideo : SalAudio, const_pt->mime_type)){
-		PayloadType *pt=payload_type_clone(const_pt);
-		int number=-1;
-		payload_type_set_enable(pt,enabled);
-		if (recv_fmtp!=NULL) payload_type_set_recv_fmtp(pt,recv_fmtp);
-		/*Set a number to the payload type from the statically defined (RFC3551) profile, if not static, -1 is returned
-		 and the payload type number will be determined dynamically later, at call time.*/
-		payload_type_set_number(pt,
-			(number=rtp_profile_find_payload_number(&av_profile, pt->mime_type, pt->clock_rate, pt->channels))
-		);
-		ms_message("Codec %s/%i fmtp=[%s] number=%i, enabled=%i) added to default capabilities.", pt->mime_type, pt->clock_rate,
-			   pt->recv_fmtp ? pt->recv_fmtp : "", number, (int)payload_type_enabled(pt));
-		*codec_list=ms_list_append(*codec_list,pt);
-	}
+	bctbx_list_t **codec_list = const_pt->type==PAYLOAD_VIDEO ? &lc->default_video_codecs : const_pt->type==PAYLOAD_TEXT ? &lc->default_text_codecs : &lc->default_audio_codecs;
+	PayloadType *pt=payload_type_clone(const_pt);
+	int number=-1;
+	payload_type_set_enable(pt,enabled);
+	if (recv_fmtp!=NULL) payload_type_set_recv_fmtp(pt,recv_fmtp);
+	/*Set a number to the payload type from the statically defined (RFC3551) profile, if not static, -1 is returned
+		and the payload type number will be determined dynamically later, at call time.*/
+	payload_type_set_number(pt,
+		(number=rtp_profile_find_payload_number(&av_profile, pt->mime_type, pt->clock_rate, pt->channels))
+	);
+	ms_message("Codec %s/%i fmtp=[%s] number=%i, enabled=%i) added to the list of possible codecs.", pt->mime_type, pt->clock_rate,
+			pt->recv_fmtp ? pt->recv_fmtp : "", number, (int)payload_type_enabled(pt));
+	*codec_list=bctbx_list_append(*codec_list,pt);
 }
 
 static void linphone_core_register_static_payloads(LinphoneCore *lc){
@@ -1425,8 +1577,8 @@ static void linphone_core_register_static_payloads(LinphoneCore *lc){
 			if (pt->type==PAYLOAD_VIDEO) continue;
 #endif
 			if (find_payload_type_from_list(
-				pt->mime_type, pt->clock_rate, pt->type!=PAYLOAD_VIDEO ? pt->channels : LINPHONE_FIND_PAYLOAD_IGNORE_CHANNELS,
-				pt->type==PAYLOAD_VIDEO ? lc->default_video_codecs : lc->default_audio_codecs)==NULL){
+				pt->mime_type, pt->clock_rate, pt->type == PAYLOAD_VIDEO || pt->type == PAYLOAD_TEXT ? LINPHONE_FIND_PAYLOAD_IGNORE_CHANNELS : pt->channels,
+				pt->type == PAYLOAD_VIDEO ? lc->default_video_codecs : pt->type == PAYLOAD_TEXT ? lc->default_text_codecs : lc->default_audio_codecs)==NULL){
 				linphone_core_register_payload_type(lc,pt,NULL,FALSE);
 			}
 		}
@@ -1434,8 +1586,9 @@ static void linphone_core_register_static_payloads(LinphoneCore *lc){
 }
 
 static void linphone_core_free_payload_types(LinphoneCore *lc){
-	ms_list_free_with_data(lc->default_audio_codecs, (void (*)(void*))payload_type_destroy);
-	ms_list_free_with_data(lc->default_video_codecs, (void (*)(void*))payload_type_destroy);
+	bctbx_list_free_with_data(lc->default_audio_codecs, (void (*)(void*))payload_type_destroy);
+	bctbx_list_free_with_data(lc->default_video_codecs, (void (*)(void*))payload_type_destroy);
+	bctbx_list_free_with_data(lc->default_text_codecs, (void (*)(void*))payload_type_destroy);
 }
 
 void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message){
@@ -1447,7 +1600,7 @@ static void misc_config_read(LinphoneCore *lc) {
 	LpConfig *config=lc->config;
 	const char *uuid;
 
-	lc->max_call_logs=lp_config_get_int(config,"misc","history_max_size",30);
+	lc->max_call_logs=lp_config_get_int(config,"misc","history_max_size",LINPHONE_MAX_CALL_HISTORY_SIZE);
 	lc->max_calls=lp_config_get_int(config,"misc","max_calls",NB_MAX_CALLS);
 
 	uuid=lp_config_get_string(config,"misc","uuid",NULL);
@@ -1461,8 +1614,19 @@ static void misc_config_read(LinphoneCore *lc) {
 	lc->user_certificates_path=ms_strdup(lp_config_get_string(config,"misc","user_certificates_path","."));
 }
 
+void linphone_core_reload_ms_plugins(LinphoneCore *lc, const char *path){
+	if (path) ms_factory_set_plugins_dir(lc->factory, path);
+	ms_factory_init_plugins(lc->factory);
+	codecs_config_read(lc);
+}
+
 static void linphone_core_start(LinphoneCore * lc) {
-	sip_setup_register_all();
+	LinphoneFriendList *list = linphone_core_create_friend_list(lc);
+	linphone_friend_list_set_display_name(list, "_default");
+	linphone_core_add_friend_list(lc, list);
+	linphone_friend_list_unref(list);
+	
+	sip_setup_register_all(lc->factory);
 	sound_config_read(lc);
 	net_config_read(lc);
 	rtp_config_read(lc);
@@ -1479,6 +1643,7 @@ static void linphone_core_start(LinphoneCore * lc) {
 	}
 #endif
 
+
 	linphone_core_notify_display_status(lc,_("Ready"));
 	lc->auto_net_state_mon=lc->sip_conf.auto_net_state_mon;
 	linphone_core_set_state(lc,LinphoneGlobalOn,"Ready");
@@ -1491,7 +1656,10 @@ void linphone_configuring_terminated(LinphoneCore *lc, LinphoneConfiguringState
 		if (linphone_core_is_provisioning_transient(lc) == TRUE)
 			linphone_core_set_provisioning_uri(lc, NULL);
 	}
-
+	if (lc->provisioning_http_listener){
+		belle_sip_object_unref(lc->provisioning_http_listener);
+		lc->provisioning_http_listener = NULL;
+	}
 	linphone_core_start(lc);
 }
 
@@ -1520,7 +1688,8 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	/*default enabled audio codecs, in order of preference*/
 #if defined(__arm__) || defined(_M_ARM)
 	/*hack for opus, that needs to be disabed by default on ARM single processor, otherwise there is no cpu left for video processing*/
-	if (ms_get_cpu_count()==1) opus_enabled=FALSE;
+	//if (ms_get_cpu_count()==1) opus_enabled=FALSE;
+	if (ms_factory_get_cpu_count(lc->factory)==1) opus_enabled=FALSE;
 #endif
 	linphone_core_register_payload_type(lc,&payload_type_opus,"useinbandfec=1",opus_enabled);
 	linphone_core_register_payload_type(lc,&payload_type_silk_wb,NULL,TRUE);
@@ -1529,6 +1698,10 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	linphone_core_register_payload_type(lc,&payload_type_pcmu8000,NULL,TRUE);
 	linphone_core_register_payload_type(lc,&payload_type_pcma8000,NULL,TRUE);
 
+	/* Text codecs in order or preference (RED first (more robust), then T140) */
+	linphone_core_register_payload_type(lc, &payload_type_t140_red, NULL, TRUE);
+	linphone_core_register_payload_type(lc, &payload_type_t140, NULL, TRUE);
+
 	/*other audio codecs, not enabled by default, in order of preference*/
 	linphone_core_register_payload_type(lc,&payload_type_gsm,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_g722,NULL,FALSE);
@@ -1565,8 +1738,7 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_32,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_40,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_codec2,NULL,FALSE);
-
-
+	linphone_core_register_payload_type(lc,&payload_type_bv16,NULL,FALSE);
 
 
 #ifdef VIDEO_ENABLED
@@ -1581,31 +1753,57 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	linphone_core_register_static_payloads(lc);
 }
 
+static void linphone_core_internal_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *notified_event, const LinphoneContent *body) {
+	if (strcmp(notified_event, "Presence") == 0) {
+		const bctbx_list_t* friendLists = linphone_core_get_friends_lists(lc);
+		while( friendLists != NULL ){
+			LinphoneFriendList* list = friendLists->data;
+			ms_message("notify presence for list %p", list);
+			linphone_friend_list_notify_presence_received(list, lev, body);
+			friendLists = friendLists->next;
+		}
+	}
+}
+
+static void linphone_core_internal_subscription_state_changed(LinphoneCore *lc, LinphoneEvent *lev, LinphoneSubscriptionState state) {
+	if (strcasecmp(linphone_event_get_name(lev), "Presence") == 0) {
+		linphone_friend_list_subscription_state_changed(lc, lev, state);
+	}
+}
+
 static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtable, LpConfig *config, void * userdata){
 	const char *remote_provisioning_uri = NULL;
 	LinphoneCoreVTable* local_vtable= linphone_core_v_table_new();
+	LinphoneCoreVTable *internal_vtable = linphone_core_v_table_new();
+
 	ms_message("Initializing LinphoneCore %s", linphone_core_get_version());
 
 	lc->config=lp_config_ref(config);
 	lc->data=userdata;
 	lc->ringstream_autorelease=TRUE;
+
 	linphone_task_list_init(&lc->hooks);
 
+	internal_vtable->notify_received = linphone_core_internal_notify_received;
+	internal_vtable->subscription_state_changed = linphone_core_internal_subscription_state_changed;
+	_linphone_core_add_listener(lc, internal_vtable, TRUE, TRUE);
 	memcpy(local_vtable,vtable,sizeof(LinphoneCoreVTable));
-	_linphone_core_add_listener(lc, local_vtable, TRUE);
+	_linphone_core_add_listener(lc, local_vtable, TRUE, FALSE);
 
 	linphone_core_set_state(lc,LinphoneGlobalStartup,"Starting up");
 	ortp_init();
 	linphone_core_activate_log_serialization_if_needed();
 
-	ms_init();
-
+	lc->factory = ms_factory_new_with_voip();
 	linphone_core_register_default_codecs(lc);
+	linphone_core_register_offer_answer_providers(lc);
 	/* Get the mediastreamer2 event queue */
 	/* This allows to run event's callback in linphone_core_iterate() */
-	lc->msevq=ms_factory_get_event_queue(ms_factory_get_fallback());
+	lc->msevq=ms_factory_create_event_queue(lc->factory);
 
-	lc->sal=sal_init();
+	lc->sal=sal_init(lc->factory);
+	sal_set_http_proxy_host(lc->sal, linphone_core_get_http_proxy_host(lc));
+	sal_set_http_proxy_port(lc->sal, linphone_core_get_http_proxy_port(lc));
 
 	sal_set_user_pointer(lc->sal,lc);
 	sal_set_callbacks(lc->sal,&linphone_sal_callbacks);
@@ -1617,12 +1815,23 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	lc->network_last_check = 0;
 	lc->network_last_status = FALSE;
 
-	lc->http_provider = belle_sip_stack_create_http_provider(sal_get_belle_sip_stack(lc->sal), "0.0.0.0");
-	lc->http_verify_policy = belle_tls_verify_policy_new();
-	belle_http_provider_set_tls_verify_policy(lc->http_provider,lc->http_verify_policy);
+	/* Create the http provider in dual stack mode (ipv4 and ipv6.
+	 * If this creates problem, we may need to implement parallel ipv6/ ipv4 http requests in belle-sip.
+	 */
+	lc->http_provider = belle_sip_stack_create_http_provider(sal_get_stack_impl(lc->sal), "::0");
+	lc->http_crypto_config = belle_tls_crypto_config_new();
+	belle_http_provider_set_tls_crypto_config(lc->http_provider,lc->http_crypto_config);
 
 	certificates_config_read(lc);
 
+	lc->ringtoneplayer = linphone_ringtoneplayer_new();
+
+#ifdef SQLITE_STORAGE_ENABLED
+	sqlite3_bctbx_vfs_register(0);
+#endif
+	
+	lc->vcard_context = linphone_vcard_context_new();
+	
 	remote_provisioning_uri = linphone_core_get_provisioning_uri(lc);
 	if (remote_provisioning_uri == NULL) {
 		linphone_configuring_terminated(lc, LinphoneConfiguringSkipped, NULL);
@@ -1646,16 +1855,21 @@ LinphoneCore *linphone_core_new_with_config(const LinphoneCoreVTable *vtable, st
 	return core;
 }
 
-const MSList *linphone_core_get_audio_codecs(const LinphoneCore *lc)
+const bctbx_list_t *linphone_core_get_audio_codecs(const LinphoneCore *lc)
 {
 	return lc->codecs_conf.audio_codecs;
 }
 
-const MSList *linphone_core_get_video_codecs(const LinphoneCore *lc)
+const bctbx_list_t *linphone_core_get_video_codecs(const LinphoneCore *lc)
 {
 	return lc->codecs_conf.video_codecs;
 }
 
+const bctbx_list_t *linphone_core_get_text_codecs(const LinphoneCore *lc)
+{
+	return lc->codecs_conf.text_codecs;
+}
+
 int linphone_core_set_primary_contact(LinphoneCore *lc, const char *contact)
 {
 	LinphoneAddress *ctt;
@@ -1732,18 +1946,26 @@ bool_t linphone_core_get_guess_hostname(LinphoneCore *lc){
 	return lc->sip_conf.guess_hostname;
 }
 
-void linphone_core_enable_lime(LinphoneCore *lc, bool_t val){
+void linphone_core_enable_lime(LinphoneCore *lc, LinphoneLimeState val){
 	if (linphone_core_ready(lc)){
 		lp_config_set_int(lc->config,"sip","lime",val);
 	}
 }
 
-bool_t linphone_core_lime_enabled(const LinphoneCore *lc){
-	return (lp_config_get_int(lc->config,"sip", "lime", FALSE) && lime_is_available());
+bool_t linphone_core_lime_available(const LinphoneCore *lc){
+	return lime_is_available();
 }
 
-bool_t linphone_core_lime_for_file_sharing_enabled(const LinphoneCore *lc){
-	return linphone_core_lime_enabled(lc) && (lp_config_get_int(lc->config,"sip", "lime_for_file_sharing", TRUE) && lime_is_available());
+LinphoneLimeState linphone_core_lime_enabled(const LinphoneCore *lc){
+	return linphone_core_lime_available(lc) ? lp_config_get_int(lc->config,"sip", "lime", LinphoneLimeDisabled) : LinphoneLimeDisabled;
+}
+
+LinphoneLimeState linphone_core_lime_for_file_sharing_enabled(const LinphoneCore *lc){
+	LinphoneLimeState s = linphone_core_lime_enabled(lc);
+	if (s != LinphoneLimeDisabled) {
+		s = lp_config_get_int(lc->config,"sip", "lime_for_file_sharing", LinphoneLimeMandatory);
+	}
+	return s;
 }
 
 LinphoneAddress *linphone_core_get_primary_contact_parsed(LinphoneCore *lc){
@@ -1760,8 +1982,8 @@ LinphoneAddress *linphone_core_get_primary_contact_parsed(LinphoneCore *lc){
  * The list is taken by the LinphoneCore thus the application should not free it.
  * This list is made of struct PayloadType describing the codec parameters.
 **/
-int linphone_core_set_audio_codecs(LinphoneCore *lc, MSList *codecs){
-	if (lc->codecs_conf.audio_codecs!=NULL) ms_list_free(lc->codecs_conf.audio_codecs);
+int linphone_core_set_audio_codecs(LinphoneCore *lc, bctbx_list_t *codecs){
+	if (lc->codecs_conf.audio_codecs!=NULL) bctbx_list_free(lc->codecs_conf.audio_codecs);
 	lc->codecs_conf.audio_codecs=codecs;
 	_linphone_core_codec_config_write(lc);
 	linphone_core_update_allocated_audio_bandwidth(lc);
@@ -1778,13 +2000,22 @@ int linphone_core_set_audio_codecs(LinphoneCore *lc, MSList *codecs){
  * The list is taken by the LinphoneCore thus the application should not free it.
  * This list is made of struct PayloadType describing the codec parameters.
 **/
-int linphone_core_set_video_codecs(LinphoneCore *lc, MSList *codecs){
-	if (lc->codecs_conf.video_codecs!=NULL) ms_list_free(lc->codecs_conf.video_codecs);
+int linphone_core_set_video_codecs(LinphoneCore *lc, bctbx_list_t *codecs){
+	if (lc->codecs_conf.video_codecs!=NULL) bctbx_list_free(lc->codecs_conf.video_codecs);
 	lc->codecs_conf.video_codecs=codecs;
 	_linphone_core_codec_config_write(lc);
 	return 0;
 }
 
+int linphone_core_set_text_codecs(LinphoneCore *lc, bctbx_list_t *codecs) {
+	if (lc->codecs_conf.text_codecs != NULL)
+		bctbx_list_free(lc->codecs_conf.text_codecs);
+
+	lc->codecs_conf.text_codecs = codecs;
+	_linphone_core_codec_config_write(lc);
+	return 0;
+}
+
 /**
  * Enable RFC3389 generic confort noise algorithm (CN payload type).
  * It is disabled by default, because this algorithm is only relevant for legacy codecs (PCMU, PCMA, G722).
@@ -1804,9 +2035,49 @@ bool_t linphone_core_generic_confort_noise_enabled(const LinphoneCore *lc){
 	return lp_config_get_int(lc->config, "misc", "use_cn", FALSE);
 }
 
-const MSList * linphone_core_get_friend_list(const LinphoneCore *lc)
-{
-	return lc->friends;
+const bctbx_list_t* linphone_core_get_friend_list(const LinphoneCore *lc) {
+	bctbx_list_t *lists = lc->friends_lists;
+	if (lists) {
+		LinphoneFriendList *list = (LinphoneFriendList *)lists->data;
+		if (list) {
+			return list->friends;
+		}
+	}
+	return NULL;
+}
+
+const bctbx_list_t* linphone_core_get_friends_lists(const LinphoneCore *lc) {
+	return lc->friends_lists;
+}
+
+LinphoneFriendList* linphone_core_get_default_friend_list(const LinphoneCore *lc) {
+	if (lc && lc->friends_lists) {
+		return (LinphoneFriendList *)lc->friends_lists->data;
+	}
+	return NULL;
+}
+
+void linphone_core_remove_friend_list(LinphoneCore *lc, LinphoneFriendList *list) {
+	bctbx_list_t *elem = bctbx_list_find(lc->friends_lists, list);
+	if (elem == NULL) return;
+#ifdef SQLITE_STORAGE_ENABLED
+	linphone_core_remove_friends_list_from_db(lc, list);
+#endif
+	linphone_core_notify_friend_list_removed(lc, list);
+	list->lc = NULL;
+	linphone_friend_list_unref(list);
+	lc->friends_lists = bctbx_list_erase_link(lc->friends_lists, elem);
+}
+
+void linphone_core_add_friend_list(LinphoneCore *lc, LinphoneFriendList *list) {
+	if (!list->lc) {
+		list->lc = lc;
+	}
+	lc->friends_lists = bctbx_list_append(lc->friends_lists, linphone_friend_list_ref(list));
+#ifdef SQLITE_STORAGE_ENABLED
+	linphone_core_store_friends_list_in_db(lc, list);
+#endif
+	linphone_core_notify_friend_list_created(lc, list);
 }
 
 void linphone_core_enable_audio_adaptive_jittcomp(LinphoneCore* lc, bool_t val)
@@ -1890,6 +2161,24 @@ void linphone_core_get_video_port_range(const LinphoneCore *lc, int *min_port, i
 	*max_port = lc->rtp_conf.video_rtp_max_port;
 }
 
+/**
+ * Returns the UDP port used for text streaming.
+ *
+ * @ingroup network_parameters
+**/
+int linphone_core_get_text_port(const LinphoneCore *lc) {
+	return lc->rtp_conf.text_rtp_min_port;
+}
+
+/**
+ * Get the video port range from which is randomly chosen the UDP port used for text streaming.
+ *
+ * @ingroup network_parameters
+ */
+void linphone_core_get_text_port_range(const LinphoneCore *lc, int *min_port, int *max_port) {
+	*min_port = lc->rtp_conf.text_rtp_min_port;
+	*max_port = lc->rtp_conf.text_rtp_max_port;
+}
 
 /**
  * Returns the value in seconds of the no-rtp timeout.
@@ -1910,7 +2199,7 @@ bool_t linphone_core_get_rtp_no_xmit_on_audio_mute(const LinphoneCore *lc){
 
 static void apply_jitter_value(LinphoneCore *lc, int value, MSFormatType stype){
 	LinphoneCall *call;
-	MSList *it;
+	bctbx_list_t *it;
 	for (it=lc->calls;it!=NULL;it=it->next){
 		MediaStream *ms;
 		call=(LinphoneCall*)it->data;
@@ -1990,6 +2279,26 @@ void linphone_core_set_video_port_range(LinphoneCore *lc, int min_port, int max_
 	lc->rtp_conf.video_rtp_max_port=max_port;
 }
 
+/**
+ * Sets the UDP port used for text streaming.
+ * A value if -1 will request the system to allocate the local port randomly.
+ * This is recommended in order to avoid firewall warnings.
+ *
+ * @ingroup network_parameters
+**/
+void linphone_core_set_text_port(LinphoneCore *lc, int port) {
+	lc->rtp_conf.text_rtp_min_port = lc->rtp_conf.text_rtp_max_port = port;
+}
+
+/**
+ * Sets the UDP port range from which to randomly select the port used for text streaming.
+ * @ingroup media_parameters
+ */
+void linphone_core_set_text_port_range(LinphoneCore *lc, int min_port, int max_port) {
+	lc->rtp_conf.text_rtp_min_port = min_port;
+	lc->rtp_conf.text_rtp_max_port = max_port;
+}
+
 /**
  * Sets the no-rtp timeout value in seconds.
  *
@@ -2099,6 +2408,17 @@ static bool_t transports_unchanged(const LCSipTransports * tr1, const LCSipTrans
 		tr2->tls_port==tr1->tls_port;
 }
 
+static void __linphone_core_invalidate_registers(LinphoneCore* lc){
+	const bctbx_list_t *elem=linphone_core_get_proxy_config_list(lc);
+	for(;elem!=NULL;elem=elem->next){
+		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
+		if (linphone_proxy_config_register_enabled(cfg)) {
+			/*this will force a re-registration at next iterate*/
+			cfg->commit = TRUE;
+		}
+	}
+}
+
 int _linphone_core_apply_transports(LinphoneCore *lc){
 	Sal *sal=lc->sal;
 	const char *anyaddr;
@@ -2115,7 +2435,10 @@ int _linphone_core_apply_transports(LinphoneCore *lc){
 	sal_unlisten_ports(sal);
 
 	listening_address = lp_config_get_string(lc->config,"sip","bind_address",anyaddr);
-
+	if (linphone_core_get_http_proxy_host(lc)) {
+		sal_set_http_proxy_host(sal, linphone_core_get_http_proxy_host(lc));
+		sal_set_http_proxy_port(sal,linphone_core_get_http_proxy_port(lc));
+	}
 	if (lc->tunnel && linphone_tunnel_sip_enabled(lc->tunnel) && linphone_tunnel_get_activated(lc->tunnel)){
 		if (sal_listen_port(sal,anyaddr,tr->udp_port,SalTransportUDP,TRUE)!=0){
 			transport_error(lc,"udp+tunnel",tr->udp_port);
@@ -2244,9 +2567,6 @@ bool_t linphone_core_ipv6_enabled(LinphoneCore *lc){
  *
  * @ingroup network_parameters
  *
- * @note IPv6 support is exclusive with IPv4 in liblinphone:
- * when IPv6 is turned on, IPv4 calls won't be possible anymore.
- * By default IPv6 support is off.
 **/
 void linphone_core_enable_ipv6(LinphoneCore *lc, bool_t val){
 	if (lc->sip_conf.ipv6_enabled!=val){
@@ -2264,6 +2584,12 @@ void linphone_core_enable_ipv6(LinphoneCore *lc, bool_t val){
 }
 
 
+bool_t linphone_core_content_encoding_supported(const LinphoneCore *lc, const char *content_encoding) {
+	const char *handle_content_encoding = lp_config_get_string(lc->config, "sip", "handle_content_encoding", "deflate");
+	return (strcmp(handle_content_encoding, content_encoding) == 0) && sal_content_encoding_available(lc->sal, content_encoding);
+}
+
+
 static void monitor_network_state(LinphoneCore *lc, time_t curtime){
 	bool_t new_status=lc->network_last_status;
 	char newip[LINPHONE_IPADDR_SIZE];
@@ -2295,13 +2621,13 @@ static void monitor_network_state(LinphoneCore *lc, time_t curtime){
 }
 
 static void proxy_update(LinphoneCore *lc){
-	MSList *elem,*next;
-	ms_list_for_each(lc->sip_conf.proxies,(void (*)(void*))&linphone_proxy_config_update);
+	bctbx_list_t *elem,*next;
+	bctbx_list_for_each(lc->sip_conf.proxies,(void (*)(void*))&linphone_proxy_config_update);
 	for(elem=lc->sip_conf.deleted_proxies;elem!=NULL;elem=next){
 		LinphoneProxyConfig* cfg = (LinphoneProxyConfig*)elem->data;
 		next=elem->next;
 		if (ms_time(NULL) - cfg->deletion_date > 32) {
-			lc->sip_conf.deleted_proxies =ms_list_remove_link(lc->sip_conf.deleted_proxies,elem);
+			lc->sip_conf.deleted_proxies =bctbx_list_erase_link(lc->sip_conf.deleted_proxies,elem);
 			ms_message("Proxy config for [%s] is definitely removed from core.",linphone_proxy_config_get_addr(cfg));
 			_linphone_proxy_config_release_ops(cfg);
 			linphone_proxy_config_unref(cfg);
@@ -2321,14 +2647,14 @@ static void assign_buddy_info(LinphoneCore *lc, BuddyInfo *info){
 }
 
 static void analyze_buddy_lookup_results(LinphoneCore *lc, LinphoneProxyConfig *cfg){
-	MSList *elem;
+	bctbx_list_t *elem;
 	SipSetupContext *ctx=linphone_proxy_config_get_sip_setup_context(cfg);
-	for (elem=lc->bl_reqs;elem!=NULL;elem=ms_list_next(elem)){
+	for (elem=lc->bl_reqs;elem!=NULL;elem=bctbx_list_next(elem)){
 		BuddyLookupRequest *req=(BuddyLookupRequest *)elem->data;
 		if (req->status==BuddyLookupDone || req->status==BuddyLookupFailure){
 			if (req->results!=NULL){
 				BuddyInfo *i=(BuddyInfo*)req->results->data;
-				ms_list_free(req->results);
+				bctbx_list_free(req->results);
 				req->results=NULL;
 				assign_buddy_info(lc,i);
 			}
@@ -2337,13 +2663,13 @@ static void analyze_buddy_lookup_results(LinphoneCore *lc, LinphoneProxyConfig *
 		}
 	}
 	/*purge completed requests */
-	while((elem=ms_list_find(lc->bl_reqs,NULL))!=NULL){
-		lc->bl_reqs=ms_list_remove_link(lc->bl_reqs,elem);
+	while((elem=bctbx_list_find(lc->bl_reqs,NULL))!=NULL){
+		lc->bl_reqs=bctbx_list_erase_link(lc->bl_reqs,elem);
 	}
 }
 
 static void linphone_core_grab_buddy_infos(LinphoneCore *lc, LinphoneProxyConfig *cfg){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	SipSetupContext *ctx=linphone_proxy_config_get_sip_setup_context(cfg);
 	for(elem=linphone_core_get_friend_list(lc);elem!=NULL;elem=elem->next){
 		LinphoneFriend *lf=(LinphoneFriend*)elem->data;
@@ -2356,7 +2682,7 @@ static void linphone_core_grab_buddy_infos(LinphoneCore *lc, LinphoneProxyConfig
 					buddy_lookup_request_set_key(req,tmp);
 					buddy_lookup_request_set_max_results(req,1);
 					sip_setup_context_buddy_lookup_submit(ctx,req);
-					lc->bl_reqs=ms_list_append(lc->bl_reqs,req);
+					lc->bl_reqs=bctbx_list_append(lc->bl_reqs,req);
 					ms_free(tmp);
 				}
 			}
@@ -2365,8 +2691,7 @@ static void linphone_core_grab_buddy_infos(LinphoneCore *lc, LinphoneProxyConfig
 }
 
 static void linphone_core_do_plugin_tasks(LinphoneCore *lc){
-	LinphoneProxyConfig *cfg=NULL;
-	linphone_core_get_default_proxy(lc,&cfg);
+	LinphoneProxyConfig *cfg=linphone_core_get_default_proxy_config(lc);
 	if (cfg){
 		if (lc->bl_refresh){
 			SipSetupContext *ctx=linphone_proxy_config_get_sip_setup_context(cfg);
@@ -2394,21 +2719,23 @@ static void linphone_core_do_plugin_tasks(LinphoneCore *lc){
  * serialized with a mutex.
 **/
 void linphone_core_iterate(LinphoneCore *lc){
-	MSList *calls;
+	bctbx_list_t *calls;
 	LinphoneCall *call;
-	time_t curtime=time(NULL);
+	uint64_t curtime_ms = ms_get_cur_time_ms(); /*monotonic time*/
 	int elapsed;
+	time_t current_real_time = ms_time(NULL);
+	int64_t diff_time;
 	bool_t one_second_elapsed=FALSE;
 	const char *remote_provisioning_uri = NULL;
+
 	if (lc->network_reachable_to_be_notified) {
 		lc->network_reachable_to_be_notified=FALSE;
-		linphone_core_notify_network_reachable(lc,lc->network_reachable);
+		linphone_core_notify_network_reachable(lc,lc->sip_network_reachable);
 	}
 	if (linphone_core_get_global_state(lc) == LinphoneGlobalStartup) {
 		if (sal_get_root_ca(lc->sal)) {
-			belle_tls_verify_policy_t *tls_policy = belle_tls_verify_policy_new();
-			belle_tls_verify_policy_set_root_ca(tls_policy, sal_get_root_ca(lc->sal));
-			belle_http_provider_set_tls_verify_policy(lc->http_provider, tls_policy);
+			belle_tls_crypto_config_set_root_ca(lc->http_crypto_config, sal_get_root_ca(lc->sal));
+			belle_http_provider_set_tls_crypto_config(lc->http_provider, lc->http_crypto_config);
 		}
 
 		linphone_core_notify_display_status(lc, _("Configuring"));
@@ -2422,10 +2749,18 @@ void linphone_core_iterate(LinphoneCore *lc){
 			}
 		} // else linphone_configuring_terminated has already been called in linphone_core_init
 	}
-
-	if (curtime-lc->prevtime>=1){
-		lc->prevtime=curtime;
+	if (lc->prevtime_ms == 0){
+		lc->prevtime_ms = curtime_ms;
+	}
+	if ((diff_time=curtime_ms-lc->prevtime_ms) >= 1000){
 		one_second_elapsed=TRUE;
+		if (diff_time>3000){
+			/*since monotonic time doesn't increment while machine is sleeping, we don't want to catchup too much*/
+			lc->prevtime_ms = curtime_ms;
+		}else{
+			lc->prevtime_ms += 1000;
+
+		}
 	}
 
 	if (lc->ecc!=NULL){
@@ -2450,13 +2785,12 @@ void linphone_core_iterate(LinphoneCore *lc){
 
 	if (lc->preview_finished){
 		lc->preview_finished=0;
-		ring_stop(lc->ringstream);
-		lc->ringstream=NULL;
+		linphone_ringtoneplayer_stop(lc->ringtoneplayer);
 		lc_callback_obj_invoke(&lc->preview_finished_cb,lc);
 	}
 
 	if (lc->ringstream && lc->ringstream_autorelease && lc->dmfs_playing_start_time!=0
-		&& (curtime-lc->dmfs_playing_start_time)>5){
+		&& (curtime_ms/1000 - lc->dmfs_playing_start_time)>5){
 		MSPlayerState state;
 		bool_t stop=TRUE;
 		if (lc->ringstream->source && ms_filter_call_method(lc->ringstream->source,MS_PLAYER_GET_STATE,&state)==0){
@@ -2470,15 +2804,15 @@ void linphone_core_iterate(LinphoneCore *lc){
 
 	sal_iterate(lc->sal);
 	if (lc->msevq) ms_event_queue_pump(lc->msevq);
-	if (lc->auto_net_state_mon) monitor_network_state(lc,curtime);
+	if (lc->auto_net_state_mon) monitor_network_state(lc, current_real_time);
 
 	proxy_update(lc);
 
 	//we have to iterate for each call
-	calls= lc->calls;
+	calls = lc->calls;
 	while(calls!= NULL){
 		call = (LinphoneCall *)calls->data;
-		elapsed = curtime-call->log->start_date_time;
+		elapsed = (int)(current_real_time - call->log->start_date_time);
 		 /* get immediately a reference to next one in case the one
 		 we are going to examine is destroy and removed during
 		 linphone_core_start_invite() */
@@ -2505,7 +2839,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 			if (elapsed>lc->sip_conf.inc_timeout){
 				LinphoneReason decline_reason;
 				ms_message("incoming call timeout (%i)",lc->sip_conf.inc_timeout);
-				decline_reason=lc->current_call ? LinphoneReasonBusy : LinphoneReasonDeclined;
+				decline_reason = (lc->current_call != call) ? LinphoneReasonBusy : LinphoneReasonDeclined;
 				call->log->status=LinphoneCallMissed;
 				sal_error_info_set(&call->non_op_error,SalReasonRequestTimeout,408,"Not answered",NULL);
 				linphone_core_decline_call(lc,call,decline_reason);
@@ -2513,7 +2847,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 		}
 		if ( (lc->sip_conf.in_call_timeout > 0)
 			 && (call->log->connected_date_time != 0)
-			 && ((curtime - call->log->connected_date_time) > lc->sip_conf.in_call_timeout))
+			 && ((current_real_time - call->log->connected_date_time) > lc->sip_conf.in_call_timeout))
 		{
 			ms_message("in call timeout (%i)",lc->sip_conf.in_call_timeout);
 			linphone_core_terminate_call(lc,call);
@@ -2534,15 +2868,22 @@ void linphone_core_iterate(LinphoneCore *lc){
 	linphone_core_run_hooks(lc);
 	linphone_core_do_plugin_tasks(lc);
 
-	if (lc->network_reachable && lc->netup_time!=0 && (curtime-lc->netup_time)>3){
+	if (lc->sip_network_reachable && lc->netup_time!=0 && (current_real_time-lc->netup_time)>3){
 		/*not do that immediately, take your time.*/
 		linphone_core_send_initial_subscribes(lc);
 	}
 
 	if (one_second_elapsed) {
+		bctbx_list_t *elem = NULL;
 		if (lp_config_needs_commit(lc->config)) {
 			lp_config_sync(lc->config);
 		}
+		for (elem = lc->friends_lists; elem != NULL; elem = bctbx_list_next(elem)) {
+			LinphoneFriendList *list = (LinphoneFriendList *)elem->data;
+			if (list->dirty_friends_to_update) {
+				linphone_friend_list_update_dirty_friends(list);
+			}
+		}
 	}
 
 	if (liblinphone_serialize_logs == TRUE) {
@@ -2566,9 +2907,8 @@ LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url)
  * it returns the registered identity on the proxy.
 **/
 const char * linphone_core_get_identity(LinphoneCore *lc){
-	LinphoneProxyConfig *proxy=NULL;
+	LinphoneProxyConfig *proxy=linphone_core_get_default_proxy_config(lc);
 	const char *from;
-	linphone_core_get_default_proxy(lc,&proxy);
 	if (proxy!=NULL) {
 		from=linphone_proxy_config_get_identity(proxy);
 	}else from=linphone_core_get_primary_contact(lc);
@@ -2576,9 +2916,8 @@ const char * linphone_core_get_identity(LinphoneCore *lc){
 }
 
 const char * linphone_core_get_route(LinphoneCore *lc){
-	LinphoneProxyConfig *proxy=NULL;
+	LinphoneProxyConfig *proxy=linphone_core_get_default_proxy_config(lc);
 	const char *route=NULL;
-	linphone_core_get_default_proxy(lc,&proxy);
 	if (proxy!=NULL) {
 		route=linphone_proxy_config_get_route(proxy);
 	}
@@ -2596,7 +2935,7 @@ const char * linphone_core_get_route(LinphoneCore *lc){
  * @return a LinphoneCall corresponding to the new call that is attempted to the transfer destination.
 **/
 LinphoneCall * linphone_core_start_refered_call(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){
-	LinphoneCallParams *cp=params ? linphone_call_params_copy(params) : linphone_core_create_default_call_parameters(lc);
+	LinphoneCallParams *cp=params ? linphone_call_params_copy(params) : linphone_core_create_call_params(lc, NULL);
 	LinphoneCall *newcall;
 
 	if (call->state!=LinphoneCallPaused){
@@ -2606,6 +2945,7 @@ LinphoneCall * linphone_core_start_refered_call(LinphoneCore *lc, LinphoneCall *
 	}
 
 	if (!params){
+		cp->has_audio = call->current_params->has_audio;
 		cp->has_video = call->current_params->has_video; /*start the call to refer-target with video enabled if original call had video*/
 	}
 	cp->referer=call;
@@ -2645,29 +2985,29 @@ void linphone_core_notify_refer_state(LinphoneCore *lc, LinphoneCall *referer, L
    system.
 */
 
-static MSList *make_routes_for_proxy(LinphoneProxyConfig *proxy, const LinphoneAddress *dest){
-	MSList *ret=NULL;
+static bctbx_list_t *make_routes_for_proxy(LinphoneProxyConfig *proxy, const LinphoneAddress *dest){
+	bctbx_list_t *ret=NULL;
 	const char *local_route=linphone_proxy_config_get_route(proxy);
 	const LinphoneAddress *srv_route=linphone_proxy_config_get_service_route(proxy);
 	if (local_route){
-		ret=ms_list_append(ret,sal_address_new(local_route));
+		ret=bctbx_list_append(ret,sal_address_new(local_route));
 	}
 	if (srv_route){
-		ret=ms_list_append(ret,sal_address_clone((SalAddress*)srv_route));
+		ret=bctbx_list_append(ret,sal_address_clone((SalAddress*)srv_route));
 	}
 	if (ret==NULL){
 		/*if the proxy address matches the domain part of the destination, then use the same transport
 		 * as the one used for registration. This is done by forcing a route to this proxy.*/
 		SalAddress *proxy_addr=sal_address_new(linphone_proxy_config_get_addr(proxy));
 		if (strcmp(sal_address_get_domain(proxy_addr),linphone_address_get_domain(dest))==0){
-			ret=ms_list_append(ret,proxy_addr);
+			ret=bctbx_list_append(ret,proxy_addr);
 		}else sal_address_destroy(proxy_addr);
 	}
 	return ret;
 }
 
 LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const LinphoneAddress *uri){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	LinphoneProxyConfig *found_cfg=NULL;
 	LinphoneProxyConfig *found_reg_cfg=NULL;
 	LinphoneProxyConfig *found_noreg_cfg=NULL;
@@ -2754,8 +3094,9 @@ int linphone_core_proceed_with_invite_if_ready(LinphoneCore *lc, LinphoneCall *c
 int linphone_core_restart_invite(LinphoneCore *lc, LinphoneCall *call){
 	linphone_call_create_op(call);
 	linphone_call_stop_media_streams(call);
-	ms_media_stream_sessions_uninit(&call->sessions[0]);
-	ms_media_stream_sessions_uninit(&call->sessions[1]);
+	ms_media_stream_sessions_uninit(&call->sessions[call->main_audio_stream_index]);
+	ms_media_stream_sessions_uninit(&call->sessions[call->main_video_stream_index]);
+	ms_media_stream_sessions_uninit(&call->sessions[call->main_text_stream_index]);
 	linphone_call_init_media_streams(call);
 	return linphone_core_start_invite(lc,call, NULL);
 }
@@ -2787,26 +3128,33 @@ int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, const Linph
 		/*we are offering, set local media description before sending the call*/
 		sal_call_set_local_media_description(call->op,call->localdesc);
 	}
+	
+	barmsg=ortp_strdup_printf("%s %s", _("Contacting"), real_url);
+	linphone_core_notify_display_status(lc,barmsg);
+	ms_free(barmsg);
+	
 	err=sal_call(call->op,from,real_url);
+	
+	if (err < 0){
+		if (call->state != LinphoneCallError &&
+			call->state != LinphoneCallReleased){
+			/*sal_call() may invoke call_failure() and call_released() SAL callbacks synchronously,
+			 * in which case there is no need to perform a state change here.*/
+			linphone_core_notify_display_status(lc,_("Could not call"));
+			linphone_call_stop_media_streams(call);
+			linphone_call_set_state(call,LinphoneCallError,"Call failed");
+		}
+		goto end;
+	}
 	if (lc->sip_conf.sdp_200_ack){
 		/*we are NOT offering, set local media description after sending the call so that we are ready to
 		 process the remote offer when it will arrive*/
 		sal_call_set_local_media_description(call->op,call->localdesc);
 	}
-
 	call->log->call_id=ms_strdup(sal_op_get_call_id(call->op)); /*must be known at that time*/
-
-	barmsg=ortp_strdup_printf("%s %s", _("Contacting"), real_url);
-	linphone_core_notify_display_status(lc,barmsg);
-	ms_free(barmsg);
-
-	if (err<0){
-		linphone_core_notify_display_status(lc,_("Could not call"));
-		linphone_call_stop_media_streams(call);
-		linphone_call_set_state(call,LinphoneCallError,"Call failed");
-	}else {
-		linphone_call_set_state(call,LinphoneCallOutgoingProgress,"Outgoing call in progress");
-	}
+	linphone_call_set_state(call,LinphoneCallOutgoingProgress,"Outgoing call in progress");
+	
+end:
 	ms_free(real_url);
 	ms_free(from);
 	return err;
@@ -2826,7 +3174,7 @@ int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, const Linph
 **/
 LinphoneCall * linphone_core_invite(LinphoneCore *lc, const char *url){
 	LinphoneCall *call;
-	LinphoneCallParams *p=linphone_core_create_default_call_parameters (lc);
+	LinphoneCallParams *p=linphone_core_create_call_params(lc, NULL);
 	p->has_video &= !!lc->video_policy.automatically_initiate;
 	call=linphone_core_invite_with_params(lc,url,p);
 	linphone_call_params_destroy(p);
@@ -2874,25 +3222,25 @@ LinphoneCall * linphone_core_invite_with_params(LinphoneCore *lc, const char *ur
 **/
 LinphoneCall * linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddress *addr){
 	LinphoneCall *call;
-	LinphoneCallParams *p=linphone_core_create_default_call_parameters(lc);
+	LinphoneCallParams *p=linphone_core_create_call_params(lc, NULL);
 	p->has_video &= !!lc->video_policy.automatically_initiate;
 	call=linphone_core_invite_address_with_params (lc,addr,p);
 	linphone_call_params_destroy(p);
 	return call;
 }
 
-static void linphone_transfer_routes_to_op(MSList *routes, SalOp *op){
-	MSList *it;
+static void linphone_transfer_routes_to_op(bctbx_list_t *routes, SalOp *op){
+	bctbx_list_t *it;
 	for(it=routes;it!=NULL;it=it->next){
 		SalAddress *addr=(SalAddress*)it->data;
 		sal_op_add_route_address(op,addr);
 		sal_address_destroy(addr);
 	}
-	ms_list_free(routes);
+	bctbx_list_free(routes);
 }
 
 void linphone_configure_op(LinphoneCore *lc, SalOp *op, const LinphoneAddress *dest, SalCustomHeader *headers, bool_t with_contact){
-	MSList *routes=NULL;
+	bctbx_list_t *routes=NULL;
 	LinphoneProxyConfig *proxy=linphone_core_lookup_known_proxy(lc,dest);
 	const char *identity;
 	if (proxy){
@@ -2924,23 +3272,28 @@ void linphone_configure_op(LinphoneCore *lc, SalOp *op, const LinphoneAddress *d
 	sal_op_cnx_ip_to_0000_if_sendonly_enable(op,lp_config_get_default_int(lc->config,"sip","cnx_ip_to_0000_if_sendonly_enabled",0)); /*also set in linphone_call_new_incoming*/
 }
 
-LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const LinphoneAddress *addr, const LinphoneCallParams *params)
-{
+LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const LinphoneAddress *addr, const LinphoneCallParams *params){
 	const char *from=NULL;
 	LinphoneProxyConfig *proxy=NULL;
 	LinphoneAddress *parsed_url2=NULL;
 	char *real_url=NULL;
 	LinphoneCall *call;
 	bool_t defer = FALSE;
-	LinphoneCallParams *cp = linphone_call_params_copy(params);
+	LinphoneCallParams *cp;
 
-	linphone_core_preempt_sound_resources(lc);
+	if (!(!linphone_call_params_audio_enabled(params) || linphone_call_params_get_audio_direction(params) == LinphoneMediaDirectionInactive)
+		&& linphone_core_preempt_sound_resources(lc) == -1){
+		ms_error("linphone_core_invite_address_with_params(): sound is required for this call but another call is already locking the sound resource. Call attempt is rejected.");
+		return NULL;
+	}
 
 	if(!linphone_core_can_we_add_call(lc)){
 		linphone_core_notify_display_warning(lc,_("Sorry, we have reached the maximum number of simultaneous calls"));
 		return NULL;
 	}
 
+	cp = linphone_call_params_copy(params);
+
 	real_url=linphone_address_as_string(addr);
 	proxy=linphone_core_lookup_known_proxy(lc,addr);
 
@@ -3006,7 +3359,12 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
 		}
 	}
 
-	if (defer==FALSE) linphone_core_start_invite(lc,call,NULL);
+	if (defer==FALSE) {
+		if (linphone_core_start_invite(lc,call,NULL) != 0){
+			/*the call has already gone to error and released state, so do not return it*/
+			call = NULL;
+		}
+	}
 
 	if (real_url!=NULL) ms_free(real_url);
 	linphone_call_params_destroy(cp);
@@ -3101,22 +3459,13 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 	linphone_core_notify_display_status(lc,barmesg);
 
 	/* play the ring if this is the only call*/
-	if (ms_list_size(lc->calls)==1){
+	if (bctbx_list_size(lc->calls)==1){
+		MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
 		lc->current_call=call;
 		if (lc->ringstream && lc->dmfs_playing_start_time!=0){
 			linphone_core_stop_dtmf_stream(lc);
 		}
-		if (lc->sound_conf.ring_sndcard!=NULL){
-			if(lc->ringstream==NULL && lc->sound_conf.local_ring){
-				MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
-				ms_message("Starting local ring...");
-				lc->ringstream=ring_start(lc->sound_conf.local_ring,2000,ringcard);
-			}
-			else
-			{
-				ms_message("the local ring is already started");
-			}
-		}
+		linphone_ringtoneplayer_start(lc->factory, lc->ringtoneplayer, ringcard, lc->sound_conf.local_ring, 2000);
 	}else{
 		/* else play a tone within the context of the current call */
 		call->ringing_beep=TRUE;
@@ -3217,10 +3566,12 @@ int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call){
 #endif //BUILD_UPNP
 	if (call->params->in_conference){
 		subject="Conference";
+	}else if (call->params->internal_call_update){
+		subject="ICE processing concluded";
 	}else if (!no_user_consent){
-		subject="Media change";
-	}else{
 		subject="Refreshing";
+	}else{
+		subject="Media change";
 	}
 	linphone_core_notify_display_status(lc,_("Modifying call parameters..."));
 	if (!lc->sip_conf.sdp_200_ack){
@@ -3273,14 +3624,23 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
 		case LinphoneCallStreamsRunning:
 		case LinphoneCallPaused:
 		case LinphoneCallPausedByRemote:
+		case LinphoneCallUpdatedByRemote:
 			nextstate=LinphoneCallUpdating;
 			break;
+		case LinphoneCallPausing:
+		case LinphoneCallResuming:
+		case LinphoneCallUpdating:
+			nextstate=call->state;
+			break;
 		default:
 		ms_error("linphone_core_update_call() is not allowed in [%s] state",linphone_call_state_to_string(call->state));
 		return -1;
 	}
+	
+	linphone_call_check_ice_session(call, IR_Controlling, TRUE);
 
 	if (params!=NULL){
+		call->broken = FALSE;
 		linphone_call_set_state(call,nextstate,"Updating call");
 #if defined(VIDEO_ENABLED) && defined(BUILD_UPNP)
 		has_video = call->params->has_video;
@@ -3320,7 +3680,7 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
 #endif //defined(VIDEO_ENABLED) && defined(BUILD_UPNP)
 		if ((err = linphone_core_start_update_call(lc, call)) && call->state!=initial_state) {
 			/*Restore initial state*/
-			linphone_call_set_state(call,initial_state,NULL);
+			linphone_call_set_state(call,initial_state,"Restore initial state");
 		}
 
 	}else{
@@ -3350,7 +3710,7 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
  * the call state notification, to deactivate the automatic answer that would just confirm the audio but reject the video.
  * Then, when the user responds to dialog prompt, it becomes possible to call linphone_core_accept_call_update() to answer
  * the reINVITE, with eventually video enabled in the LinphoneCallParams argument.
- * 
+ *
  * The #LinphoneCallUpdatedByRemote notification can also arrive when receiving an INVITE without SDP. In such case, an unchanged offer is made
  * in the 200Ok, and when the ACK containing the SDP answer is received, #LinphoneCallUpdatedByRemote is triggered to notify the application of possible
  * changes in the media session. However in such case defering the update has no meaning since we just generating an offer.
@@ -3382,13 +3742,12 @@ int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call,
 	linphone_call_make_local_media_description(call);
 
 	linphone_call_update_remote_session_id_and_ver(call);
-	linphone_call_stop_ice_for_inactive_streams(call);
 	sal_call_set_local_media_description(call->op,call->localdesc);
 	sal_call_accept(call->op);
 	md=sal_call_get_final_media_description(call->op);
+	linphone_call_stop_ice_for_inactive_streams(call, md);
 	if (md && !sal_media_description_empty(md)){
 		linphone_core_update_streams(lc, call, md, next_state);
-		linphone_call_fix_call_parameters(call);
 	}
 	linphone_call_set_state(call,next_state,state_info);
 	return 0;
@@ -3414,11 +3773,15 @@ int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call,
  * @return 0 if successful, -1 otherwise (actually when this function call is performed outside ot #LinphoneCallUpdatedByRemote state).
 **/
 int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){
-	if (call->state!=LinphoneCallUpdatedByRemote){
+	if (call->state != LinphoneCallUpdatedByRemote){
 		ms_error("linphone_core_accept_update(): invalid state %s to call this function.",
 				 linphone_call_state_to_string(call->state));
 		return -1;
 	}
+	if (call->expect_media_in_ack){
+		ms_error("linphone_core_accept_call_update() is not possible during a late offer incoming reINVITE (INVITE without SDP)");
+		return -1;
+	}
 	return _linphone_core_accept_call_update(lc, call, params, call->prevstate, linphone_call_state_to_string(call->prevstate));
 }
 
@@ -3439,7 +3802,6 @@ int _linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, cons
 		return 0;
 	}
 	if (params==NULL){
-		linphone_call_params_enable_video(call->params, lc->video_policy.automatically_accept || call->current_params->has_video);
 		if (!sal_call_is_offerer(call->op)) {
 			/*reset call param for multicast because this param is only relevant when offering*/
 			linphone_call_params_enable_audio_multicast(call->params,FALSE);
@@ -3459,11 +3821,10 @@ int _linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, cons
 	/*update multicast params according to call params*/
 	linphone_call_fill_media_multicast_addr(call);
 
+	linphone_call_check_ice_session(call, IR_Controlled, TRUE);
 	linphone_call_init_media_streams(call); /*so that video stream is initialized if necessary*/
-	if (call->ice_session != NULL) {
-		if (linphone_call_prepare_ice(call,TRUE)==1)
-			return 0;/*deferred to completion of ICE gathering*/
-	}
+	if (linphone_call_prepare_ice(call,TRUE)==1)
+		return 0;/*deferred to completion of ICE gathering*/
 
 #ifdef BUILD_UPNP
 	if(call->upnp_session != NULL) {
@@ -3518,7 +3879,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 	SalOp *replaced;
 	SalMediaDescription *new_md;
 	bool_t was_ringing=FALSE;
-	MSList * iterator, *copy;
+	bctbx_list_t * iterator, *copy;
 
 	if (call==NULL){
 		//if just one call is present answer the only one ...
@@ -3540,7 +3901,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 	}
 
 
-	for (iterator=copy=ms_list_copy(linphone_core_get_calls(lc));iterator!=NULL;iterator=iterator->next) {
+	for (iterator=copy=bctbx_list_copy(linphone_core_get_calls(lc));iterator!=NULL;iterator=iterator->next) {
 		LinphoneCall *a_call=(LinphoneCall*)iterator->data;
 		if (a_call==call) continue;
 		switch(a_call->state){
@@ -3557,7 +3918,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 				break; /*nothing to do*/
 		}
 	}
-	ms_list_free(copy);
+	bctbx_list_free(copy);
 
 	/* check if this call is supposed to replace an already running one*/
 	replaced=sal_call_get_replaces(call->op);
@@ -3575,7 +3936,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 	}
 
 	/*stop ringing */
-	if (lc->ringstream!=NULL) {
+	if (linphone_ringtoneplayer_is_started(lc->ringtoneplayer)) {
 		ms_message("stop ringing");
 		linphone_core_stop_ringing(lc);
 		was_ringing=TRUE;
@@ -3588,13 +3949,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 	/*try to be best-effort in giving real local or routable contact address */
 	linphone_call_set_contact_op(call);
 	if (params){
-		const SalMediaDescription *md = sal_call_get_remote_media_description(call->op);
 		linphone_call_set_new_params(call,params);
-		// There might not be a md if the INVITE was lacking an SDP
-		// In this case we use the parameters as is.
-		if (md) {
-			linphone_call_set_compatible_incoming_call_parameters(call, md);
-		}
 		linphone_call_prepare_ice(call,TRUE);
 		linphone_call_make_local_media_description(call);
 		sal_call_set_local_media_description(call->op,call->localdesc);
@@ -3615,15 +3970,15 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 	}
 
 	linphone_call_update_remote_session_id_and_ver(call);
-	linphone_call_stop_ice_for_inactive_streams(call);
+
 	sal_call_accept(call->op);
 	linphone_core_notify_display_status(lc,_("Connected."));
 	lc->current_call=call;
 	linphone_call_set_state(call,LinphoneCallConnected,"Connected");
 	new_md=sal_call_get_final_media_description(call->op);
+	linphone_call_stop_ice_for_inactive_streams(call, new_md);
 	if (new_md){
 		linphone_core_update_streams(lc, call, new_md, LinphoneCallStreamsRunning);
-		linphone_call_fix_call_parameters(call);
 		linphone_call_set_state(call,LinphoneCallStreamsRunning,"Connected (streams running)");
 	}else call->expect_media_in_ack=TRUE;
 
@@ -3666,10 +4021,21 @@ static void terminate_call(LinphoneCore *lc, LinphoneCall *call){
 }
 
 int linphone_core_redirect_call(LinphoneCore *lc, LinphoneCall *call, const char *redirect_uri){
+
 	if (call->state==LinphoneCallIncomingReceived){
-		sal_call_decline(call->op,SalReasonRedirect,redirect_uri);
+		char *real_url=NULL;
+		LinphoneAddress *real_parsed_url=linphone_core_interpret_url(lc,redirect_uri);
+		if (!real_parsed_url){
+			/* bad url */
+			ms_error("Bad redirect URI: %s", redirect_uri?redirect_uri:"NULL");
+			return -1;
+		}
+		real_url=linphone_address_as_string (real_parsed_url);
+		sal_call_decline(call->op,SalReasonRedirect,real_url);
+		ms_free(real_url);
 		sal_error_info_set(&call->non_op_error,SalReasonRedirect,603,"Call redirected",NULL);
 		terminate_call(lc,call);
+		linphone_address_unref(real_parsed_url);
 	}else{
 		ms_error("Bad state for call redirection.");
 		return -1;
@@ -3690,7 +4056,7 @@ int linphone_core_terminate_call(LinphoneCore *lc, LinphoneCall *the_call)
 	LinphoneCall *call;
 	if (the_call == NULL){
 		call = linphone_core_get_current_call(lc);
-		if (ms_list_size(lc->calls)==1){
+		if (bctbx_list_size(lc->calls)==1){
 			call=(LinphoneCall*)lc->calls->data;
 		}else{
 			ms_warning("No unique call to terminate !");
@@ -3701,9 +4067,11 @@ int linphone_core_terminate_call(LinphoneCore *lc, LinphoneCall *the_call)
 	{
 		call = the_call;
 	}
+	ms_message("Terminate call [%p] which is currently in state %s", call, linphone_call_state_to_string(call->state));
 	switch (call->state) {
 		case LinphoneCallReleased:
 		case LinphoneCallEnd:
+		case LinphoneCallError:
 			ms_warning("No need to terminate a call [%p] in state [%s]",call,linphone_call_state_to_string(call->state));
 			return -1;
 		case LinphoneCallIncomingReceived:
@@ -3750,7 +4118,7 @@ int linphone_core_decline_call(LinphoneCore *lc, LinphoneCall * call, LinphoneRe
  * @param lc The LinphoneCore
 **/
 int linphone_core_terminate_all_calls(LinphoneCore *lc){
-	MSList *calls=lc->calls;
+	bctbx_list_t *calls=lc->calls;
 	while(calls) {
 		LinphoneCall *c=(LinphoneCall*)calls->data;
 		calls=calls->next;
@@ -3770,7 +4138,7 @@ int linphone_core_terminate_all_calls(LinphoneCore *lc){
  *
  * @ingroup call_control
 **/
-const MSList *linphone_core_get_calls(LinphoneCore *lc)
+const bctbx_list_t *linphone_core_get_calls(LinphoneCore *lc)
 {
 	return lc->calls;
 }
@@ -3821,6 +4189,7 @@ int _linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call){
 		ms_error("No reason to pause this call, it is already paused or inactive.");
 		return -1;
 	}
+	call->broken = FALSE;
 	linphone_call_set_state(call, LinphoneCallPausing, "Pausing call");
 	linphone_call_make_local_media_description(call);
 #ifdef BUILD_UPNP
@@ -3834,7 +4203,7 @@ int _linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call){
 	}
 	lc->current_call=NULL;
 	linphone_core_notify_display_status(lc,_("Pausing the current call..."));
-	if (call->audiostream || call->videostream)
+	if (call->audiostream || call->videostream || call->textstream)
 		linphone_call_stop_media_streams (call);
 	call->paused_by_app=FALSE;
 	return 0;
@@ -3845,7 +4214,7 @@ int _linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call){
  * @ingroup call_control
 **/
 int linphone_core_pause_all_calls(LinphoneCore *lc){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	for(elem=lc->calls;elem!=NULL;elem=elem->next){
 		LinphoneCall *call=(LinphoneCall *)elem->data;
 		LinphoneCallState cs=linphone_call_get_state(call);
@@ -3856,22 +4225,24 @@ int linphone_core_pause_all_calls(LinphoneCore *lc){
 	return 0;
 }
 
-void linphone_core_preempt_sound_resources(LinphoneCore *lc){
+int linphone_core_preempt_sound_resources(LinphoneCore *lc){
 	LinphoneCall *current_call;
+	int err = 0;
 
 	if (linphone_core_is_in_conference(lc)){
 		linphone_core_leave_conference(lc);
-		return;
+		return 0;
 	}
 
 	current_call=linphone_core_get_current_call(lc);
 	if(current_call != NULL){
 		ms_message("Pausing automatically the current call.");
-		_linphone_core_pause_call(lc,current_call);
+		err = _linphone_core_pause_call(lc,current_call);
 	}
 	if (lc->ringstream){
 		linphone_core_stop_ringing(lc);
 	}
+	return err;
 }
 
 /**
@@ -3882,6 +4253,7 @@ void linphone_core_preempt_sound_resources(LinphoneCore *lc){
 int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call){
 	char temp[255]={0};
 	const char *subject="Call resuming";
+	char *tmp;
 
 	if(call->state!=LinphoneCallPaused ){
 		ms_warning("we cannot resume a call that has not been established and paused before");
@@ -3897,6 +4269,7 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call){
 	}
 
 	call->was_automatically_paused=FALSE;
+	call->broken = FALSE;
 
 	/* Stop playing music immediately. If remote side is a conference it
 	 prevents the participants to hear it while the 200OK comes back.*/
@@ -3921,7 +4294,8 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call){
 	linphone_call_set_state(call,LinphoneCallResuming,"Resuming");
 	if (call->params->in_conference==FALSE)
 		lc->current_call=call;
-	snprintf(temp,sizeof(temp)-1,"Resuming the call with %s",linphone_call_get_remote_address_as_string(call));
+	snprintf(temp,sizeof(temp)-1,"Resuming the call with %s",(tmp = linphone_call_get_remote_address_as_string(call)));
+	ms_free(tmp);
 	linphone_core_notify_display_status(lc,temp);
 
 	if (lc->sip_conf.sdp_200_ack){
@@ -3955,7 +4329,7 @@ LinphoneCall *linphone_core_get_call_by_remote_address(LinphoneCore *lc, const c
 	return call;
 }
 LinphoneCall *linphone_core_get_call_by_remote_address2(LinphoneCore *lc, const LinphoneAddress *raddr){
-	MSList *elem=ms_list_find_custom(lc->calls,(int (*)(const void*,const void *))remote_address_compare,raddr);
+	bctbx_list_t *elem=bctbx_list_find_custom(lc->calls,(int (*)(const void*,const void *))remote_address_compare,raddr);
 
 	if (elem) return (LinphoneCall*) elem->data;
 	return NULL;
@@ -3964,8 +4338,8 @@ LinphoneCall *linphone_core_get_call_by_remote_address2(LinphoneCore *lc, const
 int linphone_core_send_publish(LinphoneCore *lc,
 				   LinphonePresenceModel *presence)
 {
-	const MSList *elem;
-	for (elem=linphone_core_get_proxy_config_list(lc);elem!=NULL;elem=ms_list_next(elem)){
+	const bctbx_list_t *elem;
+	for (elem=linphone_core_get_proxy_config_list(lc);elem!=NULL;elem=bctbx_list_next(elem)){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
 		if (cfg->publish) linphone_proxy_config_send_publish(cfg,presence);
 	}
@@ -4167,6 +4541,7 @@ LinphonePresenceModel * linphone_core_get_presence_model(const LinphoneCore *lc)
  * Get playback sound level in 0-100 scale.
  *
  * @ingroup media_parameters
+ * @deprecated
 **/
 int linphone_core_get_play_level(LinphoneCore *lc)
 {
@@ -4177,6 +4552,7 @@ int linphone_core_get_play_level(LinphoneCore *lc)
  * Get ring sound level in 0-100 scale
  *
  * @ingroup media_parameters
+ * @deprecated
 **/
 int linphone_core_get_ring_level(LinphoneCore *lc)
 {
@@ -4187,6 +4563,7 @@ int linphone_core_get_ring_level(LinphoneCore *lc)
  * Get sound capture level in 0-100 scale
  *
  * @ingroup media_parameters
+ * @deprecated
 **/
 int linphone_core_get_rec_level(LinphoneCore *lc){
 	return lc->sound_conf.rec_lev;
@@ -4196,6 +4573,7 @@ int linphone_core_get_rec_level(LinphoneCore *lc){
  * Set sound ring level in 0-100 scale
  *
  * @ingroup media_parameters
+ * @deprecated
 **/
 void linphone_core_set_ring_level(LinphoneCore *lc, int level){
 	MSSndCard *sndcard;
@@ -4269,7 +4647,7 @@ float linphone_core_get_playback_gain_db(LinphoneCore *lc) {
 
 /**
  * Set sound playback level in 0-100 scale
- *
+ * @deprecated
  * @ingroup media_parameters
 **/
 void linphone_core_set_play_level(LinphoneCore *lc, int level){
@@ -4281,7 +4659,7 @@ void linphone_core_set_play_level(LinphoneCore *lc, int level){
 
 /**
  * Set sound capture level in 0-100 scale
- *
+ * @deprecated
  * @ingroup media_parameters
 **/
 void linphone_core_set_rec_level(LinphoneCore *lc, int level)
@@ -4292,10 +4670,10 @@ void linphone_core_set_rec_level(LinphoneCore *lc, int level)
 	if (sndcard) ms_snd_card_set_level(sndcard,MS_SND_CARD_CAPTURE,level);
 }
 
-static MSSndCard *get_card_from_string_id(const char *devid, unsigned int cap){
+static MSSndCard *get_card_from_string_id(const char *devid, unsigned int cap, MSFactory *f){
 	MSSndCard *sndcard=NULL;
 	if (devid!=NULL){
-		sndcard=ms_snd_card_manager_get_card(ms_snd_card_manager_get(),devid);
+		sndcard=ms_snd_card_manager_get_card(ms_factory_get_snd_card_manager(f),devid);
 		if (sndcard!=NULL &&
 			(ms_snd_card_get_capabilities(sndcard) & cap)==0 ){
 			ms_warning("%s card does not have the %s capability, ignoring.",
@@ -4306,15 +4684,15 @@ static MSSndCard *get_card_from_string_id(const char *devid, unsigned int cap){
 	}
 	if (sndcard==NULL) {
 		if ((cap & MS_SND_CARD_CAP_CAPTURE) && (cap & MS_SND_CARD_CAP_PLAYBACK)){
-			sndcard=ms_snd_card_manager_get_default_card(ms_snd_card_manager_get());
+			sndcard=ms_snd_card_manager_get_default_card(ms_factory_get_snd_card_manager(f));
 		}else if (cap & MS_SND_CARD_CAP_CAPTURE){
-			sndcard=ms_snd_card_manager_get_default_capture_card(ms_snd_card_manager_get());
+			sndcard=ms_snd_card_manager_get_default_capture_card(ms_factory_get_snd_card_manager(f));
 		}
 		else if (cap & MS_SND_CARD_CAP_PLAYBACK){
-			sndcard=ms_snd_card_manager_get_default_playback_card(ms_snd_card_manager_get());
+			sndcard=ms_snd_card_manager_get_default_playback_card(ms_factory_get_snd_card_manager(f));
 		}
 		if (sndcard==NULL){/*looks like a bug! take the first one !*/
-			const MSList *elem=ms_snd_card_manager_get_list(ms_snd_card_manager_get());
+			const bctbx_list_t *elem=ms_snd_card_manager_get_list(ms_factory_get_snd_card_manager(f));
 			if (elem) sndcard=(MSSndCard*)elem->data;
 		}
 	}
@@ -4330,10 +4708,7 @@ static MSSndCard *get_card_from_string_id(const char *devid, unsigned int cap){
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 bool_t linphone_core_sound_device_can_capture(LinphoneCore *lc, const char *devid){
-	MSSndCard *sndcard;
-	sndcard=ms_snd_card_manager_get_card(ms_snd_card_manager_get(),devid);
-	if (sndcard!=NULL && (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_CAPTURE)) return TRUE;
-	return FALSE;
+	return ms_snd_card_manager_get_capture_card(ms_factory_get_snd_card_manager(lc->factory),devid) != NULL;
 }
 
 /**
@@ -4344,10 +4719,7 @@ bool_t linphone_core_sound_device_can_capture(LinphoneCore *lc, const char *devi
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 bool_t linphone_core_sound_device_can_playback(LinphoneCore *lc, const char *devid){
-	MSSndCard *sndcard;
-	sndcard=ms_snd_card_manager_get_card(ms_snd_card_manager_get(),devid);
-	if (sndcard!=NULL && (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_PLAYBACK)) return TRUE;
-	return FALSE;
+	return ms_snd_card_manager_get_playback_card(ms_factory_get_snd_card_manager(lc->factory),devid) != NULL;
 }
 
 /**
@@ -4358,7 +4730,7 @@ bool_t linphone_core_sound_device_can_playback(LinphoneCore *lc, const char *dev
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 int linphone_core_set_ringer_device(LinphoneCore *lc, const char * devid){
-	MSSndCard *card=get_card_from_string_id(devid,MS_SND_CARD_CAP_PLAYBACK);
+	MSSndCard *card=get_card_from_string_id(devid,MS_SND_CARD_CAP_PLAYBACK, lc->factory);
 	lc->sound_conf.ring_sndcard=card;
 	if (card && linphone_core_ready(lc))
 		lp_config_set_string(lc->config,"sound","ringer_dev_id",ms_snd_card_get_string_id(card));
@@ -4373,7 +4745,7 @@ int linphone_core_set_ringer_device(LinphoneCore *lc, const char * devid){
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 int linphone_core_set_playback_device(LinphoneCore *lc, const char * devid){
-	MSSndCard *card=get_card_from_string_id(devid,MS_SND_CARD_CAP_PLAYBACK);
+	MSSndCard *card=get_card_from_string_id(devid,MS_SND_CARD_CAP_PLAYBACK, lc->factory);
 	lc->sound_conf.play_sndcard=card;
 	if (card &&  linphone_core_ready(lc))
 		lp_config_set_string(lc->config,"sound","playback_dev_id",ms_snd_card_get_string_id(card));
@@ -4388,7 +4760,7 @@ int linphone_core_set_playback_device(LinphoneCore *lc, const char * devid){
  * @param devid the device name as returned by linphone_core_get_sound_devices()
 **/
 int linphone_core_set_capture_device(LinphoneCore *lc, const char * devid){
-	MSSndCard *card=get_card_from_string_id(devid,MS_SND_CARD_CAP_CAPTURE);
+	MSSndCard *card=get_card_from_string_id(devid,MS_SND_CARD_CAP_CAPTURE, lc->factory);
 	lc->sound_conf.capt_sndcard=card;
 	if (card &&  linphone_core_ready(lc))
 		lp_config_set_string(lc->config,"sound","capture_dev_id",ms_snd_card_get_string_id(card));
@@ -4451,6 +4823,12 @@ const char**  linphone_core_get_video_devices(const LinphoneCore *lc){
 	return lc->video_conf.cams;
 }
 
+void linphone_core_set_default_sound_devices(LinphoneCore *lc){
+    linphone_core_set_ringer_device(lc, NULL);
+    linphone_core_set_playback_device(lc, NULL);
+    linphone_core_set_capture_device(lc, NULL);
+}
+
 void linphone_core_reload_sound_devices(LinphoneCore *lc){
 	const char *ringer;
 	const char *playback;
@@ -4471,7 +4849,7 @@ void linphone_core_reload_sound_devices(LinphoneCore *lc){
 	if (capture != NULL) {
 		capture_copy = ms_strdup(capture);
 	}
-	ms_snd_card_manager_reload(ms_snd_card_manager_get());
+	ms_snd_card_manager_reload(ms_factory_get_snd_card_manager(lc->factory));
 	build_sound_devices_table(lc);
 	if (ringer_copy != NULL) {
 		linphone_core_set_ringer_device(lc, ringer_copy);
@@ -4493,7 +4871,7 @@ void linphone_core_reload_video_devices(LinphoneCore *lc){
 	if (devid != NULL) {
 		devid_copy = ms_strdup(devid);
 	}
-	ms_web_cam_manager_reload(ms_web_cam_manager_get());
+	ms_web_cam_manager_reload(ms_factory_get_web_cam_manager(lc->factory));
 	build_video_devices_table(lc);
 	if (devid_copy != NULL) {
 		linphone_core_set_video_device(lc, devid_copy);
@@ -4560,12 +4938,28 @@ const char *linphone_core_get_ring(const LinphoneCore *lc){
  *
  * @ingroup initializing
 **/
-void linphone_core_set_root_ca(LinphoneCore *lc,const char *path){
+void linphone_core_set_root_ca(LinphoneCore *lc, const char *path) {
 	sal_set_root_ca(lc->sal, path);
-	if (lc->http_verify_policy){
-		belle_tls_verify_policy_set_root_ca(lc->http_verify_policy,path);
+	if (lc->http_crypto_config) {
+		belle_tls_crypto_config_set_root_ca(lc->http_crypto_config, path);
+	}
+	lp_config_set_string(lc->config,"sip", "root_ca", path);
+}
+
+/**
+ * Sets the trusted root CAs (PEM format)
+ *
+ * @param path
+ * @param lc The LinphoneCore object
+ *
+ * @ingroup initializing
+**/
+void linphone_core_set_root_ca_data(LinphoneCore *lc, const char *data) {
+	sal_set_root_ca(lc->sal, NULL);
+	sal_set_root_ca_data(lc->sal, data);
+	if (lc->http_crypto_config) {
+		belle_tls_crypto_config_set_root_ca_data(lc->http_crypto_config, data);
 	}
-	lp_config_set_string(lc->config,"sip","root_ca",path);
 }
 
 /**
@@ -4586,8 +4980,8 @@ const char *linphone_core_get_root_ca(LinphoneCore *lc){
 **/
 void linphone_core_verify_server_certificates(LinphoneCore *lc, bool_t yesno){
 	sal_verify_server_certificates(lc->sal,yesno);
-	if (lc->http_verify_policy){
-		belle_tls_verify_policy_set_exceptions(lc->http_verify_policy, yesno ? 0 : BELLE_TLS_VERIFY_ANY_REASON);
+	if (lc->http_crypto_config){
+		belle_tls_crypto_config_set_verify_exceptions(lc->http_crypto_config, yesno ? 0 : BELLE_TLS_VERIFY_ANY_REASON);
 	}
 	lp_config_set_int(lc->config,"sip","verify_server_certs",yesno);
 }
@@ -4598,34 +4992,44 @@ void linphone_core_verify_server_certificates(LinphoneCore *lc, bool_t yesno){
 **/
 void linphone_core_verify_server_cn(LinphoneCore *lc, bool_t yesno){
 	sal_verify_server_cn(lc->sal,yesno);
-	if (lc->http_verify_policy){
-		belle_tls_verify_policy_set_exceptions(lc->http_verify_policy, yesno ? 0 : BELLE_TLS_VERIFY_CN_MISMATCH);
+	if (lc->http_crypto_config){
+		belle_tls_crypto_config_set_verify_exceptions(lc->http_crypto_config, yesno ? 0 : BELLE_TLS_VERIFY_CN_MISMATCH);
 	}
 	lp_config_set_int(lc->config,"sip","verify_server_cn",yesno);
 }
 
-static void notify_end_of_ring(void *ud, MSFilter *f, unsigned int event, void *arg){
-	LinphoneCore *lc=(LinphoneCore*)ud;
-	if (event==MS_PLAYER_EOF){
-		lc->preview_finished=1;
+void linphone_core_set_ssl_config(LinphoneCore *lc, void *ssl_config) {
+	sal_set_ssl_config(lc->sal, ssl_config);
+	if (lc->http_crypto_config) {
+		belle_tls_crypto_config_set_ssl_config(lc->http_crypto_config, ssl_config);
 	}
 }
 
-int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc func,void * userdata)
+static void notify_end_of_ringtone( LinphoneRingtonePlayer* rp, void* user_data, int status) {
+	LinphoneCore *lc=(LinphoneCore*)user_data;
+	lc->preview_finished=1;
+}
+
+int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc end_of_ringtone,void * userdata)
 {
-	if (lc->ringstream!=0){
+	int err;
+	MSSndCard *ringcard=lc->sound_conf.lsd_card ? lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
+	if (linphone_ringtoneplayer_is_started(lc->ringtoneplayer)){
 		ms_warning("Cannot start ring now,there's already a ring being played");
 		return -1;
 	}
-	lc_callback_obj_init(&lc->preview_finished_cb,func,userdata);
+	lc_callback_obj_init(&lc->preview_finished_cb,end_of_ringtone,userdata);
 	lc->preview_finished=0;
-	if (lc->sound_conf.ring_sndcard!=NULL){
-		MSSndCard *ringcard=lc->sound_conf.lsd_card ? lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
-		lc->ringstream=ring_start_with_cb(ring,2000,ringcard,notify_end_of_ring,(void *)lc);
+	err = linphone_ringtoneplayer_start_with_cb(lc->factory, lc->ringtoneplayer, ringcard, ring, -1, notify_end_of_ringtone,(void *)lc);
+	if (err) {
+		lc->preview_finished=1;
 	}
-	return 0;
+	return err;
 }
 
+MSFactory *linphone_core_get_ms_factory(LinphoneCore *lc){
+	return lc->factory;
+}
 /**
  * Sets the path to a wav file used for ringing back.
  *
@@ -4695,39 +5099,39 @@ static void linphone_core_mute_audio_stream(LinphoneCore *lc, AudioStream *st, b
 }
 
 void linphone_core_mute_mic(LinphoneCore *lc, bool_t val){
+	linphone_core_enable_mic(lc, !val);
+}
+
+bool_t linphone_core_is_mic_muted(LinphoneCore *lc) {
+	return !linphone_core_mic_enabled(lc);
+}
+
+void linphone_core_enable_mic(LinphoneCore *lc, bool_t enable) {
 	LinphoneCall *call;
-	const MSList *list;
-	const MSList *elem;
+	const bctbx_list_t *list;
+	const bctbx_list_t *elem;
 
 	if (linphone_core_is_in_conference(lc)){
-		lc->conf_ctx.local_muted=val;
-		linphone_core_mute_audio_stream(lc, lc->conf_ctx.local_participant, val);
+		linphone_conference_mute_microphone(lc->conf_ctx, !enable);
 	}
 	list = linphone_core_get_calls(lc);
 	for (elem = list; elem != NULL; elem = elem->next) {
 		call = (LinphoneCall *)elem->data;
-		call->audio_muted = val;
-		linphone_core_mute_audio_stream(lc, call->audiostream, val);
+		call->audio_muted = !enable;
+		if (call->audiostream)
+			linphone_core_mute_audio_stream(lc, call->audiostream, call->audio_muted);
 	}
 }
 
-bool_t linphone_core_is_mic_muted(LinphoneCore *lc) {
-	LinphoneCall *call=linphone_core_get_current_call(lc);
-	if (linphone_core_is_in_conference(lc)){
-		return lc->conf_ctx.local_muted;
-	}else if (call==NULL){
-		ms_warning("linphone_core_is_mic_muted(): No current call !");
-		return FALSE;
-	}
-	return call->audio_muted;
-}
-
-void linphone_core_enable_mic(LinphoneCore *lc, bool_t enable) {
-	linphone_core_mute_mic(lc, (enable == TRUE) ? FALSE : TRUE);
-}
-
 bool_t linphone_core_mic_enabled(LinphoneCore *lc) {
-	return (linphone_core_is_mic_muted(lc) == TRUE) ? FALSE : TRUE;
+	LinphoneCall *call=linphone_core_get_current_call(lc);
+	if (linphone_core_is_in_conference(lc)){
+		return !linphone_conference_microphone_is_muted(lc->conf_ctx);
+	}else if (call==NULL){
+		ms_warning("%s(): No current call!", __FUNCTION__);
+		return TRUE;
+	}
+	return !call->audio_muted;
 }
 
 // returns rtp transmission status for an active stream
@@ -4759,29 +5163,20 @@ void linphone_core_send_dtmf(LinphoneCore *lc, char dtmf)
 	linphone_call_send_dtmf(call, dtmf);
 }
 
-void linphone_core_set_stun_server(LinphoneCore *lc, const char *server){
-	if (lc->net_conf.stun_server!=NULL)
-		ms_free(lc->net_conf.stun_server);
-	if (server)
-		lc->net_conf.stun_server=ms_strdup(server);
-	else lc->net_conf.stun_server=NULL;
-
-	/* each time the stun server is changed, we must clean the resolved cached addrinfo*/
-	if (lc->net_conf.stun_addrinfo){
-		freeaddrinfo(lc->net_conf.stun_addrinfo);
-		lc->net_conf.stun_addrinfo=NULL;
+void linphone_core_set_stun_server(LinphoneCore *lc, const char *server) {
+	if (lc->nat_policy != NULL) {
+		linphone_nat_policy_set_stun_server(lc->nat_policy, server);
+		linphone_nat_policy_save_to_config(lc->nat_policy);
+	} else {
+		lp_config_set_string(lc->config, "net", "stun_server", server);
 	}
-	/*if a stun server is set, we must request asynchronous resolution immediately to be ready for call*/
-	if (lc->net_conf.stun_server){
-		linphone_core_resolve_stun_server(lc);
-	}
-
-	if (linphone_core_ready(lc))
-		lp_config_set_string(lc->config,"net","stun_server",lc->net_conf.stun_server);
 }
 
 const char * linphone_core_get_stun_server(const LinphoneCore *lc){
-	return lc->net_conf.stun_server;
+	if (lc->nat_policy != NULL)
+		return linphone_nat_policy_get_stun_server(lc->nat_policy);
+	else
+		return lp_config_get_string(lc->config, "net", "stun_server", NULL);
 }
 
 
@@ -4850,66 +5245,74 @@ const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc)
 	return lc->net_conf.nat_address_ip;
 }
 
-void linphone_core_set_firewall_policy(LinphoneCore *lc, LinphoneFirewallPolicy pol){
-	const char *policy = "none";
+void linphone_core_set_firewall_policy(LinphoneCore *lc, LinphoneFirewallPolicy pol) {
+	LinphoneNatPolicy *nat_policy;
+	char *stun_server = NULL;
+	char *stun_server_username = NULL;
+	
+	if (lc->nat_policy != NULL) {
+		nat_policy = linphone_nat_policy_ref(lc->nat_policy);
+		stun_server = ms_strdup(linphone_nat_policy_get_stun_server(nat_policy));
+		stun_server_username = ms_strdup(linphone_nat_policy_get_stun_server_username(nat_policy));
+		linphone_nat_policy_clear(nat_policy);
+	} else {
+		nat_policy = linphone_core_create_nat_policy(lc);
+		stun_server = ms_strdup(linphone_core_get_stun_server(lc));
+	}
 
 	switch (pol) {
 		default:
 		case LinphonePolicyNoFirewall:
-			policy = "none";
-			break;
 		case LinphonePolicyUseNatAddress:
-			policy = "nat_address";
 			break;
 		case LinphonePolicyUseStun:
-			policy = "stun";
+			linphone_nat_policy_enable_stun(nat_policy, TRUE);
 			break;
 		case LinphonePolicyUseIce:
-			policy = "ice";
+			linphone_nat_policy_enable_ice(nat_policy, TRUE);
+			linphone_nat_policy_enable_stun(nat_policy, TRUE);
 			break;
 		case LinphonePolicyUseUpnp:
 #ifdef BUILD_UPNP
-			policy = "upnp";
+			linphone_nat_policy_enable_upnp(nat_policy, TRUE);
 #else
 			ms_warning("UPNP is not available, reset firewall policy to no firewall");
-			pol = LinphonePolicyNoFirewall;
-			policy = "none";
 #endif //BUILD_UPNP
 			break;
 	}
-#ifdef BUILD_UPNP
-	if(pol == LinphonePolicyUseUpnp) {
-		if(lc->upnp == NULL) {
-			lc->upnp = linphone_upnp_context_new(lc);
-		}
-	} else {
-		if(lc->upnp != NULL) {
-			linphone_upnp_context_destroy(lc->upnp);
-			lc->upnp = NULL;
-		}
+
+	if (stun_server_username != NULL) {
+		linphone_nat_policy_set_stun_server_username(nat_policy, stun_server_username);
+		ms_free(stun_server_username);
 	}
-	linphone_core_enable_keep_alive(lc, (lc->sip_conf.keepalive_period > 0));
-#endif //BUILD_UPNP
-	switch(pol) {
-	case LinphonePolicyUseUpnp:
-		sal_nat_helper_enable(lc->sal, FALSE);
-		sal_enable_auto_contacts(lc->sal,FALSE);
-		sal_use_rport(lc->sal, FALSE);
-		break;
-	default:
-		sal_nat_helper_enable(lc->sal, lp_config_get_int(lc->config,"net","enable_nat_helper",1));
-		sal_enable_auto_contacts(lc->sal,TRUE);
-		sal_use_rport(lc->sal, lp_config_get_int(lc->config,"sip","use_rport",1));
-		break;
+	if (stun_server != NULL) {
+		linphone_nat_policy_set_stun_server(nat_policy, stun_server);
+		ms_free(stun_server);
 	}
-	if (lc->sip_conf.contact) update_primary_contact(lc);
-	if (linphone_core_ready(lc))
-		lp_config_set_string(lc->config,"net","firewall_policy",policy);
+	linphone_core_set_nat_policy(lc, nat_policy);
+	linphone_nat_policy_unref(nat_policy);
+
+	/* Ensure that the firewall policy is cleared in the config because it has been replaced by the nat_policy. */
+	lp_config_set_string(lc->config, "net", "firewall_policy", NULL);
 }
-LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc){
+
+LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
 	const char *policy;
+
 	policy = lp_config_get_string(lc->config, "net", "firewall_policy", NULL);
-	if ((policy == NULL) || (strcmp(policy, "0") == 0))
+	if (policy == NULL) {
+		LinphoneNatPolicy *nat_policy = linphone_core_get_nat_policy(lc);
+		if (nat_policy == NULL) {
+			return LinphonePolicyNoFirewall;
+		} else if (linphone_nat_policy_upnp_enabled(nat_policy))
+			return LinphonePolicyUseUpnp;
+		else if (linphone_nat_policy_ice_enabled(nat_policy))
+			return LinphonePolicyUseIce;
+		else if (linphone_nat_policy_stun_enabled(nat_policy))
+			return LinphonePolicyUseStun;
+		else
+			return LinphonePolicyNoFirewall;
+	} else if (strcmp(policy, "0") == 0)
 		return LinphonePolicyNoFirewall;
 	else if ((strcmp(policy, "nat_address") == 0) || (strcmp(policy, "1") == 0))
 		return LinphonePolicyUseNatAddress;
@@ -4923,21 +5326,93 @@ LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc)
 		return LinphonePolicyNoFirewall;
 }
 
+void linphone_core_set_nat_policy(LinphoneCore *lc, LinphoneNatPolicy *policy) {
+	if (policy != NULL) policy = linphone_nat_policy_ref(policy); /* Prevent object destruction if the same policy is used */
+	else{
+		ms_error("linphone_core_set_nat_policy() setting to NULL is not allowed");
+		return ;
+	}
+	if (lc->nat_policy != NULL) {
+		linphone_nat_policy_unref(lc->nat_policy);
+		lc->nat_policy = NULL;
+	}
+	if (policy != NULL){
+		lc->nat_policy = policy;
+		/*start an immediate (but asynchronous) resolution.*/
+		linphone_nat_policy_resolve_stun_server(policy);
+		lp_config_set_string(lc->config, "net", "nat_policy_ref", lc->nat_policy->ref);
+		linphone_nat_policy_save_to_config(lc->nat_policy);
+	}
+
+#ifdef BUILD_UPNP
+	linphone_core_enable_keep_alive(lc, (lc->sip_conf.keepalive_period > 0));
+	if (linphone_nat_policy_upnp_enabled(policy)) {
+		if (lc->upnp == NULL) {
+			lc->upnp = linphone_upnp_context_new(lc);
+		}
+		sal_nat_helper_enable(lc->sal, FALSE);
+		sal_enable_auto_contacts(lc->sal, FALSE);
+		sal_use_rport(lc->sal, FALSE);
+	} else {
+		if (lc->upnp != NULL) {
+			linphone_upnp_context_destroy(lc->upnp);
+			lc->upnp = NULL;
+		}
+#endif
+		sal_nat_helper_enable(lc->sal, lp_config_get_int(lc->config, "net", "enable_nat_helper", 1));
+		sal_enable_auto_contacts(lc->sal, TRUE);
+		sal_use_rport(lc->sal, lp_config_get_int(lc->config, "sip", "use_rport", 1));
+		if (lc->sip_conf.contact) update_primary_contact(lc);
+#ifdef BUILD_UPNP
+	}
+#endif
+}
+
+LinphoneNatPolicy * linphone_core_get_nat_policy(const LinphoneCore *lc) {
+	return lc->nat_policy;
+}
 
 
 /*******************************************************************************
  * Call log related functions                                                  *
  ******************************************************************************/
 
-const MSList * linphone_core_get_call_logs(LinphoneCore *lc){
+void linphone_core_set_call_logs_database_path(LinphoneCore *lc, const char *path) {
+	if (lc->logs_db_file){
+		ms_free(lc->logs_db_file);
+		lc->logs_db_file = NULL;
+	}
+	if (path) {
+		lc->logs_db_file = ms_strdup(path);
+		linphone_core_call_log_storage_init(lc);
+
+		linphone_core_migrate_logs_from_rc_to_db(lc);
+	}
+}
+
+const bctbx_list_t* linphone_core_get_call_logs(LinphoneCore *lc) {
+#ifdef SQLITE_STORAGE_ENABLED
+	if (lc->logs_db) {
+		linphone_core_get_call_history(lc);
+	}
+#endif
 	return lc->call_logs;
 }
 
-void linphone_core_clear_call_logs(LinphoneCore *lc){
+void linphone_core_clear_call_logs(LinphoneCore *lc) {
+	bool_t call_logs_sqlite_db_found = FALSE;
 	lc->missed_calls=0;
-	ms_list_for_each(lc->call_logs,(void (*)(void*))linphone_call_log_unref);
-	lc->call_logs=ms_list_free(lc->call_logs);
-	call_logs_write_to_config_file(lc);
+#ifdef SQLITE_STORAGE_ENABLED
+	if (lc->logs_db) {
+		call_logs_sqlite_db_found = TRUE;
+		linphone_core_delete_call_history(lc);
+	}
+#endif
+	if (!call_logs_sqlite_db_found) {
+		bctbx_list_for_each(lc->call_logs, (void (*)(void*))linphone_call_log_unref);
+		lc->call_logs = bctbx_list_free(lc->call_logs);
+		call_logs_write_to_config_file(lc);
+	}
 }
 
 int linphone_core_get_missed_calls_count(LinphoneCore *lc) {
@@ -4948,14 +5423,123 @@ void linphone_core_reset_missed_calls_count(LinphoneCore *lc) {
 	lc->missed_calls=0;
 }
 
-void linphone_core_remove_call_log(LinphoneCore *lc, LinphoneCallLog *cl){
-	lc->call_logs = ms_list_remove(lc->call_logs, cl);
-	call_logs_write_to_config_file(lc);
-	linphone_call_log_unref(cl);
+void linphone_core_remove_call_log(LinphoneCore *lc, LinphoneCallLog *cl) {
+	bool_t call_logs_sqlite_db_found = FALSE;
+#ifdef SQLITE_STORAGE_ENABLED
+	if (lc->logs_db) {
+		call_logs_sqlite_db_found = TRUE;
+		linphone_core_delete_call_log(lc, cl);
+	}
+#endif
+	if (!call_logs_sqlite_db_found) {
+		lc->call_logs = bctbx_list_remove(lc->call_logs, cl);
+		call_logs_write_to_config_file(lc);
+		linphone_call_log_unref(cl);
+	}
+}
+
+void linphone_core_migrate_logs_from_rc_to_db(LinphoneCore *lc) {
+	bctbx_list_t *logs_to_migrate = NULL;
+	LpConfig *lpc = NULL;
+	size_t original_logs_count, migrated_logs_count;
+	int i;
+
+#ifndef SQLITE_STORAGE_ENABLED
+	ms_warning("linphone has been compiled without sqlite, can't migrate call logs");
+	return;
+#endif
+	if (!lc) {
+		return;
+	}
+
+	lpc = linphone_core_get_config(lc);
+	if (!lpc) {
+		ms_warning("this core has been started without a rc file, nothing to migrate");
+		return;
+	}
+	if (lp_config_get_int(lpc, "misc", "call_logs_migration_done", 0) == 1) {
+		ms_warning("the call logs migration has already been done, skipping...");
+		return;
+	}
+
+	// This is because there must have been a call previously to linphone_core_call_log_storage_init
+	lc->call_logs = bctbx_list_free_with_data(lc->call_logs, (void (*)(void*))linphone_call_log_unref);
+
+	call_logs_read_from_config_file(lc);
+	if (!lc->call_logs) {
+		ms_warning("nothing to migrate, skipping...");
+		return;
+	}
+
+	logs_to_migrate = lc->call_logs;
+	lc->call_logs = NULL;
+	// We can't use bctbx_list_for_each because logs_to_migrate are listed in the wrong order (latest first), and we want to store the logs latest last
+	for (i = (int)bctbx_list_size(logs_to_migrate) - 1; i >= 0; i--) {
+		LinphoneCallLog *log = (LinphoneCallLog *) bctbx_list_nth_data(logs_to_migrate, i);
+		linphone_core_store_call_log(lc, log);
+	}
+
+	original_logs_count = bctbx_list_size(logs_to_migrate);
+	migrated_logs_count = bctbx_list_size(lc->call_logs);
+	if (original_logs_count == migrated_logs_count) {
+		size_t i = 0;
+		ms_debug("call logs migration successful: %u logs migrated", (unsigned int)bctbx_list_size(lc->call_logs));
+		lp_config_set_int(lpc, "misc", "call_logs_migration_done", 1);
+
+		for (; i < original_logs_count; i++) {
+			char logsection[32];
+			snprintf(logsection, sizeof(logsection), "call_log_%u", (unsigned int)i);
+			lp_config_clean_section(lpc, logsection);
+		}
+	} else {
+		ms_error("not as many logs saved in db has logs read from rc ("FORMAT_SIZE_T" in rc against "FORMAT_SIZE_T" in db)!", original_logs_count, migrated_logs_count);
+	}
+
+	bctbx_list_free_with_data(logs_to_migrate, (void (*)(void*))linphone_call_log_unref);
 }
 
 
+/*******************************************************************************
+ * Video related functions                                                  *
+ ******************************************************************************/
 
+#ifdef VIDEO_ENABLED
+static void snapshot_taken(void *userdata, struct _MSFilter *f, unsigned int id, void *arg) {
+	if (id == MS_JPEG_WRITER_SNAPSHOT_TAKEN) {
+		LinphoneCore *lc = (LinphoneCore *)userdata;
+		linphone_core_enable_video_preview(lc, FALSE);
+	}
+}
+#endif
+
+int linphone_core_take_preview_snapshot(LinphoneCore *lc, const char *file) {
+	LinphoneCall *call = linphone_core_get_current_call(lc);
+
+	if (!file) return -1;
+	if (call) {
+		return linphone_call_take_preview_snapshot(call, file);
+	} else {
+#ifdef VIDEO_ENABLED
+		if (lc->previewstream == NULL) {
+			MSVideoSize vsize=lc->video_conf.preview_vsize.width != 0 ? lc->video_conf.preview_vsize : lc->video_conf.vsize;
+			lc->previewstream = video_preview_new(lc->factory);
+			video_preview_set_size(lc->previewstream, vsize);
+			video_preview_set_display_filter_name(lc->previewstream, NULL);
+			video_preview_set_fps(lc->previewstream,linphone_core_get_preferred_framerate(lc));
+			video_preview_start(lc->previewstream, lc->video_conf.device);
+			lc->previewstream->ms.factory = lc->factory;
+			linphone_core_enable_video_preview(lc, TRUE);
+
+			ms_filter_add_notify_callback(lc->previewstream->local_jpegwriter, snapshot_taken, lc, TRUE);
+			ms_filter_call_method(lc->previewstream->local_jpegwriter, MS_JPEG_WRITER_TAKE_SNAPSHOT, (void*)file);
+		} else {
+			ms_filter_call_method(lc->previewstream->local_jpegwriter, MS_JPEG_WRITER_TAKE_SNAPSHOT, (void*)file);
+		}
+		return 0;
+#endif
+	}
+	return -1;
+}
 
 static void toggle_video_preview(LinphoneCore *lc, bool_t val){
 #ifdef VIDEO_ENABLED
@@ -4963,7 +5547,7 @@ static void toggle_video_preview(LinphoneCore *lc, bool_t val){
 		if (lc->previewstream==NULL){
 			const char *display_filter=linphone_core_get_video_display_filter(lc);
 			MSVideoSize vsize=lc->video_conf.preview_vsize.width!=0 ? lc->video_conf.preview_vsize : lc->video_conf.vsize;
-			lc->previewstream=video_preview_new();
+			lc->previewstream=video_preview_new(lc->factory);
 			video_preview_set_size(lc->previewstream,vsize);
 			if (display_filter)
 				video_preview_set_display_filter_name(lc->previewstream,display_filter);
@@ -4971,6 +5555,7 @@ static void toggle_video_preview(LinphoneCore *lc, bool_t val){
 				video_preview_set_native_window_id(lc->previewstream,lc->preview_window_id);
 			video_preview_set_fps(lc->previewstream,linphone_core_get_preferred_framerate(lc));
 			video_preview_start(lc->previewstream,lc->video_conf.device);
+			lc->previewstream->ms.factory = lc->factory;
 		}
 	}else{
 		if (lc->previewstream!=NULL){
@@ -5071,7 +5656,7 @@ void linphone_core_set_video_policy(LinphoneCore *lc, const LinphoneVideoPolicy
  * See linphone_core_set_video_policy() for more details.
  * @ingroup media_parameters
 **/
-const LinphoneVideoPolicy *linphone_core_get_video_policy(LinphoneCore *lc){
+const LinphoneVideoPolicy *linphone_core_get_video_policy(const LinphoneCore *lc){
 	return &lc->video_policy;
 }
 
@@ -5142,13 +5727,13 @@ int linphone_core_set_video_device(LinphoneCore *lc, const char *id){
 	MSWebCam *olddev=lc->video_conf.device;
 	const char *vd;
 	if (id!=NULL){
-		lc->video_conf.device=ms_web_cam_manager_get_cam(ms_web_cam_manager_get(),id);
+		lc->video_conf.device=ms_web_cam_manager_get_cam(ms_factory_get_web_cam_manager(lc->factory),id);
 		if (lc->video_conf.device==NULL){
 			ms_warning("Could not find video device %s",id);
 		}
 	}
 	if (lc->video_conf.device==NULL)
-		lc->video_conf.device=ms_web_cam_manager_get_default_cam(ms_web_cam_manager_get());
+		lc->video_conf.device=ms_web_cam_manager_get_default_cam(ms_factory_get_web_cam_manager(lc->factory));
 	if (olddev!=NULL && olddev!=lc->video_conf.device){
 		toggle_video_preview(lc,FALSE);/*restart the video local preview*/
 	}
@@ -5286,7 +5871,7 @@ void * linphone_core_get_native_video_window_id(const LinphoneCore *lc){
 static void unset_video_window_id(LinphoneCore *lc, bool_t preview, void *id){
 #ifdef VIDEO_ENABLED
 	LinphoneCall *call;
-	MSList *elem;
+	bctbx_list_t *elem;
 #endif
 
 	if ((id != NULL)
@@ -5598,6 +6183,10 @@ void linphone_core_set_use_files(LinphoneCore *lc, bool_t yesno){
 	lc->use_files=yesno;
 }
 
+bool_t linphone_core_get_use_files(LinphoneCore *lc) {
+	return lc->use_files;
+}
+
 const char * linphone_core_get_play_file(const LinphoneCore *lc) {
 	return lc->play_file;
 }
@@ -5644,7 +6233,7 @@ static MSFilter *get_audio_resource(LinphoneCore *lc, LinphoneAudioResourceType
 	if (call){
 		stream=call->audiostream;
 	}else if (linphone_core_is_in_conference(lc)){
-		stream=lc->conf_ctx.local_participant;
+		stream=linphone_conference_get_audio_stream(lc->conf_ctx);
 	}
 	if (stream){
 		if (rtype==LinphoneToneGenerator) return stream->dtmfgen;
@@ -5652,18 +6241,18 @@ static MSFilter *get_audio_resource(LinphoneCore *lc, LinphoneAudioResourceType
 		return NULL;
 	}
 	if (lc->ringstream==NULL){
-		float amp=lp_config_get_float(lc->config,"sound","dtmf_player_amp",0.1);
+		float amp=lp_config_get_float(lc->config,"sound","dtmf_player_amp",0.1f);
 		MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
 		if (ringcard == NULL)
 			return NULL;
 
-		ringstream=lc->ringstream=ring_start(NULL,0,ringcard);
+		ringstream=lc->ringstream=ring_start(lc->factory, NULL,0,ringcard);
 		ms_filter_call_method(lc->ringstream->gendtmf,MS_DTMF_GEN_SET_DEFAULT_AMPLITUDE,&amp);
-		lc->dmfs_playing_start_time=time(NULL);
+		lc->dmfs_playing_start_time = ms_get_cur_time_ms()/1000;
 	}else{
 		ringstream=lc->ringstream;
 		if (lc->dmfs_playing_start_time!=0)
-			lc->dmfs_playing_start_time=time(NULL);
+			lc->dmfs_playing_start_time = ms_get_cur_time_ms()/1000;
 	}
 	if (rtype==LinphoneToneGenerator) return ringstream->gendtmf;
 	if (rtype==LinphoneLocalPlayer) return ringstream->source;
@@ -5821,9 +6410,9 @@ void linphone_core_set_mtu(LinphoneCore *lc, int mtu){
 			ms_error("MTU too small !");
 			mtu=500;
 		}
-		ms_set_mtu(mtu);
-		ms_message("MTU is supposed to be %i, rtp payload max size will be %i",mtu, ms_get_payload_max_size());
-	}else ms_set_mtu(0);//use mediastreamer2 default value
+		ms_factory_set_mtu(lc->factory, mtu);
+		ms_message("MTU is supposed to be %i, rtp payload max size will be %i",mtu, ms_factory_get_payload_max_size(lc->factory));
+	}else ms_factory_set_mtu(lc->factory, 0);//use mediastreamer2 default value
 }
 
 void linphone_core_set_waiting_callback(LinphoneCore *lc, LinphoneCoreWaitingCallback cb, void *user_context){
@@ -5882,13 +6471,6 @@ void net_config_uninit(LinphoneCore *lc)
 {
 	net_config_t *config=&lc->net_conf;
 
-	if (config->stun_server!=NULL){
-		ms_free(config->stun_server);
-	}
-	if (config->stun_addrinfo){
-		freeaddrinfo(config->stun_addrinfo);
-		config->stun_addrinfo=NULL;
-	}
 	if (config->nat_address!=NULL){
 		lp_config_set_string(lc->config,"net","nat_address",config->nat_address);
 		ms_free(lc->net_conf.nat_address);
@@ -5897,12 +6479,16 @@ void net_config_uninit(LinphoneCore *lc)
 		ms_free(lc->net_conf.nat_address_ip);
 	}
 	lp_config_set_int(lc->config,"net","mtu",config->mtu);
+	if (lc->nat_policy != NULL) {
+		linphone_nat_policy_unref(lc->nat_policy);
+		lc->nat_policy = NULL;
+	}
 }
 
 
 void sip_config_uninit(LinphoneCore *lc)
 {
-	MSList *elem;
+	bctbx_list_t *elem;
 	int i;
 	sip_config_t *config=&lc->sip_conf;
 	bool_t still_registered=TRUE;
@@ -5912,13 +6498,13 @@ void sip_config_uninit(LinphoneCore *lc)
 	lp_config_set_int(lc->config,"sip","inc_timeout",config->inc_timeout);
 	lp_config_set_int(lc->config,"sip","in_call_timeout",config->in_call_timeout);
 	lp_config_set_int(lc->config,"sip","delayed_timeout",config->delayed_timeout);
-	lp_config_set_int(lc->config,"sip","use_ipv6",config->ipv6_enabled);
 	lp_config_set_int(lc->config,"sip","register_only_when_network_is_up",config->register_only_when_network_is_up);
 	lp_config_set_int(lc->config,"sip","register_only_when_upnp_is_ok",config->register_only_when_upnp_is_ok);
 
-	if (lc->network_reachable) {
-		for(elem=config->proxies;elem!=NULL;elem=ms_list_next(elem)){
+	if (lc->sip_network_reachable) {
+		for(elem=config->proxies;elem!=NULL;elem=bctbx_list_next(elem)){
 			LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)(elem->data);
+			_linphone_proxy_config_unpublish(cfg);	/* to unpublish without changing the stored flag enable_publish */
 			_linphone_proxy_config_unregister(cfg);	/* to unregister without changing the stored flag enable_register */
 		}
 
@@ -5927,7 +6513,7 @@ void sip_config_uninit(LinphoneCore *lc)
 		for (i=0;i<20&&still_registered;i++){
 			still_registered=FALSE;
 			sal_iterate(lc->sal);
-			for(elem=config->proxies;elem!=NULL;elem=ms_list_next(elem)){
+			for(elem=config->proxies;elem!=NULL;elem=bctbx_list_next(elem)){
 				LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)(elem->data);
 				LinphoneRegistrationState state = linphone_proxy_config_get_state(cfg);
 				still_registered|=(state==LinphoneRegistrationOk||state==LinphoneRegistrationProgress);
@@ -5936,15 +6522,32 @@ void sip_config_uninit(LinphoneCore *lc)
 		}
 		if (i>=20) ms_warning("Cannot complete unregistration, giving up");
 	}
-	config->proxies=ms_list_free_with_data(config->proxies,(void (*)(void*)) _linphone_proxy_config_release);
+	config->proxies=bctbx_list_free_with_data(config->proxies,(void (*)(void*)) _linphone_proxy_config_release);
 
-	config->deleted_proxies=ms_list_free_with_data(config->deleted_proxies,(void (*)(void*)) _linphone_proxy_config_release);
+	config->deleted_proxies=bctbx_list_free_with_data(config->deleted_proxies,(void (*)(void*)) _linphone_proxy_config_release);
 
 	/*no longuer need to write proxy config if not changedlinphone_proxy_config_write_to_config_file(lc->config,NULL,i);*/	/*mark the end */
 
-	lc->auth_info=ms_list_free_with_data(lc->auth_info,(void (*)(void*))linphone_auth_info_destroy);
+	lc->auth_info=bctbx_list_free_with_data(lc->auth_info,(void (*)(void*))linphone_auth_info_destroy);
 
-	/*now that we are unregisted, we no longer need the tunnel.*/
+
+
+	if (lc->vcard_context) {
+		linphone_vcard_context_destroy(lc->vcard_context);
+	}
+
+	sal_reset_transports(lc->sal);
+	sal_unlisten_ports(lc->sal); /*to make sure no new messages are received*/
+	if (lc->http_provider) {
+		belle_sip_object_unref(lc->http_provider);
+		lc->http_provider=NULL;
+	}
+	if (lc->http_crypto_config){
+		belle_sip_object_unref(lc->http_crypto_config);
+		lc->http_crypto_config=NULL;
+	}
+	
+	/*now that we are unregisted, there is no more channel using tunnel socket we no longer need the tunnel.*/
 #ifdef TUNNEL_ENABLED
 	if (lc->tunnel) {
 		linphone_tunnel_destroy(lc->tunnel);
@@ -5953,24 +6556,17 @@ void sip_config_uninit(LinphoneCore *lc)
 	}
 #endif
 
-	sal_reset_transports(lc->sal);
-	sal_unlisten_ports(lc->sal); /*to make sure no new messages are received*/
-	if (lc->http_provider) {
-		belle_sip_object_unref(lc->http_provider);
-		lc->http_provider=NULL;
-	}
-	if (lc->http_verify_policy){
-		belle_sip_object_unref(lc->http_verify_policy);
-		lc->http_verify_policy=NULL;
-	}
 	sal_iterate(lc->sal); /*make sure event are purged*/
 	sal_uninit(lc->sal);
 	lc->sal=NULL;
+	
 
 	if (lc->sip_conf.guessed_contact)
 		ms_free(lc->sip_conf.guessed_contact);
 	if (config->contact)
 		ms_free(config->contact);
+	if (lc->default_rls_addr)
+		linphone_address_destroy(lc->default_rls_addr);
 
 }
 
@@ -5987,6 +6583,11 @@ void rtp_config_uninit(LinphoneCore *lc)
 	} else {
 		lp_config_set_range(lc->config, "rtp", "video_rtp_port", config->video_rtp_min_port, config->video_rtp_max_port);
 	}
+	if (config->text_rtp_min_port == config->text_rtp_max_port) {
+		lp_config_set_int(lc->config, "rtp", "text_rtp_port", config->text_rtp_min_port);
+	} else {
+		lp_config_set_range(lc->config, "rtp", "text_rtp_port", config->text_rtp_min_port, config->text_rtp_max_port);
+	}
 	lp_config_set_int(lc->config,"rtp","audio_jitt_comp",config->audio_jitt_comp);
 	lp_config_set_int(lc->config,"rtp","video_jitt_comp",config->video_jitt_comp);
 	lp_config_set_int(lc->config,"rtp","nortp_timeout",config->nortp_timeout);
@@ -6000,7 +6601,7 @@ void rtp_config_uninit(LinphoneCore *lc)
 static void sound_config_uninit(LinphoneCore *lc)
 {
 	sound_config_t *config=&lc->sound_conf;
-	ms_free(config->cards);
+	ms_free((void *)config->cards);
 
 	lp_config_set_string(lc->config,"sound","remote_ring",config->remote_ring);
 	lp_config_set_float(lc->config,"sound","playback_gain_db",config->soft_play_lev);
@@ -6008,7 +6609,7 @@ static void sound_config_uninit(LinphoneCore *lc)
 
 	if (config->local_ring) ms_free(config->local_ring);
 	if (config->remote_ring) ms_free(config->remote_ring);
-	lc->tones=ms_list_free_with_data(lc->tones, (void (*)(void*))linphone_tone_description_destroy);
+	lc->tones=bctbx_list_free_with_data(lc->tones, (void (*)(void*))linphone_tone_description_destroy);
 }
 
 static void video_config_uninit(LinphoneCore *lc)
@@ -6017,18 +6618,18 @@ static void video_config_uninit(LinphoneCore *lc)
 	lp_config_set_int(lc->config,"video","display",lc->video_conf.display);
 	lp_config_set_int(lc->config,"video","capture",lc->video_conf.capture);
 	if (lc->video_conf.cams)
-		ms_free(lc->video_conf.cams);
+		ms_free((void *)lc->video_conf.cams);
 }
 
 void _linphone_core_codec_config_write(LinphoneCore *lc){
 	if (linphone_core_ready(lc)){
 		PayloadType *pt;
 		codecs_config_t *config=&lc->codecs_conf;
-		MSList *node;
+		bctbx_list_t *node;
 		char key[50];
 		int index;
 		index=0;
-		for(node=config->audio_codecs;node!=NULL;node=ms_list_next(node)){
+		for(node=config->audio_codecs;node!=NULL;node=bctbx_list_next(node)){
 			pt=(PayloadType*)(node->data);
 			sprintf(key,"audio_codec_%i",index);
 			lp_config_set_string(lc->config,key,"mime",pt->mime_type);
@@ -6041,7 +6642,7 @@ void _linphone_core_codec_config_write(LinphoneCore *lc){
 		lp_config_clean_section (lc->config,key);
 
 		index=0;
-		for(node=config->video_codecs;node!=NULL;node=ms_list_next(node)){
+		for(node=config->video_codecs;node!=NULL;node=bctbx_list_next(node)){
 			pt=(PayloadType*)(node->data);
 			sprintf(key,"video_codec_%i",index);
 			lp_config_set_string(lc->config,key,"mime",pt->mime_type);
@@ -6058,17 +6659,17 @@ void _linphone_core_codec_config_write(LinphoneCore *lc){
 static void codecs_config_uninit(LinphoneCore *lc)
 {
 	_linphone_core_codec_config_write(lc);
-	ms_list_free_with_data(lc->codecs_conf.audio_codecs, (void (*)(void*))payload_type_destroy);
-	ms_list_free_with_data(lc->codecs_conf.video_codecs, (void (*)(void*))payload_type_destroy);
+	bctbx_list_free_with_data(lc->codecs_conf.audio_codecs, (void (*)(void*))payload_type_destroy);
+	bctbx_list_free_with_data(lc->codecs_conf.video_codecs, (void (*)(void*))payload_type_destroy);
+	bctbx_list_free_with_data(lc->codecs_conf.text_codecs, (void (*)(void*))payload_type_destroy);
 }
 
-void ui_config_uninit(LinphoneCore* lc)
+void friends_config_uninit(LinphoneCore* lc)
 {
 	ms_message("Destroying friends.");
-	if (lc->friends){
-		ms_list_for_each(lc->friends,(void (*)(void *))linphone_friend_unref);
-		ms_list_free(lc->friends);
-		lc->friends=NULL;
+	lc->friends_lists = bctbx_list_free_with_data(lc->friends_lists, (void (*)(void*))_linphone_friend_list_release);
+	if (lc->subscribers) {
+		lc->subscribers = bctbx_list_free_with_data(lc->subscribers, (void (*)(void *))_linphone_friend_release);
 	}
 	if (lc->presence_model) {
 		linphone_presence_model_unref(lc->presence_model);
@@ -6095,19 +6696,33 @@ LpConfig * linphone_core_create_lp_config(LinphoneCore *lc, const char *filename
 
 static void linphone_core_uninit(LinphoneCore *lc)
 {
+	bctbx_list_t *elem = NULL;
+	int i=0;
+	bool_t wait_until_unsubscribe = FALSE;
 	linphone_task_list_free(&lc->hooks);
 	lc->video_conf.show_local = FALSE;
 
-	while(lc->calls)
-	{
+	while(lc->calls) {
 		LinphoneCall *the_call = lc->calls->data;
 		linphone_core_terminate_call(lc,the_call);
 		linphone_core_iterate(lc);
-		ms_usleep(50000);
+		ms_usleep(10000);
 	}
 
-	if (lc->friends) /* FIXME we should wait until subscription to complete*/
-		ms_list_for_each(lc->friends,(void (*)(void *))linphone_friend_close_subscriptions);
+	for (elem = lc->friends_lists; elem != NULL; elem = bctbx_list_next(elem)) {
+		LinphoneFriendList *list = (LinphoneFriendList *)elem->data;
+		linphone_friend_list_enable_subscriptions(list,FALSE);
+		if (list->event)
+			wait_until_unsubscribe =  TRUE;
+	}
+	/*give a chance to unsubscribe, might be optimized*/
+	for (i=0; wait_until_unsubscribe && i<50; i++) {
+		linphone_core_iterate(lc);
+		ms_usleep(10000);
+	}
+
+	lc->chatrooms = bctbx_list_free_with_data(lc->chatrooms, (MSIterateFunc)linphone_chat_room_release);
+
 	linphone_core_set_state(lc,LinphoneGlobalShutdown,"Shutting down");
 #ifdef VIDEO_ENABLED
 	if (lc->previewstream!=NULL){
@@ -6117,8 +6732,9 @@ static void linphone_core_uninit(LinphoneCore *lc)
 #endif
 
 	lc->msevq=NULL;
+	
 	/* save all config */
-	ui_config_uninit(lc);
+	friends_config_uninit(lc);
 	sip_config_uninit(lc);
 	net_config_uninit(lc);
 	rtp_config_uninit(lc);
@@ -6136,18 +6752,15 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	}
 #endif //BUILD_UPNP
 
-	ms_list_for_each(lc->chatrooms, (MSIterateFunc)linphone_chat_room_release);
-	lc->chatrooms = ms_list_free(lc->chatrooms);
-
 	if (lp_config_needs_commit(lc->config)) lp_config_sync(lc->config);
 	lp_config_destroy(lc->config);
 	lc->config = NULL; /* Mark the config as NULL to block further calls */
 
-	ms_list_for_each(lc->call_logs,(void (*)(void*))linphone_call_log_unref);
-	lc->call_logs=ms_list_free(lc->call_logs);
+	bctbx_list_for_each(lc->call_logs,(void (*)(void*))linphone_call_log_unref);
+	lc->call_logs=bctbx_list_free(lc->call_logs);
 
-	ms_list_for_each(lc->last_recv_msg_ids,ms_free);
-	lc->last_recv_msg_ids=ms_list_free(lc->last_recv_msg_ids);
+	bctbx_list_for_each(lc->last_recv_msg_ids,ms_free);
+	lc->last_recv_msg_ids=bctbx_list_free(lc->last_recv_msg_ids);
 
 	if(lc->zrtp_secrets_cache != NULL) {
 		ms_free(lc->zrtp_secrets_cache);
@@ -6164,52 +6777,76 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	if (lc->chat_db_file){
 		ms_free(lc->chat_db_file);
 	}
-	if(lc->presence_model){
-		linphone_presence_model_unref(lc->presence_model);
+	if (lc->logs_db_file) {
+		ms_free(lc->logs_db_file);
 	}
+	if (lc->friends_db_file) {
+		ms_free(lc->friends_db_file);
+	}
+	if (lc->ringtoneplayer) {
+		linphone_ringtoneplayer_destroy(lc->ringtoneplayer);
+	}
+
 	linphone_core_free_payload_types(lc);
-	if (lc->supported_formats) ms_free(lc->supported_formats);
+	if (lc->supported_formats) ms_free((void *)lc->supported_formats);
 	linphone_core_message_storage_close(lc);
-	ms_exit();
+	linphone_core_call_log_storage_close(lc);
+	linphone_core_friends_storage_close(lc);
+
 	linphone_core_set_state(lc,LinphoneGlobalOff,"Off");
 	linphone_core_deactivate_log_serialization_if_needed();
-	ms_list_free_with_data(lc->vtable_refs,(void (*)(void *))v_table_reference_destroy);
+	bctbx_list_free_with_data(lc->vtable_refs,(void (*)(void *))v_table_reference_destroy);
+
+	ms_factory_destroy(lc->factory);
 }
 
-static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t curtime){
-	// second get the list of available proxies
-	const MSList *elem=linphone_core_get_proxy_config_list(lc);
-
-	if (lc->network_reachable==isReachable) return; // no change, ignore.
-	lc->network_reachable_to_be_notified=TRUE;
-	ms_message("Network state is now [%s]",isReachable?"UP":"DOWN");
-	for(;elem!=NULL;elem=elem->next){
-		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
-		if (linphone_proxy_config_register_enabled(cfg) ) {
-			if (!isReachable) {
-				linphone_proxy_config_stop_refreshing(cfg);
-				linphone_proxy_config_set_state(cfg, LinphoneRegistrationNone,"Registration impossible (network down)");
-			}else{
-				cfg->commit=TRUE;
-			}
+static void stop_refreshing_proxy_config(bool_t is_sip_reachable, LinphoneProxyConfig* cfg) {
+	if (linphone_proxy_config_register_enabled(cfg) ) {
+		if (!is_sip_reachable) {
+			linphone_proxy_config_stop_refreshing(cfg);
+			linphone_proxy_config_set_state(cfg, LinphoneRegistrationNone,"Registration impossible (network down)");
+		}else{
+			cfg->commit=TRUE;
 		}
 	}
-	lc->netup_time=curtime;
-	lc->network_reachable=isReachable;
+}
+static void set_sip_network_reachable(LinphoneCore* lc,bool_t is_sip_reachable, time_t curtime){
+	// second get the list of available proxies
+	const bctbx_list_t *elem = NULL;
 
-	if (!lc->network_reachable){
+	if (lc->sip_network_reachable==is_sip_reachable) return; // no change, ignore.
+	lc->network_reachable_to_be_notified=TRUE;
+	ms_message("SIP network reachability state is now [%s]",is_sip_reachable?"UP":"DOWN");
+	for(elem=linphone_core_get_proxy_config_list(lc);elem!=NULL;elem=elem->next){
+		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
+		stop_refreshing_proxy_config(is_sip_reachable, cfg);
+	}
+	for(elem=lc->sip_conf.deleted_proxies;elem!=NULL;elem=elem->next){
+		LinphoneProxyConfig *deleted_cfg=(LinphoneProxyConfig*)elem->data;
+		stop_refreshing_proxy_config(is_sip_reachable, deleted_cfg);
+	}
+
+
+
+
+	lc->netup_time=curtime;
+	lc->sip_network_reachable=is_sip_reachable;
+
+	if (!lc->sip_network_reachable){
 		linphone_core_invalidate_friend_subscriptions(lc);
 		sal_reset_transports(lc->sal);
+		/*mark all calls as broken, so that they can be either dropped immediately or restaured when network will be back*/
+		bctbx_list_for_each(lc->calls, (MSIterateFunc) linphone_call_set_broken);
 	}else{
 		linphone_core_resolve_stun_server(lc);
 	}
 #ifdef BUILD_UPNP
 	if(lc->upnp == NULL) {
-		if(isReachable && linphone_core_get_firewall_policy(lc) == LinphonePolicyUseUpnp) {
+		if(is_sip_reachable && linphone_core_get_firewall_policy(lc) == LinphonePolicyUseUpnp) {
 			lc->upnp = linphone_upnp_context_new(lc);
 		}
 	} else {
-		if(!isReachable && linphone_core_get_firewall_policy(lc) == LinphonePolicyUseUpnp) {
+		if(!is_sip_reachable && linphone_core_get_firewall_policy(lc) == LinphonePolicyUseUpnp) {
 			linphone_upnp_context_destroy(lc->upnp);
 			lc->upnp = NULL;
 		}
@@ -6217,9 +6854,37 @@ static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t cu
 #endif
 }
 
+void linphone_core_repair_calls(LinphoneCore *lc){
+	if (lc->calls && lp_config_get_int(lc->config, "sip", "repair_broken_calls", 1) && lc->media_network_reachable){
+		/*if we are registered and there were broken calls due to a past network disconnection, attempt to repair them*/
+		bctbx_list_for_each(lc->calls, (MSIterateFunc) linphone_call_repair_if_broken);
+	}
+}
+
+static void set_media_network_reachable(LinphoneCore* lc, bool_t is_media_reachable){
+	if (lc->media_network_reachable==is_media_reachable) return; // no change, ignore.
+	ms_message("Media network reachability state is now [%s]",is_media_reachable?"UP":"DOWN");
+	lc->media_network_reachable=is_media_reachable;
+
+	if (!lc->media_network_reachable){
+		/*mark all calls as broken, so that they can be either dropped immediately or restaured when network will be back*/
+		bctbx_list_for_each(lc->calls, (MSIterateFunc) linphone_call_set_broken);
+	}else{
+		if (lp_config_get_int(lc->config, "net", "recreate_sockets_when_network_is_up", 0)){
+			bctbx_list_for_each(lc->calls, (MSIterateFunc)linphone_call_refresh_sockets);
+		}
+		linphone_core_repair_calls(lc);
+	}
+}
+
+static void set_network_reachable(LinphoneCore *lc, bool_t is_network_reachable, time_t curtime){
+	set_sip_network_reachable(lc, is_network_reachable, curtime);
+	set_media_network_reachable(lc, is_network_reachable);
+}
+
 void linphone_core_refresh_registers(LinphoneCore* lc) {
-	const MSList *elem;
-	if (!lc->network_reachable) {
+	const bctbx_list_t *elem;
+	if (!lc->sip_network_reachable) {
 		ms_warning("Refresh register operation not available (network unreachable)");
 		return;
 	}
@@ -6232,28 +6897,31 @@ void linphone_core_refresh_registers(LinphoneCore* lc) {
 	}
 }
 
-void __linphone_core_invalidate_registers(LinphoneCore* lc){
-	const MSList *elem=linphone_core_get_proxy_config_list(lc);
-	for(;elem!=NULL;elem=elem->next){
-		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
-		if (linphone_proxy_config_register_enabled(cfg)) {
-			linphone_proxy_config_edit(cfg);
-			linphone_proxy_config_done(cfg);
-		}
-	}
-}
 
-void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t isReachable) {
-	//first disable automatic mode
+static void disable_internal_network_reachability_detection(LinphoneCore *lc){
 	if (lc->auto_net_state_mon) {
 		ms_message("Disabling automatic network state monitoring");
 		lc->auto_net_state_mon=FALSE;
 	}
-	set_network_reachable(lc,isReachable, ms_time(NULL));
+}
+
+void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t isReachable) {
+	disable_internal_network_reachability_detection(lc);
+	set_network_reachable(lc, isReachable, ms_time(NULL));
+}
+
+void linphone_core_set_media_network_reachable(LinphoneCore *lc, bool_t is_reachable){
+	disable_internal_network_reachability_detection(lc);
+	set_media_network_reachable(lc, is_reachable);
+}
+
+void linphone_core_set_sip_network_reachable(LinphoneCore *lc, bool_t is_reachable){
+	disable_internal_network_reachability_detection(lc);
+	set_sip_network_reachable(lc, is_reachable, ms_time(NULL));
 }
 
 bool_t linphone_core_is_network_reachable(LinphoneCore* lc) {
-	return lc->network_reachable;
+	return lc->sip_network_reachable;
 }
 ortp_socket_t linphone_core_get_sip_socket(LinphoneCore *lc){
 	return sal_get_socket(lc->sal);
@@ -6273,7 +6941,7 @@ void linphone_core_destroy(LinphoneCore *lc){
  * @ingroup call_control
 **/
 int linphone_core_get_calls_nb(const LinphoneCore *lc){
-	return  ms_list_size(lc->calls);;
+	return (int)bctbx_list_size(lc->calls);
 }
 
 /**
@@ -6297,7 +6965,7 @@ static void notify_soundcard_usage(LinphoneCore *lc, bool_t used){
 }
 
 void linphone_core_soundcard_hint_check( LinphoneCore* lc){
-	MSList* the_calls = lc->calls;
+	bctbx_list_t* the_calls = lc->calls;
 	LinphoneCall* call = NULL;
 	bool_t dont_need_sound = TRUE;
 	bool_t use_rtp_io = lp_config_get_int(lc->config, "sound", "rtp_io", FALSE);
@@ -6323,7 +6991,7 @@ int linphone_core_add_call( LinphoneCore *lc, LinphoneCall *call)
 {
 	if (linphone_core_can_we_add_call(lc)){
 		if (lc->calls==NULL) notify_soundcard_usage(lc,TRUE);
-		lc->calls = ms_list_append(lc->calls,call);
+		lc->calls = bctbx_list_append(lc->calls,call);
 		return 0;
 	}
 	return -1;
@@ -6331,13 +6999,13 @@ int linphone_core_add_call( LinphoneCore *lc, LinphoneCall *call)
 
 int linphone_core_del_call( LinphoneCore *lc, LinphoneCall *call)
 {
-	MSList *it;
-	MSList *the_calls = lc->calls;
+	bctbx_list_t *it;
+	bctbx_list_t *the_calls = lc->calls;
 
-	it=ms_list_find(the_calls,call);
+	it=bctbx_list_find(the_calls,call);
 	if (it)
 	{
-		the_calls = ms_list_remove_link(the_calls,it);
+		the_calls = bctbx_list_erase_link(the_calls,it);
 	}
 	else
 	{
@@ -6378,6 +7046,11 @@ LinphonePayloadType* linphone_core_find_payload_type(LinphoneCore* lc, const cha
 		result = find_payload_type_from_list(type, rate, 0, linphone_core_get_video_codecs(lc));
 		if (result) {
 			return result;
+		} else {
+			result = find_payload_type_from_list(type, rate, 0, linphone_core_get_text_codecs(lc));
+			if (result) {
+				return result;
+			}
 		}
 	}
 	/*not found*/
@@ -6423,12 +7096,14 @@ LinphoneGlobalState linphone_core_get_global_state(const LinphoneCore *lc){
 	return lc->state;
 }
 
-LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *lc){
+
+static LinphoneCallParams *_create_call_params(LinphoneCore *lc){
 	LinphoneCallParams *p=linphone_call_params_new();
 	linphone_core_init_default_params(lc, p);
 	return p;
 }
 
+
 /**
  * Create a LinphoneCallParams suitable for linphone_core_invite_with_params(), linphone_core_accept_call_with_params(), linphone_core_accept_early_media_with_params(),
  * linphone_core_accept_call_update().
@@ -6439,8 +7114,12 @@ LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *l
  * @ingroup call_control
  */
 LinphoneCallParams *linphone_core_create_call_params(LinphoneCore *lc, LinphoneCall *call){
-	if (!call) return linphone_core_create_default_call_parameters(lc);
-	return linphone_call_params_copy(call->params);
+	if (!call) return _create_call_params(lc);
+	if (call->params){
+		return linphone_call_params_copy(call->params);
+	}
+	ms_error("linphone_core_create_call_params(): call [%p] is not in a state where call params can be created or used.", call);
+	return NULL;
 }
 
 const char *linphone_reason_to_string(LinphoneReason err){
@@ -6464,7 +7143,7 @@ const char *linphone_reason_to_string(LinphoneReason err){
 		case LinphoneReasonIOError:
 			return "IO error";
 		case LinphoneReasonDoNotDisturb:
-			return "Do not distrub";
+			return "Do not disturb";
 		case LinphoneReasonUnauthorized:
 			return "Unauthorized";
 		case LinphoneReasonNotAcceptable:
@@ -6532,6 +7211,9 @@ void linphone_core_start_dtmf_stream(LinphoneCore* lc) {
 **/
 void linphone_core_stop_ringing(LinphoneCore* lc) {
 	LinphoneCall *call=linphone_core_get_current_call(lc);
+	if (linphone_ringtoneplayer_is_started(lc->ringtoneplayer)) {
+		linphone_ringtoneplayer_stop(lc->ringtoneplayer);
+	}
 	if (lc->ringstream) {
 		ring_stop(lc->ringstream);
 		lc->ringstream=NULL;
@@ -6568,7 +7250,7 @@ static void linphone_core_run_hooks(LinphoneCore *lc){
 
 void linphone_core_remove_iterate_hook(LinphoneCore *lc, LinphoneCoreIterateHook hook, void *hook_data){
 	linphone_task_list_remove(&lc->hooks, hook, hook_data);
-	
+
 }
 
 void linphone_core_set_zrtp_secrets_file(LinphoneCore *lc, const char* file){
@@ -6595,7 +7277,7 @@ const char *linphone_core_get_user_certificates_path(LinphoneCore *lc){
 }
 
 LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri) {
-	MSList *calls;
+	bctbx_list_t *calls;
 	LinphoneCall *c;
 	const LinphoneAddress *address;
 	char *current_uri;
@@ -6619,15 +7301,25 @@ LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const cha
 
 
 /**
- * Check if a call will need the sound resources.
+ * Check if a call will need the sound resources in near future (typically an outgoing call that is awaiting
+ * response).
+ * In liblinphone, it is not possible to have two independant calls using sound device or camera at the same time.
+ * In order to prevent this situation, an application can use linphone_core_sound_resources_locked() to know whether
+ * it is possible at a given time to start a new outgoing call.
+ * When the function returns TRUE, an application should not allow the user to start an outgoing call.
  *
  * @ingroup call_control
  * @param lc The LinphoneCore
 **/
 bool_t linphone_core_sound_resources_locked(LinphoneCore *lc){
-	MSList *elem;
+	bctbx_list_t *elem;
 	for(elem=lc->calls;elem!=NULL;elem=elem->next) {
 		LinphoneCall *c=(LinphoneCall*)elem->data;
+
+		if (linphone_call_media_in_progress(c)) {
+			return TRUE;
+		}
+
 		switch (c->state) {
 			case LinphoneCallOutgoingInit:
 			case LinphoneCallOutgoingProgress:
@@ -6673,7 +7365,7 @@ bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, Linphone
 		case LinphoneMediaEncryptionDTLS:
 			return ms_dtls_srtp_available();
 		case LinphoneMediaEncryptionZRTP:
-			return ms_zrtp_available();
+			return ms_zrtp_available() && !lc->zrtp_not_available_simulation;
 		case LinphoneMediaEncryptionNone:
 			return TRUE;
 	}
@@ -6696,7 +7388,7 @@ int linphone_core_set_media_encryption(LinphoneCore *lc, LinphoneMediaEncryption
 			}
 		break;
 		case LinphoneMediaEncryptionZRTP:
-			if (!ms_zrtp_available()){
+			if (!linphone_core_media_encryption_supported(lc, LinphoneMediaEncryptionZRTP)){
 				ms_warning("ZRTP not supported by library.");
 				type="none";
 				ret=-1;
@@ -6748,16 +7440,26 @@ void linphone_core_set_media_encryption_mandatory(LinphoneCore *lc, bool_t m) {
 }
 
 void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *params) {
+	params->has_audio = TRUE;
 	params->has_video=linphone_core_video_enabled(lc) && lc->video_policy.automatically_initiate;
+	if (!linphone_core_video_enabled(lc) && lc->video_policy.automatically_initiate){
+		ms_error("LinphoneCore has video disabled for both capture and display, but video policy is to start the call with video. "
+			"This is a possible mis-use of the API. In this case, video is disabled in default LinphoneCallParams");
+	}
 	params->media_encryption=linphone_core_get_media_encryption(lc);
 	params->in_conference=FALSE;
+	params->realtimetext_enabled = linphone_core_realtime_text_enabled(lc);
 	params->privacy=LinphonePrivacyDefault;
-	params->avpf_enabled=FALSE;
+	params->avpf_enabled=linphone_core_get_avpf_mode(lc);
+	params->implicit_rtcp_fb = lp_config_get_int(lc->config,"rtp","rtcp_fb_implicit_rtcp_fb",TRUE);
+	params->avpf_rr_interval = linphone_core_get_avpf_rr_interval(lc);
 	params->audio_dir=LinphoneMediaDirectionSendRecv;
 	params->video_dir=LinphoneMediaDirectionSendRecv;
 	params->real_early_media=lp_config_get_int(lc->config,"misc","real_early_media",FALSE);
 	params->audio_multicast_enabled=linphone_core_audio_multicast_enabled(lc);
 	params->video_multicast_enabled=linphone_core_video_multicast_enabled(lc);
+	params->update_call_when_ice_completed = lp_config_get_int(lc->config, "sip", "update_call_when_ice_completed", TRUE);
+	params->encryption_mandatory = linphone_core_is_media_encryption_mandatory(lc);
 }
 
 void linphone_core_set_device_identifier(LinphoneCore *lc,const char* device_id) {
@@ -6859,6 +7561,9 @@ void linphone_core_set_chat_database_path(LinphoneCore *lc, const char *path){
 		linphone_core_message_storage_init(lc);
 	}
 }
+const char* linphone_core_get_chat_database_path(const LinphoneCore *lc) {
+	return lc->chat_db_file;
+}
 void linphone_core_enable_sdp_200_ack(LinphoneCore *lc, bool_t enable) {
 	lp_config_set_int(lc->config,"sip","sdp_200_ack",lc->sip_conf.sdp_200_ack=enable);
 }
@@ -7047,15 +7752,15 @@ const char * linphone_core_get_video_preset(const LinphoneCore *lc) {
 #ifdef ANDROID
 static int linphone_core_call_void_method(jobject obj, jmethodID id) {
 	JNIEnv *env=ms_get_jni_env();
-		if (env && obj) {
-			(*env)->CallVoidMethod(env,obj,id);
-			if ((*env)->ExceptionCheck(env)) {
-				(*env)->ExceptionClear(env);
-				return -1;
-			} else
-				return 0;
-		} else
+	if (env && obj) {
+		(*env)->CallVoidMethod(env,obj,id);
+		if ((*env)->ExceptionCheck(env)) {
+			(*env)->ExceptionClear(env);
 			return -1;
+		} else
+			return 0;
+	} else
+		return -1;
 }
 
 void linphone_core_wifi_lock_acquire(LinphoneCore *lc) {
@@ -7085,3 +7790,209 @@ LINPHONE_PUBLIC const char *linphone_core_log_collection_upload_state_to_string(
 	}
 	return "UNKNOWN";
 }
+
+bool_t linphone_core_realtime_text_enabled(LinphoneCore *lc) {
+	return lc->text_conf.enabled;
+}
+void linphone_core_set_http_proxy_host(LinphoneCore *lc, const char *host) {
+	lp_config_set_string(lc->config,"sip","http_proxy_host",host);
+	if (lc->sal) {
+		sal_set_http_proxy_host(lc->sal,host);
+		sal_set_http_proxy_port(lc->sal,linphone_core_get_http_proxy_port(lc)); /*to make sure default value is set*/
+	}
+}
+
+void linphone_core_set_http_proxy_port(LinphoneCore *lc, int port) {
+	lp_config_set_int(lc->config,"sip","http_proxy_port",port);
+	if (lc->sal)
+		sal_set_http_proxy_port(lc->sal,port);
+}
+const char *linphone_core_get_http_proxy_host(const LinphoneCore *lc) {
+	return lp_config_get_string(lc->config,"sip","http_proxy_host",NULL);
+}
+
+int linphone_core_get_http_proxy_port(const LinphoneCore *lc) {
+	return lp_config_get_int(lc->config,"sip","http_proxy_port",3128);
+}
+
+const char* linphone_transport_to_string(LinphoneTransportType transport) {
+	return sal_transport_to_string((SalTransport)transport);
+}
+
+LinphoneTransportType linphone_transport_parse(const char* transport) {
+	return (LinphoneTransportType)sal_transport_parse(transport);
+}
+
+const char *linphone_stream_type_to_string(const LinphoneStreamType type) {
+	switch (type) {
+		case LinphoneStreamTypeAudio: return "LinphoneStreamTypeAudio";
+		case LinphoneStreamTypeVideo: return "LinphoneStreamTypeVideo";
+		case LinphoneStreamTypeText: return "LinphoneStreamTypeText";
+		case LinphoneStreamTypeUnknown: return "LinphoneStreamTypeUnknown";
+	}
+	return "INVALID";
+}
+
+LinphoneRingtonePlayer *linphone_core_get_ringtoneplayer(LinphoneCore *lc) {
+	return lc->ringtoneplayer;
+}
+
+static int _linphone_core_delayed_conference_destriction_cb(void *user_data, unsigned int event) {
+	LinphoneConference *conf = (LinphoneConference *)user_data;
+	linphone_conference_free(conf);
+	return 0;
+}
+
+static void _linphone_core_conference_state_changed(LinphoneConference *conf, LinphoneConferenceState cstate, void *user_data) {
+	LinphoneCore *lc = (LinphoneCore *)user_data;
+	if(cstate == LinphoneConferenceStartingFailed || cstate == LinphoneConferenceStopped) {
+		linphone_core_queue_task(lc, _linphone_core_delayed_conference_destriction_cb, conf, "Conference destruction task");
+		lc->conf_ctx = NULL;
+	}
+}
+
+LinphoneConference *linphone_core_create_conference_with_params(LinphoneCore *lc, const LinphoneConferenceParams *params) {
+	const char *conf_method_name;
+	if(lc->conf_ctx == NULL) {
+		LinphoneConferenceParams *params2 = linphone_conference_params_clone(params);
+		linphone_conference_params_set_state_changed_callback(params2, _linphone_core_conference_state_changed, lc);
+		conf_method_name = lp_config_get_string(lc->config, "misc", "conference_type", "local");
+		if(strcasecmp(conf_method_name, "local") == 0) {
+			lc->conf_ctx = linphone_local_conference_new_with_params(lc, params2);
+		} else if(strcasecmp(conf_method_name, "remote") == 0) {
+			lc->conf_ctx = linphone_remote_conference_new_with_params(lc, params2);
+		} else {
+			ms_error("'%s' is not a valid conference method", conf_method_name);
+			linphone_conference_params_free(params2);
+			return NULL;
+		}
+		linphone_conference_params_free(params2);
+	} else {
+		ms_error("Could not create a conference: a conference instance already exists");
+		return NULL;
+	}
+	return lc->conf_ctx;
+}
+
+int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call) {
+	LinphoneConference *conference = linphone_core_get_conference(lc);
+	if(conference == NULL) {
+		LinphoneConferenceParams *params = linphone_conference_params_new(lc);
+		conference = linphone_core_create_conference_with_params(lc, params);
+		linphone_conference_params_free(params);
+	}
+	if(conference) return linphone_conference_add_participant(lc->conf_ctx, call);
+	else return -1;
+}
+
+int linphone_core_add_all_to_conference(LinphoneCore *lc) {
+	bctbx_list_t *calls=lc->calls;
+	while (calls) {
+		LinphoneCall *call=(LinphoneCall*)calls->data;
+		calls=calls->next;
+		if(linphone_call_get_conference(call) == NULL) { // Prevent the call to the conference server from being added to the conference
+			linphone_core_add_to_conference(lc, call);
+		}
+	}
+	if(lc->conf_ctx && linphone_conference_check_class(lc->conf_ctx, LinphoneConferenceClassLocal)) {
+		linphone_core_enter_conference(lc);
+	}
+	return 0;
+}
+
+int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call) {
+	if(lc->conf_ctx) return linphone_conference_remove_participant_with_call(lc->conf_ctx, call);
+	else return -1;
+}
+
+int linphone_core_terminate_conference(LinphoneCore *lc) {
+	if(lc->conf_ctx == NULL) {
+		ms_error("Could not terminate conference: no conference context");
+		return -1;
+	}
+	linphone_conference_terminate(lc->conf_ctx);
+	linphone_conference_free(lc->conf_ctx);
+	lc->conf_ctx = NULL;
+	return 0;
+}
+
+int linphone_core_enter_conference(LinphoneCore *lc) {
+	if(lc->conf_ctx) return linphone_conference_enter(lc->conf_ctx);
+	else return -1;
+}
+
+int linphone_core_leave_conference(LinphoneCore *lc) {
+	if(lc->conf_ctx) return linphone_conference_leave(lc->conf_ctx);
+	else return -1;
+}
+
+bool_t linphone_core_is_in_conference(const LinphoneCore *lc) {
+	if(lc->conf_ctx) return linphone_conference_is_in(lc->conf_ctx);
+	else return FALSE;
+}
+
+int linphone_core_get_conference_size(LinphoneCore *lc) {
+	if(lc->conf_ctx) return linphone_conference_get_size(lc->conf_ctx);
+	return 0;
+}
+
+float linphone_core_get_conference_local_input_volume(LinphoneCore *lc) {
+	if(lc->conf_ctx) return linphone_conference_get_input_volume(lc->conf_ctx);
+	else return -1.0;
+}
+
+int linphone_core_start_conference_recording(LinphoneCore *lc, const char *path) {
+	if(lc->conf_ctx) return linphone_conference_start_recording(lc->conf_ctx, path);
+	return -1;
+}
+
+int linphone_core_stop_conference_recording(LinphoneCore *lc) {
+	if(lc->conf_ctx) return linphone_conference_stop_recording(lc->conf_ctx);
+	return -1;
+}
+
+LinphoneConference *linphone_core_get_conference(LinphoneCore *lc) {
+	return lc->conf_ctx;
+}
+
+void linphone_core_set_tls_cert(LinphoneCore *lc, const char *tls_cert) {
+	if (lc->tls_cert) {
+		ms_free(lc->tls_cert);
+		lc->tls_cert = NULL;
+	}
+	if (tls_cert && strlen(tls_cert) > 0) lc->tls_cert = ms_strdup(tls_cert);
+}
+
+void linphone_core_set_tls_key(LinphoneCore *lc, const char *tls_key) {
+	if (lc->tls_key) {
+		ms_free(lc->tls_key);
+		lc->tls_key = NULL;
+	}
+	if (tls_key && strlen(tls_key) > 0) lc->tls_key = ms_strdup(tls_key);
+}
+
+void linphone_core_set_tls_cert_path(LinphoneCore *lc, const char *tls_cert_path) {
+	lp_config_set_string(lc->config, "sip", "client_cert_chain", tls_cert_path);
+}
+
+void linphone_core_set_tls_key_path(LinphoneCore *lc, const char *tls_key_path) {
+	lp_config_set_string(lc->config, "sip", "client_cert_key", tls_key_path);
+}
+
+const char *linphone_core_get_tls_cert(const LinphoneCore *lc) {
+	return lc->tls_cert;
+}
+
+const char *linphone_core_get_tls_key(const LinphoneCore *lc) {
+	return lc->tls_key;
+}
+
+const char *linphone_core_get_tls_cert_path(const LinphoneCore *lc) {
+	const char *tls_cert_path = lp_config_get_string(lc->config, "sip", "client_cert_chain", NULL);
+	return tls_cert_path;
+}
+
+const char *linphone_core_get_tls_key_path(const LinphoneCore *lc) {
+	const char *tls_key_path = lp_config_get_string(lc->config, "sip", "client_cert_key", NULL);
+	return tls_key_path;
+}
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 656fb32f5..4eb5335f6 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -38,14 +38,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define LINPHONE_HOSTNAME_SIZE 128
 
 #ifndef LINPHONE_PUBLIC
-	#define LINPHONE_PUBLIC MS2_PUBLIC
+#define LINPHONE_PUBLIC MS2_PUBLIC
 #endif
 
+#ifndef LINPHONE_DEPRECATED
+#define LINPHONE_DEPRECATED MS2_DEPRECATED
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct _LinphoneCore;
+struct _LinphoneChatRoom;
+struct _LinphoneAuthInfo;
+struct _SipSetupContext;
+struct _LinphoneInfoMessage;
+
 /**
  * Linphone core main object created by function linphone_core_new() .
  * @ingroup initializing
@@ -64,28 +74,36 @@ typedef struct _LinphoneCore LinphoneCore;
  * Use with #LCSipTransports
  * @ingroup initializing
  */
-#define LC_SIP_TRANSPORT_RANDOM -1
+#define LC_SIP_TRANSPORT_RANDOM (-1)
+
+/**
+ * Don't create any server socket for this transport, ie don't bind on any port.
+ * Use with #LCSipTransports
+ * @ingroup initializing
+**/
+#define LC_SIP_TRANSPORT_DONTBIND (-2)
 
 /**
  * Linphone core SIP transport ports.
+ * Special values LC_SIP_TRANSPORT_RANDOM, LC_SIP_TRANSPORT_RANDOM, #define LC_SIP_TRANSPORT_DONTBIND can be used.
  * Use with #linphone_core_set_sip_transports
  * @ingroup initializing
  */
 typedef struct _LCSipTransports{
 	/**
-	 * udp port to listening on, negative value if not set
-	 * */
+	 * SIP/UDP port.
+	 **/
 	int udp_port;
 	/**
-	 * tcp port to listening on, negative value if not set
+	 * SIP/TCP port
 	 * */
 	int tcp_port;
 	/**
-	 * dtls port to listening on, negative value if not set
+	 * SIP/DTLS port
 	 * */
 	int dtls_port;
 	/**
-	 * tls port to listening on, negative value if not set
+	 * SIP/TLS port
 	 * */
 	int tls_port;
 } LCSipTransports;
@@ -109,6 +127,29 @@ enum _LinphoneTransportType{
 **/
 typedef enum _LinphoneTransportType LinphoneTransportType;
 
+/**
+ * Enum describing the stream types.
+ * @ingroup initializing
+**/
+enum _LinphoneStreamType {
+	LinphoneStreamTypeAudio,
+	LinphoneStreamTypeVideo,
+	LinphoneStreamTypeText,
+	LinphoneStreamTypeUnknown /* WARNING: Make sure this value remains the last one in the list */
+};
+
+/**
+ * Enum describing the stream types.
+ * @ingroup initializing
+**/
+typedef enum _LinphoneStreamType LinphoneStreamType;
+
+/**
+ * Function returning a human readable value for LinphoneStreamType.
+ * @ingroup initializing
+ **/
+
+LINPHONE_PUBLIC const char *linphone_stream_type_to_string(const LinphoneStreamType);
 /**
  * Object that represents a SIP address.
  *
@@ -156,7 +197,7 @@ enum _LinphoneReason{
 	LinphoneReasonIOError, /**<Transport error: connection failures, disconnections etc...*/
 	LinphoneReasonDoNotDisturb, /**<Do not disturb reason*/
 	LinphoneReasonUnauthorized, /**<Operation is unauthorized because missing credential*/
-	LinphoneReasonNotAcceptable, /**<Operation like call update rejected by peer*/
+	LinphoneReasonNotAcceptable, /**<Operation is rejected due to incompatible or unsupported media parameters*/
 	LinphoneReasonNoMatch, /**<Operation could not be executed by server or remote client because it didn't have any context for it*/
 	LinphoneReasonMovedPermanently, /**<Resource moved permanently*/
 	LinphoneReasonGone, /**<Resource no longer exists*/
@@ -193,6 +234,21 @@ LINPHONE_PUBLIC const char *linphone_reason_to_string(LinphoneReason err);
 **/
 typedef struct _LinphoneErrorInfo LinphoneErrorInfo;
 
+/**
+ * Enum describing the authentication methods
+ * @ingroup network_parameters
+**/
+enum _LinphoneAuthMethod {
+	LinphoneAuthHttpDigest, /* Digest authentication requested */
+	LinphoneAuthTls, /* Client certificate requested */
+};
+
+/**
+ * Typedef for authentication methods enum.
+ * @ingroup network_parameters
+**/
+typedef enum _LinphoneAuthMethod LinphoneAuthMethod;
+
 LINPHONE_PUBLIC LinphoneReason linphone_error_info_get_reason(const LinphoneErrorInfo *ei);
 LINPHONE_PUBLIC const char *linphone_error_info_get_phrase(const LinphoneErrorInfo *ei);
 LINPHONE_PUBLIC const char *linphone_error_info_get_details(const LinphoneErrorInfo *ei);
@@ -373,7 +429,9 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
 #include "content.h"
 #include "event.h"
 #include "linphonefriend.h"
+#include "nat_policy.h"
 #include "xmlrpc.h"
+#include "conference.h"
 #else
 #include "linphone/buffer.h"
 #include "linphone/call_log.h"
@@ -381,7 +439,9 @@ LINPHONE_PUBLIC const char* linphone_privacy_to_string(LinphonePrivacy privacy);
 #include "linphone/content.h"
 #include "linphone/event.h"
 #include "linphone/linphonefriend.h"
+#include "linphone/nat_policy.h"
 #include "linphone/xmlrpc.h"
+#include "linphone/conference.h"
 #endif
 
 LINPHONE_PUBLIC	LinphoneAddress * linphone_address_new(const char *addr);
@@ -393,10 +453,11 @@ LINPHONE_PUBLIC	const char *linphone_address_get_display_name(const LinphoneAddr
 LINPHONE_PUBLIC	const char *linphone_address_get_username(const LinphoneAddress *u);
 LINPHONE_PUBLIC	const char *linphone_address_get_domain(const LinphoneAddress *u);
 LINPHONE_PUBLIC int linphone_address_get_port(const LinphoneAddress *u);
-LINPHONE_PUBLIC	void linphone_address_set_display_name(LinphoneAddress *u, const char *display_name);
-LINPHONE_PUBLIC	void linphone_address_set_username(LinphoneAddress *uri, const char *username);
-LINPHONE_PUBLIC	void linphone_address_set_domain(LinphoneAddress *uri, const char *host);
-LINPHONE_PUBLIC	void linphone_address_set_port(LinphoneAddress *uri, int port);
+LINPHONE_PUBLIC	int linphone_address_set_display_name(LinphoneAddress *u, const char *display_name);
+LINPHONE_PUBLIC	int linphone_address_set_username(LinphoneAddress *uri, const char *username);
+LINPHONE_PUBLIC	int linphone_address_set_domain(LinphoneAddress *uri, const char *host);
+LINPHONE_PUBLIC	int linphone_address_set_port(LinphoneAddress *uri, int port);
+LINPHONE_PUBLIC int linphone_address_set_transport(LinphoneAddress *uri,LinphoneTransportType type);
 /*remove tags, params etc... so that it is displayable to the user*/
 LINPHONE_PUBLIC	void linphone_address_clean(LinphoneAddress *uri);
 LINPHONE_PUBLIC bool_t linphone_address_is_secure(const LinphoneAddress *addr);
@@ -404,7 +465,8 @@ LINPHONE_PUBLIC bool_t linphone_address_get_secure(const LinphoneAddress *addr);
 LINPHONE_PUBLIC void linphone_address_set_secure(LinphoneAddress *addr, bool_t enabled);
 LINPHONE_PUBLIC bool_t linphone_address_is_sip(const LinphoneAddress *uri);
 LINPHONE_PUBLIC LinphoneTransportType linphone_address_get_transport(const LinphoneAddress *uri);
-LINPHONE_PUBLIC void linphone_address_set_transport(LinphoneAddress *uri,LinphoneTransportType type);
+LINPHONE_PUBLIC const char *linphone_address_get_method_param(const LinphoneAddress *addr);
+LINPHONE_PUBLIC void linphone_address_set_method_param(LinphoneAddress *addr, const char *method);
 LINPHONE_PUBLIC	char *linphone_address_as_string(const LinphoneAddress *u);
 LINPHONE_PUBLIC	char *linphone_address_as_string_uri_only(const LinphoneAddress *u);
 LINPHONE_PUBLIC	bool_t linphone_address_weak_equal(const LinphoneAddress *a1, const LinphoneAddress *a2);
@@ -412,6 +474,14 @@ LINPHONE_PUBLIC bool_t linphone_address_equal(const LinphoneAddress *a1, const L
 LINPHONE_PUBLIC void linphone_address_set_password(LinphoneAddress *addr, const char *passwd);
 LINPHONE_PUBLIC const char *linphone_address_get_password(const LinphoneAddress *addr);
 LINPHONE_PUBLIC void linphone_address_set_header(LinphoneAddress *addr, const char *header_name, const char *header_value);
+LINPHONE_PUBLIC bool_t linphone_address_has_param(const LinphoneAddress *addr, const char *name);
+LINPHONE_PUBLIC const char * linphone_address_get_param(const LinphoneAddress *addr, const char *name);
+LINPHONE_PUBLIC void linphone_address_set_param(LinphoneAddress *addr, const char *name, const char *value);
+LINPHONE_PUBLIC void linphone_address_set_params(LinphoneAddress *addr, const char *params);
+LINPHONE_PUBLIC void linphone_address_set_uri_param(LinphoneAddress *addr, const char *name, const char *value);
+LINPHONE_PUBLIC void linphone_address_set_uri_params(LinphoneAddress *addr, const char *params);
+LINPHONE_PUBLIC bool_t linphone_address_has_uri_param(const LinphoneAddress *addr, const char *name);
+LINPHONE_PUBLIC const char * linphone_address_get_uri_param(const LinphoneAddress *addr, const char *name);
 LINPHONE_PUBLIC	void linphone_address_destroy(LinphoneAddress *u);
 
 /**
@@ -423,10 +493,6 @@ LINPHONE_PUBLIC	void linphone_address_destroy(LinphoneAddress *u);
  */
 LINPHONE_PUBLIC LinphoneAddress * linphone_core_create_address(LinphoneCore *lc, const char *address);
 
-struct _SipSetupContext;
-
-
-struct _LinphoneInfoMessage;
 /**
  * The LinphoneInfoMessage is an object representing an informational message sent or received by the core.
 **/
@@ -467,8 +533,9 @@ typedef struct _LinphoneVideoPolicy LinphoneVideoPolicy;
  * @{
 **/
 
-#define LINPHONE_CALL_STATS_AUDIO 0
-#define LINPHONE_CALL_STATS_VIDEO 1
+#define LINPHONE_CALL_STATS_AUDIO ((int)LinphoneStreamTypeAudio)
+#define LINPHONE_CALL_STATS_VIDEO ((int)LinphoneStreamTypeVideo)
+#define LINPHONE_CALL_STATS_TEXT  ((int)LinphoneStreamTypeText)
 
 /**
  * Enum describing ICE states.
@@ -517,6 +584,21 @@ typedef enum _LinphoneUpnpState LinphoneUpnpState;
 #define LINPHONE_CALL_STATS_SENT_RTCP_UPDATE (1 << 1) /**< sent_rtcp field of LinphoneCallStats object has been updated */
 #define LINPHONE_CALL_STATS_PERIODICAL_UPDATE (1 << 2) /**< Every seconds LinphoneCallStats object has been updated */
 
+/**
+ * Enum describing Ip family.
+ * @ingroup initializing
+**/
+enum _LinphoneAddressFamily {
+	LinphoneAddressFamilyInet, /* IpV4 */
+	LinphoneAddressFamilyInet6, /* IpV6 */
+	LinphoneAddressFamilyUnspec, /* Unknown */
+};
+
+/**
+ * Enum describing Ip family.
+ * @ingroup initializing
+**/
+typedef enum _LinphoneAddressFamily LinphoneAddressFamily;
 
 /**
  * The LinphoneCallStats objects carries various statistic informations regarding quality of audio or video streams.
@@ -552,6 +634,8 @@ struct _LinphoneCallStats {
 	float rtcp_download_bandwidth; /**<RTCP download bandwidth measurement of received stream, expressed in kbit/s, including IP/UDP/RTP headers*/
 	float rtcp_upload_bandwidth; /**<RTCP download bandwidth measurement of sent stream, expressed in kbit/s, including IP/UDP/RTP headers*/
 	rtp_stats_t rtp_stats; /**< RTP stats */
+	bool_t rtcp_received_via_mux; /*private flag, for non-regression test only*/
+	int rtp_remote_family; /* Ip adress family of the remote destination */
 };
 
 /**
@@ -560,6 +644,7 @@ struct _LinphoneCallStats {
 
 LINPHONE_PUBLIC const LinphoneCallStats *linphone_call_get_audio_stats(LinphoneCall *call);
 LINPHONE_PUBLIC const LinphoneCallStats *linphone_call_get_video_stats(LinphoneCall *call);
+LINPHONE_PUBLIC const LinphoneCallStats *linphone_call_get_text_stats(LinphoneCall *call);
 LINPHONE_PUBLIC float linphone_call_stats_get_sender_loss_rate(const LinphoneCallStats *stats);
 LINPHONE_PUBLIC float linphone_call_stats_get_receiver_loss_rate(const LinphoneCallStats *stats);
 LINPHONE_PUBLIC float linphone_call_stats_get_sender_interarrival_jitter(const LinphoneCallStats *stats, LinphoneCall *call);
@@ -675,7 +760,7 @@ LINPHONE_PUBLIC void *linphone_call_get_user_data(const LinphoneCall *call);
 
 /**
  * Assign a user pointer to the call.
- * @param[in] cfg The call.
+ * @param[in] call The call.
  * @param[in] ud The user pointer to associate with the call.
  * @ingroup call_control
 **/
@@ -702,6 +787,7 @@ LINPHONE_PUBLIC	const LinphoneAddress * linphone_core_get_current_call_remote_ad
 
 LINPHONE_PUBLIC	const LinphoneAddress * linphone_call_get_remote_address(const LinphoneCall *call);
 LINPHONE_PUBLIC	char *linphone_call_get_remote_address_as_string(const LinphoneCall *call);
+LINPHONE_PUBLIC	const LinphoneAddress * linphone_call_get_diversion_address(const LinphoneCall *call);
 LINPHONE_PUBLIC	LinphoneCallDir linphone_call_get_dir(const LinphoneCall *call);
 LINPHONE_PUBLIC	LinphoneCallLog *linphone_call_get_call_log(const LinphoneCall *call);
 LINPHONE_PUBLIC const char *linphone_call_get_refer_to(const LinphoneCall *call);
@@ -737,6 +823,16 @@ LINPHONE_PUBLIC	float linphone_call_get_play_volume(LinphoneCall *call);
  */
 LINPHONE_PUBLIC	float linphone_call_get_record_volume(LinphoneCall *call);
 
+/**
+ * Create a new chat room for messaging from a call if not already existing, else return existing one.
+ * No reference is given to the caller: the chat room will be deleted when the call is ended.
+ * @param call #LinphoneCall object
+ * @return #LinphoneChatRoom where messaging can take place.
+ */
+LINPHONE_PUBLIC	struct _LinphoneChatRoom * linphone_call_get_chat_room(LinphoneCall *call);
+
+
+
 /**
  * Get speaker volume gain.
  * If the sound backend supports it, the returned gain is equal to the gain set
@@ -801,8 +897,9 @@ LINPHONE_PUBLIC bool_t linphone_call_media_in_progress(LinphoneCall *call);
  * @param call The LinphoneCall object
  * @param dtmf The dtmf name specified as a char, such as '0', '#' etc...
  * @return 0 if successful, -1 on error.
+ * @ingroup call_control
 **/
-LINPHONE_PUBLIC	int linphone_call_send_dtmf(LinphoneCall *lc,char dtmf);
+LINPHONE_PUBLIC	int linphone_call_send_dtmf(LinphoneCall *call,char dtmf);
 
 /**
  * Send a list of dtmf.
@@ -812,8 +909,9 @@ LINPHONE_PUBLIC	int linphone_call_send_dtmf(LinphoneCall *lc,char dtmf);
  * @param call The LinphoneCall object
  * @param dtmfs A dtmf sequence such as '123#123123'
  * @return -2 if there is already a DTMF sequence, -1 if call is not ready, 0 otherwise.
+ * @ingroup call_control
 **/
-LINPHONE_PUBLIC	int linphone_call_send_dtmfs(LinphoneCall *call,char *dtmfs);
+LINPHONE_PUBLIC	int linphone_call_send_dtmfs(LinphoneCall *call,const char *dtmfs);
 
 /**
  * Stop current DTMF sequence sending.
@@ -823,6 +921,7 @@ LINPHONE_PUBLIC	int linphone_call_send_dtmfs(LinphoneCall *call,char *dtmfs);
  * function will be automatically called if call state change to anything but LinphoneCallStreamsRunning.
  *
  * @param call The LinphoneCall object
+ * @ingroup call_control
 **/
 LINPHONE_PUBLIC	void linphone_call_cancel_dtmfs(LinphoneCall *call);
 
@@ -844,10 +943,19 @@ LINPHONE_PUBLIC void linphone_call_set_native_video_window_id(LinphoneCall *call
  * @param call #LinphoneCall
  * @return TRUE if part of a conference.
  *
- * @deprecated
+ * @deprecated Use linphone_call_get_conference() instead.
  * @ingroup call_control
  */
-LINPHONE_PUBLIC	bool_t linphone_call_is_in_conference(const LinphoneCall *call);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED bool_t linphone_call_is_in_conference(const LinphoneCall *call);
+
+/**
+ * Return the associated conference object
+ * @param call #LinphoneCall
+ * @return A pointer on #LinphoneConference or NULL if the call is not part
+ * of any conference.
+ * @ingroup call_control
+ */
+LINPHONE_PUBLIC LinphoneConference *linphone_call_get_conference(const LinphoneCall *call);
 /**
  * Enables or disable echo cancellation for this call
  * @param call
@@ -915,7 +1023,7 @@ LINPHONE_PUBLIC int linphone_call_get_stream_count(LinphoneCall *call);
  * @param call
  * @param stream_index
  *
- * @return MsAudio if stream_index = 0, MsVideo otherwise
+ * @return the type (MSAudio, MSVideo, MSText) of the stream of given index.
 **/
 LINPHONE_PUBLIC MSFormatType linphone_call_get_stream_type(LinphoneCall *call, int stream_index);
 
@@ -989,13 +1097,12 @@ LINPHONE_PUBLIC	const char *linphone_registration_state_to_string(LinphoneRegist
  * @}
  */
 
-#include "linphone_proxy_config.h"
-
-struct _LinphoneAuthInfo;
-
 /**
  * @addtogroup authentication
  * @{
+ */
+
+/**
  * Object holding authentication information.
  *
  * @note The object's fields should not be accessed directly. Prefer using
@@ -1038,7 +1145,6 @@ LINPHONE_PUBLIC	LinphoneAuthInfo *linphone_auth_info_new(const char *username, c
 	const char *passwd, const char *ha1,const char *realm, const char *domain);
 
 /**
- * @addtogroup authentication
  * Instantiates a new auth info with values from source.
  * @param[in] source The #LinphoneAuthInfo object to be cloned
  * @return The newly created #LinphoneAuthInfo object.
@@ -1089,6 +1195,34 @@ LINPHONE_PUBLIC void linphone_auth_info_set_domain(LinphoneAuthInfo *info, const
 **/
 LINPHONE_PUBLIC void linphone_auth_info_set_ha1(LinphoneAuthInfo *info, const char *ha1);
 
+/**
+ * Sets the TLS certificate.
+ * @param[in] info The #LinphoneAuthInfo object
+ * @param[in] ha1 The TLS certificate.
+**/
+LINPHONE_PUBLIC void linphone_auth_info_set_tls_cert(LinphoneAuthInfo *info, const char *tls_cert);
+
+/**
+ * Sets the TLS key.
+ * @param[in] info The #LinphoneAuthInfo object
+ * @param[in] ha1 The TLS key.
+**/
+LINPHONE_PUBLIC void linphone_auth_info_set_tls_key(LinphoneAuthInfo *info, const char *tls_key);
+
+/**
+ * Sets the TLS certificate path.
+ * @param[in] info The #LinphoneAuthInfo object
+ * @param[in] ha1 The TLS certificate path.
+**/
+LINPHONE_PUBLIC void linphone_auth_info_set_tls_cert_path(LinphoneAuthInfo *info, const char *tls_cert_path);
+
+/**
+ * Sets the TLS key path.
+ * @param[in] info The #LinphoneAuthInfo object
+ * @param[in] ha1 The TLS key path.
+**/
+LINPHONE_PUBLIC void linphone_auth_info_set_tls_key_path(LinphoneAuthInfo *info, const char *tls_key_path);
+
 /**
  * Gets the username.
  *
@@ -1137,6 +1271,38 @@ LINPHONE_PUBLIC const char *linphone_auth_info_get_domain(const LinphoneAuthInfo
  */
 LINPHONE_PUBLIC const char *linphone_auth_info_get_ha1(const LinphoneAuthInfo *info);
 
+/**
+ * Gets the TLS certificate.
+ *
+ * @param[in] info The #LinphoneAuthInfo object
+ * @return The TLS certificate.
+ */
+LINPHONE_PUBLIC const char *linphone_auth_info_get_tls_cert(const LinphoneAuthInfo *info);
+
+/**
+ * Gets the TLS key.
+ *
+ * @param[in] info The #LinphoneAuthInfo object
+ * @return The TLS key.
+ */
+LINPHONE_PUBLIC const char *linphone_auth_info_get_tls_key(const LinphoneAuthInfo *info);
+
+/**
+ * Gets the TLS certificate path.
+ *
+ * @param[in] info The #LinphoneAuthInfo object
+ * @return The TLS certificate path.
+ */
+LINPHONE_PUBLIC const char *linphone_auth_info_get_tls_cert_path(const LinphoneAuthInfo *info);
+
+/**
+ * Gets the TLS key path.
+ *
+ * @param[in] info The #LinphoneAuthInfo object
+ * @return The TLS key path.
+ */
+LINPHONE_PUBLIC const char *linphone_auth_info_get_tls_key_path(const LinphoneAuthInfo *info);
+
 /* you don't need those function*/
 LINPHONE_PUBLIC void linphone_auth_info_destroy(LinphoneAuthInfo *info);
 LINPHONE_PUBLIC LinphoneAuthInfo * linphone_auth_info_new_from_config_file(LpConfig *config, int pos);
@@ -1148,12 +1314,17 @@ LINPHONE_PUBLIC LinphoneAuthInfo * linphone_auth_info_new_from_config_file(LpCon
 
 #ifdef IN_LINPHONE
 #include "account_creator.h"
+#include "friendlist.h"
+#include "linphone_proxy_config.h"
+#include "carddav.h"
 #else
 #include "linphone/account_creator.h"
+#include "linphone/friendlist.h"
+#include "linphone/linphone_proxy_config.h"
+#include "linphone/carddav.h"
 #endif
 
 
-struct _LinphoneChatRoom;
 /**
  * @addtogroup chatroom
  * @{
@@ -1188,6 +1359,12 @@ typedef enum _LinphoneChatMessageState {
 	LinphoneChatMessageStateFileTransferDone /**< File transfer has been completed successfully. */
 } LinphoneChatMessageState;
 
+typedef enum _LinphoneLimeState {
+	LinphoneLimeDisabled, /**< Lime is not used at all */
+	LinphoneLimeMandatory, /**< Lime is always used */
+	LinphoneLimePreferred, /**< Lime is used only if we already shared a secret with remote */
+} LinphoneLimeState;
+
 /**
  * Call back used to notify message delivery status
  * @param msg #LinphoneChatMessage object
@@ -1233,7 +1410,13 @@ typedef void (*LinphoneChatMessageCbsFileTransferProgressIndicationCb)(LinphoneC
 
 LINPHONE_PUBLIC void linphone_core_set_chat_database_path(LinphoneCore *lc, const char *path);
 
+/**
+ * Get path to the database file used for storing chat messages.
+ * @param lc the linphone core
+ * @return file path or NULL if not exist
+ **/
 
+LINPHONE_PUBLIC const char *linphone_core_get_chat_database_path(const LinphoneCore *lc);
 /**
  * Get a chat room whose peer is the supplied address. If it does not exist yet, it will be created.
  * No reference is transfered to the application. The LinphoneCore keeps a reference on the chat room.
@@ -1245,7 +1428,7 @@ LINPHONE_PUBLIC LinphoneChatRoom *linphone_core_get_chat_room(LinphoneCore *lc,
 /**
  * Get a chat room for messaging from a sip uri like sip:joe@sip.linphone.org. If it does not exist yet, it will be created.
  * No reference is transfered to the application. The LinphoneCore keeps a reference on the chat room.
- * @param lc The linphone core
+ * @param lc A #LinphoneCore object
  * @param to The destination address for messages.
  * @return #LinphoneChatRoom where messaging can take place.
 **/
@@ -1253,25 +1436,26 @@ LINPHONE_PUBLIC LinphoneChatRoom *linphone_core_get_chat_room_from_uri(LinphoneC
 
 /**
  * Removes a chatroom including all message history from the LinphoneCore.
- * @param lc The linphone core
- * @param to The chatroom.
+ * @param lc A #LinphoneCore object
+ * @param cr A #LinphoneChatRoom object
 **/
 LINPHONE_PUBLIC void linphone_core_delete_chat_room(LinphoneCore *lc, LinphoneChatRoom *cr);
 
 /**
  * Inconditionnaly disable incoming chat messages.
- * @param lc the core
+ * @param lc A #LinphoneCore object
  * @param deny_reason the deny reason (#LinphoneReasonNone has no effect).
 **/
 LINPHONE_PUBLIC void linphone_core_disable_chat(LinphoneCore *lc, LinphoneReason deny_reason);
 /**
  * Enable reception of incoming chat messages.
  * By default it is enabled but it can be disabled with linphone_core_disable_chat().
- * @param lc the core
+ * @param lc A #LinphoneCore object
 **/
 LINPHONE_PUBLIC void linphone_core_enable_chat(LinphoneCore *lc);
 /**
  * Returns whether chat is enabled.
+ * @param lc A #LinphoneCore object
 **/
 LINPHONE_PUBLIC bool_t linphone_core_chat_enabled(const LinphoneCore *lc);
 /**
@@ -1279,7 +1463,7 @@ LINPHONE_PUBLIC bool_t linphone_core_chat_enabled(const LinphoneCore *lc);
  * @param cr #LinphoneChatRoom object
  * @deprecated Use linphone_chat_room_unref() instead.
  */
-LINPHONE_PUBLIC void linphone_chat_room_destroy(LinphoneChatRoom *cr);
+LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_chat_room_destroy(LinphoneChatRoom *cr);
 /**
  * Create a message attached to a dedicated chat room;
  * @param cr the chat room.
@@ -1336,14 +1520,20 @@ LINPHONE_PUBLIC void linphone_chat_room_set_user_data(LinphoneChatRoom *cr, void
  */
 LINPHONE_PUBLIC	LinphoneChatMessage* linphone_chat_room_create_file_transfer_message(LinphoneChatRoom *cr, const LinphoneContent* initial_content);
 
+/**
+ * get peer address \link linphone_core_get_chat_room() associated to \endlink this #LinphoneChatRoom
+ * @param cr #LinphoneChatRoom object
+ * @return #LinphoneAddress peer address
+ */
 LINPHONE_PUBLIC	const LinphoneAddress* linphone_chat_room_get_peer_address(LinphoneChatRoom *cr);
+
 /**
  * Send a message to peer member of this chat room.
  * @deprecated Use linphone_chat_room_send_chat_message() instead.
  * @param cr #LinphoneChatRoom object
  * @param msg message to be sent
  */
-LINPHONE_PUBLIC	void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg);
 /**
  * Send a message to peer member of this chat room.
  * @param cr #LinphoneChatRoom object
@@ -1354,7 +1544,7 @@ LINPHONE_PUBLIC	void linphone_chat_room_send_message(LinphoneChatRoom *cr, const
  * @note The LinphoneChatMessage must not be destroyed until the the callback is called.
  * The LinphoneChatMessage reference is transfered to the function and thus doesn't need to be unref'd by the application.
  */
-LINPHONE_PUBLIC	void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangedCb status_cb,void* ud);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED void linphone_chat_room_send_message2(LinphoneChatRoom *cr, LinphoneChatMessage* msg,LinphoneChatMessageStateChangedCb status_cb,void* ud);
 /**
  * Send a message to peer member of this chat room.
  * @param[in] cr LinphoneChatRoom object
@@ -1395,7 +1585,7 @@ LINPHONE_PUBLIC int linphone_chat_room_get_history_size(LinphoneChatRoom *cr);
  * @param[in] nb_message Number of message to retrieve. 0 means everything.
  * @return \mslist{LinphoneChatMessage}
  */
-LINPHONE_PUBLIC MSList *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message);
+LINPHONE_PUBLIC bctbx_list_t *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message);
 
 /**
  * Gets the partial list of messages in the given range, sorted from oldest to most recent.
@@ -1404,7 +1594,7 @@ LINPHONE_PUBLIC MSList *linphone_chat_room_get_history(LinphoneChatRoom *cr,int
  * @param[in] end The last message of the range to be retrieved. History oldest message has index of history size - 1 (use #linphone_chat_room_get_history_size to retrieve history size)
  * @return \mslist{LinphoneChatMessage}
  */
-LINPHONE_PUBLIC MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int begin, int end);
+LINPHONE_PUBLIC bctbx_list_t *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int begin, int end);
 
 /**
  * Notifies the destination of the chat message being composed that the user is typing a new message.
@@ -1414,33 +1604,48 @@ LINPHONE_PUBLIC void linphone_chat_room_compose(LinphoneChatRoom *cr);
 
 /**
  * Tells whether the remote is currently composing a message.
- * @param[in] cr The "LinphoneChatRoom object corresponding to the conversation.
+ * @param[in] cr The #LinphoneChatRoom object corresponding to the conversation.
  * @return TRUE if the remote is currently composing a message, FALSE otherwise.
  */
 LINPHONE_PUBLIC bool_t linphone_chat_room_is_remote_composing(const LinphoneChatRoom *cr);
 
 /**
  * Gets the number of unread messages in the chatroom.
- * @param[in] cr The "LinphoneChatRoom object corresponding to the conversation.
+ * @param[in] cr The #LinphoneChatRoom object corresponding to the conversation.
  * @return the number of unread messages.
  */
 LINPHONE_PUBLIC int linphone_chat_room_get_unread_messages_count(LinphoneChatRoom *cr);
 /**
- * Returns back pointer to LinphoneCore object.
+ * Returns back pointer to #LinphoneCore object.
  * @deprecated use linphone_chat_room_get_core()
 **/
-LINPHONE_PUBLIC LinphoneCore* linphone_chat_room_get_lc(LinphoneChatRoom *cr);
+LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneCore* linphone_chat_room_get_lc(LinphoneChatRoom *cr);
 /**
- * Returns back pointer to LinphoneCore object.
+ * Returns back pointer to #LinphoneCore object.
 **/
 LINPHONE_PUBLIC LinphoneCore* linphone_chat_room_get_core(LinphoneChatRoom *cr);
 
+/**
+ * When realtime text is enabled #linphone_call_params_realtime_text_enabled, #LinphoneCoreIsComposingReceivedCb is call everytime a char is received from peer.
+ * At the end of remote typing a regular #LinphoneChatMessage is received with committed data from #LinphoneCoreMessageReceivedCb.
+ * @param[in] cr #LinphoneChatRoom object
+ * @returns  RFC 4103/T.140 char
+ */
+LINPHONE_PUBLIC uint32_t linphone_chat_room_get_char(const LinphoneChatRoom *cr);
+
+/**
+ * Returns true if lime is available for given peer
+ *
+ * @return true if zrtp secrets have already been shared and ready to use
+ */
+ LINPHONE_PUBLIC bool_t linphone_chat_room_lime_available(LinphoneChatRoom *cr);
+
 /**
  * Returns an list of chat rooms
  * @param[in] lc #LinphoneCore object
  * @return \mslist{LinphoneChatRoom}
 **/
-LINPHONE_PUBLIC const MSList* linphone_core_get_chat_rooms(LinphoneCore *lc);
+LINPHONE_PUBLIC const bctbx_list_t* linphone_core_get_chat_rooms(LinphoneCore *lc);
 LINPHONE_PUBLIC unsigned int linphone_chat_message_store(LinphoneChatMessage *msg);
 
 /**
@@ -1479,7 +1684,7 @@ LINPHONE_PUBLIC void linphone_chat_message_destroy(LinphoneChatMessage* msg);
  * @param[in] message #LinphoneChatMessage obj
  * @param[in] from #LinphoneAddress origin of this message (copied)
  */
-LINPHONE_PUBLIC void linphone_chat_message_set_from_address(LinphoneChatMessage* message, const LinphoneAddress* addr);
+LINPHONE_PUBLIC void linphone_chat_message_set_from_address(LinphoneChatMessage* message, const LinphoneAddress* from);
 /** @deprecated Use linphone_chat_message_get_from_address() instead. */
 #define linphone_chat_message_get_from(msg) linphone_chat_message_get_from_address(msg)
 /**
@@ -1492,7 +1697,7 @@ LINPHONE_PUBLIC	const LinphoneAddress* linphone_chat_message_get_from_address(co
 /**
  * Set destination of the message
  * @param[in] message #LinphoneChatMessage obj
- * @param[in] to #LinphoneAddress destination of this message (copied)
+ * @param[in] addr #LinphoneAddress destination of this message (copied)
  */
 LINPHONE_PUBLIC void linphone_chat_message_set_to_address(LinphoneChatMessage* message, const LinphoneAddress* addr);
 /** @deprecated Use linphone_chat_message_get_to_address() instead. */
@@ -1528,14 +1733,15 @@ LINPHONE_PUBLIC	const LinphoneContent* linphone_chat_message_get_file_transfer_i
  *
  * @param message #LinphoneChatMessage
  * @param status_cb LinphoneChatMessageStateChangeCb status callback invoked when file is downloaded or could not be downloaded
+ * @param ud user data
  * @deprecated Use linphone_chat_message_download_file() instead.
  */
-LINPHONE_PUBLIC void linphone_chat_message_start_file_download(LinphoneChatMessage* message, LinphoneChatMessageStateChangedCb status_cb, void* ud);
+LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_chat_message_start_file_download(LinphoneChatMessage* message, LinphoneChatMessageStateChangedCb status_cb, void* ud);
 /**
  * Start the download of the file referenced in a LinphoneChatMessage from remote server.
  * @param[in] message LinphoneChatMessage object.
  */
-LINPHONE_PUBLIC void linphone_chat_message_download_file(LinphoneChatMessage *message);
+LINPHONE_PUBLIC int linphone_chat_message_download_file(LinphoneChatMessage *message);
 /**
  * Cancel an ongoing file transfer attached to this message.(upload or download)
  * @param msg	#LinphoneChatMessage
@@ -1580,11 +1786,7 @@ LINPHONE_PUBLIC	void linphone_chat_message_set_user_data(LinphoneChatMessage* me
  * Returns the chatroom this message belongs to.
 **/
 LINPHONE_PUBLIC LinphoneChatRoom* linphone_chat_message_get_chat_room(LinphoneChatMessage *msg);
-/**
- * get peer address \link linphone_core_get_chat_room() associated to \endlink this #LinphoneChatRoom
- * @param cr #LinphoneChatRoom object
- * @return #LinphoneAddress peer address
- */
+
 LINPHONE_PUBLIC	const LinphoneAddress* linphone_chat_message_get_peer_address(LinphoneChatMessage *msg);
 /**
  * Returns the origin address of a message if it was a outgoing message, or the destination address if it was an incoming message.
@@ -1640,6 +1842,25 @@ LINPHONE_PUBLIC void linphone_chat_message_set_file_transfer_filepath(LinphoneCh
  * @return The path to the file to use for the file transfer.
  */
 LINPHONE_PUBLIC const char * linphone_chat_message_get_file_transfer_filepath(LinphoneChatMessage *msg);
+
+/**
+ * Fulfill a chat message char by char. Message linked to a Real Time Text Call send char in realtime following RFC 4103/T.140
+ * To commit a message, use #linphone_chat_room_send_message
+ * @param[in] msg LinphoneChatMessage
+ * @param[in] character T.140 char
+ * @returns 0 if succeed.
+ */
+LINPHONE_PUBLIC int linphone_chat_message_put_char(LinphoneChatMessage *msg,uint32_t character);
+
+/**
+ * get Curent Call associated to this chatroom if any
+ * To commit a message, use #linphone_chat_room_send_message
+ * @param[in] room LinphoneChatRomm
+ * @returns LinphoneCall or NULL.
+ */
+LINPHONE_PUBLIC LinphoneCall *linphone_chat_room_get_call(const LinphoneChatRoom *room);
+
+
 /**
  * Get the LinphoneChatMessageCbs object associated with the LinphoneChatMessage.
  * @param[in] msg LinphoneChatMessage object
@@ -1766,7 +1987,7 @@ typedef void (*LinphoneCoreGlobalStateChangedCb)(LinphoneCore *lc, LinphoneGloba
  * @param lc the LinphoneCore
  * @param call the call object whose state is changed.
  * @param cstate the new state of the call
- * @param message an informational message about the state.
+ * @param message a non NULL informational message about the state.
  */
 typedef void (*LinphoneCoreCallStateChangedCb)(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *message);
 
@@ -1782,23 +2003,23 @@ typedef void (*LinphoneCoreCallEncryptionChangedCb)(LinphoneCore *lc, LinphoneCa
 /** @ingroup Proxies
  * Registration state notification callback prototype
  * */
-typedef void (*LinphoneCoreRegistrationStateChangedCb)(LinphoneCore *lc, LinphoneProxyConfig *cfg, LinphoneRegistrationState cstate, const char *message);
+typedef void (*LinphoneCoreRegistrationStateChangedCb)(LinphoneCore *lc, LinphoneProxyConfig *cfg, LinphoneRegistrationState cstate, const char *message) ;
 /** Callback prototype
  * @deprecated
  */
-typedef void (*ShowInterfaceCb)(LinphoneCore *lc);
+typedef void (*ShowInterfaceCb)(LinphoneCore *lc) ;
 /** Callback prototype
  * @deprecated
  */
-typedef void (*DisplayStatusCb)(LinphoneCore *lc, const char *message);
+typedef void (*DisplayStatusCb)(LinphoneCore *lc, const char *message) ;
 /** Callback prototype
  * @deprecated
  */
-typedef void (*DisplayMessageCb)(LinphoneCore *lc, const char *message);
+typedef void (*DisplayMessageCb)(LinphoneCore *lc, const char *message) ;
 /** Callback prototype
  * @deprecated
  */
-typedef void (*DisplayUrlCb)(LinphoneCore *lc, const char *message, const char *url);
+typedef void (*DisplayUrlCb)(LinphoneCore *lc, const char *message, const char *url) ;
 /** Callback prototype
  */
 typedef void (*LinphoneCoreCbFunc)(LinphoneCore *lc,void * user_data);
@@ -1808,6 +2029,14 @@ typedef void (*LinphoneCoreCbFunc)(LinphoneCore *lc,void * user_data);
  * @param lf Updated #LinphoneFriend .
  */
 typedef void (*LinphoneCoreNotifyPresenceReceivedCb)(LinphoneCore *lc, LinphoneFriend * lf);
+/**
+ * Reports presence model change for a specific URI or phone number of a friend
+ * @param lc #LinphoneCore object
+ * @param lf #LinphoneFriend object
+ * @param uri_or_tel The URI or phone number for which teh presence model has changed
+ * @param presence_model The new presence model
+ */
+typedef void (*LinphoneCoreNotifyPresenceReceivedForUriOrTelCb)(LinphoneCore *lc, LinphoneFriend *lf, const char *uri_or_tel, const LinphonePresenceModel *presence_model);
 /**
  *  Reports that a new subscription request has been received and wait for a decision.
  *  Status on this subscription request is notified by \link linphone_friend_set_inc_subscribe_policy() changing policy \endlink for this friend
@@ -1822,10 +2051,20 @@ typedef void (*LinphoneCoreNewSubscriptionRequestedCb)(LinphoneCore *lc, Linphon
  * @param lc the LinphoneCore
  * @param realm the realm (domain) on which authentication is required.
  * @param username the username that needs to be authenticated.
+ * @param domain the domain on which authentication is required.
  * Application shall reply to this callback using linphone_core_add_auth_info().
  */
 typedef void (*LinphoneCoreAuthInfoRequestedCb)(LinphoneCore *lc, const char *realm, const char *username, const char *domain);
 
+/**
+ * Callback for requesting authentication information to application or user.
+ * @param lc the LinphoneCore
+ * @param auth_info a LinphoneAuthInfo pre-filled with username, realm and domain values as much as possible
+ * @param method the type of authentication requested
+ * Application shall reply to this callback using linphone_core_add_auth_info().
+ */
+typedef void (*LinphoneCoreAuthenticationRequestedCb)(LinphoneCore *lc, LinphoneAuthInfo *auth_info, LinphoneAuthMethod method);
+
 /**
  * Callback to notify a new call-log entry has been added.
  * This is done typically when a call terminates.
@@ -1980,6 +2219,20 @@ typedef void (*LinphoneCoreLogCollectionUploadStateChangedCb)(LinphoneCore *lc,
  */
 typedef void (*LinphoneCoreLogCollectionUploadProgressIndicationCb)(LinphoneCore *lc, size_t offset, size_t total);
 
+/**
+ * Callback prototype for reporting when a friend list has been added to the core friends list.
+ * @param[in] lc LinphoneCore object
+ * @param[in] list LinphoneFriendList object
+ */
+typedef void (*LinphoneCoreFriendListCreatedCb) (LinphoneCore *lc, LinphoneFriendList *list);
+
+/**
+ * Callback prototype for reporting when a friend list has been removed from the core friends list.
+ * @param[in] lc LinphoneCore object
+ * @param[in] list LinphoneFriendList object
+ */
+typedef void (*LinphoneCoreFriendListRemovedCb) (LinphoneCore *lc, LinphoneFriendList *list);
+
 /**
  * This structure holds all callbacks that the application should implement.
  *  None is mandatory.
@@ -1989,8 +2242,10 @@ typedef struct _LinphoneCoreVTable{
 	LinphoneCoreRegistrationStateChangedCb registration_state_changed;/**<Notifies registration state changes*/
 	LinphoneCoreCallStateChangedCb call_state_changed;/**<Notifies call state changes*/
 	LinphoneCoreNotifyPresenceReceivedCb notify_presence_received; /**< Notify received presence events*/
+	LinphoneCoreNotifyPresenceReceivedForUriOrTelCb notify_presence_received_for_uri_or_tel; /**< Notify received presence events*/
 	LinphoneCoreNewSubscriptionRequestedCb new_subscription_requested; /**< Notify about pending presence subscription request */
-	LinphoneCoreAuthInfoRequestedCb auth_info_requested; /**< Ask the application some authentication information */
+	LINPHONE_DEPRECATED LinphoneCoreAuthInfoRequestedCb auth_info_requested; /**< @deprecated Use authentication_requested instead. Ask the application some authentication information */
+	LinphoneCoreAuthenticationRequestedCb authentication_requested; /**< Ask the application some authentication information */
 	LinphoneCoreCallLogUpdatedCb call_log_updated; /**< Notifies that call log list has been updated */
 	LinphoneCoreMessageReceivedCb message_received; /**< a message is received, can be text or external body*/
 	LinphoneCoreIsComposingReceivedCb is_composing_received; /**< An is-composing notification has been received */
@@ -2005,18 +2260,20 @@ typedef struct _LinphoneCoreVTable{
 	LinphoneCoreNotifyReceivedCb notify_received; /**< Notifies a an event notification, see linphone_core_subscribe() */
 	LinphoneCorePublishStateChangedCb publish_state_changed;/**Notifies publish state change (only from #LinphoneEvent api)*/
 	LinphoneCoreConfiguringStatusCb configuring_status; /** Notifies configuring status changes */
-	DisplayStatusCb display_status; /**< @deprecated Callback that notifies various events with human readable text.*/
-	DisplayMessageCb display_message;/**< @deprecated Callback to display a message to the user */
-	DisplayMessageCb display_warning;/**< @deprecated Callback to display a warning to the user */
-	DisplayUrlCb display_url; /**< @deprecated */
-	ShowInterfaceCb show; /**< @deprecated Notifies the application that it should show up*/
-	LinphoneCoreTextMessageReceivedCb text_received; /**< @deprecated, use #message_received instead <br> A text message has been received */
-	LinphoneCoreFileTransferRecvCb file_transfer_recv; /**< @deprecated Callback to store file received attached to a #LinphoneChatMessage */
-	LinphoneCoreFileTransferSendCb file_transfer_send; /**< @deprecated Callback to collect file chunk to be sent for a #LinphoneChatMessage */
-	LinphoneCoreFileTransferProgressIndicationCb file_transfer_progress_indication; /**< @deprecated Callback to indicate file transfer progress */
+	LINPHONE_DEPRECATED DisplayStatusCb display_status; /**< @deprecated Callback that notifies various events with human readable text.*/
+	LINPHONE_DEPRECATED DisplayMessageCb display_message;/**< @deprecated Callback to display a message to the user */
+	LINPHONE_DEPRECATED DisplayMessageCb display_warning;/**< @deprecated Callback to display a warning to the user */
+	LINPHONE_DEPRECATED DisplayUrlCb display_url; /**< @deprecated */
+	LINPHONE_DEPRECATED ShowInterfaceCb show; /**< vNotifies the application that it should show up*/
+	LINPHONE_DEPRECATED LinphoneCoreTextMessageReceivedCb text_received; /**< @deprecated, use #message_received instead <br> A text message has been received */
+	LINPHONE_DEPRECATED LinphoneCoreFileTransferRecvCb file_transfer_recv; /**< @deprecated Callback to store file received attached to a #LinphoneChatMessage */
+	LINPHONE_DEPRECATED LinphoneCoreFileTransferSendCb file_transfer_send; /**< @deprecated Callback to collect file chunk to be sent for a #LinphoneChatMessage */
+	LINPHONE_DEPRECATED LinphoneCoreFileTransferProgressIndicationCb file_transfer_progress_indication; /**< @deprecated Callback to indicate file transfer progress */
 	LinphoneCoreNetworkReachableCb network_reachable; /**< Callback to report IP network status (I.E up/down )*/
 	LinphoneCoreLogCollectionUploadStateChangedCb log_collection_upload_state_changed; /**< Callback to upload collected logs */
 	LinphoneCoreLogCollectionUploadProgressIndicationCb log_collection_upload_progress_indication; /**< Callback to indicate log collection upload progress */
+	LinphoneCoreFriendListCreatedCb friend_list_created;
+	LinphoneCoreFriendListRemovedCb friend_list_removed;
 	void *user_data; /**<User data associated with the above callbacks */
 } LinphoneCoreVTable;
 
@@ -2024,7 +2281,7 @@ typedef struct _LinphoneCoreVTable{
  * Instantiate a vtable with all arguments set to NULL
  * @return newly allocated vtable
  */
-LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_v_table_new();
+LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_v_table_new(void);
 
 /**
  * Sets a user data pointer in the vtable.
@@ -2038,7 +2295,7 @@ LINPHONE_PUBLIC void linphone_core_v_table_set_user_data(LinphoneCoreVTable *tab
  * @param table the vtable
  * @return the data attached to the vtable
  */
-LINPHONE_PUBLIC void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *table);
+LINPHONE_PUBLIC void* linphone_core_v_table_get_user_data(const LinphoneCoreVTable *table);
 
 /**
  * Gets the current VTable.
@@ -2050,7 +2307,7 @@ LINPHONE_PUBLIC LinphoneCoreVTable *linphone_core_get_current_vtable(LinphoneCor
 
 /**
  * Destroy a vtable.
- * @param vtable to be destroyed
+ * @param table to be destroyed
  */
 LINPHONE_PUBLIC void linphone_core_v_table_destroy(LinphoneCoreVTable* table);
 
@@ -2068,6 +2325,7 @@ typedef struct _LCCallbackObj
 /**
  * Policy to use to pass through firewalls.
  * @ingroup network_parameters
+ * @deprecated Use LinphoneNatPolicy instead
 **/
 typedef enum _LinphoneFirewallPolicy {
 	LinphonePolicyNoFirewall, /**< Do not use any mechanism to pass through firewalls */
@@ -2087,6 +2345,11 @@ typedef void * (*LinphoneCoreWaitingCallback)(LinphoneCore *lc, void *context, L
 
 /* THE main API */
 
+/**
+ * @addtogroup initializing
+ * @{
+**/
+
 typedef enum _LinphoneLogCollectionState {
 	LinphoneLogCollectionDisabled,
 	LinphoneLogCollectionEnabled,
@@ -2095,52 +2358,45 @@ typedef enum _LinphoneLogCollectionState {
 
 /**
  * Tells whether the linphone core log collection is enabled.
- * @ingroup misc
  * @return The state of the linphone core log collection.
  */
 LINPHONE_PUBLIC LinphoneLogCollectionState linphone_core_log_collection_enabled(void);
 
 /**
  * Enable the linphone core log collection to upload logs on a server.
- * @ingroup misc
  * @param[in] state LinphoneLogCollectionState value telling whether to enable log collection or not.
  */
 LINPHONE_PUBLIC void linphone_core_enable_log_collection(LinphoneLogCollectionState state);
 
 /**
  * Get the path where the log files will be written for log collection.
- * @ingroup misc
  * @return The path where the log files will be written.
  */
 LINPHONE_PUBLIC const char * linphone_core_get_log_collection_path(void);
 
 /**
  * Set the path where the log files will be written for log collection.
- * @ingroup misc
  * @param[in] path The path where the log files will be written.
  */
 LINPHONE_PUBLIC void linphone_core_set_log_collection_path(const char *path);
 
 /**
  * Get the prefix of the filenames that will be used for log collection.
- * @ingroup misc
  * @return The prefix of the filenames used for log collection.
  */
 LINPHONE_PUBLIC const char * linphone_core_get_log_collection_prefix(void);
 
 /**
  * Set the prefix of the filenames that will be used for log collection.
- * @ingroup misc
  * @param[in] prefix The prefix to use for the filenames for log collection.
  */
 LINPHONE_PUBLIC void linphone_core_set_log_collection_prefix(const char *prefix);
 
 /**
  * Get the max file size in bytes of the files used for log collection.
- * @ingroup misc
  * @return The max file size in bytes of the files used for log collection.
  */
-LINPHONE_PUBLIC int linphone_core_get_log_collection_max_file_size(void);
+LINPHONE_PUBLIC size_t linphone_core_get_log_collection_max_file_size(void);
 
 /**
  * Set the max file size in bytes of the files used for log collection.
@@ -2148,14 +2404,12 @@ LINPHONE_PUBLIC int linphone_core_get_log_collection_max_file_size(void);
  * dynamically but instead only before calling @see
  * linphone_core_enable_log_collection. If you increase max size
   * on runtime, logs chronological order COULD be broken.
- * @ingroup misc
  * @param[in] size The max file size in bytes of the files used for log collection.
  */
-LINPHONE_PUBLIC void linphone_core_set_log_collection_max_file_size(int size);
+LINPHONE_PUBLIC void linphone_core_set_log_collection_max_file_size(size_t size);
 
 /**
  * Set the url of the server where to upload the collected log files.
- * @ingroup misc
  * @param[in] core LinphoneCore object
  * @param[in] server_url The url of the server where to upload the collected log files.
  */
@@ -2163,37 +2417,31 @@ LINPHONE_PUBLIC void linphone_core_set_log_collection_upload_server_url(Linphone
 
 /**
  * Upload the log collection to the configured server url.
- * @ingroup misc
  * @param[in] core LinphoneCore object
  */
 LINPHONE_PUBLIC void linphone_core_upload_log_collection(LinphoneCore *core);
 
 /**
  * Compress the log collection in a single file.
- * @ingroup misc
  * @return The path of the compressed log collection file (to be freed calling ms_free()).
  */
-LINPHONE_PUBLIC char * linphone_core_compress_log_collection();
+LINPHONE_PUBLIC char * linphone_core_compress_log_collection(void);
 
 /**
  * Reset the log collection by removing the log files.
- * @ingroup misc
  */
-LINPHONE_PUBLIC void linphone_core_reset_log_collection();
+LINPHONE_PUBLIC void linphone_core_reset_log_collection(void);
 
 /**
  * Define a log handler.
  *
- * @ingroup misc
- *
  * @param logfunc The function pointer of the log handler.
  */
 LINPHONE_PUBLIC void linphone_core_set_log_handler(OrtpLogFunc logfunc);
+
 /**
  * Define a log file.
  *
- * @ingroup misc
- *
  * If the file pointer passed as an argument is NULL, stdout is used instead.
  *
  * @param file A pointer to the FILE structure of the file to write to.
@@ -2201,49 +2449,77 @@ LINPHONE_PUBLIC void linphone_core_set_log_handler(OrtpLogFunc logfunc);
 LINPHONE_PUBLIC void linphone_core_set_log_file(FILE *file);
 
 /**
- * @deprecated Define the log level.
+ * Define the minimum level for logging.
  *
  * @param loglevel Minimum level for logging messages.
 **/
 LINPHONE_PUBLIC void linphone_core_set_log_level(OrtpLogLevel loglevel);
+
 /**
  * Define the log level using mask.
  *
- * @ingroup misc
- *
  * The loglevel parameter is a bitmask parameter. Therefore to enable only warning and error
  * messages, use ORTP_WARNING | ORTP_ERROR. To disable logs, simply set loglevel to 0.
  *
  * @param loglevel A bitmask of the log levels to set.
  */
 LINPHONE_PUBLIC void linphone_core_set_log_level_mask(OrtpLogLevel loglevel);
+
+/**
+ * Enable logs in supplied FILE*.
+ *
+ * @deprecated Use #linphone_core_set_log_file and #linphone_core_set_log_level instead.
+ *
+ * @param file a C FILE* where to fprintf logs. If null stdout is used.
+ *
+**/
 LINPHONE_PUBLIC void linphone_core_enable_logs(FILE *file);
+
+/**
+ * Enable logs through the user's supplied log callback.
+ *
+ * @deprecated Use #linphone_core_set_log_handler and #linphone_core_set_log_level instead.
+ *
+ * @param logfunc The address of a OrtpLogFunc callback whose protoype is
+ *            	  typedef void (*OrtpLogFunc)(OrtpLogLevel lev, const char *fmt, va_list args);
+ *
+**/
 LINPHONE_PUBLIC void linphone_core_enable_logs_with_cb(OrtpLogFunc logfunc);
+
+/**
+ * Entirely disable logging.
+ *
+ * @deprecated Use #linphone_core_set_log_level instead.
+**/
 LINPHONE_PUBLIC void linphone_core_disable_logs(void);
 
 /**
  * Enable logs serialization (output logs from either the thread that creates the linphone core or the thread that calls linphone_core_iterate()).
  * Must be called before creating the linphone core.
- * @ingroup misc
  */
 LINPHONE_PUBLIC void linphone_core_serialize_logs(void);
 
 /**
  * Returns liblinphone's version as a string.
- *
- * @ingroup misc
- *
 **/
 LINPHONE_PUBLIC	const char *linphone_core_get_version(void);
+
+/**
+ * @return liblinphone's user agent as a string.
+**/
 LINPHONE_PUBLIC	const char *linphone_core_get_user_agent(LinphoneCore *lc);
 /**
  * @deprecated Use #linphone_core_get_user_agent instead.
 **/
-LINPHONE_PUBLIC	const char *linphone_core_get_user_agent_name(void);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED const char *linphone_core_get_user_agent_name(void);
 /**
  * @deprecated Use #linphone_core_get_user_agent instead.
 **/
-LINPHONE_PUBLIC	const char *linphone_core_get_user_agent_version(void);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED const char *linphone_core_get_user_agent_version(void);
+
+/**
+ * @}
+**/
 
 /**
  * Instanciates a LinphoneCore object.
@@ -2265,7 +2541,7 @@ LINPHONE_PUBLIC	const char *linphone_core_get_user_agent_version(void);
  * @see linphone_core_new_with_config
 **/
 LINPHONE_PUBLIC LinphoneCore *linphone_core_new(const LinphoneCoreVTable *vtable,
-						const char *config_path, const char *factory_config, void* userdata);
+						const char *config_path, const char *factory_config_path, void* userdata);
 
 /**
  * Instantiates a LinphoneCore object with a given LpConfig.
@@ -2290,16 +2566,14 @@ LINPHONE_PUBLIC	void linphone_core_iterate(LinphoneCore *lc);
  * add a listener to be notified of linphone core events. Once events are received, registered vtable are invoked in order.
  * @param vtable a LinphoneCoreVTable structure holding your application callbacks. Object is owned by linphone core until linphone_core_remove_listener.
  * @param lc object
- * @param string identifying the device, can be EMEI or UDID
  *
  */
 LINPHONE_PUBLIC void linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable);
 /**
  * @ingroup initializing
  * remove a listener registred by linphone_core_add_listener.
- * @param vtable a LinphoneCoreVTable structure holding your application callbacks
  * @param lc object
- * @param string identifying the device, can be EMEI or UDID
+ * @param vtable a LinphoneCoreVTable structure holding your application callbacks
  *
  */
 LINPHONE_PUBLIC void linphone_core_remove_listener(LinphoneCore *lc, const LinphoneCoreVTable *vtable);
@@ -2308,7 +2582,8 @@ LINPHONE_PUBLIC void linphone_core_remove_listener(LinphoneCore *lc, const Linph
 /*sets the user-agent string in sip messages, ideally called just after linphone_core_new() or linphone_core_init() */
 LINPHONE_PUBLIC	void linphone_core_set_user_agent(LinphoneCore *lc, const char *ua_name, const char *version);
 
-/** @deprecated Use linphone_proxy_config_normalize_sip_uri instead. */
+/** See linphone_proxy_config_normalize_sip_uri for documentation. Default proxy config is used to parse
+the address. */
 LINPHONE_PUBLIC	LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url);
 
 LINPHONE_PUBLIC	LinphoneCall * linphone_core_invite(LinphoneCore *lc, const char *url);
@@ -2390,14 +2665,6 @@ LINPHONE_PUBLIC	int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *ca
 LINPHONE_PUBLIC	int linphone_core_defer_call_update(LinphoneCore *lc, LinphoneCall *call);
 
 LINPHONE_PUBLIC	int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params);
-/**
- * @ingroup media_parameters
- * Get default call parameters reflecting current linphone core configuration
- * @param lc LinphoneCore object
- * @return  LinphoneCallParams
- * @deprecated use linphone_core_create_call_params()
- */
-LINPHONE_PUBLIC	LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *lc);
 
 LINPHONE_PUBLIC LinphoneCallParams *linphone_core_create_call_params(LinphoneCore *lc, LinphoneCall *call);
 
@@ -2424,7 +2691,7 @@ LINPHONE_PUBLIC	LinphoneCall *linphone_core_get_call_by_remote_address2(Linphone
  * @param dtmf The dtmf name specified as a char, such as '0', '#' etc...
  *
 **/
-LINPHONE_PUBLIC	void linphone_core_send_dtmf(LinphoneCore *lc,char dtmf);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED void linphone_core_send_dtmf(LinphoneCore *lc,char dtmf);
 
 /**
  * Sets the local "from" identity.
@@ -2461,8 +2728,9 @@ LINPHONE_PUBLIC bool_t linphone_core_get_guess_hostname(LinphoneCore *lc);
  * Tells to LinphoneCore to use Linphone Instant Messaging encryption
  *
  */
-LINPHONE_PUBLIC void linphone_core_enable_lime(LinphoneCore *lc, bool_t val);
-LINPHONE_PUBLIC bool_t linphone_core_lime_enabled(const LinphoneCore *lc);
+LINPHONE_PUBLIC void linphone_core_enable_lime(LinphoneCore *lc, LinphoneLimeState val);
+LINPHONE_PUBLIC LinphoneLimeState linphone_core_lime_enabled(const LinphoneCore *lc);
+LINPHONE_PUBLIC bool_t linphone_core_lime_available(const LinphoneCore *lc);
 
 LINPHONE_PUBLIC	bool_t linphone_core_ipv6_enabled(LinphoneCore *lc);
 LINPHONE_PUBLIC	void linphone_core_enable_ipv6(LinphoneCore *lc, bool_t val);
@@ -2589,7 +2857,7 @@ LINPHONE_PUBLIC	int linphone_core_get_upload_ptime(LinphoneCore *lc);
  * @param[in] timeout_ms The SIP transport timeout in milliseconds.
  * @ingroup media_parameters
  */
-void linphone_core_set_sip_transport_timeout(LinphoneCore *lc, int timeout_ms);
+LINPHONE_PUBLIC	void linphone_core_set_sip_transport_timeout(LinphoneCore *lc, int timeout_ms);
 
 /**
  * Get the SIP transport timeout.
@@ -2615,35 +2883,77 @@ LINPHONE_PUBLIC void linphone_core_enable_dns_srv(LinphoneCore *lc, bool_t enabl
  */
 LINPHONE_PUBLIC bool_t linphone_core_dns_srv_enabled(const LinphoneCore *lc);
 
+/**
+ * Enable or disable DNS search (use of local domain if the fully qualified name did return results).
+ * @param[in] lc #LinphoneCore object.
+ * @param[in] enable TRUE to enable DNS search, FALSE to disable it.
+ * @ingroup media_parameters
+ */
+LINPHONE_PUBLIC void linphone_core_enable_dns_search(LinphoneCore *lc, bool_t enable);
+
+/**
+ * Tells whether DNS search (use of local domain if the fully qualified name did return results) is enabled.
+ * @param[in] lc #LinphoneCore object.
+ * @return TRUE if DNS search is enabled, FALSE if disabled.
+ * @ingroup media_parameters
+ */
+LINPHONE_PUBLIC bool_t linphone_core_dns_search_enabled(const LinphoneCore *lc);
+
+/**
+ * Forces liblinphone to use the supplied list of dns servers, instead of system's ones.
+ * @param[in] lc #LinphoneCore object.
+ * @param[in] servers A #bctbx_list_t of strings containing the IP addresses of DNS servers to be used.
+ * Setting to NULL restores default behaviour, which is to use the DNS server list provided by the system.
+ * The list is copied internally.
+ * @ingroup media_parameters
+ */
+LINPHONE_PUBLIC void linphone_core_set_dns_servers(LinphoneCore *lc, const bctbx_list_t *servers);
+
 /**
  * Returns the list of available audio codecs.
  * @param[in] lc The LinphoneCore object
  * @return \mslist{PayloadType}
  *
- * This list is unmodifiable. The ->data field of the MSList points a PayloadType
+ * This list is unmodifiable. The ->data field of the bctbx_list_t points a PayloadType
  * structure holding the codec information.
- * It is possible to make copy of the list with ms_list_copy() in order to modify it
+ * It is possible to make copy of the list with bctbx_list_copy() in order to modify it
  * (such as the order of codecs).
  * @ingroup media_parameters
 **/
-LINPHONE_PUBLIC	const MSList *linphone_core_get_audio_codecs(const LinphoneCore *lc);
+LINPHONE_PUBLIC	const bctbx_list_t *linphone_core_get_audio_codecs(const LinphoneCore *lc);
 
-LINPHONE_PUBLIC int linphone_core_set_audio_codecs(LinphoneCore *lc, MSList *codecs);
+LINPHONE_PUBLIC int linphone_core_set_audio_codecs(LinphoneCore *lc, bctbx_list_t *codecs);
 
 /**
  * Returns the list of available video codecs.
  * @param[in] lc The LinphoneCore object
  * @return \mslist{PayloadType}
  *
- * This list is unmodifiable. The ->data field of the MSList points a PayloadType
+ * This list is unmodifiable. The ->data field of the bctbx_list_t points a PayloadType
  * structure holding the codec information.
- * It is possible to make copy of the list with ms_list_copy() in order to modify it
+ * It is possible to make copy of the list with bctbx_list_copy() in order to modify it
  * (such as the order of codecs).
  * @ingroup media_parameters
 **/
-LINPHONE_PUBLIC const MSList *linphone_core_get_video_codecs(const LinphoneCore *lc);
+LINPHONE_PUBLIC const bctbx_list_t *linphone_core_get_video_codecs(const LinphoneCore *lc);
 
-LINPHONE_PUBLIC int linphone_core_set_video_codecs(LinphoneCore *lc, MSList *codecs);
+LINPHONE_PUBLIC int linphone_core_set_video_codecs(LinphoneCore *lc, bctbx_list_t *codecs);
+
+/**
+ * Returns the list of available text codecs.
+ * @param[in] lc The LinphoneCore object
+ * @return \mslist{PayloadType}
+ *
+ * This list is unmodifiable. The ->data field of the bctbx_list_t points a PayloadType
+ * structure holding the codec information.
+ * It is possible to make copy of the list with bctbx_list_copy() in order to modify it
+ * (such as the order of codecs).
+ * @ingroup media_parameters
+**/
+LINPHONE_PUBLIC const bctbx_list_t *linphone_core_get_text_codecs(const LinphoneCore *lc);
+
+
+LINPHONE_PUBLIC int linphone_core_set_text_codecs(LinphoneCore *lc, bctbx_list_t *codecs);
 
 LINPHONE_PUBLIC void linphone_core_enable_generic_confort_noise(LinphoneCore *lc, bool_t enabled);
 
@@ -2770,7 +3080,7 @@ LINPHONE_PUBLIC void linphone_core_remove_proxy_config(LinphoneCore *lc, Linphon
  * @param[in] lc The LinphoneCore object
  * @return \mslist{LinphoneProxyConfig}
 **/
-LINPHONE_PUBLIC const MSList *linphone_core_get_proxy_config_list(const LinphoneCore *lc);
+LINPHONE_PUBLIC const bctbx_list_t *linphone_core_get_proxy_config_list(const LinphoneCore *lc);
 
 /** @deprecated Use linphone_core_set_default_proxy_config() instead. */
 #define linphone_core_set_default_proxy(lc, config) linphone_core_set_default_proxy_config(lc, config)
@@ -2781,7 +3091,7 @@ LINPHONE_PUBLIC void linphone_core_set_default_proxy_index(LinphoneCore *lc, int
  * @return the default proxy configuration, that is the one used to determine the current identity.
  * @deprecated Use linphone_core_get_default_proxy_config() instead.
 **/
-LINPHONE_PUBLIC int linphone_core_get_default_proxy(LinphoneCore *lc, LinphoneProxyConfig **config);
+LINPHONE_PUBLIC LINPHONE_DEPRECATED int linphone_core_get_default_proxy(LinphoneCore *lc, LinphoneProxyConfig **config);
 
 /**
  * @return the default proxy configuration, that is the one used to determine the current identity.
@@ -2823,8 +3133,17 @@ LINPHONE_PUBLIC	void linphone_core_add_auth_info(LinphoneCore *lc, const Linphon
 
 LINPHONE_PUBLIC void linphone_core_remove_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *info);
 
-LINPHONE_PUBLIC const MSList *linphone_core_get_auth_info_list(const LinphoneCore *lc);
+LINPHONE_PUBLIC const bctbx_list_t *linphone_core_get_auth_info_list(const LinphoneCore *lc);
 
+/**
+ * Find authentication info matching realm, username, domain criteria.
+ * First of all, (realm,username) pair are searched. If multiple results (which should not happen because realm are supposed to be unique), then domain is added to the search.
+ * @param lc the LinphoneCore
+ * @param realm the authentication 'realm' (optional)
+ * @param username the SIP username to be authenticated (mandatory)
+ * @param sip_domain the SIP domain name (optional)
+ * @return a #LinphoneAuthInfo
+**/
 LINPHONE_PUBLIC const LinphoneAuthInfo *linphone_core_find_auth_info(LinphoneCore *lc, const char *realm, const char *username, const char *sip_domain);
 
 LINPHONE_PUBLIC void linphone_core_abort_authentication(LinphoneCore *lc,  LinphoneAuthInfo *info);
@@ -2893,6 +3212,10 @@ LINPHONE_PUBLIC	int linphone_core_get_video_port(const LinphoneCore *lc);
 
 LINPHONE_PUBLIC	void linphone_core_get_video_port_range(const LinphoneCore *lc, int *min_port, int *max_port);
 
+LINPHONE_PUBLIC	int linphone_core_get_text_port(const LinphoneCore *lc);
+
+LINPHONE_PUBLIC	void linphone_core_get_text_port_range(const LinphoneCore *lc, int *min_port, int *max_port);
+
 LINPHONE_PUBLIC	int linphone_core_get_nortp_timeout(const LinphoneCore *lc);
 
 LINPHONE_PUBLIC	void linphone_core_set_audio_port(LinphoneCore *lc, int port);
@@ -2903,7 +3226,11 @@ LINPHONE_PUBLIC	void linphone_core_set_video_port(LinphoneCore *lc, int port);
 
 LINPHONE_PUBLIC	void linphone_core_set_video_port_range(LinphoneCore *lc, int min_port, int max_port);
 
-LINPHONE_PUBLIC	void linphone_core_set_nortp_timeout(LinphoneCore *lc, int port);
+LINPHONE_PUBLIC	void linphone_core_set_text_port(LinphoneCore *lc, int port);
+
+LINPHONE_PUBLIC	void linphone_core_set_text_port_range(LinphoneCore *lc, int min_port, int max_port);
+
+LINPHONE_PUBLIC	void linphone_core_set_nortp_timeout(LinphoneCore *lc, int seconds);
 
 LINPHONE_PUBLIC	void linphone_core_set_use_info_for_dtmf(LinphoneCore *lc, bool_t use_info);
 
@@ -2924,6 +3251,9 @@ LINPHONE_PUBLIC	int linphone_core_get_sip_transports(LinphoneCore *lc, LCSipTran
 LINPHONE_PUBLIC void linphone_core_get_sip_transports_used(LinphoneCore *lc, LCSipTransports *tr);
 
 LINPHONE_PUBLIC	bool_t linphone_core_sip_transport_supported(const LinphoneCore *lc, LinphoneTransportType tp);
+
+LINPHONE_PUBLIC bool_t linphone_core_content_encoding_supported(const LinphoneCore *lc, const char *content_encoding);
+
 /**
  *
  * Give access to the UDP sip socket. Can be useful to configure this socket as persistent I.E kCFStreamNetworkServiceType set to kCFStreamNetworkServiceTypeVoIP)
@@ -3010,6 +3340,7 @@ LINPHONE_PUBLIC const char *linphone_core_get_nat_address(const LinphoneCore *lc
  * @param[in] lc #LinphoneCore object.
  * @param[in] pol The #LinphoneFirewallPolicy to use.
  * @ingroup network_parameters
+ * @deprecated Use linphone_core_set_nat_policy() instead.
  */
 LINPHONE_PUBLIC	void linphone_core_set_firewall_policy(LinphoneCore *lc, LinphoneFirewallPolicy pol);
 
@@ -3018,13 +3349,39 @@ LINPHONE_PUBLIC	void linphone_core_set_firewall_policy(LinphoneCore *lc, Linphon
  * @param[in] lc #LinphoneCore object.
  * @return The #LinphoneFirewallPolicy that is being used.
  * @ingroup network_parameters
+ * @deprecated Use linphone_core_get_nat_policy() instead.
  */
 LINPHONE_PUBLIC	LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc);
 
+/**
+ * Set the policy to use to pass through NATs/firewalls.
+ * It may be overridden by a NAT policy for a specific proxy config.
+ * @param[in] lc #LinphoneCore object
+ * @param[in] policy LinphoneNatPolicy object
+ * @ingroup network_parameters
+ * @see linphone_proxy_config_set_nat_policy()
+ */
+LINPHONE_PUBLIC void linphone_core_set_nat_policy(LinphoneCore *lc, LinphoneNatPolicy *policy);
+
+/**
+ * Get The policy that is used to pass through NATs/firewalls.
+ * It may be overridden by a NAT policy for a specific proxy config.
+ * @param[in] lc #LinphoneCore object
+ * @return LinphoneNatPolicy object in use.
+ * @ingroup network_parameters
+ * @see linphone_proxy_config_get_nat_policy()
+ */
+LINPHONE_PUBLIC LinphoneNatPolicy * linphone_core_get_nat_policy(const LinphoneCore *lc);
+
 /* sound functions */
 /* returns a null terminated static array of string describing the sound devices */
 LINPHONE_PUBLIC const char**  linphone_core_get_sound_devices(LinphoneCore *lc);
 
+/**
+ * Use this function when you want to set the default sound devices
+ **/
+LINPHONE_PUBLIC void linphone_core_set_default_sound_devices(LinphoneCore *lc);
+
 /**
  * Update detection of sound devices.
  *
@@ -3037,32 +3394,44 @@ LINPHONE_PUBLIC void linphone_core_reload_sound_devices(LinphoneCore *lc);
 
 LINPHONE_PUBLIC bool_t linphone_core_sound_device_can_capture(LinphoneCore *lc, const char *device);
 LINPHONE_PUBLIC bool_t linphone_core_sound_device_can_playback(LinphoneCore *lc, const char *device);
-LINPHONE_PUBLIC	int linphone_core_get_ring_level(LinphoneCore *lc);
-LINPHONE_PUBLIC	int linphone_core_get_play_level(LinphoneCore *lc);
-LINPHONE_PUBLIC int linphone_core_get_rec_level(LinphoneCore *lc);
-LINPHONE_PUBLIC	void linphone_core_set_ring_level(LinphoneCore *lc, int level);
-LINPHONE_PUBLIC	void linphone_core_set_play_level(LinphoneCore *lc, int level);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED int linphone_core_get_ring_level(LinphoneCore *lc);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED int linphone_core_get_play_level(LinphoneCore *lc);
+LINPHONE_PUBLIC LINPHONE_DEPRECATED int linphone_core_get_rec_level(LinphoneCore *lc);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED void linphone_core_set_ring_level(LinphoneCore *lc, int level);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED void linphone_core_set_play_level(LinphoneCore *lc, int level);
+LINPHONE_PUBLIC LINPHONE_DEPRECATED void linphone_core_set_rec_level(LinphoneCore *lc, int level);
+LINPHONE_DEPRECATED char linphone_core_get_sound_source(LinphoneCore *lc);
+LINPHONE_DEPRECATED void linphone_core_set_sound_source(LinphoneCore *lc, char source);
 
 LINPHONE_PUBLIC	void linphone_core_set_mic_gain_db(LinphoneCore *lc, float level);
 LINPHONE_PUBLIC	float linphone_core_get_mic_gain_db(LinphoneCore *lc);
 LINPHONE_PUBLIC	void linphone_core_set_playback_gain_db(LinphoneCore *lc, float level);
 LINPHONE_PUBLIC	float linphone_core_get_playback_gain_db(LinphoneCore *lc);
 
-LINPHONE_PUBLIC void linphone_core_set_rec_level(LinphoneCore *lc, int level);
 LINPHONE_PUBLIC const char * linphone_core_get_ringer_device(LinphoneCore *lc);
 LINPHONE_PUBLIC const char * linphone_core_get_playback_device(LinphoneCore *lc);
 LINPHONE_PUBLIC const char * linphone_core_get_capture_device(LinphoneCore *lc);
 LINPHONE_PUBLIC int linphone_core_set_ringer_device(LinphoneCore *lc, const char * devid);
 LINPHONE_PUBLIC int linphone_core_set_playback_device(LinphoneCore *lc, const char * devid);
 LINPHONE_PUBLIC int linphone_core_set_capture_device(LinphoneCore *lc, const char * devid);
-char linphone_core_get_sound_source(LinphoneCore *lc);
-void linphone_core_set_sound_source(LinphoneCore *lc, char source);
+
 LINPHONE_PUBLIC void linphone_core_stop_ringing(LinphoneCore *lc);
 LINPHONE_PUBLIC	void linphone_core_set_ring(LinphoneCore *lc, const char *path);
 LINPHONE_PUBLIC const char *linphone_core_get_ring(const LinphoneCore *lc);
 LINPHONE_PUBLIC void linphone_core_verify_server_certificates(LinphoneCore *lc, bool_t yesno);
 LINPHONE_PUBLIC void linphone_core_verify_server_cn(LinphoneCore *lc, bool_t yesno);
 LINPHONE_PUBLIC void linphone_core_set_root_ca(LinphoneCore *lc, const char *path);
+LINPHONE_PUBLIC void linphone_core_set_root_ca_data(LinphoneCore *lc, const char *data);
+/**
+ * @internal
+ * Set the pointer to an externally provided ssl configuration for the crypto library
+ * @param			lc			#LinphoneCore object
+ * @param[in]		ssl_config	A pointer to an opaque structure which will be provided directly to the crypto library used in bctoolbox. Use with extra care.
+ * 								This ssl_config structure is responsability of the caller and will not be freed at the connection's end.
+ * @ingroup initializing
+ * @endinternal
+ */
+LINPHONE_PUBLIC void linphone_core_set_ssl_config(LinphoneCore *lc, void *ssl_config);
 LINPHONE_PUBLIC const char *linphone_core_get_root_ca(LinphoneCore *lc);
 LINPHONE_PUBLIC	void linphone_core_set_ringback(LinphoneCore *lc, const char *path);
 LINPHONE_PUBLIC const char * linphone_core_get_ringback(const LinphoneCore *lc);
@@ -3098,6 +3467,10 @@ LINPHONE_PUBLIC void linphone_core_set_ring_during_incoming_early_media(Linphone
 LINPHONE_PUBLIC bool_t linphone_core_get_ring_during_incoming_early_media(const LinphoneCore *lc);
 
 LINPHONE_PUBLIC int linphone_core_preview_ring(LinphoneCore *lc, const char *ring,LinphoneCoreCbFunc func,void * userdata);
+/**
+ * Returns the MSFactory (mediastreamer2 factory) used by the LinphoneCore to control mediastreamer2 library.
+**/
+LINPHONE_PUBLIC MSFactory* linphone_core_get_ms_factory(LinphoneCore* lc);
 LINPHONE_PUBLIC int linphone_core_play_local(LinphoneCore *lc, const char *audiofile);
 LINPHONE_PUBLIC	void linphone_core_enable_echo_cancellation(LinphoneCore *lc, bool_t val);
 LINPHONE_PUBLIC	bool_t linphone_core_echo_cancellation_enabled(LinphoneCore *lc);
@@ -3124,13 +3497,13 @@ bool_t linphone_core_agc_enabled(const LinphoneCore *lc);
 /**
  * @deprecated Use #linphone_core_enable_mic instead.
 **/
-LINPHONE_PUBLIC	void linphone_core_mute_mic(LinphoneCore *lc, bool_t muted);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED void linphone_core_mute_mic(LinphoneCore *lc, bool_t muted);
 
 /**
  * Get mic state.
  * @deprecated Use #linphone_core_mic_enabled instead
 **/
-LINPHONE_PUBLIC	bool_t linphone_core_is_mic_muted(LinphoneCore *lc);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED bool_t linphone_core_is_mic_muted(LinphoneCore *lc);
 
 /**
  * Enable or disable the microphone.
@@ -3168,7 +3541,31 @@ LINPHONE_PUBLIC void linphone_core_set_rtp_no_xmit_on_audio_mute(LinphoneCore *l
  * @param[in] lc LinphoneCore object
  * @return \mslist{LinphoneCallLog}
 **/
-LINPHONE_PUBLIC const MSList * linphone_core_get_call_logs(LinphoneCore *lc);
+LINPHONE_PUBLIC const bctbx_list_t * linphone_core_get_call_logs(LinphoneCore *lc);
+
+/**
+ * Get the list of call logs (past calls) that matches the given #LinphoneAddress.
+ * At the contrary of linphone_core_get_call_logs, it is your responsability to unref the logs and free this list once you are done using it.
+ * @param[in] lc LinphoneCore object
+ * @param[in] addr LinphoneAddress object
+ * @return \mslist{LinphoneCallLog}
+**/
+LINPHONE_PUBLIC bctbx_list_t * linphone_core_get_call_history_for_address(LinphoneCore *lc, const LinphoneAddress *addr);
+
+/**
+ * Get the latest outgoing call log.
+ * @param[in] lc LinphoneCore object
+ * @return {LinphoneCallLog}
+**/
+LINPHONE_PUBLIC LinphoneCallLog * linphone_core_get_last_outgoing_call_log(LinphoneCore *lc);
+
+/**
+ * Get the call log matching the call id, or NULL if can't be found.
+ * @param[in] lc LinphoneCore object
+ * @param[in] call_id Call id of the call log to find
+ * @return {LinphoneCallLog}
+**/
+LINPHONE_PUBLIC LinphoneCallLog * linphone_core_find_call_log_from_call_id(LinphoneCore *lc, const char *call_id);
 
 /**
  * Erase the call log.
@@ -3198,10 +3595,32 @@ LINPHONE_PUBLIC void linphone_core_reset_missed_calls_count(LinphoneCore *lc);
 **/
 LINPHONE_PUBLIC void linphone_core_remove_call_log(LinphoneCore *lc, LinphoneCallLog *call_log);
 
+/**
+ * Sets the database filename where call logs will be stored.
+ * If the file does not exist, it will be created.
+ * @ingroup initializing
+ * @param lc the linphone core
+ * @param path filesystem path
+**/
+LINPHONE_PUBLIC void linphone_core_set_call_logs_database_path(LinphoneCore *lc, const char *path);
+
+/**
+ * Migrates the call logs from the linphonerc to the database if not done yet
+ * @ingroup initializing
+ * @param lc the linphone core
+**/
+LINPHONE_PUBLIC void linphone_core_migrate_logs_from_rc_to_db(LinphoneCore *lc);
+
 /**
  * @}
 **/
 
+/**
+ * Tells whether VCARD support is builtin.
+ * @return TRUE if VCARD is supported, FALSE otherwise.
+ * @ingroup misc
+ */
+LINPHONE_PUBLIC bool_t linphone_core_vcard_supported(void);
 
 /* video support */
 LINPHONE_PUBLIC bool_t linphone_core_video_supported(LinphoneCore *lc);
@@ -3219,14 +3638,14 @@ LINPHONE_PUBLIC bool_t linphone_core_video_supported(LinphoneCore *lc);
  * @ingroup media_parameters
  * @deprecated Use #linphone_core_enable_video_capture and #linphone_core_enable_video_display instead.
 **/
-LINPHONE_PUBLIC	void linphone_core_enable_video(LinphoneCore *lc, bool_t vcap_enabled, bool_t display_enabled);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED void linphone_core_enable_video(LinphoneCore *lc, bool_t vcap_enabled, bool_t display_enabled);
 
 /**
- * Returns TRUE if video is enabled, FALSE otherwise.
+ * Returns TRUE if either capture or display is enabled, FALSE otherwise.
+ * same as  ( #linphone_core_video_capture_enabled | #linphone_core_video_display_enabled )
  * @ingroup media_parameters
- * @deprecated Use #linphone_core_video_capture_enabled and #linphone_core_video_display_enabled instead.
 **/
-LINPHONE_PUBLIC bool_t linphone_core_video_enabled(LinphoneCore *lc);
+LINPHONE_PUBLIC  bool_t linphone_core_video_enabled(LinphoneCore *lc);
 
 /**
  * Enable or disable video capture.
@@ -3285,7 +3704,7 @@ LINPHONE_PUBLIC bool_t linphone_core_video_capture_enabled(LinphoneCore *lc);
 LINPHONE_PUBLIC bool_t linphone_core_video_display_enabled(LinphoneCore *lc);
 
 LINPHONE_PUBLIC	void linphone_core_set_video_policy(LinphoneCore *lc, const LinphoneVideoPolicy *policy);
-LINPHONE_PUBLIC const LinphoneVideoPolicy *linphone_core_get_video_policy(LinphoneCore *lc);
+LINPHONE_PUBLIC const LinphoneVideoPolicy *linphone_core_get_video_policy(const LinphoneCore *lc);
 
 typedef struct MSVideoSizeDef{
 	MSVideoSize vsize;
@@ -3379,6 +3798,15 @@ LINPHONE_PUBLIC void linphone_core_set_preferred_framerate(LinphoneCore *lc, flo
 **/
 LINPHONE_PUBLIC float linphone_core_get_preferred_framerate(LinphoneCore *lc);
 LINPHONE_PUBLIC void linphone_core_enable_video_preview(LinphoneCore *lc, bool_t val);
+/**
+ * Take a photo of currently from capture device and write it into a jpeg file.
+ * Note that the snapshot is asynchronous, an application shall not assume that the file is created when the function returns.
+ * @ingroup misc
+ * @param lc the linphone core
+ * @param file a path where to write the jpeg content.
+ * @return 0 if successfull, -1 otherwise (typically if jpeg format is not supported).
+**/
+LINPHONE_PUBLIC int linphone_core_take_preview_snapshot(LinphoneCore *lc, const char *file);
 LINPHONE_PUBLIC bool_t linphone_core_video_preview_enabled(const LinphoneCore *lc);
 
 LINPHONE_PUBLIC void linphone_core_enable_self_view(LinphoneCore *lc, bool_t val);
@@ -3493,6 +3921,15 @@ void linphone_core_show_video(LinphoneCore *lc, bool_t show);
 **/
 LINPHONE_PUBLIC void linphone_core_set_use_files(LinphoneCore *lc, bool_t yesno);
 
+/**
+ * Gets whether linphone is currently streaming audio from and to files, rather
+ * than using the soundcard.
+ * @ingroup media_parameters
+ * @param[in] lc LinphoneCore object
+ * @return A boolean value representing whether linphone is streaming audio from and to files or not.
+**/
+LINPHONE_PUBLIC bool_t linphone_core_get_use_files(LinphoneCore *lc);
+
 /**
  * Get the wav file that is played when putting somebody on hold,
  * or when files are used instead of soundcards (see linphone_core_set_use_files()).
@@ -3561,6 +3998,22 @@ LINPHONE_PUBLIC	void linphone_core_set_network_reachable(LinphoneCore* lc,bool_t
  */
 LINPHONE_PUBLIC	bool_t linphone_core_is_network_reachable(LinphoneCore* lc);
 
+/**
+ * @ingroup network_parameters
+ * This method is called by the application to notify the linphone core library when the SIP network is reachable.
+ * This is for advanced usage, when SIP and RTP layers are required to use different interfaces.
+ * Most applications just need linphone_core_set_network_reachable().
+ */
+LINPHONE_PUBLIC	void linphone_core_set_sip_network_reachable(LinphoneCore* lc,bool_t value);
+
+/**
+ * @ingroup network_parameters
+ * This method is called by the application to notify the linphone core library when the media (RTP) network is reachable.
+ * This is for advanced usage, when SIP and RTP layers are required to use different interfaces.
+ * Most applications just need linphone_core_set_network_reachable().
+ */
+LINPHONE_PUBLIC	void linphone_core_set_media_network_reachable(LinphoneCore* lc,bool_t value);
+
 /**
  *  @ingroup network_parameters
  *  enable signaling keep alive. small udp packet sent periodically to keep udp NAT association
@@ -3591,7 +4044,7 @@ LINPHONE_PUBLIC LpConfig * linphone_core_create_lp_config(LinphoneCore *lc, cons
 LINPHONE_PUBLIC void linphone_core_set_waiting_callback(LinphoneCore *lc, LinphoneCoreWaitingCallback cb, void *user_context);
 
 /*returns the list of registered SipSetup (linphonecore plugins) */
-LINPHONE_PUBLIC const MSList * linphone_core_get_sip_setups(LinphoneCore *lc);
+LINPHONE_PUBLIC const bctbx_list_t * linphone_core_get_sip_setups(LinphoneCore *lc);
 
 LINPHONE_PUBLIC	void linphone_core_destroy(LinphoneCore *lc);
 
@@ -3615,7 +4068,7 @@ int linphone_core_get_current_call_stats(LinphoneCore *lc, rtp_stats_t *local, r
 
 LINPHONE_PUBLIC	int linphone_core_get_calls_nb(const LinphoneCore *lc);
 
-LINPHONE_PUBLIC	const MSList *linphone_core_get_calls(LinphoneCore *lc);
+LINPHONE_PUBLIC	const bctbx_list_t *linphone_core_get_calls(LinphoneCore *lc);
 
 LINPHONE_PUBLIC LinphoneGlobalState linphone_core_get_global_state(const LinphoneCore *lc);
 /**
@@ -3656,6 +4109,14 @@ LINPHONE_PUBLIC void linphone_core_set_user_certificates_path(LinphoneCore *lc,
  */
 LINPHONE_PUBLIC const char *linphone_core_get_user_certificates_path(LinphoneCore *lc);
 
+/**
+ * Reload mediastreamer2 plugins from specified directory.
+ * @param[in] lc #LinphoneCore object.
+ * @param[in] path the path from where plugins are to be loaded, pass NULL to use default (compile-time determined) plugin directory.
+ * @ingroup initializing
+ */
+LINPHONE_PUBLIC void linphone_core_reload_ms_plugins(LinphoneCore *lc, const char *path);
+
 /**
  * Search from the list of current calls if a remote address match uri
  * @ingroup call_control
@@ -3665,23 +4126,120 @@ LINPHONE_PUBLIC const char *linphone_core_get_user_certificates_path(LinphoneCor
  */
 LINPHONE_PUBLIC LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri);
 
-LINPHONE_PUBLIC	int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call);
-LINPHONE_PUBLIC	int linphone_core_add_all_to_conference(LinphoneCore *lc);
-LINPHONE_PUBLIC	int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call);
+/**
+ * @addtogroup call_control
+ * @{
+ */
+
+/**
+ * Create a conference
+ * @param lc The #LinphoneCore instance where the conference will be created inside.
+ * @param params Parameters of the conference. See #LinphoneConferenceParams.
+ * @return A pointer on the freshly created conference. That object will be automatically
+ * freed by the core after calling linphone_core_terminate_conference().
+ */
+LINPHONE_PUBLIC LinphoneConference *linphone_core_create_conference_with_params(LinphoneCore *lc, const LinphoneConferenceParams *params);
+/**
+ * Add a participant to the conference. If no conference is going on
+ * a new internal conference context is created and the participant is
+ * added to it.
+ * @param lc #LinphoneCore
+ * @param call The current call with the participant to add
+ * @return 0 if succeeded. Negative number if failed
+ */
+LINPHONE_PUBLIC int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call);
+/**
+ * Add all current calls into the conference. If no conference is running
+ * a new internal conference context is created and all current calls
+ * are added to it.
+ * @param lc #LinphoneCore
+ * @return 0 if succeeded. Negative number if failed
+ */
+LINPHONE_PUBLIC int linphone_core_add_all_to_conference(LinphoneCore *lc);
+/**
+ * Remove a call from the conference.
+ * @param lc the linphone core
+ * @param call a call that has been previously merged into the conference.
+ *
+ * After removing the remote participant belonging to the supplied call, the call becomes a normal call in paused state.
+ * If one single remote participant is left alone together with the local user in the conference after the removal, then the conference is
+ * automatically transformed into a simple call in StreamsRunning state.
+ * The conference's resources are then automatically destroyed.
+ *
+ * In other words, unless linphone_core_leave_conference() is explicitly called, the last remote participant of a conference is automatically
+ * put in a simple call in running state.
+ *
+ * @return 0 if successful, -1 otherwise.
+ **/
+ LINPHONE_PUBLIC int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call);
 /**
  * Indicates whether the local participant is part of a conference.
+ * @warning That function automatically fails in the case of conferences using a
+ * conferencet server (focus). If you use such a conference, you should use
+ * linphone_conference_remove_participant() instead.
  * @param lc the linphone core
  * @return TRUE if the local participant is in a conference, FALSE otherwise.
-**/
-LINPHONE_PUBLIC	bool_t linphone_core_is_in_conference(const LinphoneCore *lc);
-LINPHONE_PUBLIC	int linphone_core_enter_conference(LinphoneCore *lc);
-LINPHONE_PUBLIC	int linphone_core_leave_conference(LinphoneCore *lc);
-LINPHONE_PUBLIC	float linphone_core_get_conference_local_input_volume(LinphoneCore *lc);
-
-LINPHONE_PUBLIC	int linphone_core_terminate_conference(LinphoneCore *lc);
-LINPHONE_PUBLIC	int linphone_core_get_conference_size(LinphoneCore *lc);
+*/
+LINPHONE_PUBLIC bool_t linphone_core_is_in_conference(const LinphoneCore *lc);
+/**
+ * Join the local participant to the running conference
+ * @param lc #LinphoneCore
+ * @return 0 if succeeded. Negative number if failed
+ */
+LINPHONE_PUBLIC int linphone_core_enter_conference(LinphoneCore *lc);
+/**
+ * Make the local participant leave the running conference
+ * @param lc #LinphoneCore
+ * @return 0 if succeeded. Negative number if failed
+ */
+LINPHONE_PUBLIC int linphone_core_leave_conference(LinphoneCore *lc);
+/**
+ * Get the set input volume of the local participant
+ * @param lc #LinphoneCore
+ * @return A value inside [0.0 ; 1.0]
+ */
+LINPHONE_PUBLIC float linphone_core_get_conference_local_input_volume(LinphoneCore *lc);
+/**
+ * Terminate the running conference. If it is a local conference, all calls
+ * inside it will become back separate calls and will be put in #LinphoneCallPaused state.
+ * If it is a conference involving a focus server, all calls inside the conference
+ * will be terminated.
+ * @param lc #LinphoneCore
+ * @return 0 if succeeded. Negative number if failed
+ */
+LINPHONE_PUBLIC int linphone_core_terminate_conference(LinphoneCore *lc);
+/**
+ * Get the number of participant in the running conference. The local
+ * participant is included in the count only if it is in the conference.
+ * @param lc #LinphoneCore
+ * @return The number of participant
+ */
+LINPHONE_PUBLIC int linphone_core_get_conference_size(LinphoneCore *lc);
+/**
+ * Start recording the running conference
+ * @param lc #LinphoneCore
+ * @param path Path to the file where the recording will be written
+ * @return 0 if succeeded. Negative number if failed
+ */
 LINPHONE_PUBLIC int linphone_core_start_conference_recording(LinphoneCore *lc, const char *path);
+/**
+ * Stop recording the running conference
+ * @param lc #LinphoneCore
+ * @return 0 if succeeded. Negative number if failed
+ */
 LINPHONE_PUBLIC int linphone_core_stop_conference_recording(LinphoneCore *lc);
+/**
+ * Get a pointer on the internal conference object.
+ * @param lc #LinphoneCore
+ * @return A pointer on #LinphoneConference or NULL if no conference are going on
+ */
+LINPHONE_PUBLIC LinphoneConference *linphone_core_get_conference(LinphoneCore *lc);
+
+
+/**
+ * @}
+ */
+
 /**
  * Get the maximum number of simultaneous calls Linphone core can manage at a time. All new call above this limit are declined with a busy answer
  * @ingroup initializing
@@ -3786,7 +4344,7 @@ typedef unsigned int ContactSearchID;
 typedef struct _LinphoneContactSearch LinphoneContactSearch;
 typedef struct _LinphoneContactProvider LinphoneContactProvider;
 
-typedef void (*ContactSearchCallback)( LinphoneContactSearch* id, MSList* friends, void* data );
+typedef void (*ContactSearchCallback)( LinphoneContactSearch* id, bctbx_list_t* friends, void* data );
 
 /*
  * Remote provisioning
@@ -3798,10 +4356,11 @@ typedef void (*ContactSearchCallback)( LinphoneContactSearch* id, MSList* friend
  * Calling this function does not load the configuration. It will write the value into configuration so that configuration
  * from remote URI will take place at next LinphoneCore start.
  * @param lc the linphone core
- * @param uri the http or https uri to use in order to download the configuration.
+ * @param uri the http or https uri to use in order to download the configuration. Passing NULL will disable remote provisioning.
+ * @return -1 if uri could not be parsed, 0 otherwise. Note that this does not check validity of URI endpoint nor scheme and download may still fail.
  * @ingroup initializing
 **/
-LINPHONE_PUBLIC void linphone_core_set_provisioning_uri(LinphoneCore *lc, const char*uri);
+LINPHONE_PUBLIC int linphone_core_set_provisioning_uri(LinphoneCore *lc, const char*uri);
 
 /**
  * Get provisioning URI.
@@ -3881,6 +4440,15 @@ LINPHONE_PUBLIC const char * linphone_core_get_file_transfer_server(LinphoneCore
 **/
 LINPHONE_PUBLIC const char ** linphone_core_get_supported_file_formats(LinphoneCore *core);
 
+/**
+ * Returns whether a specific file format is supported.
+ * @see linphone_core_get_supported_file_formats
+ * @param lc A #LinphoneCore object
+ * @param fmt The format extension (wav, mkv).
+ * @ingroup media_paramaters
+**/
+LINPHONE_PUBLIC bool_t linphone_core_file_format_supported(LinphoneCore *lc, const char *fmt);
+
 LINPHONE_PUBLIC void linphone_core_add_supported_tag(LinphoneCore *core, const char *tag);
 
 LINPHONE_PUBLIC void linphone_core_remove_supported_tag(LinphoneCore *core, const char *tag);
@@ -3903,7 +4471,7 @@ LINPHONE_PUBLIC int linphone_core_get_avpf_rr_interval(const LinphoneCore *lc);
 LINPHONE_PUBLIC int linphone_core_set_audio_multicast_addr(LinphoneCore *core, const char* ip);
 /**
  * Use to set multicast address to be used for video stream.
- * @param core #LinphoneCore
+ * @param lc #LinphoneCore
  * @param ip an ipv4/6 multicast address
  * @return 0 in case of success
  * @ingroup media_parameters
@@ -3934,9 +4502,10 @@ LINPHONE_PUBLIC const char* linphone_core_get_video_multicast_addr(const Linphon
  * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC int linphone_core_set_audio_multicast_ttl(LinphoneCore *core, int ttl);
+
 /**
  * Use to set multicast ttl to be used for video stream.
- * @param core #LinphoneCore
+ * @param lc #LinphoneCore
  * @param  ttl value or -1 if not used. [0..255] default value is 1
  * @return 0 in case of success
  * @ingroup media_parameters
@@ -4005,6 +4574,7 @@ LINPHONE_PUBLIC bool_t linphone_core_video_multicast_enabled(const LinphoneCore
  * @param lc the LinphoneCore
  * @param params the parameters used for the network simulation.
  * @return 0 if successful, -1 otherwise.
+ * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC int linphone_core_set_network_simulator_params(LinphoneCore *lc, const OrtpNetworkSimulatorParams *params);
 
@@ -4013,6 +4583,7 @@ LINPHONE_PUBLIC int linphone_core_set_network_simulator_params(LinphoneCore *lc,
  * Get the previously set network simulation parameters.
  * @see linphone_core_set_network_simulator_params
  * @return a OrtpNetworkSimulatorParams structure.
+ * @ingroup media_parameters
 **/
 LINPHONE_PUBLIC const OrtpNetworkSimulatorParams *linphone_core_get_network_simulator_params(const LinphoneCore *lc);
 
@@ -4020,6 +4591,7 @@ LINPHONE_PUBLIC const OrtpNetworkSimulatorParams *linphone_core_get_network_simu
  * Set the video preset to be used for video calls.
  * @param[in] lc LinphoneCore object
  * @param[in] preset The name of the video preset to be used (can be NULL to use the default video preset).
+ * @ingroup media_parameters
  */
 LINPHONE_PUBLIC void linphone_core_set_video_preset(LinphoneCore *lc, const char *preset);
 
@@ -4027,9 +4599,137 @@ LINPHONE_PUBLIC void linphone_core_set_video_preset(LinphoneCore *lc, const char
  * Get the video preset used for video calls.
  * @param[in] lc LinphoneCore object
  * @return The name of the video preset used for video calls (can be NULL if the default video preset is used).
+ * @ingroup media_parameters
  */
 LINPHONE_PUBLIC const char * linphone_core_get_video_preset(const LinphoneCore *lc);
 
+/**
+ * Gets if realtime text is enabled or not
+ * @param[in] lc LinphoneCore object
+ * @return true if realtime text is enabled, false otherwise
+ * @ingroup media_parameters
+ */
+LINPHONE_PUBLIC bool_t linphone_core_realtime_text_enabled(LinphoneCore *lc);
+
+/**
+ * Set http proxy address to be used for signaling during next channel connection. Use #linphone_core_set_network_reachable FASLE/TRUE to force channel restart.
+ * @param[in] lc LinphoneCore object
+ * @param[in] host Hostname of IP adress of the http proxy (can be NULL to disable).
+ * @ingroup network_parameters
+ */
+LINPHONE_PUBLIC	void linphone_core_set_http_proxy_host(LinphoneCore *lc, const char *host) ;
+
+/**
+ * Set http proxy port to be used for signaling.
+ * @param[in] lc LinphoneCore object
+ * @param[in] port of the http proxy.
+ * @ingroup network_parameters
+ */
+LINPHONE_PUBLIC void linphone_core_set_http_proxy_port(LinphoneCore *lc, int port) ;
+
+/**
+ * Get http proxy address to be used for signaling.
+ * @param[in] lc LinphoneCore object
+ * @return hostname of IP adress of the http proxy (can be NULL to disable).
+ * @ingroup network_parameters
+ */
+LINPHONE_PUBLIC	const char *linphone_core_get_http_proxy_host(const LinphoneCore *lc);
+
+/**
+ * Get http proxy port to be used for signaling.
+ * @param[in] lc LinphoneCore object
+ * @return port of the http proxy.
+ * @ingroup network_parameters
+ */
+LINPHONE_PUBLIC	int linphone_core_get_http_proxy_port(const LinphoneCore *lc);
+
+/**
+ * Converts a LinphoneTransportType enum to a lowercase string.
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC const char* linphone_transport_to_string(LinphoneTransportType transport);
+
+/**
+ * Converts a lowercase string to a LinphoneTransportType enum.
+ * @ingroup misc
+ * @return Transport matching input, or LinphoneTransportUdp if nothing is found
+**/
+LINPHONE_PUBLIC LinphoneTransportType linphone_transport_parse(const char* transport);
+
+typedef struct _LinphoneRingtonePlayer LinphoneRingtonePlayer;
+
+LINPHONE_PUBLIC LinphoneRingtonePlayer *linphone_core_get_ringtoneplayer(LinphoneCore *lc);
+
+/**
+ * @ingroup network_parameters
+ * Sets a TLS certificate used for TLS authentication
+ * The certificate won't be stored, you have to set it after each LinphoneCore startup
+ * @param lc LinphoneCore object
+ * @param tls_cert the TLS certificate
+ */
+LINPHONE_PUBLIC void linphone_core_set_tls_cert(LinphoneCore *lc, const char *tls_cert);
+
+/**
+ * @ingroup network_parameters
+ * Sets a TLS key used for TLS authentication
+ * The key won't be stored, you have to set it after each LinphoneCore startup
+ * @param lc LinphoneCore object
+ * @param tls_key the TLS key
+ */
+LINPHONE_PUBLIC void linphone_core_set_tls_key(LinphoneCore *lc, const char *tls_key);
+
+/**
+ * @ingroup network_parameters
+ * Sets a TLS certificate path used for TLS authentication
+ * The path will be stored in the rc file and automatically restored on startup
+ * @param lc LinphoneCore object
+ * @param tls_cert_path path to the TLS certificate
+ */
+LINPHONE_PUBLIC void linphone_core_set_tls_cert_path(LinphoneCore *lc, const char *tls_cert_path);
+
+/**
+ * @ingroup network_parameters
+ * Sets a TLS key path used for TLS authentication
+ * The path will be stored in the rc file and automatically restored on startup
+ * @param lc LinphoneCore object
+ * @param tls_key_path path to the TLS key
+ */
+LINPHONE_PUBLIC void linphone_core_set_tls_key_path(LinphoneCore *lc, const char *tls_key_path);
+
+/**
+ * @ingroup network_parameters
+ * Gets the TLS certificate
+ * @param lc LinphoneCore object
+ * @return the TLS certificate or NULL if not set yet
+ */
+LINPHONE_PUBLIC const char *linphone_core_get_tls_cert(const LinphoneCore *lc);
+
+/**
+ * @ingroup network_parameters
+ * Gets the TLS key
+ * @param lc LinphoneCore object
+ * @return  the TLS key or NULL if not set yet
+ */
+LINPHONE_PUBLIC const char *linphone_core_get_tls_key(const LinphoneCore *lc);
+
+/**
+ * @ingroup network_parameters
+ * Gets the path to the TLS certificate file
+ * @param lc LinphoneCore object
+ * @return the TLS certificate path or NULL if not set yet
+ */
+LINPHONE_PUBLIC const char *linphone_core_get_tls_cert_path(const LinphoneCore *lc);
+
+/**
+ * @ingroup network_parameters
+ * Gets the path to the TLS key file
+ * @param lc LinphoneCore object
+ * @return the TLS key path or NULL if not set yet
+ */
+LINPHONE_PUBLIC const char *linphone_core_get_tls_key_path(const LinphoneCore *lc);
+
+#include "ringtoneplayer.h"
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 469215283..a42b688c6 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -29,38 +29,18 @@ extern "C" {
 #include "mediastreamer2/mscommon.h"
 #include "mediastreamer2/msmediaplayer.h"
 #include "mediastreamer2/msutils.h"
-#include "devices.h"
+#include "mediastreamer2/devices.h"
 }
 #include "mediastreamer2/msjava.h"
 #include "private.h"
+#include "account_creator.h"
 #include <cpu-features.h>
 
 #include "lpconfig.h"
 
 #ifdef ANDROID
 #include <android/log.h>
-extern "C" void libmsilbc_init();
-#ifdef HAVE_X264
-extern "C" void libmsx264_init();
-#endif
-#ifdef HAVE_OPENH264
-extern "C" void libmsopenh264_init();
-#endif
-#ifdef HAVE_AMR
-extern "C" void libmsamr_init();
-#endif
-#ifdef HAVE_SILK
-extern "C" void libmssilk_init();
-#endif
-#ifdef HAVE_G729
-extern "C" void libmsbcg729_init();
-#endif
-#ifdef HAVE_WEBRTC
-extern "C" void libmswebrtc_init();
-#endif
-#ifdef HAVE_CODEC2
-extern "C" void libmscodec2_init();
-#endif
+
 #include <belle-sip/wakelock.h>
 #endif /*ANDROID*/
 
@@ -90,6 +70,7 @@ static jobject handler_obj=NULL;
 static jobject create_java_linphone_content(JNIEnv *env, const LinphoneContent *content);
 static jobject create_java_linphone_buffer(JNIEnv *env, const LinphoneBuffer *buffer);
 static LinphoneBuffer* create_c_linphone_buffer_from_java_linphone_buffer(JNIEnv *env, jobject jbuffer);
+static jobject getTunnelConfig(JNIEnv *env, LinphoneTunnelConfig *cfg);
 
 #ifdef ANDROID
 void linphone_android_log_handler(int prio, char *str) {
@@ -101,7 +82,10 @@ void linphone_android_log_handler(int prio, char *str) {
 	} else {
 		current = str;
 		while ((next = strchr(current, '\n')) != NULL) {
+
 			*next = '\0';
+			if (next != str && next[-1] == '\r')
+				next[-1] = '\0';
 			__android_log_write(prio, LogDomain, current);
 			current = next + 1;
 		}
@@ -109,32 +93,50 @@ void linphone_android_log_handler(int prio, char *str) {
 	}
 }
 
-static void linphone_android_ortp_log_handler(OrtpLogLevel lev, const char *fmt, va_list args) {
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreFactoryImpl__1setLogHandler(JNIEnv *env, jobject jfactory, jobject jhandler) {
+	if (handler_obj) {
+		env->DeleteGlobalRef(handler_obj);
+		handler_obj = NULL;
+	}
+	if (jhandler) {
+		handler_class = (jclass) env->GetObjectClass(jhandler);
+		loghandler_id = env->GetMethodID(handler_class, "log", "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V");
+
+		if (loghandler_id == NULL) {
+			ms_fatal("log method not found");
+		}
+		handler_obj = env->NewGlobalRef(jhandler);
+	}
+}
+
+static void linphone_android_ortp_log_handler(const char *domain, OrtpLogLevel lev, const char *fmt, va_list args) {
 	char str[4096];
-	const char *levname="undef";
+	const char *levname = "undef";
 	vsnprintf(str, sizeof(str) - 1, fmt, args);
 	str[sizeof(str) - 1] = '\0';
 
 	int prio;
-	switch(lev){
-	case ORTP_DEBUG:	prio = ANDROID_LOG_DEBUG;	levname="debug"; break;
-	case ORTP_MESSAGE:	prio = ANDROID_LOG_INFO;	levname="message"; break;
-	case ORTP_WARNING:	prio = ANDROID_LOG_WARN;	levname="warning"; break;
-	case ORTP_ERROR:	prio = ANDROID_LOG_ERROR;	levname="error"; break;
-	case ORTP_FATAL:	prio = ANDROID_LOG_FATAL;	levname="fatal"; break;
-	default:			prio = ANDROID_LOG_DEFAULT;	break;
+	switch(lev) {
+		case ORTP_DEBUG:	prio = ANDROID_LOG_DEBUG;	levname="debug"; break;
+		case ORTP_MESSAGE:	prio = ANDROID_LOG_INFO;	levname="message"; break;
+		case ORTP_WARNING:	prio = ANDROID_LOG_WARN;	levname="warning"; break;
+		case ORTP_ERROR:	prio = ANDROID_LOG_ERROR;	levname="error"; break;
+		case ORTP_FATAL:	prio = ANDROID_LOG_FATAL;	levname="fatal"; break;
+		default:			prio = ANDROID_LOG_DEFAULT;	break;
 	}
-	if (handler_obj){
-		JNIEnv *env=ms_get_jni_env();
-		jstring jdomain=env->NewStringUTF(LogDomain);
-		jstring jlevname=env->NewStringUTF(levname);
-		jstring jstr=env->NewStringUTF(str);
-		env->CallVoidMethod(handler_obj,loghandler_id,jdomain,(jint)lev,jlevname,jstr,NULL);
+
+	if (handler_obj) {
+		JNIEnv *env = ms_get_jni_env();
+		jstring jdomain = env->NewStringUTF(LogDomain);
+		jstring jlevname = env->NewStringUTF(levname);
+		jstring jstr = env->NewStringUTF(str);
+		env->CallVoidMethod(handler_obj, loghandler_id, jdomain, (jint)lev, jlevname, jstr, NULL);
 		if (jdomain) env->DeleteLocalRef(jdomain);
 		if (jlevname) env->DeleteLocalRef(jlevname);
 		if (jstr) env->DeleteLocalRef(jstr);
-	}else
+	} else {
 		linphone_android_log_handler(prio, str);
+	}
 }
 
 int dumbMethodForAllowingUsageOfCpuFeaturesFromStaticLibMediastream() {
@@ -151,12 +153,20 @@ JNIEXPORT jint JNICALL  JNI_OnLoad(JavaVM *ajvm, void *reserved)
 {
 #ifdef ANDROID
 	ms_set_jvm(ajvm);
-	
+
 #endif /*ANDROID*/
 	jvm=ajvm;
 	return JNI_VERSION_1_2;
 }
 
+static const char* GetStringUTFChars(JNIEnv* env, jstring string) {
+	const char *cstring = string ? env->GetStringUTFChars(string, NULL) : NULL;
+	return cstring;
+}
+
+static void ReleaseStringUTFChars(JNIEnv* env, jstring string, const char *cstring) {
+	if (string) env->ReleaseStringUTFChars(string, cstring);
+}
 
 //LinphoneFactory
 extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_setDebugMode(JNIEnv*  env
@@ -164,13 +174,21 @@ extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_setDebugMode(JNIE
 		,jboolean isDebug
 		,jstring  jdebugTag) {
 	if (isDebug) {
-		LogDomain = env->GetStringUTFChars(jdebugTag, NULL);
+		LogDomain = GetStringUTFChars(env, jdebugTag);
 		linphone_core_enable_logs_with_cb(linphone_android_ortp_log_handler);
 	} else {
 		linphone_core_disable_logs();
 	}
 }
 
+extern "C" jobject Java_org_linphone_core_LinphoneCoreFactoryImpl__1createTunnelConfig(JNIEnv*  env, jobject  thiz){
+	jobject jobj;
+	LinphoneTunnelConfig *cfg =  linphone_tunnel_config_new();
+	jobj = getTunnelConfig(env, cfg); //this will take a ref.
+	linphone_tunnel_config_unref(cfg);
+	return jobj;
+}
+
 extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_enableLogCollection(JNIEnv* env
 		,jobject  thiz
 		,jboolean enable) {
@@ -181,183 +199,77 @@ extern "C" void Java_org_linphone_core_LinphoneCoreFactoryImpl_setLogCollectionP
 		,jobject  thiz
 		,jstring jpath) {
 
-	const char* path = env->GetStringUTFChars(jpath, NULL);
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_log_collection_path(path);
-	env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
 }
+
+extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreFactoryImpl_getAllDialPlanNative(JNIEnv *env, jobject thiz) {
+	LinphoneDialPlan *countries;
+	jclass addr_class = env->FindClass("org/linphone/core/DialPlanImpl");
+	jmethodID addr_constructor = env->GetMethodID(addr_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V");
+	jobjectArray jaddr_array;
+	int i, size = 0;
+	countries = (LinphoneDialPlan *)linphone_dial_plan_get_all();
+
+	while (countries[size].country != NULL) size++;
+
+	jaddr_array = env->NewObjectArray(size, addr_class, NULL);
+
+	for (i=0; i < size ; i++) {
+		jstring jcountry = env->NewStringUTF(countries[i].country);
+		jstring jiso = env->NewStringUTF(countries[i].iso_country_code);
+		jstring jccc = env->NewStringUTF(countries[i].ccc);
+		jint jnnl = (jint)countries[i].nnl;
+		jstring jicp = env->NewStringUTF(countries[i].icp);
+
+		jobject jaddr = env->NewObject(addr_class, addr_constructor, jcountry, jiso, jccc, jnnl, jicp);
+
+		env->SetObjectArrayElement(jaddr_array, i, jaddr);
+
+		env->DeleteLocalRef(jcountry);
+		env->DeleteLocalRef(jiso);
+		env->DeleteLocalRef(jccc);
+		env->DeleteLocalRef(jicp);
+	}
+	return jaddr_array;
+}
+
 // LinphoneCore
 
-/*
- * returns the java LinphoneProxyConfig associated with a C LinphoneProxyConfig.
-**/
-jobject getProxy(JNIEnv *env, LinphoneProxyConfig *proxy, jobject core){
-	jobject jobj=0;
-
-	if (proxy!=NULL){
-		jclass proxyClass = (jclass)env->FindClass("org/linphone/core/LinphoneProxyConfigImpl");
-		jmethodID proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
-
-		void *up=linphone_proxy_config_get_user_data(proxy);
-
-		if (up==NULL){
-			jobj=env->NewObject(proxyClass,proxyCtrId,core,(jlong)proxy);
-			linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
-			linphone_proxy_config_ref(proxy);
-		}else{
-			//promote the weak ref to local ref
-			jobj=env->NewLocalRef((jobject)up);
-			if (jobj == NULL){
-				//the weak ref was dead
-				jobj=env->NewObject(proxyClass,proxyCtrId,core,(jlong)proxy);
-				linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
-			}
-		}
-		env->DeleteLocalRef(proxyClass);
-	}
-	return jobj;
-}
-
-jobject getCall(JNIEnv *env, LinphoneCall *call){
-	jobject jobj=0;
-
-	if (call!=NULL){
-		jclass callClass = (jclass)env->FindClass("org/linphone/core/LinphoneCallImpl");
-		jmethodID callCtrId = env->GetMethodID(callClass,"<init>", "(J)V");
-
-		void *up=linphone_call_get_user_pointer(call);
-
-		if (up==NULL){
-			jobj=env->NewObject(callClass,callCtrId,(jlong)call);
-			jobj=env->NewGlobalRef(jobj);
-			linphone_call_set_user_pointer(call,(void*)jobj);
-			linphone_call_ref(call);
-		}else{
-			jobj=(jobject)up;
-		}
-		env->DeleteLocalRef(callClass);
-	}
-	return jobj;
-}
-
-jobject getChatMessage(JNIEnv *env, LinphoneChatMessage *msg){
-	jobject jobj = 0;
-
-	if (msg != NULL){
-		jclass chatMessageClass = (jclass)env->FindClass("org/linphone/core/LinphoneChatMessageImpl");
-		jmethodID chatMessageCtrId = env->GetMethodID(chatMessageClass,"<init>", "(J)V");
-
-		void *up = linphone_chat_message_get_user_data(msg);
-
-		if (up == NULL) {
-			jobj = env->NewObject(chatMessageClass,chatMessageCtrId,(jlong)linphone_chat_message_ref(msg));
-			jobj = env->NewGlobalRef(jobj);
-			linphone_chat_message_set_user_data(msg,(void*)jobj);
-		} else {
-			jobj = (jobject)up;
-		}
-		env->DeleteLocalRef(chatMessageClass);
-	}
-	return jobj;
-}
-
-jobject getFriend(JNIEnv *env, LinphoneFriend *lfriend){
-	jobject jobj=0;
-
-	if (lfriend != NULL){
-		jclass friendClass = (jclass)env->FindClass("org/linphone/core/LinphoneFriendImpl");
-		jmethodID friendCtrId = env->GetMethodID(friendClass,"<init>", "(J)V");
-
-		void *up=linphone_friend_get_user_data(lfriend);
-
-		if (up == NULL){
-			jobj=env->NewObject(friendClass,friendCtrId,(jlong)lfriend);
-			linphone_friend_set_user_data(lfriend,(void*)env->NewWeakGlobalRef(jobj));
-			linphone_friend_ref(lfriend);
-		}else{
-
-			jobj=env->NewLocalRef((jobject)up);
-			if (jobj == NULL){
-				jobj=env->NewObject(friendClass,friendCtrId,(jlong)lfriend);
-				linphone_friend_set_user_data(lfriend,(void*)env->NewWeakGlobalRef(jobj));
-			}
-		}
-		env->DeleteLocalRef(friendClass);
-	}
-	return jobj;
-}
-
-jobject getEvent(JNIEnv *env, LinphoneEvent *lev){
-	if (lev==NULL) return NULL;
-	jobject jev=(jobject)linphone_event_get_user_data(lev);
-	if (jev==NULL){
-		jclass linphoneEventClass = (jclass)env->FindClass("org/linphone/core/LinphoneEventImpl");
-		jmethodID linphoneEventCtrId = env->GetMethodID(linphoneEventClass,"<init>", "(J)V");
-
-		jev=env->NewObject(linphoneEventClass,linphoneEventCtrId,(jlong)linphone_event_ref(lev));
-		jev=env->NewGlobalRef(jev);
-		linphone_event_set_user_data(lev,jev);
-
-		env->DeleteLocalRef(linphoneEventClass);
-	}
-	return jev;
-}
-
-class LinphoneCoreData {
+class LinphoneJavaBindings {
 public:
-	LinphoneCoreData(JNIEnv *env, jobject lc, LinphoneCoreVTable *vTable, jobject alistener) {
-		core = env->NewGlobalRef(lc);
-		listener = env->NewGlobalRef(alistener);
+	LinphoneJavaBindings(JNIEnv *env) {
+		listenerClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCoreListener"));
 
-		memset(vTable, 0, sizeof(LinphoneCoreVTable));
-
-		listenerClass = (jclass)env->NewGlobalRef(env->GetObjectClass(alistener));
+		authMethodClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$AuthMethod"));
+		authMethodFromIntId = env->GetStaticMethodID(authMethodClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$AuthMethod;");
 
 		/*displayStatus(LinphoneCore lc,String message);*/
 		displayStatusId = env->GetMethodID(listenerClass,"displayStatus","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;)V");
-		if (displayStatusId) {
-			vTable->display_status = displayStatusCb;
-		}
 
 		/*void generalState(LinphoneCore lc,int state); */
 		globalStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$GlobalState"));
 		globalStateFromIntId = env->GetStaticMethodID(globalStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$GlobalState;");
 		globalStateId = env->GetMethodID(listenerClass,"globalState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$GlobalState;Ljava/lang/String;)V");
-		if (globalStateId) {
-			vTable->global_state_changed = globalStateChange;
-		}
 
 		/*registrationState(LinphoneCore lc, LinphoneProxyConfig cfg, LinphoneCore.RegistrationState cstate, String smessage);*/
 		registrationStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RegistrationState"));
 		registrationStateFromIntId = env->GetStaticMethodID(registrationStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RegistrationState;");
 		registrationStateId = env->GetMethodID(listenerClass,"registrationState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneProxyConfig;Lorg/linphone/core/LinphoneCore$RegistrationState;Ljava/lang/String;)V");
-		if (registrationStateId) {
-			vTable->registration_state_changed = registrationStateChange;
-		}
 
 		/*callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State cstate,String message);*/
 		callStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCall$State"));
 		callStateFromIntId = env->GetStaticMethodID(callStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCall$State;");
 		callStateId = env->GetMethodID(listenerClass,"callState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;Ljava/lang/String;)V");
-		if (callStateId) {
-			vTable->call_state_changed = callStateChange;
-		}
 
 		transferStateId = env->GetMethodID(listenerClass,"transferState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCall$State;)V");
-		if (transferStateId) {
-			vTable->transfer_state_changed = transferStateChanged;
-		}
 
 		/*callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats);*/
 		callStatsUpdatedId = env->GetMethodID(listenerClass, "callStatsUpdated", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneCallStats;)V");
-		if (callStatsUpdatedId) {
-			vTable->call_stats_updated = callStatsUpdated;
-		}
 
 		/*callEncryption(LinphoneCore lc, LinphoneCall call, boolean encrypted,String auth_token);*/
 		callEncryptionChangedId = env->GetMethodID(listenerClass,"callEncryptionChanged","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;ZLjava/lang/String;)V");
-		if (callEncryptionChangedId) {
-			vTable->call_encryption_changed = callEncryptionChange;
-		}
 
 		/*void ecCalibrationStatus(LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);*/
 		ecCalibratorStatusClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$EcCalibratorStatus"));
@@ -366,96 +278,52 @@ public:
 
 		/*void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url)*/
 		newSubscriptionRequestId = env->GetMethodID(listenerClass,"newSubscriptionRequest","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;Ljava/lang/String;)V");
-		if (newSubscriptionRequestId) {
-			vTable->new_subscription_requested = new_subscription_requested;
-		}
 
 		authInfoRequestedId = env->GetMethodID(listenerClass,"authInfoRequested","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-		if (authInfoRequestedId) {
-			vTable->auth_info_requested = authInfoRequested;
-		}
+		authenticationRequestedId = env->GetMethodID(listenerClass,"authenticationRequested","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneAuthInfo;Lorg/linphone/core/LinphoneCore$AuthMethod;)V");
 
 		/*void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf);*/
 		notifyPresenceReceivedId = env->GetMethodID(listenerClass,"notifyPresenceReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriend;)V");
-		if (notifyPresenceReceivedId) {
-			vTable->notify_presence_received = notify_presence_received;
-		}
 
 		messageReceivedId = env->GetMethodID(listenerClass,"messageReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;Lorg/linphone/core/LinphoneChatMessage;)V");
-		if (messageReceivedId) {
-			vTable->message_received = message_received;
-		}
 
 		isComposingReceivedId = env->GetMethodID(listenerClass,"isComposingReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatRoom;)V");
-		if (isComposingReceivedId) {
-			vTable->is_composing_received = is_composing_received;
-		}
 
 		dtmfReceivedId = env->GetMethodID(listenerClass,"dtmfReceived","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;I)V");
-		if (dtmfReceivedId) {
-			vTable->dtmf_received = dtmf_received;
-		}
 
 		infoReceivedId = env->GetMethodID(listenerClass,"infoReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCall;Lorg/linphone/core/LinphoneInfoMessage;)V");
-		if (infoReceivedId) {
-			vTable->info_received = infoReceived;
-		}
 
 		subscriptionStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/SubscriptionState"));
 		subscriptionStateFromIntId = env->GetStaticMethodID(subscriptionStateClass,"fromInt","(I)Lorg/linphone/core/SubscriptionState;");
 		subscriptionStateId = env->GetMethodID(listenerClass,"subscriptionStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/SubscriptionState;)V");
-		if (subscriptionStateId) {
-			vTable->subscription_state_changed = subscriptionStateChanged;
-		}
 
 		publishStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/PublishState"));
 		publishStateFromIntId = env->GetStaticMethodID(publishStateClass,"fromInt","(I)Lorg/linphone/core/PublishState;");
 		publishStateId = env->GetMethodID(listenerClass,"publishStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Lorg/linphone/core/PublishState;)V");
-		if (publishStateId) {
-			vTable->publish_state_changed = publishStateChanged;
-		}
 
 		notifyRecvId = env->GetMethodID(listenerClass,"notifyReceived", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneEvent;Ljava/lang/String;Lorg/linphone/core/LinphoneContent;)V");
-		if (notifyRecvId) {
-			vTable->notify_received = notifyReceived;
-		}
 
 		configuringStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$RemoteProvisioningState"));
 		configuringStateFromIntId = env->GetStaticMethodID(configuringStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;");
 		configuringStateId = env->GetMethodID(listenerClass,"configuringStatus","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$RemoteProvisioningState;Ljava/lang/String;)V");
-		if (configuringStateId) {
-			vTable->configuring_status = configuringStatus;
-		}
 
 		fileTransferProgressIndicationId = env->GetMethodID(listenerClass, "fileTransferProgressIndication", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;I)V");
-		if (fileTransferProgressIndicationId) {
-			vTable->file_transfer_progress_indication = fileTransferProgressIndication;
-		}
 
 		fileTransferSendId = env->GetMethodID(listenerClass, "fileTransferSend", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;Ljava/nio/ByteBuffer;I)I");
-		if (fileTransferSendId) {
-			vTable->file_transfer_send = fileTransferSend;
-		}
 
 		fileTransferRecvId = env->GetMethodID(listenerClass, "fileTransferRecv", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;[BI)V");
-		if (fileTransferRecvId) {
-			vTable->file_transfer_recv = fileTransferRecv;
-		}
 
 		logCollectionUploadStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$LogCollectionUploadState"));
 		logCollectionUploadStateFromIntId = env->GetStaticMethodID(logCollectionUploadStateClass, "fromInt", "(I)Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;");
 		logCollectionUploadProgressId = env->GetMethodID(listenerClass, "uploadProgressIndication", "(Lorg/linphone/core/LinphoneCore;II)V");
-		if (logCollectionUploadProgressId) {
-			vTable->log_collection_upload_progress_indication = logCollectionUploadProgressIndication;
-		}
 		logCollectionUploadStateId = env->GetMethodID(listenerClass, "uploadStateChanged", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$LogCollectionUploadState;Ljava/lang/String;)V");
-		if (logCollectionUploadStateId) {
-			vTable->log_collection_upload_state_changed = logCollectionUploadStateChange;
-		}
 
 		chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
 		chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
 
+		authInfoClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneAuthInfoImpl"));
+		authInfoCtrId = env->GetMethodID(authInfoClass,"<init>", "(J)V");
+
 		proxyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
 		proxyCtrId = env->GetMethodID(proxyClass,"<init>", "(Lorg/linphone/core/LinphoneCoreImpl;J)V");
 
@@ -472,9 +340,19 @@ public:
 		chatRoomClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatRoomImpl"));
 		chatRoomCtrId = env->GetMethodID(chatRoomClass,"<init>", "(J)V");
 
-		friendClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneFriendImpl"));;
+		friendClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneFriendImpl"));
 		friendCtrId = env->GetMethodID(friendClass,"<init>", "(J)V");
 
+		friendListClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneFriendListImpl"));
+		friendListCtrId = env->GetMethodID(friendListClass,"<init>", "(J)V");
+		friendListCreatedId = env->GetMethodID(listenerClass, "friendListCreated", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriendList;)V");
+		friendListRemovedId = env->GetMethodID(listenerClass, "friendListRemoved", "(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneFriendList;)V");
+		friendListSyncStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneFriendList$State"));
+		friendListSyncStateFromIntId = env->GetStaticMethodID(friendListSyncStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneFriendList$State;");
+
+		natPolicyClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneNatPolicyImpl"));
+		natPolicyCtrId = env->GetMethodID(natPolicyClass, "<init>", "(J)V");
+
 		addressClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneAddressImpl"));
 		addressCtrId = env->GetMethodID(addressClass,"<init>", "(J)V");
 
@@ -489,32 +367,54 @@ public:
 
 		subscriptionDirClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/SubscriptionDir"));
 		subscriptionDirFromIntId = env->GetStaticMethodID(subscriptionDirClass,"fromInt","(I)Lorg/linphone/core/SubscriptionDir;");
+
+		msFactoryClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/mediastream/Factory"));
+		msFactoryCtrId = env->GetMethodID(msFactoryClass,"<init>", "(J)V");
+
+		accountCreatorClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneAccountCreatorImpl"));
+		accountCreatorCtrId = env->GetMethodID(accountCreatorClass, "<init>", "(J)V");
+		accountCreatorStatusClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneAccountCreator$Status"));
+		accountCreatorStatusFromIntId = env->GetStaticMethodID(accountCreatorStatusClass,"fromInt","(I)Lorg/linphone/core/LinphoneAccountCreator$Status;");
 	}
 
-	~LinphoneCoreData() {
+	void setCore(jobject c) {
+		core = c;
+	}
+
+	jobject getCore() {
+		return core;
+	}
+
+	~LinphoneJavaBindings() {
 		JNIEnv *env = 0;
 		jvm->AttachCurrentThread(&env,NULL);
-		env->DeleteGlobalRef(core);
-		env->DeleteGlobalRef(listener);
 		env->DeleteGlobalRef(listenerClass);
+		env->DeleteGlobalRef(authMethodClass);
 		env->DeleteGlobalRef(globalStateClass);
 		env->DeleteGlobalRef(configuringStateClass);
 		env->DeleteGlobalRef(registrationStateClass);
 		env->DeleteGlobalRef(callStateClass);
 		env->DeleteGlobalRef(chatMessageStateClass);
+		env->DeleteGlobalRef(authInfoClass);
 		env->DeleteGlobalRef(proxyClass);
 		env->DeleteGlobalRef(callClass);
 		env->DeleteGlobalRef(chatMessageClass);
 		env->DeleteGlobalRef(chatRoomClass);
 		env->DeleteGlobalRef(friendClass);
+		env->DeleteGlobalRef(friendListClass);
+		env->DeleteGlobalRef(friendListSyncStateClass);
+		env->DeleteGlobalRef(natPolicyClass);
 		env->DeleteGlobalRef(infoMessageClass);
 		env->DeleteGlobalRef(linphoneEventClass);
 		env->DeleteGlobalRef(subscriptionStateClass);
 		env->DeleteGlobalRef(subscriptionDirClass);
 		env->DeleteGlobalRef(logCollectionUploadStateClass);
+		env->DeleteGlobalRef(msFactoryClass);
+		env->DeleteGlobalRef(accountCreatorClass);
+		env->DeleteGlobalRef(accountCreatorStatusClass);
 	}
+
 	jobject core;
-	jobject listener;
 
 	jclass listenerClass;
 	jmethodID displayStatusId;
@@ -528,9 +428,13 @@ public:
 	jmethodID infoReceivedId;
 	jmethodID subscriptionStateId;
 	jmethodID authInfoRequestedId;
+	jmethodID authenticationRequestedId;
 	jmethodID publishStateId;
 	jmethodID notifyRecvId;
 
+	jclass authMethodClass;
+	jmethodID authMethodFromIntId;
+
 	jclass configuringStateClass;
 	jmethodID configuringStateId;
 	jmethodID configuringStateFromIntId;
@@ -561,6 +465,9 @@ public:
 	jmethodID ecCalibrationStatusId;
 	jmethodID ecCalibratorStatusFromIntId;
 
+	jclass authInfoClass;
+	jmethodID authInfoCtrId;
+
 	jclass proxyClass;
 	jmethodID proxyCtrId;
 
@@ -576,6 +483,16 @@ public:
 	jclass friendClass;
 	jmethodID friendCtrId;
 
+	jclass friendListClass;
+	jmethodID friendListCtrId;
+	jmethodID friendListCreatedId;
+	jmethodID friendListRemovedId;
+	jclass friendListSyncStateClass;
+	jmethodID friendListSyncStateFromIntId;
+
+	jclass natPolicyClass;
+	jmethodID natPolicyCtrId;
+
 	jclass addressClass;
 	jmethodID addressCtrId;
 
@@ -603,6 +520,385 @@ public:
 	jmethodID logCollectionUploadStateFromIntId;
 	jmethodID logCollectionUploadProgressId;
 
+	jclass msFactoryClass;
+	jmethodID msFactoryCtrId;
+
+	jclass accountCreatorClass;
+	jmethodID accountCreatorCtrId;
+	jclass accountCreatorStatusClass;
+	jmethodID accountCreatorStatusFromIntId;
+};
+
+/*
+ * returns the java LinphoneProxyConfig associated with a C LinphoneProxyConfig.
+**/
+jobject getProxy(JNIEnv *env, LinphoneProxyConfig *proxy, jobject core){
+	jobject jobj=0;
+
+	if (proxy!=NULL){
+		LinphoneCore *lc = linphone_proxy_config_get_core(proxy);
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up=linphone_proxy_config_get_user_data(proxy);
+
+		if (up==NULL){
+			jobj=env->NewObject(ljb->proxyClass, ljb->proxyCtrId, core, (jlong)proxy);
+			linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
+			linphone_proxy_config_ref(proxy);
+		}else{
+ 			//promote the weak ref to local ref
+			jobj=env->NewLocalRef((jobject)up);
+			if (jobj == NULL){
+				//the weak ref was dead
+				jobj=env->NewObject(ljb->proxyClass, ljb->proxyCtrId, core, (jlong)proxy);
+				linphone_proxy_config_set_user_data(proxy,(void*)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+jobject getAuthInfo(JNIEnv *env, LinphoneCore *lc, LinphoneAuthInfo *authInfo, jobject core){
+	jobject jobj = 0;
+
+	if (authInfo && lc) {
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+		jobj = env->NewObject(ljb->authInfoClass, ljb->authInfoCtrId, core, (jlong)authInfo);
+	}
+	return jobj;
+}
+
+jobject getCall(JNIEnv *env, LinphoneCall *call){
+	jobject jobj=0;
+
+	if (call!=NULL){
+		LinphoneCore *lc = linphone_call_get_core(call);
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up=linphone_call_get_user_pointer(call);
+
+		if (up==NULL){
+			jobj=env->NewObject(ljb->callClass, ljb->callCtrId, (jlong)call);
+			jobj=env->NewGlobalRef(jobj);
+			linphone_call_set_user_pointer(call,(void*)jobj);
+			linphone_call_ref(call);
+		}else{
+			jobj=(jobject)up;
+		}
+	}
+	return jobj;
+}
+
+jobject getChatMessage(JNIEnv *env, LinphoneChatMessage *msg){
+	jobject jobj = 0;
+
+	if (msg != NULL){
+		LinphoneChatRoom *room = linphone_chat_message_get_chat_room(msg);
+		LinphoneCore *lc = linphone_chat_room_get_core(room);
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up = linphone_chat_message_get_user_data(msg);
+
+		if (up == NULL) {
+			jobj = env->NewObject(ljb->chatMessageClass, ljb->chatMessageCtrId, (jlong)msg);
+			void *userdata = (void*)env->NewWeakGlobalRef(jobj);
+			linphone_chat_message_set_user_data(msg, userdata);
+			linphone_chat_message_ref(msg);
+		} else {
+			jobj = env->NewLocalRef((jobject)up);
+			if (jobj == NULL) {
+				// takes implicit local ref
+				jobj = env->NewObject(ljb->chatMessageClass, ljb->chatMessageCtrId, (jlong)msg);
+				linphone_chat_message_set_user_data(msg, (void*)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+jobject getChatRoom(JNIEnv *env, LinphoneChatRoom *room) {
+	jobject jobj = 0;
+
+	if (room != NULL){
+		LinphoneCore *lc = linphone_chat_room_get_core(room);
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up = linphone_chat_room_get_user_data(room);
+		if (up == NULL) {
+			// take implicit local ref
+			jobj = env->NewObject(ljb->chatRoomClass, ljb->chatRoomCtrId, (jlong)room);
+			linphone_chat_room_set_user_data(room, (void*)env->NewWeakGlobalRef(jobj));
+			linphone_chat_room_ref(room);
+		} else {
+			jobj = env->NewLocalRef((jobject)up);
+			if (jobj == NULL) {
+				// takes implicit local ref
+				jobj = env->NewObject(ljb->chatRoomClass, ljb->chatRoomCtrId, (jlong)room);
+				linphone_chat_room_set_user_data(room, (void*)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+jobject getFriend(JNIEnv *env, LinphoneFriend *lfriend){
+	jobject jobj=0;
+
+
+	if (lfriend != NULL){
+		LinphoneCore *lc = linphone_friend_get_core(lfriend);
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up=linphone_friend_get_user_data(lfriend);
+
+		if (up == NULL){
+
+			// take implicit local ref
+			jobj=env->NewObject(ljb->friendClass, ljb->friendCtrId, (jlong)lfriend);
+			linphone_friend_set_user_data(lfriend,(void*)env->NewWeakGlobalRef(jobj));
+			linphone_friend_ref(lfriend);
+		}else{
+
+			jobj=env->NewLocalRef((jobject)up);
+			if (jobj == NULL){
+				// takes implicit local ref
+				jobj=env->NewObject(ljb->friendClass, ljb->friendCtrId, (jlong)lfriend);
+				linphone_friend_set_user_data(lfriend,(void*)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+jobject getFriendList(JNIEnv *env, LinphoneFriendList *lfriendList){
+	jobject jobj=0;
+
+	if (lfriendList != NULL){
+		LinphoneCore *lc = linphone_friend_list_get_core(lfriendList);
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up=linphone_friend_list_get_user_data(lfriendList);
+
+		if (up == NULL){
+			jobj=env->NewObject(ljb->friendListClass, ljb->friendListCtrId, (jlong)lfriendList);
+			linphone_friend_list_set_user_data(lfriendList,(void*)env->NewWeakGlobalRef(jobj));
+			linphone_friend_list_ref(lfriendList);
+		}else{
+
+			jobj=env->NewLocalRef((jobject)up);
+			if (jobj == NULL){
+				jobj=env->NewObject(ljb->friendListClass, ljb->friendListCtrId, (jlong)lfriendList);
+				linphone_friend_list_set_user_data(lfriendList,(void*)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+jobject getNatPolicy(JNIEnv *env, LinphoneNatPolicy *lNatPolicy) {
+	jobject jobj = 0;
+
+	if (lNatPolicy != NULL) {
+		LinphoneCore *lc = lNatPolicy->lc;
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up = linphone_nat_policy_get_user_data(lNatPolicy);
+		if (up == NULL) {
+			jobj = env->NewObject(ljb->natPolicyClass, ljb->natPolicyCtrId, (jlong)lNatPolicy);
+			linphone_nat_policy_set_user_data(lNatPolicy, (void *)env->NewWeakGlobalRef(jobj));
+			linphone_nat_policy_ref(lNatPolicy);
+		} else {
+			jobj = env->NewLocalRef((jobject)up);
+			if (jobj == NULL) {
+				jobj = env->NewObject(ljb->natPolicyClass, ljb->natPolicyCtrId, (jlong)lNatPolicy);
+				linphone_nat_policy_set_user_data(lNatPolicy, (void *)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+jobject getEvent(JNIEnv *env, LinphoneEvent *lev){
+	if (lev==NULL) return NULL;
+	jobject jev=(jobject)linphone_event_get_user_data(lev);
+	if (jev==NULL){
+		LinphoneCore *lc = linphone_event_get_core(lev);
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		jev=env->NewObject(ljb->linphoneEventClass, ljb->linphoneEventCtrId, (jlong)linphone_event_ref(lev));
+		jev=env->NewGlobalRef(jev);
+		linphone_event_set_user_data(lev,jev);
+	}
+	return jev;
+}
+
+jobject getXmlRpcRequest(JNIEnv *env, LinphoneXmlRpcRequest *lrequest) {
+	jobject jobj = 0;
+
+	if (lrequest != NULL) {
+		jclass xmlRpcSessionClass = (jclass)env->FindClass("org/linphone/core/LinphoneXmlRpcRequestImpl");
+		jmethodID xmlRpcSessionCtrId = env->GetMethodID(xmlRpcSessionClass, "<init>", "(J)V");
+
+		void *up = linphone_xml_rpc_request_get_user_data(lrequest);
+		if (up == NULL) {
+			jobj = env->NewObject(xmlRpcSessionClass, xmlRpcSessionCtrId, (jlong)lrequest);
+			linphone_xml_rpc_request_set_user_data(lrequest, (void *)env->NewWeakGlobalRef(jobj));
+			linphone_xml_rpc_request_ref(lrequest);
+		} else {
+			jobj = env->NewLocalRef((jobject)up);
+			if (jobj == NULL) {
+				jobj = env->NewObject(xmlRpcSessionClass, xmlRpcSessionCtrId, (jlong)lrequest);
+				linphone_xml_rpc_request_set_user_data(lrequest, (void *)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+jobject getAccountCreator(JNIEnv *env, LinphoneAccountCreator *account_creator) {
+	jobject jobj = 0;
+
+	if (account_creator != NULL) {
+		LinphoneCore *lc = account_creator->core;
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+		void *up = linphone_account_creator_get_user_data(account_creator);
+		if (up == NULL) {
+			jobj = env->NewObject(ljb->accountCreatorClass, ljb->accountCreatorCtrId, (jlong)account_creator);
+			linphone_account_creator_set_user_data(account_creator, (void *)env->NewWeakGlobalRef(jobj));
+			linphone_account_creator_ref(account_creator);
+		} else {
+			jobj = env->NewLocalRef((jobject)up);
+			if (jobj == NULL) {
+				jobj = env->NewObject(ljb->accountCreatorClass, ljb->accountCreatorCtrId, (jlong)account_creator);
+				linphone_account_creator_set_user_data(account_creator, (void *)env->NewWeakGlobalRef(jobj));
+			}
+		}
+	}
+	return jobj;
+}
+
+class LinphoneCoreData {
+public:
+	LinphoneCoreData(JNIEnv *env, jobject lc, LinphoneCoreVTable *vTable, jobject alistener, LinphoneJavaBindings *ljb) {
+		core = env->NewGlobalRef(lc);
+		listener = env->NewGlobalRef(alistener);
+
+		memset(vTable, 0, sizeof(LinphoneCoreVTable));
+
+		if (ljb->displayStatusId) {
+			vTable->display_status = displayStatusCb;
+		}
+
+		if (ljb->globalStateId) {
+			vTable->global_state_changed = globalStateChange;
+		}
+
+		if (ljb->registrationStateId) {
+			vTable->registration_state_changed = registrationStateChange;
+		}
+
+		if (ljb->callStateId) {
+			vTable->call_state_changed = callStateChange;
+		}
+
+		if (ljb->transferStateId) {
+			vTable->transfer_state_changed = transferStateChanged;
+		}
+
+		if (ljb->callStatsUpdatedId) {
+			vTable->call_stats_updated = callStatsUpdated;
+		}
+
+		if (ljb->callEncryptionChangedId) {
+			vTable->call_encryption_changed = callEncryptionChange;
+		}
+
+		if (ljb->newSubscriptionRequestId) {
+			vTable->new_subscription_requested = new_subscription_requested;
+		}
+
+		if (ljb->authInfoRequestedId) {
+			vTable->auth_info_requested = authInfoRequested;
+		}
+
+		if (ljb->authenticationRequestedId) {
+			vTable->authentication_requested = authenticationRequested;
+		}
+
+		if (ljb->notifyPresenceReceivedId) {
+			vTable->notify_presence_received = notify_presence_received;
+		}
+
+		if (ljb->messageReceivedId) {
+			vTable->message_received = message_received;
+		}
+
+		if (ljb->isComposingReceivedId) {
+			vTable->is_composing_received = is_composing_received;
+		}
+
+		if (ljb->dtmfReceivedId) {
+			vTable->dtmf_received = dtmf_received;
+		}
+
+		if (ljb->infoReceivedId) {
+			vTable->info_received = infoReceived;
+		}
+
+		if (ljb->subscriptionStateId) {
+			vTable->subscription_state_changed = subscriptionStateChanged;
+		}
+
+		if (ljb->publishStateId) {
+			vTable->publish_state_changed = publishStateChanged;
+		}
+
+		if (ljb->notifyRecvId) {
+			vTable->notify_received = notifyReceived;
+		}
+
+		if (ljb->configuringStateId) {
+			vTable->configuring_status = configuringStatus;
+		}
+
+		if (ljb->fileTransferProgressIndicationId) {
+			vTable->file_transfer_progress_indication = fileTransferProgressIndication;
+		}
+
+		if (ljb->fileTransferSendId) {
+			vTable->file_transfer_send = fileTransferSend;
+		}
+
+		if (ljb->fileTransferRecvId) {
+			vTable->file_transfer_recv = fileTransferRecv;
+		}
+
+		if (ljb->logCollectionUploadProgressId) {
+			vTable->log_collection_upload_progress_indication = logCollectionUploadProgressIndication;
+		}
+		if (ljb->logCollectionUploadStateId) {
+			vTable->log_collection_upload_state_changed = logCollectionUploadStateChange;
+		}
+
+		if (ljb->friendListCreatedId) {
+			vTable->friend_list_created = friendListCreated;
+		}
+		if (ljb->friendListRemovedId) {
+			vTable->friend_list_removed = friendListRemoved;
+		}
+	}
+
+	~LinphoneCoreData() {
+		JNIEnv *env = 0;
+		jvm->AttachCurrentThread(&env,NULL);
+		env->DeleteGlobalRef(core);
+		env->DeleteGlobalRef(listener);
+	}
+
+	jobject core;
+	jobject listener;
+
 	LinphoneCoreVTable vTable;
 
 	static void displayStatusCb(LinphoneCore *lc, const char *message) {
@@ -612,10 +908,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jstring msg = message ? env->NewStringUTF(message) : NULL;
-		env->CallVoidMethod(lcData->listener,lcData->displayStatusId,lcData->core,msg);
+		env->CallVoidMethod(lcData->listener,ljb->displayStatusId,lcData->core,msg);
 		handle_possible_java_exception(env, lcData->listener);
 		if (msg) {
 			env->DeleteLocalRef(msg);
@@ -628,17 +926,20 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jstring r = realm ? env->NewStringUTF(realm) : NULL;
 		jstring u = username ? env->NewStringUTF(username) : NULL;
 		jstring d = domain ? env->NewStringUTF(domain) : NULL;
 		env->CallVoidMethod(lcData->listener,
-							lcData->authInfoRequestedId,
+							ljb->authInfoRequestedId,
 							lcData->core,
 							r,
 							u,
-							d);
+							d
+   						);
 		handle_possible_java_exception(env, lcData->listener);
 		if (r) {
 			env->DeleteLocalRef(r);
@@ -650,6 +951,34 @@ public:
 			env->DeleteLocalRef(d);
 		}
 	}
+	static void authenticationRequested(LinphoneCore *lc, LinphoneAuthInfo *auth_info, LinphoneAuthMethod method) {
+		JNIEnv *env = 0;
+		jint result = jvm->AttachCurrentThread(&env,NULL);
+		if (result != 0) {
+			ms_error("cannot attach VM");
+			return;
+		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		env->CallVoidMethod(lcData->listener,
+							ljb->authenticationRequestedId,
+							lcData->core,
+							getAuthInfo(env, lc, auth_info, lcData->core),
+							env->CallStaticObjectMethod(ljb->authMethodClass,ljb->authMethodFromIntId,(jint)method)
+   						);
+		handle_possible_java_exception(env, lcData->listener);
+	}
+	static void setCoreIfNotDone(JNIEnv *env, jobject jcore, LinphoneCore *lc){
+		jclass objClass = env->GetObjectClass(jcore);
+		jfieldID myFieldID = env->GetFieldID(objClass, "nativePtr", "J");
+		jlong fieldVal = env->GetLongField(jcore, myFieldID);
+		if (fieldVal == 0){
+			env->SetLongField(jcore, myFieldID, (jlong)lc);
+		}
+	}
+
 	static void globalStateChange(LinphoneCore *lc, LinphoneGlobalState gstate,const char* message) {
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
@@ -657,13 +986,20 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+
+		jobject jcore = lcData->core;
+		/*at this stage, the java object may not be aware of its C object, because linphone_core_new() hasn't returned yet.*/
+		setCoreIfNotDone(env,jcore, lc);
+
 		jstring msg = message ? env->NewStringUTF(message) : NULL;
 		env->CallVoidMethod(lcData->listener
-							,lcData->globalStateId
+							,ljb->globalStateId
 							,lcData->core
-							,env->CallStaticObjectMethod(lcData->globalStateClass,lcData->globalStateFromIntId,(jint)gstate),
+							,env->CallStaticObjectMethod(ljb->globalStateClass,ljb->globalStateFromIntId,(jint)gstate),
 							msg);
 		handle_possible_java_exception(env, lcData->listener);
 		if (msg) {
@@ -678,19 +1014,24 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jstring msg = message ? env->NewStringUTF(message) : NULL;
 		env->CallVoidMethod(lcData->listener
-							,lcData->registrationStateId
+							,ljb->registrationStateId
 							,lcData->core
 							,(jproxy=getProxy(env,proxy,lcData->core))
-							,env->CallStaticObjectMethod(lcData->registrationStateClass,lcData->registrationStateFromIntId,(jint)state),
+							,env->CallStaticObjectMethod(ljb->registrationStateClass,ljb->registrationStateFromIntId,(jint)state),
 							msg);
 		handle_possible_java_exception(env, lcData->listener);
 		if (msg) {
 			env->DeleteLocalRef(msg);
 		}
+		if (jproxy) {
+			env->DeleteLocalRef(jproxy);
+		}
 	}
 
 	static void callStateChange(LinphoneCore *lc, LinphoneCall* call,LinphoneCallState state,const char* message) {
@@ -701,14 +1042,16 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jstring msg = message ? env->NewStringUTF(message) : NULL;
 		env->CallVoidMethod(lcData->listener
-							,lcData->callStateId
+							,ljb->callStateId
 							,lcData->core
 							,(jcall=getCall(env,call))
-							,env->CallStaticObjectMethod(lcData->callStateClass,lcData->callStateFromIntId,(jint)state),
+							,env->CallStaticObjectMethod(ljb->callStateClass,ljb->callStateFromIntId,(jint)state),
 							msg);
 		handle_possible_java_exception(env, lcData->listener);
 		if (state==LinphoneCallReleased) {
@@ -726,10 +1069,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
-							,lcData->callEncryptionChangedId
+							,ljb->callEncryptionChangedId
 							,lcData->core
 							,getCall(env,call)
 							,encrypted
@@ -739,17 +1084,23 @@ public:
 	static void notify_presence_received(LinphoneCore *lc,  LinphoneFriend *my_friend) {
 		JNIEnv *env = 0;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
+		jobject jfriend = NULL;
+
 		if (result != 0) {
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jfriend = getFriend(env, my_friend);
 		env->CallVoidMethod(lcData->listener
-							,lcData->notifyPresenceReceivedId
+							,ljb->notifyPresenceReceivedId
 							,lcData->core
-							,getFriend(env,my_friend));
+							,jfriend);
 		handle_possible_java_exception(env, lcData->listener);
+		env->DeleteLocalRef(jfriend);
 	}
 	static void new_subscription_requested(LinphoneCore *lc,  LinphoneFriend *my_friend, const char* url) {
 		JNIEnv *env = 0;
@@ -758,13 +1109,17 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		jobject jfriend =  getFriend(env, my_friend);
 		env->CallVoidMethod(lcData->listener
-							,lcData->newSubscriptionRequestId
+							,ljb->newSubscriptionRequestId
 							,lcData->core
-							,getFriend(env,my_friend)
+							,jfriend
 							,url ? env->NewStringUTF(url) : NULL);
+		env->DeleteLocalRef(jfriend);
 		handle_possible_java_exception(env, lcData->listener);
 	}
 	static void dtmf_received(LinphoneCore *lc, LinphoneCall *call, int dtmf) {
@@ -774,10 +1129,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
-							,lcData->dtmfReceivedId
+							,ljb->dtmfReceivedId
 							,lcData->core
 							,getCall(env,call)
 							,dtmf);
@@ -785,21 +1142,31 @@ public:
 	}
 	static void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *msg) {
 		JNIEnv *env = 0;
-		jobject jmsg;
 		jint result = jvm->AttachCurrentThread(&env,NULL);
 		if (result != 0) {
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		jobject jmsg;
+		jobject jroom;
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		/*note: we call linphone_chat_message_ref() because the application does not acquire the object when invoked from a callback*/
 		env->CallVoidMethod(lcData->listener
-							,lcData->messageReceivedId
+							,ljb->messageReceivedId
 							,lcData->core
-							,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room)
+							,(jroom = getChatRoom(env, room))
 							,(jmsg = getChatMessage(env, msg)));
 		handle_possible_java_exception(env, lcData->listener);
+
+		if (jmsg) {
+			env->DeleteLocalRef(jmsg);
+		}
+		if (jroom) {
+			env->DeleteLocalRef(jroom);
+		}
 	}
 	static void is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
 		JNIEnv *env = 0;
@@ -808,13 +1175,20 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		jobject jroom;
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
-							,lcData->isComposingReceivedId
+							,ljb->isComposingReceivedId
 							,lcData->core
-							,env->NewObject(lcData->chatRoomClass,lcData->chatRoomCtrId,(jlong)room));
+							,(jroom = getChatRoom(env, room)));
 		handle_possible_java_exception(env, lcData->listener);
+
+		if (jroom) {
+			env->DeleteLocalRef(jroom);
+		}
 	}
 	static void ecCalibrationStatus(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay_ms, void *data) {
 		JNIEnv *env = 0;
@@ -824,13 +1198,14 @@ public:
 			return;
 		}
 
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = (LinphoneCoreVTable*) data;
-		if (table) {
+		if (table && ljb) {
 			LinphoneCoreData* lcData = (LinphoneCoreData*) linphone_core_v_table_get_user_data(table);
-			if (lcData->ecCalibrationStatusId) {
-				jobject state = env->CallStaticObjectMethod(lcData->ecCalibratorStatusClass, lcData->ecCalibratorStatusFromIntId, (jint)status);
+			if (ljb->ecCalibrationStatusId) {
+				jobject state = env->CallStaticObjectMethod(ljb->ecCalibratorStatusClass, ljb->ecCalibratorStatusFromIntId, (jint)status);
 				env->CallVoidMethod(lcData->listener
-								,lcData->ecCalibrationStatusId
+								,ljb->ecCalibrationStatusId
 								,lcData->core
 								,state
 								,delay_ms
@@ -852,16 +1227,22 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
-		statsobj = env->NewObject(lcData->callStatsClass, lcData->callStatsId, (jlong)call, (jlong)stats);
+		statsobj = env->NewObject(ljb->callStatsClass, ljb->callStatsId, (jlong)call, (jlong)stats);
 		callobj = getCall(env, call);
 		if (stats->type == LINPHONE_CALL_STATS_AUDIO)
-			env->CallVoidMethod(callobj, lcData->callSetAudioStatsId, statsobj);
-		else
-			env->CallVoidMethod(callobj, lcData->callSetVideoStatsId, statsobj);
-		env->CallVoidMethod(lcData->listener, lcData->callStatsUpdatedId, lcData->core, callobj, statsobj);
+			env->CallVoidMethod(callobj, ljb->callSetAudioStatsId, statsobj);
+		else if (stats->type == LINPHONE_CALL_STATS_VIDEO){
+			env->CallVoidMethod(callobj, ljb->callSetVideoStatsId, statsobj);
+		}else{
+			//text stats not updated yet.
+		}
+		env->CallVoidMethod(lcData->listener, ljb->callStatsUpdatedId, lcData->core, callobj, statsobj);
 		handle_possible_java_exception(env, lcData->listener);
+		if (statsobj) env->DeleteLocalRef(statsobj);
 	}
 	static void transferStateChanged(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState remote_call_state){
 		JNIEnv *env = 0;
@@ -871,13 +1252,15 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
-							,lcData->transferStateId
+							,ljb->transferStateId
 							,lcData->core
 							,(jcall=getCall(env,call))
-							,env->CallStaticObjectMethod(lcData->callStateClass,lcData->callStateFromIntId,(jint)remote_call_state)
+							,env->CallStaticObjectMethod(ljb->callStateClass,ljb->callStateFromIntId,(jint)remote_call_state)
 							);
 		handle_possible_java_exception(env, lcData->listener);
 	}
@@ -888,14 +1271,16 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneInfoMessage *copy_info=linphone_info_message_copy(info);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
-							,lcData->infoReceivedId
+							,ljb->infoReceivedId
 							,lcData->core
 							,getCall(env,call)
-							,env->NewObject(lcData->infoMessageClass,lcData->infoMessageCtor,(jlong)copy_info)
+							,env->NewObject(ljb->infoMessageClass,ljb->infoMessageCtor,(jlong)copy_info)
 							);
 		handle_possible_java_exception(env, lcData->listener);
 	}
@@ -908,12 +1293,14 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jevent=getEvent(env,ev);
-		jstate=env->CallStaticObjectMethod(lcData->subscriptionStateClass,lcData->subscriptionStateFromIntId,(jint)state);
+		jstate=env->CallStaticObjectMethod(ljb->subscriptionStateClass,ljb->subscriptionStateFromIntId,(jint)state);
 		env->CallVoidMethod(lcData->listener
-							,lcData->subscriptionStateId
+							,ljb->subscriptionStateId
 							,lcData->core
 							,jevent
 							,jstate
@@ -934,12 +1321,14 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jevent=getEvent(env,ev);
-		jstate=env->CallStaticObjectMethod(lcData->publishStateClass,lcData->publishStateFromIntId,(jint)state);
+		jstate=env->CallStaticObjectMethod(ljb->publishStateClass,ljb->publishStateFromIntId,(jint)state);
 		env->CallVoidMethod(lcData->listener
-							,lcData->publishStateId
+							,ljb->publishStateId
 							,lcData->core
 							,jevent
 							,jstate
@@ -954,11 +1343,13 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jevent=getEvent(env,ev);
 		env->CallVoidMethod(lcData->listener
-							,lcData->notifyRecvId
+							,ljb->notifyRecvId
 							,lcData->core
 							,jevent
 							,env->NewStringUTF(evname)
@@ -974,9 +1365,11 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
-		env->CallVoidMethod(lcData->listener, lcData->configuringStateId, lcData->core, env->CallStaticObjectMethod(lcData->configuringStateClass,lcData->configuringStateFromIntId,(jint)status), message ? env->NewStringUTF(message) : NULL);
+		env->CallVoidMethod(lcData->listener, ljb->configuringStateId, lcData->core, env->CallStaticObjectMethod(ljb->configuringStateClass,ljb->configuringStateFromIntId,(jint)status), message ? env->NewStringUTF(message) : NULL);
 		handle_possible_java_exception(env, lcData->listener);
 	}
 
@@ -989,11 +1382,13 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jobject jcontent = content ? create_java_linphone_content(env, content) : NULL;
 		env->CallVoidMethod(lcData->listener,
-				lcData->fileTransferProgressIndicationId,
+				ljb->fileTransferProgressIndicationId,
 				lcData->core,
 				(jmsg = getChatMessage(env, message)),
 				jcontent,
@@ -1001,6 +1396,9 @@ public:
 		if (jcontent) {
 			env->DeleteLocalRef(jcontent);
 		}
+		if (jmsg) {
+			env->DeleteLocalRef(jmsg);
+		}
 		handle_possible_java_exception(env, lcData->listener);
 	}
 
@@ -1013,12 +1411,14 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jobject jcontent = content ? create_java_linphone_content(env, content) : NULL;
 		jobject jbuffer = buff ? env->NewDirectByteBuffer(buff, asking) : NULL;
 		*size = env->CallIntMethod(lcData->listener,
-				lcData->fileTransferSendId,
+				ljb->fileTransferSendId,
 				lcData->core,
 				(jmsg = getChatMessage(env, message)),
 				jcontent,
@@ -1030,6 +1430,9 @@ public:
 		if (jbuffer) {
 			env->DeleteLocalRef(jbuffer);
 		}
+		if (jmsg) {
+			env->DeleteLocalRef(jmsg);
+		}
 		handle_possible_java_exception(env, lcData->listener);
 	}
 
@@ -1041,6 +1444,8 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 
@@ -1049,7 +1454,7 @@ public:
 		jobject jcontent = content ? create_java_linphone_content(env, content) : NULL;
 
 		env->CallVoidMethod(lcData->listener,
-				lcData->fileTransferRecvId,
+				ljb->fileTransferRecvId,
 				lcData->core,
 				(jmsg = getChatMessage(env, message)),
 				jcontent,
@@ -1058,6 +1463,9 @@ public:
 		if (jcontent) {
 			env->DeleteLocalRef(jcontent);
 		}
+		if (jmsg) {
+			env->DeleteLocalRef(jmsg);
+		}
 		handle_possible_java_exception(env, lcData->listener);
 	}
 	static void logCollectionUploadProgressIndication(LinphoneCore *lc, size_t offset, size_t total) {
@@ -1067,10 +1475,12 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		env->CallVoidMethod(lcData->listener
-							,lcData->logCollectionUploadProgressId
+							,ljb->logCollectionUploadProgressId
 							,lcData->core
 							,(jlong)offset
 							,(jlong)total);
@@ -1083,19 +1493,60 @@ public:
 			ms_error("cannot attach VM");
 			return;
 		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
 		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
 		jstring msg = info ? env->NewStringUTF(info) : NULL;
 		env->CallVoidMethod(lcData->listener
-							,lcData->logCollectionUploadStateId
+							,ljb->logCollectionUploadStateId
 							,lcData->core
-							,env->CallStaticObjectMethod(lcData->logCollectionUploadStateClass,lcData->logCollectionUploadStateFromIntId,(jint)state),
+							,env->CallStaticObjectMethod(ljb->logCollectionUploadStateClass,ljb->logCollectionUploadStateFromIntId,(jint)state),
 							msg);
 		handle_possible_java_exception(env, lcData->listener);
 		if (msg) {
 			env->DeleteLocalRef(msg);
 		}
 	}
+	static void friendListCreated(LinphoneCore *lc, LinphoneFriendList *list) {
+		JNIEnv *env = 0;
+		jint result = jvm->AttachCurrentThread(&env,NULL);
+		if (result != 0) {
+			ms_error("cannot attach VM");
+			return;
+		}
+
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		env->CallVoidMethod(lcData->listener
+							,ljb->friendListCreatedId
+							,lcData->core
+							,getFriendList(env, list));
+		handle_possible_java_exception(env, lcData->listener);
+	}
+	static void friendListRemoved(LinphoneCore *lc, LinphoneFriendList *list) {
+		JNIEnv *env = 0;
+		jint result = jvm->AttachCurrentThread(&env,NULL);
+		if (result != 0) {
+			ms_error("cannot attach VM");
+			return;
+		}
+
+		jobject jfriendlist;
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+		LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+		LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+		env->CallVoidMethod(lcData->listener
+							,ljb->friendListRemovedId
+							,lcData->core
+							,(jfriendlist = getFriendList(env, list)));
+		handle_possible_java_exception(env, lcData->listener);
+
+		if (jfriendlist) {
+			env->DeleteLocalRef(jfriendlist);
+		}
+	}
 
 private:
 	static inline void handle_possible_java_exception(JNIEnv *env, jobject listener)
@@ -1115,50 +1566,29 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 		,jstring jfactoryConfig
 		,jobject juserdata){
 
-	const char* userConfig = juserConfig?env->GetStringUTFChars(juserConfig, NULL):NULL;
-	const char* factoryConfig = jfactoryConfig?env->GetStringUTFChars(jfactoryConfig, NULL):NULL;
+	const char* userConfig = GetStringUTFChars(env, juserConfig);
+	const char* factoryConfig = GetStringUTFChars(env, jfactoryConfig);
+
+	LinphoneJavaBindings *ljb = new LinphoneJavaBindings(env);
 
 	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
-	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener);
+	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener, ljb);
 	linphone_core_v_table_set_user_data(vTable, ldata);
 
-	ms_init(); // Initialize mediastreamer2 before loading the plugins
-
-#ifdef HAVE_ILBC
-	libmsilbc_init(); // requires an fpu
-#endif
-#ifdef HAVE_X264
-	libmsx264_init();
-#endif
-#ifdef HAVE_OPENH264
-	libmsopenh264_init();
-#endif
-#ifdef HAVE_AMR
-	libmsamr_init();
-#endif
-#ifdef HAVE_SILK
-	libmssilk_init();
-#endif
-#ifdef HAVE_G729
-	libmsbcg729_init();
-#endif
-#ifdef HAVE_WEBRTC
-	libmswebrtc_init();
-#endif
-#ifdef HAVE_CODEC2
-	libmscodec2_init();
-#endif
 
 	jobject core = env->NewGlobalRef(thiz);
-	jlong nativePtr = (jlong)linphone_core_new(vTable, userConfig, factoryConfig, core);
+	ljb->setCore(core);
+	LinphoneCore *lc = linphone_core_new(vTable, userConfig, factoryConfig, ljb);
 
-	if (userConfig) env->ReleaseStringUTFChars(juserConfig, userConfig);
-	if (factoryConfig) env->ReleaseStringUTFChars(jfactoryConfig, factoryConfig);
+	jlong nativePtr = (jlong)lc;
+	ReleaseStringUTFChars(env, juserConfig, userConfig);
+	ReleaseStringUTFChars(env, jfactoryConfig, factoryConfig);
 	return nativePtr;
 }
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv* env, jobject thiz, jlong native_ptr) {
 	LinphoneCore *lc=(LinphoneCore*)native_ptr;
-	jobject core = (jobject)linphone_core_get_user_data(lc);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 
 	jobject multicast_lock = lc->multicast_lock;
 	jobject multicast_lock_class = lc->multicast_lock_class;
@@ -1166,34 +1596,38 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv* env, jobj
 	jobject wifi_lock_class = lc->wifi_lock_class;
 
 	linphone_core_destroy(lc);
-	ms_exit();
 
 	if (wifi_lock) env->DeleteGlobalRef(wifi_lock);
 	if (wifi_lock_class) env->DeleteGlobalRef(wifi_lock_class);
 	if (multicast_lock) env->DeleteGlobalRef(multicast_lock);
 	if (multicast_lock_class) env->DeleteGlobalRef(multicast_lock_class);
 
-	if (core) {
-		env->DeleteGlobalRef(core);
+	if (ljb) {
+		jobject core = ljb->getCore();
+		if (core) {
+			env->DeleteGlobalRef(core);
+		}
+		delete ljb;
 	}
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *) linphone_core_get_user_data((LinphoneCore *)lc);
 	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
-	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener);
+	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, jlistener, ljb);
 	linphone_core_v_table_set_user_data(vTable, ldata);
 	linphone_core_add_listener((LinphoneCore*)lc, vTable);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeListener(JNIEnv* env, jobject thiz, jlong lc, jobject jlistener) {
-	MSList* iterator;
+	bctbx_list_t* iterator;
 	LinphoneCore *core = (LinphoneCore*)lc;
 	//jobject listener = env->NewGlobalRef(jlistener);
 	for (iterator = core->vtable_refs; iterator != NULL; ) {
 		VTableReference *ref=(VTableReference*)(iterator->data);
 		LinphoneCoreVTable *vTable = ref->valid ? ref->vtable : NULL;
 		iterator = iterator->next; //Because linphone_core_remove_listener may change the list
-		if (vTable) {
+		if (vTable && !ref->internal) {
 			LinphoneCoreData *data = (LinphoneCoreData*) linphone_core_v_table_get_user_data(vTable);
 			if (data && env->IsSameObject(data->listener, jlistener)) {
 				linphone_core_remove_listener(core, vTable);
@@ -1237,16 +1671,27 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_stopRinging(JNIEnv* env,
 	linphone_core_stop_ringing((LinphoneCore*)lc);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setChatDatabasePath(JNIEnv* env, jobject  thiz, jlong lc, jstring jpath) {
-	const char* path = env->GetStringUTFChars(jpath, NULL);
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setChatDatabasePath(JNIEnv* env, jobject thiz, jlong lc, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_chat_database_path((LinphoneCore*)lc, path);
-	env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setCallLogsDatabasePath( JNIEnv* env, jobject thiz, jlong lc, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_core_set_call_logs_database_path((LinphoneCore*)lc, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setFriendsDatabasePath( JNIEnv* env, jobject thiz, jlong lc, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_core_set_friends_database_path((LinphoneCore*)lc, path);
+	ReleaseStringUTFChars(env, jpath, path);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPrimaryContact2(JNIEnv* env, jobject  thiz, jlong lc, jstring jcontact) {
-	const char* contact = env->GetStringUTFChars(jcontact, NULL);
+	const char* contact = GetStringUTFChars(env, jcontact);
 	linphone_core_set_primary_contact((LinphoneCore*)lc, contact);
-	env->ReleaseStringUTFChars(jcontact, contact);
+	ReleaseStringUTFChars(env, jcontact, contact);
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getPrimaryContact(JNIEnv* env, jobject  thiz, jlong lc) {
@@ -1256,8 +1701,8 @@ extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getPrimaryContact(JNI
 
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPrimaryContact(JNIEnv* env, jobject  thiz, jlong lc, jstring jdisplayname, jstring jusername) {
-	const char* displayname = jdisplayname ? env->GetStringUTFChars(jdisplayname, NULL) : NULL;
-	const char* username = jusername ? env->GetStringUTFChars(jusername, NULL) : NULL;
+	const char* displayname = GetStringUTFChars(env, jdisplayname);
+	const char* username = GetStringUTFChars(env, jusername);
 
 	LinphoneAddress *parsed = linphone_core_get_primary_contact_parsed((LinphoneCore*)lc);
 	if (parsed != NULL) {
@@ -1267,8 +1712,8 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPrimaryContact(JNIEnv
 		linphone_core_set_primary_contact((LinphoneCore*)lc, contact);
 	}
 
-	if (jdisplayname) env->ReleaseStringUTFChars(jdisplayname, displayname);
-	if (jusername) env->ReleaseStringUTFChars(jusername, username);
+	ReleaseStringUTFChars(env, jdisplayname, displayname);
+	ReleaseStringUTFChars(env, jusername, username);
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getPrimaryContactUsername(JNIEnv* env, jobject  thiz, jlong lc) {
@@ -1297,9 +1742,8 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDefaultProxyConfig(	J
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getDefaultProxyConfig(JNIEnv*  env
 		,jobject  thiz
 		,jlong lc) {
-	LinphoneProxyConfig *config=0;
-	linphone_core_get_default_proxy((LinphoneCore*)lc,&config);
-	if(config != 0) {
+	LinphoneProxyConfig *config = linphone_core_get_default_proxy_config((LinphoneCore*)lc);
+	if (config != NULL) {
 		jobject jproxy = getProxy(env,config,thiz);
 		return jproxy;
 	} else {
@@ -1308,12 +1752,12 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getDefaultProxyConfig
 }
 
 extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreImpl_getProxyConfigList(JNIEnv* env, jobject thiz, jlong lc) {
-	const MSList* proxies = linphone_core_get_proxy_config_list((LinphoneCore*)lc);
-	int proxyCount = ms_list_size(proxies);
-	jclass cls = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneProxyConfigImpl"));
-	jobjectArray jProxies = env->NewObjectArray(proxyCount,cls,NULL);
+	const bctbx_list_t* proxies = linphone_core_get_proxy_config_list((LinphoneCore*)lc);
+	size_t proxyCount = bctbx_list_size(proxies);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data((LinphoneCore *)lc);
+	jobjectArray jProxies = env->NewObjectArray(proxyCount,ljb->proxyClass,NULL);
 
-	for (int i = 0; i < proxyCount; i++ ) {
+	for (size_t i = 0; i < proxyCount; i++ ) {
 		LinphoneProxyConfig* proxy = (LinphoneProxyConfig*)proxies->data;
 		jobject jproxy = getProxy(env,proxy,thiz);
 		if(jproxy != NULL){
@@ -1321,7 +1765,7 @@ extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreImpl_getProxyConfigLi
 		}
 		proxies = proxies->next;
 	}
-	env->DeleteGlobalRef(cls);
+
 	return jProxies;
 }
 
@@ -1343,12 +1787,12 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeAuthInfo(JNIEnv* e
 }
 
 extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_getAuthInfosList(JNIEnv* env, jobject thiz,jlong lc) {
-	const MSList* authInfos = linphone_core_get_auth_info_list((LinphoneCore*)lc);
-	int listCount = ms_list_size(authInfos);
+	const bctbx_list_t* authInfos = linphone_core_get_auth_info_list((LinphoneCore*)lc);
+	size_t listCount = bctbx_list_size(authInfos);
 	jlongArray jAuthInfos = env->NewLongArray(listCount);
 	jlong *jInternalArray = env->GetLongArrayElements(jAuthInfos, NULL);
 
-	for (int i = 0; i < listCount; i++ ) {
+	for (size_t i = 0; i < listCount; i++ ) {
 		jInternalArray[i] = (unsigned long) (authInfos->data);
 		authInfos = authInfos->next;
 	}
@@ -1359,16 +1803,14 @@ extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_getAuthInfosList(J
 }
 
 extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_findAuthInfos(JNIEnv* env, jobject thiz, jlong lc, jstring jusername, jstring jrealm, jstring jdomain) {
-	const char* username = env->GetStringUTFChars(jusername, NULL);
-	const char* realm = jrealm ? env->GetStringUTFChars(jrealm, NULL) : NULL;
-	const char* domain = jdomain ? env->GetStringUTFChars(jdomain, NULL) : NULL;
+	const char* username = GetStringUTFChars(env, jusername);
+	const char* realm = GetStringUTFChars(env, jrealm);
+	const char* domain = GetStringUTFChars(env, jdomain);
 	const LinphoneAuthInfo *authInfo = linphone_core_find_auth_info((LinphoneCore*)lc, realm, username, domain);
 
-	if (realm)
-		env->ReleaseStringUTFChars(jrealm, realm);
-	if (domain)
-		env->ReleaseStringUTFChars(jdomain, domain);
-	env->ReleaseStringUTFChars(jusername, username);
+	ReleaseStringUTFChars(env, jrealm, realm);
+	ReleaseStringUTFChars(env, jdomain, domain);
+	ReleaseStringUTFChars(env, jusername, username);
 
 	return (jlong) authInfo;
 }
@@ -1396,9 +1838,9 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_invite(JNIEnv* env
 		,jobject  thiz
 		,jlong lc
 		,jstring juri) {
-	const char* uri = env->GetStringUTFChars(juri, NULL);
+	const char* uri = GetStringUTFChars(env, juri);
 	LinphoneCall* lCall = linphone_core_invite((LinphoneCore*)lc,uri);
-	env->ReleaseStringUTFChars(juri, uri);
+	ReleaseStringUTFChars(env, juri, uri);
 	return getCall(env,lCall);
 }
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_inviteAddress(JNIEnv* env
@@ -1433,6 +1875,14 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isInCall(JNIEnv* env
 
 	return (jboolean)linphone_core_in_call((LinphoneCore*)lc);
 }
+
+extern "C" jboolean Java_org_linphone_core_LinphoneFriendImpl_isPresenceReceived(JNIEnv* env
+		,jobject  thiz
+		,jlong lf) {
+
+	return (jboolean)linphone_friend_is_presence_received((LinphoneFriend*)lf);
+}
+
 extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isInComingInvitePending(JNIEnv* env
 		,jobject  thiz
 		,jlong lc) {
@@ -1489,12 +1939,31 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_getCallLog(	JNIEnv*  en
 		,jobject  thiz
 		,jlong lc
 		,jint position) {
-		return (jlong)ms_list_nth_data(linphone_core_get_call_logs((LinphoneCore*)lc),position);
+		return (jlong)bctbx_list_nth_data(linphone_core_get_call_logs((LinphoneCore*)lc),position);
 }
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getNumberOfCallLogs(	JNIEnv*  env
 		,jobject  thiz
 		,jlong lc) {
-		return (jint)ms_list_size(linphone_core_get_call_logs((LinphoneCore*)lc));
+		return (jint)bctbx_list_size(linphone_core_get_call_logs((LinphoneCore*)lc));
+}
+extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_getLastOutgoingCallLog(	JNIEnv*  env
+		,jobject  thiz
+		,jlong lc) {
+	return (jlong)linphone_core_get_last_outgoing_call_log((LinphoneCore*)lc);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_migrateCallLogs(JNIEnv*  env
+		,jobject  thiz
+		,jlong lc) {
+		linphone_core_migrate_logs_from_rc_to_db((LinphoneCore *)lc);
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getMSFactory(JNIEnv*  env
+		,jobject  thiz
+		,jlong lc){
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data((LinphoneCore *)lc);
+	MSFactory *factory = linphone_core_get_ms_factory((LinphoneCore*)lc);
+	return env->NewObject(ljb->msFactoryClass, ljb->msFactoryCtrId, (jlong)factory);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setMtu(JNIEnv*  env
@@ -1547,16 +2016,26 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_muteMic(	JNIEnv*  env
 		,jobject  thiz
 		,jlong lc
 		,jboolean isMuted) {
-		linphone_core_mute_mic((LinphoneCore*)lc,isMuted);
+	linphone_core_enable_mic((LinphoneCore*)lc, !isMuted);
 }
 
 extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_interpretUrl(	JNIEnv*  env
 		,jobject  thiz
 		,jlong lc
 		,jstring jurl) {
-	const char* url = env->GetStringUTFChars(jurl, NULL);
+	const char* url = GetStringUTFChars(env, jurl);
 	jlong result = (jlong)linphone_core_interpret_url((LinphoneCore*)lc,url);
-	env->ReleaseStringUTFChars(jurl, url);
+	ReleaseStringUTFChars(env, jurl, url);
+	return result;
+}
+extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_sendDtmfs(	JNIEnv*  env
+		,jobject  thiz
+		,jlong lc
+		,jstring dtmf) {
+	int result;
+	const char* dtmfs = GetStringUTFChars(env, dtmf);
+	result = linphone_call_send_dtmfs(linphone_core_get_current_call((LinphoneCore*)lc),dtmfs);
+	ReleaseStringUTFChars(env, dtmf, dtmfs);
 	return result;
 }
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_sendDtmf(	JNIEnv*  env
@@ -1612,21 +2091,21 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_findPayloadType(JNIEnv*
 																			,jstring jmime
 																			,jint rate
 																			,jint channels) {
-	const char* mime = env->GetStringUTFChars(jmime, NULL);
+	const char* mime = GetStringUTFChars(env, jmime);
 	jlong result = (jlong)linphone_core_find_payload_type((LinphoneCore*)lc,mime,rate,channels);
-	env->ReleaseStringUTFChars(jmime, mime);
+	ReleaseStringUTFChars(env, jmime, mime);
 	return result;
 }
 
 extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_listVideoPayloadTypes(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc) {
-	const MSList* codecs = linphone_core_get_video_codecs((LinphoneCore*)lc);
-	int codecsCount = ms_list_size(codecs);
+	const bctbx_list_t* codecs = linphone_core_get_video_codecs((LinphoneCore*)lc);
+	size_t codecsCount = bctbx_list_size(codecs);
 	jlongArray jCodecs = env->NewLongArray(codecsCount);
 	jlong *jInternalArray = env->GetLongArrayElements(jCodecs, NULL);
 
-	for (int i = 0; i < codecsCount; i++ ) {
+	for (size_t i = 0; i < codecsCount; i++ ) {
 		jInternalArray[i] = (unsigned long) (codecs->data);
 		codecs = codecs->next;
 	}
@@ -1637,12 +2116,12 @@ extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_listVideoPayloadTy
 }
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoCodecs(JNIEnv *env, jobject thiz, jlong lc, jlongArray jCodecs) {
-	MSList *pts = NULL;
+	bctbx_list_t *pts = NULL;
 	int codecsCount = env->GetArrayLength(jCodecs);
 	jlong *codecs = env->GetLongArrayElements(jCodecs, NULL);
 	for (int i = 0; i < codecsCount; i++) {
 		PayloadType *pt = (PayloadType *)codecs[i];
-		ms_list_append(pts, pt);
+		bctbx_list_append(pts, pt);
 	}
 	linphone_core_set_video_codecs((LinphoneCore *)lc, pts);
 	env->ReleaseLongArrayElements(jCodecs, codecs, 0);
@@ -1651,12 +2130,12 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoCodecs(JN
 extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_listAudioPayloadTypes(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc) {
-	const MSList* codecs = linphone_core_get_audio_codecs((LinphoneCore*)lc);
-	int codecsCount = ms_list_size(codecs);
+	const bctbx_list_t* codecs = linphone_core_get_audio_codecs((LinphoneCore*)lc);
+	size_t codecsCount = bctbx_list_size(codecs);
 	jlongArray jCodecs = env->NewLongArray(codecsCount);
 	jlong *jInternalArray = env->GetLongArrayElements(jCodecs, NULL);
 
-	for (int i = 0; i < codecsCount; i++ ) {
+	for (size_t i = 0; i < codecsCount; i++ ) {
 		jInternalArray[i] = (unsigned long) (codecs->data);
 		codecs = codecs->next;
 	}
@@ -1667,12 +2146,12 @@ extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_listAudioPayloadTy
 }
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioCodecs(JNIEnv *env, jobject thiz, jlong lc, jlongArray jCodecs) {
-	MSList *pts = NULL;
+	bctbx_list_t *pts = NULL;
 	int codecsCount = env->GetArrayLength(jCodecs);
 	jlong *codecs = env->GetLongArrayElements(jCodecs, NULL);
 	for (int i = 0; i < codecsCount; i++) {
 		PayloadType *pt = (PayloadType *)codecs[i];
-		pts = ms_list_append(pts, pt);
+		pts = bctbx_list_append(pts, pt);
 	}
 	linphone_core_set_audio_codecs((LinphoneCore *)lc, pts);
 	env->ReleaseLongArrayElements(jCodecs, codecs, 0);
@@ -1758,9 +2237,9 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAdaptiveRateAlgorithm
 																			,jobject  thiz
 																			,jlong lc
 																			,jstring jalg) {
-	const char* alg = jalg?env->GetStringUTFChars(jalg, NULL):NULL;
+	const char* alg = GetStringUTFChars(env, jalg);
 	linphone_core_set_adaptive_rate_algorithm((LinphoneCore*)lc,alg);
-	if (alg) env->ReleaseStringUTFChars(jalg, alg);
+	ReleaseStringUTFChars(env, jalg, alg);
 
 }
 
@@ -1797,6 +2276,7 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getCurrentCall(JNIEnv
 																			) {
 	return getCall(env,linphone_core_get_current_call((LinphoneCore*)lc));
 }
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addFriend(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
@@ -1804,35 +2284,105 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addFriend(JNIEnv*  env
 																			) {
 	linphone_core_add_friend((LinphoneCore*)lc,(LinphoneFriend*)aFriend);
 }
+
+extern "C" jint Java_org_linphone_core_LinphoneFriendListImpl_importFriendsFromVCardFile(JNIEnv* env, jobject thiz, jlong list, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	int count = linphone_friend_list_import_friends_from_vcard4_file((LinphoneFriendList*)list, path);
+	ReleaseStringUTFChars(env, jpath, path);
+	return count;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneFriendListImpl_importFriendsFromVCardBuffer(JNIEnv* env, jobject thiz, jlong list, jstring jbuffer) {
+	const char* buffer = GetStringUTFChars(env, jbuffer);
+	int count = linphone_friend_list_import_friends_from_vcard4_buffer((LinphoneFriendList*)list, buffer);
+	ReleaseStringUTFChars(env, jbuffer, buffer);
+	return count;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_exportFriendsToVCardFile(JNIEnv* env, jobject thiz, jlong list, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_friend_list_export_friends_as_vcard4_file((LinphoneFriendList*)list, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_enableSubscriptions(JNIEnv* env, jobject thiz, jlong list, jboolean enable) {
+	linphone_friend_list_enable_subscriptions((LinphoneFriendList*)list, enable);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_addFriendList(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			,jlong friendList
+																			) {
+	linphone_core_add_friend_list((LinphoneCore*)lc,(LinphoneFriendList*)friendList);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_removeFriendList(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			,jlong friendList
+																			) {
+	LinphoneFriendList *list = (LinphoneFriendList *)friendList;
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(list);
+	if (cbs != NULL) {
+		jobject listener = (jobject) linphone_friend_list_cbs_get_user_data(cbs);
+		if (listener != NULL) {
+			env->DeleteGlobalRef(listener);
+		}
+	}
+	linphone_core_remove_friend_list((LinphoneCore*)lc, list);
+}
+
 extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreImpl_getFriendList(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc) {
-	const MSList* friends = linphone_core_get_friend_list((LinphoneCore*)lc);
-	int friendsSize = ms_list_size(friends);
-	jclass cls = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneFriendImpl"));
-	jobjectArray jFriends = env->NewObjectArray(friendsSize,cls,NULL);
+	const bctbx_list_t* friends = linphone_core_get_friend_list((LinphoneCore*)lc);
+	size_t friendsSize = bctbx_list_size(friends);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data((LinphoneCore *)lc);
+	jobjectArray jFriends = env->NewObjectArray(friendsSize,ljb->friendClass,NULL);
 
-	for (int i = 0; i < friendsSize; i++) {
+	for (size_t i = 0; i < friendsSize; i++) {
 		LinphoneFriend* lfriend = (LinphoneFriend*)friends->data;
-		jobject jfriend =  getFriend(env,lfriend);
+		jobject jfriend = getFriend(env,lfriend);
+		if(jfriend != NULL){
+			env->SetObjectArrayElement(jFriends, i, jfriend);
+			env->DeleteLocalRef(jfriend);
+		}
+		friends = friends->next;
+	}
+
+	return jFriends;
+}
+
+extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreImpl_getFriendLists(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc) {
+	const bctbx_list_t* friends = linphone_core_get_friends_lists((LinphoneCore*)lc);
+	size_t friendsSize = bctbx_list_size(friends);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data((LinphoneCore *)lc);
+	jobjectArray jFriends = env->NewObjectArray(friendsSize,ljb->friendListClass,NULL);
+
+	for (size_t i = 0; i < friendsSize; i++) {
+		LinphoneFriendList* lfriend = (LinphoneFriendList*)friends->data;
+		jobject jfriend =  getFriendList(env,lfriend);
 		if(jfriend != NULL){
 			env->SetObjectArrayElement(jFriends, i, jfriend);
 		}
 		friends = friends->next;
 	}
 
-	env->DeleteGlobalRef(cls);
 	return jFriends;
 }
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPresenceInfo(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
 																			,jint minutes_away
 																			,jstring jalternative_contact
 																			,jint status) {
-	const char* alternative_contact = jalternative_contact?env->GetStringUTFChars(jalternative_contact, NULL):NULL;
+	const char* alternative_contact = GetStringUTFChars(env, jalternative_contact);
 	linphone_core_set_presence_info((LinphoneCore*)lc,minutes_away,alternative_contact,(LinphoneOnlineStatus)status);
-	if (alternative_contact) env->ReleaseStringUTFChars(jalternative_contact, alternative_contact);
+	ReleaseStringUTFChars(env, jalternative_contact, alternative_contact);
 }
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getPresenceInfo(JNIEnv *env, jobject thiz, jlong lc) {
 	return (jint)linphone_core_get_presence_info((LinphoneCore *)lc);
@@ -1861,15 +2411,23 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_getPresenceMod
 	RETURN_USER_DATA_OBJECT("PresenceModelImpl", linphone_presence_model, model)
 }
 
-extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_getOrCreateChatRoom(JNIEnv*  env
+extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getOrCreateChatRoom(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
 																			,jstring jto) {
 
-	const char* to = env->GetStringUTFChars(jto, NULL);
-	LinphoneChatRoom* lResult = linphone_core_get_or_create_chat_room((LinphoneCore*)lc,to);
-	env->ReleaseStringUTFChars(jto, to);
-	return (jlong)lResult;
+	const char* to = GetStringUTFChars(env, jto);
+	LinphoneChatRoom* lResult = linphone_core_get_chat_room_from_uri((LinphoneCore*)lc,to);
+	ReleaseStringUTFChars(env, jto, to);
+	return getChatRoom(env, lResult);
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getChatRoom(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong lc
+																		,jlong to) {
+	LinphoneChatRoom* lResult = linphone_core_get_chat_room((LinphoneCore*)lc,(LinphoneAddress *)to);
+	return getChatRoom(env, lResult);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableVideo(JNIEnv*  env
@@ -1892,22 +2450,27 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isVideoSupported(JNI
 	return (jboolean)linphone_core_video_supported((LinphoneCore*)lc);
 }
 
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isVCardSupported(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc) {
+	return (jboolean)linphone_core_vcard_supported();
+}
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPlayFile(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
 																			,jstring jpath) {
-	const char* path = jpath?env->GetStringUTFChars(jpath, NULL):NULL;
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_play_file((LinphoneCore*)lc,path);
-	if (path) env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
 }
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRing(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
 																			,jstring jpath) {
-	const char* path = jpath?env->GetStringUTFChars(jpath, NULL):NULL;
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_ring((LinphoneCore*)lc,path);
-	if (path) env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
 }
 extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getRing(JNIEnv*  env
 																			,jobject  thiz
@@ -1925,9 +2488,9 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setTone(JNIEnv*  env
 																			,jlong lc
 																			,jint toneid
 																			,jstring jpath) {
-	const char* path = jpath ? env->GetStringUTFChars(jpath, NULL) : NULL;
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_tone((LinphoneCore *)lc, (LinphoneToneID)toneid, path);
-	if (path) env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setCallErrorTone(JNIEnv*  env
@@ -1935,28 +2498,52 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setCallErrorTone(JNIEnv*
 																			,jlong lc
 																			,jint reason
 																			,jstring jpath) {
-	const char* path = jpath ? env->GetStringUTFChars(jpath, NULL) : NULL;
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_call_error_tone((LinphoneCore *)lc, (LinphoneReason)reason, path);
-	if (path) env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
 }
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRootCA(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
 																			,jstring jpath) {
-	const char* path = jpath?env->GetStringUTFChars(jpath, NULL):NULL;
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_root_ca((LinphoneCore*)lc,path);
-	if (path) env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRootCAData(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			,jstring jdata) {
+	const char* data = GetStringUTFChars(env, jdata);
+	linphone_core_set_root_ca_data((LinphoneCore*)lc, data);
+	ReleaseStringUTFChars(env, jdata, data);
 }
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRingback(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc
 																			,jstring jpath) {
-	const char* path = jpath?env->GetStringUTFChars(jpath, NULL):NULL;
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_core_set_ringback((LinphoneCore*)lc,path);
-	if (path) env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
 
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setProvisioningUri(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			,jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_core_set_provisioning_uri((LinphoneCore*)lc,path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getProvisioningUri(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc) {
+	const char* path = linphone_core_get_provisioning_uri((LinphoneCore*)lc);
+	return path ? env->NewStringUTF(path) : NULL;
+}
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableKeepAlive(JNIEnv*  env
 																,jobject  thiz
 																,jlong lc
@@ -1970,49 +2557,66 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isKeepAliveEnabled(J
 	return (jboolean)linphone_core_keep_alive_enabled((LinphoneCore*)lc);
 
 }
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDefaultSoundDevices(JNIEnv*  env
+                                                                               ,jobject  thiz
+                                                                               ,jlong lc) {
+    linphone_core_set_default_sound_devices((LinphoneCore*)lc);
+}
+
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNIEnv*  env
 																				,jobject  thiz
 																				,jlong lc
 																				,jobject data) {
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *) linphone_core_get_user_data((LinphoneCore *)lc);
 	LinphoneCoreVTable *vTable = linphone_core_v_table_new();
-	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, data);
+	LinphoneCoreData* ldata = new LinphoneCoreData(env, thiz, vTable, data, ljb);
 	linphone_core_v_table_set_user_data(vTable, ldata);
 
 	return (jint)linphone_core_start_echo_calibration((LinphoneCore*)lc, ldata->ecCalibrationStatus, NULL, NULL, vTable);
-
 }
 
-extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_needsEchoCalibration(JNIEnv *env, jobject thiz, jlong lc) {
-	MSSndCard *sndcard;
-	MSSndCardManager *m = ms_snd_card_manager_get();
-	const char *card = linphone_core_get_capture_device((LinphoneCore*)lc);
-	sndcard = ms_snd_card_manager_get_card(m, card);
-	if (sndcard == NULL) {
-		ms_error("Could not get soundcard %s", card);
-		return TRUE;
-	}
-
-	SoundDeviceDescription *sound_description = sound_device_description_get();
-	if(sound_description != NULL && sound_description == &genericSoundDeviceDescriptor){
-		return TRUE;
-	}
-	
-	if (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_BUILTIN_ECHO_CANCELLER) return FALSE;
-	if (ms_snd_card_get_minimal_latency(sndcard) != 0) return FALSE;
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_needsEchoCalibration(JNIEnv *env, jobject thiz, jlong lcptr) {
+	LinphoneCore *lc = (LinphoneCore*) lcptr;
+	MSFactory * factory = linphone_core_get_ms_factory(lc);
+	MSDevicesInfo *devices = ms_factory_get_devices_info(factory);
+	SoundDeviceDescription *sound_description = ms_devices_info_get_sound_device_description(devices);
+	if (sound_description == NULL) return TRUE;
+	if (sound_description->flags & DEVICE_HAS_BUILTIN_AEC) return FALSE;
+	if (sound_description->delay != 0) return FALSE;
 	return TRUE;
 }
 
-extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_hasBuiltInEchoCanceler(JNIEnv *env, jobject thiz, jlong lc) {
-	MSSndCard *sndcard;
-	MSSndCardManager *m = ms_snd_card_manager_get();
-	const char *card = linphone_core_get_capture_device((LinphoneCore*)lc);
-	sndcard = ms_snd_card_manager_get_card(m, card);
-	if (sndcard == NULL) {
-		ms_error("Could not get soundcard %s", card);
-		return FALSE;
-	}
+extern "C" int Java_org_linphone_core_LinphoneCoreImpl_startEchoTester(JNIEnv*  env
+																				,jobject  thiz
+																				,jlong lc
+																				,jint rate) {
+	return linphone_core_start_echo_tester((LinphoneCore*)lc, rate);
+}
 
-	if (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_BUILTIN_ECHO_CANCELLER) return TRUE;
+extern "C" int Java_org_linphone_core_LinphoneCoreImpl_stopEchoTester(JNIEnv*  env
+																				,jobject  thiz
+																				,jlong lc) {
+	return linphone_core_stop_echo_tester((LinphoneCore*)lc);
+}
+
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_hasCrappyOpenGL(JNIEnv *env, jobject thiz, jlong lcptr) {
+	LinphoneCore *lc = (LinphoneCore*) lcptr;
+	MSFactory * factory = linphone_core_get_ms_factory(lc);
+	MSDevicesInfo *devices = ms_factory_get_devices_info(factory);
+	SoundDeviceDescription *sound_description = ms_devices_info_get_sound_device_description(devices);
+	if (sound_description == NULL) return FALSE;
+	if (sound_description->flags & DEVICE_HAS_CRAPPY_OPENGL) return TRUE;
+	return FALSE;
+}
+
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_hasBuiltInEchoCanceler(JNIEnv *env, jobject thiz, jlong lcptr) {
+	LinphoneCore *lc = (LinphoneCore*) lcptr;
+	MSFactory * factory = linphone_core_get_ms_factory(lc);
+	MSDevicesInfo *devices = ms_factory_get_devices_info(factory);
+	SoundDeviceDescription *sound_description = ms_devices_info_get_sound_device_description(devices);
+	if (sound_description == NULL) return FALSE;
+	if (sound_description->flags & DEVICE_HAS_BUILTIN_AEC) return TRUE;
 	return FALSE;
 }
 
@@ -2052,6 +2656,27 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setMediaEncryptionMandat
 	linphone_core_set_media_encryption_mandatory((LinphoneCore*)lc, yesno);
 }
 
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isLimeEncryptionAvailable (JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			) {
+	return (jboolean) linphone_core_lime_available((LinphoneCore*)lc);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getLimeEncryption(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			) {
+	return (jint)linphone_core_lime_enabled((LinphoneCore*)lc);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setLimeEncryption(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			,jint menc) {
+	linphone_core_enable_lime((LinphoneCore*)lc,(LinphoneLimeState)menc);
+}
+
 /*
  * Class:     org_linphone_core_LinphoneCoreImpl
  * Method:    disableChat
@@ -2079,7 +2704,6 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_ch
 	return (jboolean) linphone_core_chat_enabled((LinphoneCore*)ptr);
 }
 
-
 //ProxyConfig
 
 extern "C" jlong Java_org_linphone_core_LinphoneProxyConfigImpl_createProxyConfig(JNIEnv* env, jobject thiz, jlong lc) {
@@ -2097,9 +2721,9 @@ extern "C" void  Java_org_linphone_core_LinphoneProxyConfigImpl_finalize(JNIEnv*
 }
 
 extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setIdentity(JNIEnv* env,jobject thiz,jlong proxyCfg,jstring jidentity) {
-	const char* identity = env->GetStringUTFChars(jidentity, NULL);
+	const char* identity = GetStringUTFChars(env, jidentity);
 	linphone_proxy_config_set_identity((LinphoneProxyConfig*)proxyCfg,identity);
-	env->ReleaseStringUTFChars(jidentity, identity);
+	ReleaseStringUTFChars(env, jidentity, identity);
 }
 extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getIdentity(JNIEnv* env,jobject thiz,jlong proxyCfg) {
 	const char* identity = linphone_proxy_config_get_identity((LinphoneProxyConfig*)proxyCfg);
@@ -2109,10 +2733,16 @@ extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getIdentity(JN
 		return NULL;
 	}
 }
+extern "C" jlong Java_org_linphone_core_LinphoneProxyConfigImpl_getAddress(JNIEnv* env, jobject thiz, jlong proxyCfg) {
+	return (jlong) linphone_proxy_config_get_identity_address((LinphoneProxyConfig*)proxyCfg);
+}
+extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setAddress(JNIEnv* env,jobject thiz,jlong proxyCfg,jlong jidentity) {
+	linphone_proxy_config_set_identity_address((LinphoneProxyConfig*)proxyCfg, (LinphoneAddress*) jidentity);
+}
 extern "C" jint Java_org_linphone_core_LinphoneProxyConfigImpl_setProxy(JNIEnv* env,jobject thiz,jlong proxyCfg,jstring jproxy) {
-	const char* proxy = env->GetStringUTFChars(jproxy, NULL);
+	const char* proxy = GetStringUTFChars(env, jproxy);
 	jint err=linphone_proxy_config_set_server_addr((LinphoneProxyConfig*)proxyCfg,proxy);
-	env->ReleaseStringUTFChars(jproxy, proxy);
+	ReleaseStringUTFChars(env, jproxy, proxy);
 	return err;
 }
 extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getProxy(JNIEnv* env,jobject thiz,jlong proxyCfg) {
@@ -2124,14 +2754,14 @@ extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getProxy(JNIEn
 	}
 }
 extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setContactParameters(JNIEnv* env,jobject thiz,jlong proxyCfg,jstring jparams) {
-	const char* params = jparams ? env->GetStringUTFChars(jparams, NULL) : NULL;
+	const char* params = GetStringUTFChars(env, jparams);
 	linphone_proxy_config_set_contact_parameters((LinphoneProxyConfig*)proxyCfg, params);
-	if (jparams) env->ReleaseStringUTFChars(jparams, params);
+	ReleaseStringUTFChars(env, jparams, params);
 }
 extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setContactUriParameters(JNIEnv* env,jobject thiz,jlong proxyCfg,jstring jparams) {
-	const char* params = jparams ? env->GetStringUTFChars(jparams, NULL) : NULL;
+	const char* params = GetStringUTFChars(env, jparams);
 	linphone_proxy_config_set_contact_uri_parameters((LinphoneProxyConfig*)proxyCfg, params);
-	if (jparams) env->ReleaseStringUTFChars(jparams, params);
+	ReleaseStringUTFChars(env, jparams, params);
 }
 extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getContactParameters(JNIEnv* env,jobject thiz,jlong proxyCfg) {
 	const char* params = linphone_proxy_config_get_contact_parameters((LinphoneProxyConfig*)proxyCfg);
@@ -2145,9 +2775,9 @@ extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getContactUriP
 
 extern "C" jint Java_org_linphone_core_LinphoneProxyConfigImpl_setRoute(JNIEnv* env,jobject thiz,jlong proxyCfg,jstring jroute) {
 	if (jroute != NULL) {
-		const char* route = env->GetStringUTFChars(jroute, NULL);
+		const char* route = GetStringUTFChars(env, jroute);
 		jint err=linphone_proxy_config_set_route((LinphoneProxyConfig*)proxyCfg,route);
-		env->ReleaseStringUTFChars(jroute, route);
+		ReleaseStringUTFChars(env, jroute, route);
 		return err;
 	} else {
 		return (jint)linphone_proxy_config_set_route((LinphoneProxyConfig*)proxyCfg,NULL);
@@ -2182,28 +2812,35 @@ extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_normalizePhone
 	if (jnumber == 0) {
 		ms_error("cannot normalized null number");
 	}
-	const char* number = env->GetStringUTFChars(jnumber, NULL);
+	char * normalized_phone;
+	const char* number = GetStringUTFChars(env, jnumber);
 	int len = env->GetStringLength(jnumber);
 	if (len == 0) {
 		ms_warning("cannot normalize empty number");
 		return jnumber;
 	}
-	char targetBuff[2*len];// returned number can be greater than origin (specially in case of prefix insertion
-	linphone_proxy_config_normalize_number((LinphoneProxyConfig*)proxyCfg,number,targetBuff,sizeof(targetBuff));
-	jstring normalizedNumber = env->NewStringUTF(targetBuff);
-	env->ReleaseStringUTFChars(jnumber, number);
+	normalized_phone = linphone_proxy_config_normalize_phone_number((LinphoneProxyConfig*)proxyCfg,number);
+	jstring normalizedNumber = env->NewStringUTF(normalized_phone ? normalized_phone : number);
+	ReleaseStringUTFChars(env, jnumber, number);
+	ms_free(normalized_phone);
 	return normalizedNumber;
 }
+extern "C" jlong Java_org_linphone_core_LinphoneProxyConfigImpl_normalizeSipUri(JNIEnv* env,jobject thiz,jlong proxyCfg,jstring jusername) {
+	const char* username = GetStringUTFChars(env, jusername);
+	LinphoneAddress *addr = linphone_proxy_config_normalize_sip_uri((LinphoneProxyConfig*)proxyCfg, username);
+	ReleaseStringUTFChars(env, jusername, username);
+	return (jlong) addr;
+}
 extern "C" jint Java_org_linphone_core_LinphoneProxyConfigImpl_lookupCCCFromIso(JNIEnv* env, jobject thiz, jlong proxyCfg, jstring jiso) {
-	const char* iso = env->GetStringUTFChars(jiso, NULL);
+	const char* iso = GetStringUTFChars(env, jiso);
 	int prefix = linphone_dial_plan_lookup_ccc_from_iso(iso);
-	env->ReleaseStringUTFChars(jiso, iso);
+	ReleaseStringUTFChars(env, jiso, iso);
 	return (jint) prefix;
 }
 extern "C" jint Java_org_linphone_core_LinphoneProxyConfigImpl_lookupCCCFromE164(JNIEnv* env, jobject thiz, jlong proxyCfg, jstring je164) {
-	const char* e164 = env->GetStringUTFChars(je164, NULL);
+	const char* e164 = GetStringUTFChars(env, je164);
 	int prefix = linphone_dial_plan_lookup_ccc_from_e164(e164);
-	env->ReleaseStringUTFChars(je164, e164);
+	ReleaseStringUTFChars(env, je164, e164);
 	return (jint) prefix;
 }
 extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getDomain(JNIEnv* env
@@ -2229,9 +2866,9 @@ extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setDialPrefix(JNI
 																	,jobject thiz
 																	,jlong proxyCfg
 																	,jstring jprefix) {
-	const char* prefix = env->GetStringUTFChars(jprefix, NULL);
+	const char* prefix = GetStringUTFChars(env, jprefix);
 	linphone_proxy_config_set_dial_prefix((LinphoneProxyConfig*)proxyCfg,prefix);
-	env->ReleaseStringUTFChars(jprefix, prefix);
+	ReleaseStringUTFChars(env, jprefix, prefix);
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getDialPrefix(JNIEnv* env,jobject thiz,jlong proxyCfg) {
@@ -2343,9 +2980,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_getUsernam
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setPassword
 (JNIEnv *env, jobject, jlong auth_info, jstring jpassword) {
-	const char* password = jpassword?env->GetStringUTFChars(jpassword, NULL):NULL;
+	const char* password = GetStringUTFChars(env, jpassword);
 	linphone_auth_info_set_passwd((LinphoneAuthInfo*)auth_info,password);
-	if (password) env->ReleaseStringUTFChars(jpassword, password);
+	ReleaseStringUTFChars(env, jpassword, password);
 }
 
 /*
@@ -2355,9 +2992,9 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setPassword
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setRealm
 (JNIEnv *env, jobject, jlong auth_info, jstring jrealm) {
-	const char* realm = jrealm?env->GetStringUTFChars(jrealm, NULL):NULL;
+	const char* realm = GetStringUTFChars(env, jrealm);
 	linphone_auth_info_set_realm((LinphoneAuthInfo*)auth_info,realm);
-	if (realm) env->ReleaseStringUTFChars(jrealm, realm);
+	ReleaseStringUTFChars(env, jrealm, realm);
 }
 
 /*
@@ -2367,10 +3004,9 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setRealm
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setDomain
 (JNIEnv *env, jobject, jlong auth_info, jstring jdomain) {
-	const char* domain = jdomain ? env->GetStringUTFChars(jdomain, NULL) : NULL;
+	const char* domain = GetStringUTFChars(env, jdomain);
 	linphone_auth_info_set_domain((LinphoneAuthInfo*)auth_info, domain);
-	if (domain)
-		env->ReleaseStringUTFChars(jdomain, domain);
+	ReleaseStringUTFChars(env, jdomain, domain);
 }
 
 /*
@@ -2380,9 +3016,9 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setDomain
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setUsername
 (JNIEnv *env, jobject, jlong auth_info, jstring jusername) {
-	const char* username = jusername?env->GetStringUTFChars(jusername, NULL):NULL;
+	const char* username = GetStringUTFChars(env, jusername);
 	linphone_auth_info_set_username((LinphoneAuthInfo*)auth_info,username);
-	if (username) env->ReleaseStringUTFChars(jusername, username);
+	ReleaseStringUTFChars(env, jusername, username);
 }
 
 /*
@@ -2392,9 +3028,9 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setUsername
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setUserId
 (JNIEnv *env, jobject, jlong auth_info, jstring juserid) {
-	const char* userid = juserid?env->GetStringUTFChars(juserid, NULL):NULL;
+	const char* userid = GetStringUTFChars(env, juserid);
 	linphone_auth_info_set_userid((LinphoneAuthInfo*)auth_info,userid);
-	if (userid) env->ReleaseStringUTFChars(juserid, userid);
+	ReleaseStringUTFChars(env, juserid, userid);
 }
 
 /*
@@ -2419,9 +3055,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_getUserId
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setHa1
 (JNIEnv *env, jobject, jlong auth_info, jstring jha1) {
-	const char* ha1 = jha1?env->GetStringUTFChars(jha1, NULL):NULL;
+	const char* ha1 = GetStringUTFChars(env, jha1);
 	linphone_auth_info_set_ha1((LinphoneAuthInfo*)auth_info,ha1);
-	if (ha1) env->ReleaseStringUTFChars(jha1, ha1);
+	ReleaseStringUTFChars(env, jha1, ha1);
 }
 
 
@@ -2440,6 +3076,74 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_getHa1
 	}
 }
 
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setTlsCertificate
+(JNIEnv *env, jobject, jlong auth_info, jstring jcert) {
+	const char* cert = GetStringUTFChars(env, jcert);
+	linphone_auth_info_set_tls_cert((LinphoneAuthInfo*)auth_info,cert);
+	ReleaseStringUTFChars(env, jcert, cert);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setTlsKey
+(JNIEnv *env, jobject, jlong auth_info, jstring jkey) {
+	const char* key = GetStringUTFChars(env, jkey);
+	linphone_auth_info_set_tls_key((LinphoneAuthInfo*)auth_info,key);
+	ReleaseStringUTFChars(env, jkey, key);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setTlsCertificatePath
+(JNIEnv *env, jobject, jlong auth_info, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_auth_info_set_tls_cert_path((LinphoneAuthInfo*)auth_info,path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_setTlsKeyPath
+(JNIEnv *env, jobject, jlong auth_info, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_auth_info_set_tls_key_path((LinphoneAuthInfo*)auth_info,path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_getTlsCertificate
+(JNIEnv *env , jobject, jlong auth_info) {
+	const char* cert = linphone_auth_info_get_tls_cert((LinphoneAuthInfo*)auth_info);
+	if (cert) {
+		return env->NewStringUTF(cert);
+	} else {
+		return NULL;
+	}
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_getTlsKey
+(JNIEnv *env , jobject, jlong auth_info) {
+	const char* key = linphone_auth_info_get_tls_key((LinphoneAuthInfo*)auth_info);
+	if (key) {
+		return env->NewStringUTF(key);
+	} else {
+		return NULL;
+	}
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_getTlsCertificatePath
+(JNIEnv *env , jobject, jlong auth_info) {
+	const char* path = linphone_auth_info_get_tls_cert_path((LinphoneAuthInfo*)auth_info);
+	if (path) {
+		return env->NewStringUTF(path);
+	} else {
+		return NULL;
+	}
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneAuthInfoImpl_getTlsKeyPath
+(JNIEnv *env , jobject, jlong auth_info) {
+	const char* path = linphone_auth_info_get_tls_key_path((LinphoneAuthInfo*)auth_info);
+	if (path) {
+		return env->NewStringUTF(path);
+	} else {
+		return NULL;
+	}
+}
+
 
 //LinphoneAddress
 
@@ -2447,14 +3151,14 @@ extern "C" jlong Java_org_linphone_core_LinphoneAddressImpl_newLinphoneAddressIm
 																					,jobject  thiz
 																					,jstring juri
 																					,jstring jdisplayName) {
-	const char* uri = juri?env->GetStringUTFChars(juri, NULL):NULL;
+	const char* uri = GetStringUTFChars(env, juri);
 	LinphoneAddress* address = linphone_address_new(uri);
 	if (jdisplayName && address) {
-		const char* displayName = env->GetStringUTFChars(jdisplayName, NULL);
+		const char* displayName = GetStringUTFChars(env, jdisplayName);
 		linphone_address_set_display_name(address,displayName);
-		env->ReleaseStringUTFChars(jdisplayName, displayName);
+		ReleaseStringUTFChars(env, jdisplayName, displayName);
 	}
-	if (uri) env->ReleaseStringUTFChars(juri, uri);
+	ReleaseStringUTFChars(env, juri, uri);
 
 	return  (jlong) address;
 }
@@ -2539,25 +3243,25 @@ extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDisplayName(JNIEnv
 																		,jobject  thiz
 																		,jlong address
 																		,jstring jdisplayName) {
-	const char* displayName = jdisplayName!= NULL?env->GetStringUTFChars(jdisplayName, NULL):NULL;
+	const char* displayName = GetStringUTFChars(env, jdisplayName);
 	linphone_address_set_display_name((LinphoneAddress*)address,displayName);
-	if (displayName != NULL) env->ReleaseStringUTFChars(jdisplayName, displayName);
+	ReleaseStringUTFChars(env, jdisplayName, displayName);
 }
 extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setUserName(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong address
 																		,jstring juserName) {
-	const char* userName = juserName!= NULL?env->GetStringUTFChars(juserName, NULL):NULL;
+	const char* userName = GetStringUTFChars(env, juserName);
 	linphone_address_set_username((LinphoneAddress*)address,userName);
-	if (userName != NULL) env->ReleaseStringUTFChars(juserName, userName);
+	ReleaseStringUTFChars(env, juserName, userName);
 }
 extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDomain(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong address
 																		,jstring jdomain) {
-	const char* domain = jdomain!= NULL?env->GetStringUTFChars(jdomain, NULL):NULL;
+	const char* domain = GetStringUTFChars(env, jdomain);
 	linphone_address_set_domain((LinphoneAddress*)address,domain);
-	if (domain != NULL) env->ReleaseStringUTFChars(jdomain, domain);
+	ReleaseStringUTFChars(env, jdomain, domain);
 }
 extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setTransport(JNIEnv*  env
 																		,jobject  thiz
@@ -2610,6 +3314,10 @@ extern "C" jint Java_org_linphone_core_LinphoneCallLogImpl_getCallDuration(JNIEn
 	return (jint)((LinphoneCallLog*)ptr)->duration;
 }
 
+extern "C" jboolean Java_org_linphone_core_LinphoneCallLogImpl_wasConference(JNIEnv *env, jobject thiz, jlong ptr) {
+	return linphone_call_log_was_conference((LinphoneCallLog *)ptr);
+}
+
 /* CallStats */
 extern "C" jint Java_org_linphone_core_LinphoneCallStatsImpl_getMediaType(JNIEnv *env, jobject thiz, jlong stats_ptr) {
 	return (jint)((LinphoneCallStats *)stats_ptr)->type;
@@ -2670,6 +3378,24 @@ extern "C" void Java_org_linphone_core_LinphoneCallStatsImpl_updateStats(JNIEnv
 		linphone_call_get_video_stats((LinphoneCall*)call_ptr);
 }
 
+extern "C" jstring Java_org_linphone_core_LinphoneCallStatsImpl_getEncoderName(JNIEnv *env, jobject thiz, jlong stats_ptr, jlong call_ptr, jlong payload_ptr) {
+    LinphoneCore *lc = linphone_call_get_core((LinphoneCall*)call_ptr);
+    PayloadType* jpayload = (PayloadType*)payload_ptr;
+    jstring jencodername =env->NewStringUTF(ms_factory_get_encoder(linphone_core_get_ms_factory(lc), jpayload->mime_type)->text);
+    return jencodername;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCallStatsImpl_getDecoderName(JNIEnv *env, jobject thiz, jlong stats_ptr, jlong call_ptr, jlong payload_ptr) {
+    LinphoneCore *lc = linphone_call_get_core((LinphoneCall*)call_ptr);
+    PayloadType* jpayload = (PayloadType*)payload_ptr;
+    jstring jdecodername =env->NewStringUTF(ms_factory_get_decoder(linphone_core_get_ms_factory(lc), jpayload->mime_type)->text);
+    return jdecodername;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneCallStatsImpl_getIpFamilyOfRemote(JNIEnv *env, jobject thiz, jlong stats_ptr) {
+	return (jint) ((LinphoneCallStats *)stats_ptr)->rtp_remote_family;
+}
+
 /*payloadType*/
 extern "C" jstring Java_org_linphone_core_PayloadTypeImpl_toString(JNIEnv*  env,jobject  thiz,jlong ptr) {
 	PayloadType* pt = (PayloadType*)ptr;
@@ -2705,11 +3431,30 @@ extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getCallLog(	JNIEnv*  en
 	return (jlong)linphone_call_get_call_log((LinphoneCall*)ptr);
 }
 
+extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_getCallLogs(JNIEnv*  env
+		,jobject  thiz
+		,jlong lc) {
+	const bctbx_list_t *logs = linphone_core_get_call_logs((LinphoneCore *) lc);
+	size_t logsCount = bctbx_list_size(logs);
+	jlongArray jLogs = env->NewLongArray(logsCount);
+	jlong *jInternalArray = env->GetLongArrayElements(jLogs, NULL);
+
+	for (size_t i = 0; i < logsCount; i++) {
+		jInternalArray[i] = (unsigned long) (logs->data);
+		logs = logs->next;
+	}
+
+	env->ReleaseLongArrayElements(jLogs, jInternalArray, 0);
+
+	return jLogs;
+}
+
 extern "C" void Java_org_linphone_core_LinphoneCallImpl_takeSnapshot(	JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr, jstring path) {
-	const char* filePath = path != NULL ? env->GetStringUTFChars(path, NULL) : NULL;
+	const char* filePath = GetStringUTFChars(env, path);
 	linphone_call_take_video_snapshot((LinphoneCall*)ptr, filePath);
+	ReleaseStringUTFChars(env, path, filePath);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCallImpl_zoomVideo(		JNIEnv*  env
@@ -2730,6 +3475,12 @@ extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getRemoteAddress(	JNIEn
 	return (jlong)linphone_call_get_remote_address((LinphoneCall*)ptr);
 }
 
+extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getDiversionAddress(	JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	return (jlong)linphone_call_get_diversion_address((LinphoneCall*)ptr);
+}
+
 extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getErrorInfo(	JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {
@@ -2855,27 +3606,406 @@ extern "C" jlong Java_org_linphone_core_LinphoneFriendImpl_newLinphoneFriend(JNI
 	LinphoneFriend* lResult;
 
 	if (jFriendUri) {
-		const char* friendUri = env->GetStringUTFChars(jFriendUri, NULL);
+		const char* friendUri = GetStringUTFChars(env, jFriendUri);
 		lResult = linphone_friend_new_with_address(friendUri);
 		linphone_friend_set_user_data(lResult,env->NewWeakGlobalRef(thiz));
-		env->ReleaseStringUTFChars(jFriendUri, friendUri);
+		ReleaseStringUTFChars(env, jFriendUri, friendUri);
 	} else {
 		lResult = linphone_friend_new();
 		linphone_friend_set_user_data(lResult,env->NewWeakGlobalRef(thiz));
 	}
 	return (jlong)lResult;
 }
+
+extern "C" jlong Java_org_linphone_core_LinphoneFriendListImpl_newLinphoneFriendList(JNIEnv*  env
+																		,jobject  thiz, jlong lc) {
+	LinphoneFriendList* fl = linphone_core_create_friend_list((LinphoneCore *)lc);
+	linphone_friend_list_set_user_data(fl,env->NewWeakGlobalRef(thiz));
+	return (jlong)fl;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_setUri(JNIEnv* env, jobject thiz, jlong list, jstring juri) {
+	const char* uri = GetStringUTFChars(env, juri);
+	linphone_friend_list_set_uri((LinphoneFriendList*)list, uri);
+	ReleaseStringUTFChars(env, juri, uri);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_synchronizeFriendsFromServer(JNIEnv* env, jobject thiz, jlong list) {
+	linphone_friend_list_synchronize_friends_from_server((LinphoneFriendList*)list);
+}
+
+static void contact_created(LinphoneFriendList *list, LinphoneFriend *lf) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(list);
+	jobject listener = (jobject) linphone_friend_list_cbs_get_user_data(cbs);
+
+	if (listener == NULL) {
+		ms_error("contact_created() notification without listener");
+		return ;
+	}
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onLinphoneFriendCreated","(Lorg/linphone/core/LinphoneFriendList;Lorg/linphone/core/LinphoneFriend;)V");
+	jobject jlist = getFriendList(env, list);
+	jobject jfriend = getFriend(env, lf);
+	env->DeleteLocalRef(clazz);
+	env->CallVoidMethod(listener, method, jlist, jfriend);
+	env->DeleteLocalRef(jfriend);
+	if (jlist) {
+		env->DeleteLocalRef(jlist);
+	}
+}
+
+static void contact_updated(LinphoneFriendList *list, LinphoneFriend *lf_new, LinphoneFriend *lf_old) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(list);
+	jobject listener = (jobject) linphone_friend_list_cbs_get_user_data(cbs);
+
+	if (listener == NULL) {
+		ms_error("contact_updated() notification without listener");
+		return ;
+	}
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onLinphoneFriendUpdated","(Lorg/linphone/core/LinphoneFriendList;Lorg/linphone/core/LinphoneFriend;Lorg/linphone/core/LinphoneFriend;)V");
+	jobject jlist = getFriendList(env, list);
+	jobject jfriend_new = getFriend(env, lf_new);
+	jobject jfriend_old = getFriend(env, lf_old);
+	env->DeleteLocalRef(clazz);
+	env->CallVoidMethod(listener, method, jlist, jfriend_new, jfriend_old);
+	env->DeleteLocalRef(jfriend_new);
+	env->DeleteLocalRef(jfriend_old);
+	if (jlist) {
+		env->DeleteLocalRef(jlist);
+	}
+}
+
+static void contact_removed(LinphoneFriendList *list, LinphoneFriend *lf) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(list);
+	jobject listener = (jobject) linphone_friend_list_cbs_get_user_data(cbs);
+
+	if (listener == NULL) {
+		ms_error("contact_removed() notification without listener");
+		return ;
+	}
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onLinphoneFriendDeleted","(Lorg/linphone/core/LinphoneFriendList;Lorg/linphone/core/LinphoneFriend;)V");
+	jobject jlist = getFriendList(env, list);
+	jobject jfriend = getFriend(env, lf);
+	env->DeleteLocalRef(clazz);
+	env->CallVoidMethod(listener, method, jlist, jfriend);
+	env->DeleteLocalRef(jfriend);
+	if (jlist) {
+		env->DeleteLocalRef(jlist);
+	}
+}
+
+static void sync_status_changed(LinphoneFriendList *list, LinphoneFriendListSyncStatus status, const char *message) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(list);
+	jobject listener = (jobject) linphone_friend_list_cbs_get_user_data(cbs);
+
+	if (listener == NULL) {
+		ms_error("sync_status_changed() notification without listener");
+		return ;
+	}
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onLinphoneFriendSyncStatusChanged","(Lorg/linphone/core/LinphoneFriendList;Lorg/linphone/core/LinphoneFriendList$State;Ljava/lang/String;)V");
+	jobject jlist = getFriendList(env, list);
+	env->DeleteLocalRef(clazz);
+
+	LinphoneCore *lc = linphone_friend_list_get_core((LinphoneFriendList *)list);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	jstring msg = message ? env->NewStringUTF(message) : NULL;
+	env->CallVoidMethod(listener, method, jlist, env->CallStaticObjectMethod(ljb->friendListSyncStateClass, ljb->friendListSyncStateFromIntId, (jint)status), msg);
+	if (msg) {
+		env->DeleteLocalRef(msg);
+	}
+	if (jlist) {
+		env->DeleteLocalRef(jlist);
+	}
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_setListener(JNIEnv* env, jobject  thiz, jlong ptr, jobject jlistener) {
+	jobject listener = env->NewGlobalRef(jlistener);
+	LinphoneFriendList *list = (LinphoneFriendList *)ptr;
+	LinphoneFriendListCbs *cbs;
+
+	cbs = linphone_friend_list_get_callbacks(list);
+	linphone_friend_list_cbs_set_user_data(cbs, listener);
+	linphone_friend_list_cbs_set_contact_created(cbs, contact_created);
+	linphone_friend_list_cbs_set_contact_updated(cbs, contact_updated);
+	linphone_friend_list_cbs_set_contact_deleted(cbs, contact_removed);
+	linphone_friend_list_cbs_set_sync_status_changed(cbs, sync_status_changed);
+}
+
 extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setAddress(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr
 																		,jlong linphoneAddress) {
 	linphone_friend_set_address((LinphoneFriend*)ptr,(LinphoneAddress*)linphoneAddress);
 }
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setName(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jstring jname) {
+	const char* name = GetStringUTFChars(env, jname);
+	linphone_friend_set_name((LinphoneFriend*)ptr, name);
+	ReleaseStringUTFChars(env, jname, name);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setFamilyName(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jstring jname) {
+	LinphoneFriend *lf = (LinphoneFriend*)ptr;
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc) {
+		const char* name = GetStringUTFChars(env, jname);
+		linphone_vcard_set_family_name(lvc, name);
+		ReleaseStringUTFChars(env, jname, name);
+	}
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setGivenName(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jstring jname) {
+	LinphoneFriend *lf = (LinphoneFriend*)ptr;
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc) {
+		const char* name = GetStringUTFChars(env, jname);
+		linphone_vcard_set_given_name(lvc, name);
+		ReleaseStringUTFChars(env, jname, name);
+	}
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_setRLSUri(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jstring jrlsUri) {
+	const char* uri = jrlsUri ? GetStringUTFChars(env, jrlsUri) : NULL;
+	linphone_friend_list_set_rls_uri((LinphoneFriendList*)ptr, uri);
+	if (jrlsUri) ReleaseStringUTFChars(env, jrlsUri, uri);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_setRLSAddress(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jlong jrlsAddress) {
+	linphone_friend_list_set_rls_address((LinphoneFriendList*)ptr, (LinphoneAddress*)jrlsAddress);
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneFriendListImpl_findFriendByUri(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong friendListptr
+																		,jstring juri) {
+	const char* uri = GetStringUTFChars(env, juri);
+	LinphoneFriend* lFriend;
+	lFriend = linphone_friend_list_find_friend_by_uri((LinphoneFriendList*)friendListptr, uri);
+	ReleaseStringUTFChars(env, juri, uri);
+	if(lFriend != NULL) {
+		jobject jfriend = getFriend(env,lFriend);
+		// don't release local ref since it will be handled above by java
+		return jfriend;
+	} else {
+		return NULL;
+	}
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_addFriend(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong friendListptr
+																		,jlong friendPtr) {
+	linphone_friend_list_add_friend((LinphoneFriendList*)friendListptr, (LinphoneFriend*)friendPtr);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_addLocalFriend(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong friendListptr
+																		,jlong friendPtr) {
+	linphone_friend_list_add_local_friend((LinphoneFriendList*)friendListptr, (LinphoneFriend*)friendPtr);
+}
+
+extern "C" jobjectArray Java_org_linphone_core_LinphoneFriendListImpl_getFriendList(JNIEnv* env, jobject thiz, jlong list) {
+	const bctbx_list_t* friends = linphone_friend_list_get_friends((LinphoneFriendList *)list);
+	size_t friendsSize = bctbx_list_size(friends);
+	LinphoneCore *lc = linphone_friend_list_get_core((LinphoneFriendList *)list);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	jobjectArray jFriends = env->NewObjectArray(friendsSize,ljb->friendClass,NULL);
+
+	for (size_t i = 0; i < friendsSize; i++) {
+		LinphoneFriend* lfriend = (LinphoneFriend*)friends->data;
+		jobject jfriend =  getFriend(env,lfriend);
+		if(jfriend != NULL){
+			env->SetObjectArrayElement(jFriends, i, jfriend);
+			env->DeleteLocalRef(jfriend);
+		}
+		friends = friends->next;
+	}
+
+	return jFriends;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_updateSubscriptions(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong friendListptr) {
+	linphone_friend_list_update_subscriptions((LinphoneFriendList*)friendListptr);
+}
+
+extern "C" jlongArray Java_org_linphone_core_LinphoneFriendImpl_getAddresses(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	const bctbx_list_t *addresses = linphone_friend_get_addresses((LinphoneFriend*)ptr);
+	size_t size = bctbx_list_size(addresses);
+	jlongArray jaddresses = env->NewLongArray(size);
+	jlong *jInternalArray = env->GetLongArrayElements(jaddresses, NULL);
+	for (size_t i = 0; i < size; i++) {
+		jInternalArray[i] = (unsigned long) (addresses->data);
+		addresses = bctbx_list_next(addresses);
+	}
+	env->ReleaseLongArrayElements(jaddresses, jInternalArray, 0);
+	return jaddresses;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_addAddress(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jlong jaddress) {
+	linphone_friend_add_address((LinphoneFriend*)ptr, (LinphoneAddress*)jaddress);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_removeAddress(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jlong jaddress) {
+	linphone_friend_remove_address((LinphoneFriend*)ptr, (LinphoneAddress*)jaddress);
+}
+
+extern "C" jobjectArray Java_org_linphone_core_LinphoneFriendImpl_getPhoneNumbers(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	bctbx_list_t *phone_numbers = linphone_friend_get_phone_numbers((LinphoneFriend*)ptr);
+	bctbx_list_t *list = phone_numbers;
+	size_t size = bctbx_list_size(phone_numbers);
+	jobjectArray jphonenumbers = env->NewObjectArray(size, env->FindClass("java/lang/String"), env->NewStringUTF(""));
+	for (size_t i = 0; i < size; i++) {
+		const char *phone = (const char *)phone_numbers->data;
+		env->SetObjectArrayElement(jphonenumbers, i, env->NewStringUTF(phone));
+		phone_numbers = bctbx_list_next(phone_numbers);
+	}
+	bctbx_list_free(list);
+	return jphonenumbers;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_addPhoneNumber(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jstring jphone) {
+	if (jphone) {
+		const char* phone = GetStringUTFChars(env, jphone);
+		linphone_friend_add_phone_number((LinphoneFriend*)ptr, phone);
+		ReleaseStringUTFChars(env, jphone, phone);
+	}
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_removePhoneNumber(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr
+																		,jstring jphone) {
+	if (jphone) {
+		const char* phone = GetStringUTFChars(env, jphone);
+		linphone_friend_remove_phone_number((LinphoneFriend*)ptr, phone);
+		ReleaseStringUTFChars(env, jphone, phone);
+	}
+}
+
 extern "C" jlong Java_org_linphone_core_LinphoneFriendImpl_getAddress(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {
 	return (jlong)linphone_friend_get_address((LinphoneFriend*)ptr);
 }
+
+extern "C" jstring Java_org_linphone_core_LinphoneFriendImpl_getName(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	const char *name = linphone_friend_get_name((LinphoneFriend*)ptr);
+	return name ? env->NewStringUTF(name) : NULL;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneFriendImpl_getFamilyName(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	LinphoneFriend *lf = (LinphoneFriend*)ptr;
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc) {
+		const char *name = linphone_vcard_get_family_name(lvc);
+		return name ? env->NewStringUTF(name) : NULL;
+	}
+	return NULL;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneFriendImpl_getGivenName(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	LinphoneFriend *lf = (LinphoneFriend*)ptr;
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc) {
+		const char *name = linphone_vcard_get_given_name(lvc);
+		return name ? env->NewStringUTF(name) : NULL;
+	}
+	return NULL;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneFriendImpl_getOrganization(JNIEnv* env,
+																		jobject thiz,
+																		jlong ptr) {
+	LinphoneFriend *lf = (LinphoneFriend *)ptr;
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc) {
+		const char *org = linphone_vcard_get_organization(lvc);
+		return org ? env->NewStringUTF(org) : NULL;
+	}
+	return NULL;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setOrganization(JNIEnv* env,
+																		jobject thiz,
+																		jlong ptr,
+																		jstring jorg) {
+	LinphoneFriend *lf = (LinphoneFriend *)ptr;
+	LinphoneVcard *lvc = linphone_friend_get_vcard(lf);
+	if (lvc) {
+		const char* org = GetStringUTFChars(env, jorg);
+		linphone_vcard_set_organization(lvc, org);
+		ReleaseStringUTFChars(env, jorg, org);
+	}
+}
+
 extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setIncSubscribePolicy(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr
@@ -2907,19 +4037,32 @@ extern "C" jobject Java_org_linphone_core_LinphoneFriendImpl_getCore(JNIEnv*  en
 																		,jobject  thiz
 																		,jlong ptr) {
 	LinphoneCore *lc=linphone_friend_get_core((LinphoneFriend*)ptr);
+	if (lc!=NULL){
+		LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+		jobject core = ljb->getCore();
+		return core;
+	}
+	return NULL;
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneFriendListImpl_getCore(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	LinphoneCore *lc=linphone_friend_get_core((LinphoneFriend*)ptr);
 	if (lc!=NULL){
 		jobject core = (jobject)linphone_core_get_user_data(lc);
 		return core;
 	}
 	return NULL;
 }
+
 extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setRefKey(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr
 																		,jstring jkey) {
-	const char* key = env->GetStringUTFChars(jkey, NULL);
+	const char* key = GetStringUTFChars(env, jkey);
 	linphone_friend_set_ref_key((LinphoneFriend*)ptr,key);
-	env->ReleaseStringUTFChars(jkey, key);
+	ReleaseStringUTFChars(env, jkey, key);
 }
 extern "C" jstring Java_org_linphone_core_LinphoneFriendImpl_getRefKey(JNIEnv*  env
 																		,jobject  thiz
@@ -2937,6 +4080,34 @@ extern "C" void  Java_org_linphone_core_LinphoneFriendImpl_finalize(JNIEnv*  env
 	linphone_friend_unref(lfriend);
 }
 
+extern "C" void Java_org_linphone_core_LinphoneFriendListImpl_finalize(JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	LinphoneFriendList *lfriendList=(LinphoneFriendList*)ptr;
+	linphone_friend_list_set_user_data(lfriendList,NULL);
+	linphone_friend_list_unref(lfriendList);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneFriendImpl_setPresenceModel(JNIEnv *env, jobject jobj, jlong ptr, jlong modelPtr) {
+	LinphoneFriend *lf = (LinphoneFriend *)ptr;
+	LinphonePresenceModel *model = (LinphonePresenceModel *)modelPtr;
+	linphone_friend_set_presence_model(lf, model);
+}
+
+extern "C" jboolean Java_org_linphone_core_LinphoneFriendImpl_isAlreadyPresentInFriendList(JNIEnv* env, jobject thiz, jlong ptr) {
+	LinphoneFriend *lf = (LinphoneFriend *)ptr;
+	return lf->friend_list != NULL;
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneFriendImpl_getPresenceModelForUri(JNIEnv* env, jobject thiz, jlong ptr, jstring juri) {
+	LinphoneFriend *lf = (LinphoneFriend *)ptr;
+	const char *uri = GetStringUTFChars(env, juri);
+	LinphonePresenceModel *model = (LinphonePresenceModel *)linphone_friend_get_presence_model_for_uri_or_tel(lf, uri);
+	ReleaseStringUTFChars(env, juri, uri);
+	if (model == NULL) return NULL;
+	RETURN_USER_DATA_OBJECT("PresenceModelImpl", linphone_presence_model, model);
+}
+
 /*
  * Class:     org_linphone_core_LinphoneFriendImpl
  * Method:    getPresenceModel
@@ -2969,9 +4140,9 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getFriendByAddress(JN
 																		,jobject  thiz
 																		,jlong ptr
 																		,jstring jaddress) {
-	const char* address = env->GetStringUTFChars(jaddress, NULL);
+	const char* address = GetStringUTFChars(env, jaddress);
 	LinphoneFriend *lf = linphone_core_get_friend_by_address((LinphoneCore*)ptr, address);
-	env->ReleaseStringUTFChars(jaddress, address);
+	ReleaseStringUTFChars(env, jaddress, address);
 	if(lf != NULL) {
 		jobject jfriend = getFriend(env,lf);
 		return jfriend;
@@ -2980,38 +4151,42 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getFriendByAddress(JN
 	}
 }
 
-extern "C" jlongArray _LinphoneChatRoomImpl_getHistory(JNIEnv*  env
-																		,jobject  thiz
-																		,jlong ptr
-																		,MSList* history) {
-	int historySize = ms_list_size(history);
-	jlongArray jHistory = env->NewLongArray(historySize);
-	jlong *jInternalArray = env->GetLongArrayElements(jHistory, NULL);
+extern "C" jobjectArray _LinphoneChatRoomImpl_getHistory(JNIEnv* env, jobject thiz, jlong ptr, bctbx_list_t* history) {
+	LinphoneChatRoom *room = (LinphoneChatRoom *)ptr;
+	LinphoneCore *lc = linphone_chat_room_get_core(room);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	bctbx_list_t *list = history;
+	size_t historySize = bctbx_list_size(history);
+	jobjectArray jHistory = env->NewObjectArray(historySize, ljb->chatMessageClass, NULL);
+
+	for (size_t i = 0; i < historySize; i++) {
+		LinphoneChatMessage *msg = (LinphoneChatMessage *)history->data;
+		jobject jmsg = getChatMessage(env, msg);
+		if (jmsg != NULL) {
+			env->SetObjectArrayElement(jHistory, i, jmsg);
+			env->DeleteLocalRef(jmsg);
+		}
 
-	for (int i = 0; i < historySize; i++) {
-		jInternalArray[i] = (unsigned long) (history->data);
 		history = history->next;
 	}
-
-	ms_list_free(history);
-
-	env->ReleaseLongArrayElements(jHistory, jInternalArray, 0);
-
+	/*getChatMessage() acquired a ref that is "transfered" to the java object. We must drop
+		* the reference given by linphone_chat_room_get_history_range()*/
+	bctbx_list_free_with_data(list, (void (*)(void*))linphone_chat_message_unref);
 	return jHistory;
 }
-extern "C" jlongArray Java_org_linphone_core_LinphoneChatRoomImpl_getHistoryRange(JNIEnv*  env
+extern "C" jobjectArray Java_org_linphone_core_LinphoneChatRoomImpl_getHistoryRange(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr
 																		,jint start
 																		,jint end) {
-	MSList* history = linphone_chat_room_get_history_range((LinphoneChatRoom*)ptr, start, end);
+	bctbx_list_t* history = linphone_chat_room_get_history_range((LinphoneChatRoom*)ptr, start, end);
 	return _LinphoneChatRoomImpl_getHistory(env, thiz, ptr, history);
 }
-extern "C" jlongArray Java_org_linphone_core_LinphoneChatRoomImpl_getHistory(JNIEnv*  env
+extern "C" jobjectArray Java_org_linphone_core_LinphoneChatRoomImpl_getHistory(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr
 																		,jint limit) {
-	MSList* history = linphone_chat_room_get_history((LinphoneChatRoom*)ptr, limit);
+	bctbx_list_t* history = linphone_chat_room_get_history((LinphoneChatRoom*)ptr, limit);
 	return _LinphoneChatRoomImpl_getHistory(env, thiz, ptr, history);
 }
 extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_getPeerAddress(JNIEnv*  env
@@ -3023,9 +4198,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_createLinphoneChatM
 																		,jobject  thiz
 																		,jlong ptr
 																		,jstring jmessage) {
-	const char* message = env->GetStringUTFChars(jmessage, NULL);
+	const char* message = GetStringUTFChars(env, jmessage);
 	LinphoneChatMessage *chatMessage = linphone_chat_room_create_message((LinphoneChatRoom *)ptr, message);
-	env->ReleaseStringUTFChars(jmessage, message);
+	ReleaseStringUTFChars(env, jmessage, message);
 
 	return (jlong) chatMessage;
 }
@@ -3038,17 +4213,15 @@ extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_createLinphoneChatM
 																		,jlong time
 																		,jboolean read
 																		,jboolean incoming) {
-	const char* message = jmessage?env->GetStringUTFChars(jmessage, NULL):NULL;
-	const char* url = jurl?env->GetStringUTFChars(jurl, NULL):NULL;
+	const char* message = GetStringUTFChars(env, jmessage);
+	const char* url = GetStringUTFChars(env, jurl);
 
 	LinphoneChatMessage *chatMessage = linphone_chat_room_create_message_2(
 				(LinphoneChatRoom *)ptr, message, url, (LinphoneChatMessageState)state,
 				(time_t)time, read, incoming);
 
-	if (jmessage != NULL)
-		env->ReleaseStringUTFChars(jmessage, message);
-	if (jurl != NULL)
-		env->ReleaseStringUTFChars(jurl, url);
+	ReleaseStringUTFChars(env, jmessage, message);
+	ReleaseStringUTFChars(env, jurl, url);
 
 	return (jlong) chatMessage;
 }
@@ -3085,24 +4258,27 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_markAsRead(JNIEnv*
 	linphone_chat_room_mark_as_read((LinphoneChatRoom*)ptr);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_destroy(JNIEnv*  env
-																	,jobject  thiz
-																	,jlong ptr) {
-	linphone_chat_room_destroy((LinphoneChatRoom*)ptr);
-}
 
 extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_createFileTransferMessage(JNIEnv* env, jobject thiz, jlong ptr, jstring jname, jstring jtype, jstring jsubtype, jint data_size) {
-	LinphoneContentPrivate content = {0};
+	LinphoneCore *lc = linphone_chat_room_get_core((LinphoneChatRoom*) ptr);
+	LinphoneContent * content = linphone_core_create_content(lc);
 	LinphoneChatMessage *message = NULL;
+	const char *tmp;
 
-	content.type = (char*)env->GetStringUTFChars(jtype, NULL);
-	content.subtype = (char*)env->GetStringUTFChars(jsubtype, NULL);
-	content.name = (char*)env->GetStringUTFChars(jname, NULL);
-	content.size = data_size;
-	message = linphone_chat_room_create_file_transfer_message((LinphoneChatRoom *)ptr, LINPHONE_CONTENT(&content));
-	env->ReleaseStringUTFChars(jtype, content.type);
-	env->ReleaseStringUTFChars(jsubtype, content.subtype);
-	env->ReleaseStringUTFChars(jname, content.name);
+	linphone_content_set_type(content, tmp = GetStringUTFChars(env, jtype));
+	ReleaseStringUTFChars(env, jtype, tmp);
+
+	linphone_content_set_subtype(content, tmp = GetStringUTFChars(env, jsubtype));
+	ReleaseStringUTFChars(env, jsubtype, tmp);
+
+	linphone_content_set_name(content, tmp = GetStringUTFChars(env, jname));
+	ReleaseStringUTFChars(env, jname, tmp);
+
+	linphone_content_set_size(content, data_size);
+
+	message = linphone_chat_room_create_file_transfer_message((LinphoneChatRoom *)ptr, content);
+
+	linphone_content_unref(content);
 
 	return (jlong) message;
 }
@@ -3126,17 +4302,15 @@ extern "C" jstring Java_org_linphone_core_LinphoneChatMessageImpl_getAppData(JNI
 }
 
 extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setAppData(JNIEnv* env, jobject  thiz, jlong ptr, jstring appdata) {
-	const char * data = appdata ? env->GetStringUTFChars(appdata, NULL) : NULL;
+	const char * data = GetStringUTFChars(env, appdata);
 	linphone_chat_message_set_appdata((LinphoneChatMessage *)ptr, data);
-	if (appdata)
-		env->ReleaseStringUTFChars(appdata, data);
+	ReleaseStringUTFChars(env, appdata, data);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setFileTransferServer(JNIEnv* env, jobject thiz, jlong ptr, jstring server_url) {
-	const char * url = server_url ? env->GetStringUTFChars(server_url, NULL) : NULL;
+	const char * url = GetStringUTFChars(env, server_url);
 	linphone_core_set_file_transfer_server((LinphoneCore *)ptr, url);
-	if (server_url)
-		env->ReleaseStringUTFChars(server_url, url);
+	ReleaseStringUTFChars(env, server_url, url);
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getFileTransferServer(JNIEnv* env, jobject thiz, jlong ptr) {
@@ -3178,20 +4352,20 @@ extern "C" jlong Java_org_linphone_core_LinphoneChatMessageImpl_getErrorInfo(JNI
 extern "C" jstring Java_org_linphone_core_LinphoneChatMessageImpl_getCustomHeader(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr, jstring jheader_name) {
-	const char *name=env->GetStringUTFChars(jheader_name,NULL);
+	const char *name = GetStringUTFChars(env, jheader_name);
 	const char *value=linphone_chat_message_get_custom_header((LinphoneChatMessage*)ptr,name);
-	env->ReleaseStringUTFChars(jheader_name, name);
+	ReleaseStringUTFChars(env, jheader_name, name);
 	return value ? env->NewStringUTF(value) : NULL;
 }
 
 extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_addCustomHeader(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr, jstring jheader_name, jstring jheader_value) {
-	const char *name=env->GetStringUTFChars(jheader_name,NULL);
-	const char *value=env->GetStringUTFChars(jheader_value,NULL);
+	const char *name = GetStringUTFChars(env, jheader_name);
+	const char *value = GetStringUTFChars(env, jheader_value);
 	linphone_chat_message_add_custom_header((LinphoneChatMessage*)ptr,name,value);
-	env->ReleaseStringUTFChars(jheader_name, name);
-	env->ReleaseStringUTFChars(jheader_value, value);
+	ReleaseStringUTFChars(env, jheader_name, name);
+	ReleaseStringUTFChars(env, jheader_value, value);
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneChatMessageImpl_getExternalBodyUrl(JNIEnv*  env
@@ -3204,9 +4378,9 @@ extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setExternalBodyUr
 																		,jobject  thiz
 																		,jlong ptr
 																		,jstring jurl) {
-	const char* url = env->GetStringUTFChars(jurl, NULL);
+	const char* url = GetStringUTFChars(env, jurl);
 	linphone_chat_message_set_external_body_url((LinphoneChatMessage *)ptr, url);
-	env->ReleaseStringUTFChars(jurl, url);
+	ReleaseStringUTFChars(env, jurl, url);
 }
 extern "C" jlong Java_org_linphone_core_LinphoneChatMessageImpl_getFrom(JNIEnv*  env
 																		,jobject  thiz
@@ -3259,15 +4433,15 @@ extern "C" jint Java_org_linphone_core_LinphoneChatMessageImpl_getStorageId(JNIE
 extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setFileTransferFilepath(JNIEnv*  env
 																		 ,jobject  thiz
 																		 ,jlong ptr, jstring jpath) {
-	const char* path = env->GetStringUTFChars(jpath, NULL);
+	const char* path = GetStringUTFChars(env, jpath);
 	linphone_chat_message_set_file_transfer_filepath((LinphoneChatMessage*)ptr, path);
-	env->ReleaseStringUTFChars(jpath, path);
+	ReleaseStringUTFChars(env, jpath, path);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_downloadFile(JNIEnv*  env
+extern "C" jint Java_org_linphone_core_LinphoneChatMessageImpl_downloadFile(JNIEnv*  env
 																		 ,jobject  thiz
 																		 ,jlong ptr) {
-	linphone_chat_message_download_file((LinphoneChatMessage*)ptr);
+	return (jint) linphone_chat_message_download_file((LinphoneChatMessage*)ptr);
 }
 
 static void message_state_changed(LinphoneChatMessage* msg, LinphoneChatMessageState state) {
@@ -3278,20 +4452,29 @@ static void message_state_changed(LinphoneChatMessage* msg, LinphoneChatMessageS
 		return;
 	}
 
-	jobject listener = (jobject) msg->cb_ud;
+	jobject listener = (jobject) msg->message_state_changed_user_data;
+
+	if (listener == NULL) {
+		ms_error("message_state_changed() notification without listener");
+		return ;
+	}
 	jclass clazz = (jclass) env->GetObjectClass(listener);
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageStateChanged","(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneChatMessage$State;)V");
 	jobject jmessage = getChatMessage(env, msg);
 	env->DeleteLocalRef(clazz);
-	
-	jclass chatMessageStateClass = (jclass)env->FindClass("org/linphone/core/LinphoneChatMessage$State");
-	jmethodID chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass, "fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
-	env->CallVoidMethod(listener, method, jmessage, env->CallStaticObjectMethod(chatMessageStateClass, chatMessageStateFromIntId, (jint)state));
+
+	LinphoneChatRoom *room = linphone_chat_message_get_chat_room(msg);
+	LinphoneCore *lc = linphone_chat_room_get_core(room);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	env->CallVoidMethod(listener, method, jmessage, env->CallStaticObjectMethod(ljb->chatMessageStateClass, ljb->chatMessageStateFromIntId, (jint)state));
 
 	if (state == LinphoneChatMessageStateDelivered || state == LinphoneChatMessageStateNotDelivered) {
 		env->DeleteGlobalRef(listener);
+		msg->message_state_changed_user_data = NULL;
+	}
+	if (jmessage) {
+		env->DeleteLocalRef(jmessage);
 	}
-	env->DeleteLocalRef(chatMessageStateClass);
 }
 
 static void file_transfer_progress_indication(LinphoneChatMessage *msg, const LinphoneContent* content, size_t offset, size_t total) {
@@ -3302,7 +4485,7 @@ static void file_transfer_progress_indication(LinphoneChatMessage *msg, const Li
 		return;
 	}
 
-	jobject listener = (jobject) msg->cb_ud;
+	jobject listener = (jobject) msg->message_state_changed_user_data;
 	jclass clazz = (jclass) env->GetObjectClass(listener);
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageFileTransferProgressChanged", "(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;II)V");
 	env->DeleteLocalRef(clazz);
@@ -3312,6 +4495,9 @@ static void file_transfer_progress_indication(LinphoneChatMessage *msg, const Li
 	if (jcontent) {
 		env->DeleteLocalRef(jcontent);
 	}
+	if (jmessage) {
+		env->DeleteLocalRef(jmessage);
+	}
 }
 
 static void file_transfer_recv(LinphoneChatMessage *msg, const LinphoneContent* content, const LinphoneBuffer *buffer) {
@@ -3322,11 +4508,11 @@ static void file_transfer_recv(LinphoneChatMessage *msg, const LinphoneContent*
 		return;
 	}
 
-	jobject listener = (jobject) msg->cb_ud;
+	jobject listener = (jobject) msg->message_state_changed_user_data;
 	jclass clazz = (jclass) env->GetObjectClass(listener);
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageFileTransferReceived", "(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;Lorg/linphone/core/LinphoneBuffer;)V");
 	env->DeleteLocalRef(clazz);
-	
+
 	jobject jmessage = getChatMessage(env, msg);
 	jobject jbuffer = buffer ? create_java_linphone_buffer(env, buffer) : NULL;
 	jobject jcontent = content ? create_java_linphone_content(env, content) : NULL;
@@ -3337,6 +4523,9 @@ static void file_transfer_recv(LinphoneChatMessage *msg, const LinphoneContent*
 	if (jcontent) {
 		env->DeleteLocalRef(jcontent);
 	}
+	if (jmessage) {
+		env->DeleteLocalRef(jmessage);
+	}
 }
 
 static LinphoneBuffer* file_transfer_send(LinphoneChatMessage *msg,  const LinphoneContent* content, size_t offset, size_t size) {
@@ -3348,11 +4537,11 @@ static LinphoneBuffer* file_transfer_send(LinphoneChatMessage *msg,  const Linph
 		return buffer;
 	}
 
-	jobject listener = (jobject) msg->cb_ud;
+	jobject listener = (jobject) msg->message_state_changed_user_data;
 	jclass clazz = (jclass) env->GetObjectClass(listener);
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageFileTransferSent","(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneContent;IILorg/linphone/core/LinphoneBuffer;)V");
 	env->DeleteLocalRef(clazz);
-	
+
 	jobject jmessage = getChatMessage(env, msg);
 	jobject jbuffer = create_java_linphone_buffer(env, NULL);
 	jobject jcontent = content ? create_java_linphone_content(env, content) : NULL;
@@ -3360,7 +4549,10 @@ static LinphoneBuffer* file_transfer_send(LinphoneChatMessage *msg,  const Linph
 	if (jcontent) {
 		env->DeleteLocalRef(jcontent);
 	}
-	
+	if (jmessage) {
+		env->DeleteLocalRef(jmessage);
+	}
+
 	buffer = create_c_linphone_buffer_from_java_linphone_buffer(env, jbuffer);
 	env->DeleteLocalRef(jbuffer);
 	return buffer;
@@ -3370,8 +4562,8 @@ extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setListener(JNIEn
 	jobject listener = env->NewGlobalRef(jlistener);
 	LinphoneChatMessage *message = (LinphoneChatMessage *)ptr;
 	LinphoneChatMessageCbs *cbs;
-	
-	message->cb_ud = listener;
+
+	message->message_state_changed_user_data = listener;
 	cbs = linphone_chat_message_get_callbacks(message);
 	linphone_chat_message_cbs_set_msg_state_changed(cbs, message_state_changed);
 	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
@@ -3382,24 +4574,29 @@ extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setListener(JNIEn
 extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_unref(JNIEnv*  env
 																		 ,jobject  thiz
 																		 ,jlong ptr) {
+	linphone_chat_message_set_user_data((LinphoneChatMessage*)ptr, NULL);
 	linphone_chat_message_unref((LinphoneChatMessage*)ptr);
 }
 
-extern "C" jlongArray Java_org_linphone_core_LinphoneCoreImpl_getChatRooms(JNIEnv*  env
+extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreImpl_getChatRooms(JNIEnv*  env
 																		   ,jobject  thiz
 																		   ,jlong ptr) {
-	MSList* chats = linphone_core_get_chat_rooms((LinphoneCore*)ptr);
-	int chatsSize = ms_list_size(chats);
-	jlongArray jChats = env->NewLongArray(chatsSize);
-	jlong *jInternalArray = env->GetLongArrayElements(jChats, NULL);
+	LinphoneCore *lc = (LinphoneCore*)ptr;
+	const bctbx_list_t* chats = linphone_core_get_chat_rooms(lc);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	size_t chatsSize = bctbx_list_size(chats);
+	jobjectArray jChats = env->NewObjectArray(chatsSize, ljb->chatRoomClass, NULL);
 
-	for (int i = 0; i < chatsSize; i++) {
-		jInternalArray[i] = (unsigned long) (chats->data);
+	for (size_t i = 0; i < chatsSize; i++) {
+		LinphoneChatRoom *room = (LinphoneChatRoom *)chats->data;
+		jobject jroom = getChatRoom(env, room);
+		if (jroom != NULL) {
+			env->SetObjectArrayElement(jChats, i, jroom);
+			env->DeleteLocalRef(jroom);
+		}
 		chats = chats->next;
 	}
 
-	env->ReleaseLongArrayElements(jChats, jInternalArray, 0);
-
 	return jChats;
 }
 
@@ -3407,9 +4604,9 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendMessage(JNIEnv*
 																		,jobject  thiz
 																		,jlong ptr
 																		,jstring jmessage) {
-	const char* message = env->GetStringUTFChars(jmessage, NULL);
+	const char* message = GetStringUTFChars(env, jmessage);
 	linphone_chat_room_send_message((LinphoneChatRoom*)ptr, message);
-	env->ReleaseStringUTFChars(jmessage, message);
+	ReleaseStringUTFChars(env, jmessage, message);
 }
 
 static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessageState state, void* ud) {
@@ -3425,18 +4622,18 @@ static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessag
 	jmethodID method = env->GetMethodID(clazz, "onLinphoneChatMessageStateChanged","(Lorg/linphone/core/LinphoneChatMessage;Lorg/linphone/core/LinphoneChatMessage$State;)V");
 	jobject jmessage=(jobject)linphone_chat_message_get_user_data(msg);
 
-	jclass chatMessageStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneChatMessage$State"));
-	jmethodID chatMessageStateFromIntId = env->GetStaticMethodID(chatMessageStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneChatMessage$State;");
+	LinphoneChatRoom *room = linphone_chat_message_get_chat_room(msg);
+	LinphoneCore *lc = linphone_chat_room_get_core(room);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 	env->CallVoidMethod(
 			listener,
 			method,
 			jmessage,
-			env->CallStaticObjectMethod(chatMessageStateClass,chatMessageStateFromIntId,(jint)state));
+			env->CallStaticObjectMethod(ljb->chatMessageStateClass,ljb->chatMessageStateFromIntId,(jint)state));
 
 	if (state == LinphoneChatMessageStateDelivered || state == LinphoneChatMessageStateNotDelivered) {
 		env->DeleteGlobalRef(listener);
 		env->DeleteGlobalRef(jmessage);
-		env->DeleteGlobalRef(chatMessageStateClass);
 		linphone_chat_message_set_user_data(msg,NULL);
 	}
 }
@@ -3445,7 +4642,8 @@ extern "C" jobject Java_org_linphone_core_LinphoneChatRoomImpl_getCore(JNIEnv*
 																		,jobject  thiz
 																		,jlong chatroom_ptr){
 	LinphoneCore *lc=linphone_chat_room_get_core((LinphoneChatRoom*)chatroom_ptr);
-	jobject core = (jobject)linphone_core_get_user_data(lc);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	jobject core = ljb->getCore();
 	return core;
 }
 
@@ -3513,10 +4711,9 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDeviceRotation(JNIEnv
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRemoteRingbackTone(JNIEnv *env, jobject thiz, jlong lc, jstring jtone){
-	const char* tone = NULL;
-	if (jtone) tone=env->GetStringUTFChars(jtone, NULL);
+	const char* tone = GetStringUTFChars(env, jtone);
 	linphone_core_set_remote_ringback_tone((LinphoneCore*)lc,tone);
-	if (tone) env->ReleaseStringUTFChars(jtone,tone);
+	ReleaseStringUTFChars(env, jtone,tone);
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getRemoteRingbackTone(JNIEnv *env, jobject thiz, jlong lc){
@@ -3534,11 +4731,25 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getFirewallPolicy(JNIEnv
 	return (jint)linphone_core_get_firewall_policy((LinphoneCore*)lc);
 }
 
+JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createNatPolicy(JNIEnv *env, jobject thiz, jlong lc) {
+	LinphoneNatPolicy *nat_policy = linphone_core_create_nat_policy((LinphoneCore *)lc);
+	return (nat_policy != NULL) ? getNatPolicy(env, nat_policy) : NULL;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setNatPolicy(JNIEnv *env, jobject thiz, jlong lc, jlong jpolicy) {
+	linphone_core_set_nat_policy((LinphoneCore *)lc, (LinphoneNatPolicy *)jpolicy);
+}
+
+JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_getNatPolicy(JNIEnv *env, jobject thiz, jlong lc) {
+	LinphoneNatPolicy *nat_policy = linphone_core_get_nat_policy((LinphoneCore *)lc);
+	return (nat_policy != NULL) ? getNatPolicy(env, nat_policy) : NULL;
+}
+
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setStunServer(JNIEnv *env, jobject thiz, jlong lc, jstring jserver){
-	const char* server = NULL;
-	if (jserver) server=env->GetStringUTFChars(jserver, NULL);
+	const char* server = GetStringUTFChars(env, jserver);
 	linphone_core_set_stun_server((LinphoneCore*)lc,server);
-	if (server) env->ReleaseStringUTFChars(jserver,server);
+	ReleaseStringUTFChars(env, jserver,server);
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getStunServer(JNIEnv *env, jobject thiz, jlong lc){
@@ -3605,9 +4816,9 @@ extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_setSessionName(JNI
 																			,jobject  thiz
 																			,jlong cp
 																			,jstring jname) {
-	const char *name = jname ? env->GetStringUTFChars(jname,NULL) : NULL;
+	const char *name = GetStringUTFChars(env, jname);
 	linphone_call_params_set_session_name((LinphoneCallParams*)cp,name);
-	if (name) env->ReleaseStringUTFChars(jname,name);
+	ReleaseStringUTFChars(env, jname, name);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_audioBandwidth(JNIEnv *env, jobject thiz, jlong lcp, jint bw){
@@ -3640,25 +4851,63 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_localConferenc
 }
 
 extern "C" jstring Java_org_linphone_core_LinphoneCallParamsImpl_getCustomHeader(JNIEnv *env, jobject thiz, jlong lcp, jstring jheader_name){
-	const char* header_name=env->GetStringUTFChars(jheader_name, NULL);
-	const char *header_value=linphone_call_params_get_custom_header((LinphoneCallParams*)lcp,header_name);
-	env->ReleaseStringUTFChars(jheader_name, header_name);
+	const char* header_name = GetStringUTFChars(env, jheader_name);
+	const char *header_value = linphone_call_params_get_custom_header((LinphoneCallParams*)lcp,header_name);
+	ReleaseStringUTFChars(env, jheader_name, header_name);
 	return header_value ? env->NewStringUTF(header_value) : NULL;
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_addCustomHeader(JNIEnv *env, jobject thiz, jlong lcp, jstring jheader_name, jstring jheader_value){
-	const char* header_name=env->GetStringUTFChars(jheader_name, NULL);
-	const char* header_value=env->GetStringUTFChars(jheader_value, NULL);
+	const char* header_name = GetStringUTFChars(env, jheader_name);
+	const char* header_value = GetStringUTFChars(env, jheader_value);
 	linphone_call_params_add_custom_header((LinphoneCallParams*)lcp,header_name,header_value);
-	env->ReleaseStringUTFChars(jheader_name, header_name);
-	env->ReleaseStringUTFChars(jheader_value, header_value);
+	ReleaseStringUTFChars(env, jheader_name, header_name);
+	ReleaseStringUTFChars(env, jheader_value, header_value);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_addCustomSdpAttribute(JNIEnv *env, jobject thiz, jlong ptr, jstring jname, jstring jvalue) {
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = GetStringUTFChars(env, jvalue);
+	linphone_call_params_add_custom_sdp_attribute((LinphoneCallParams *)ptr, name, value);
+	ReleaseStringUTFChars(env, jname, name);
+	ReleaseStringUTFChars(env, jvalue, value);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_addCustomSdpMediaAttribute(JNIEnv *env, jobject thiz, jlong ptr, jint jtype, jstring jname, jstring jvalue) {
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = GetStringUTFChars(env, jvalue);
+	linphone_call_params_add_custom_sdp_media_attribute((LinphoneCallParams *)ptr, (LinphoneStreamType)jtype, name, value);
+	ReleaseStringUTFChars(env, jname, name);
+	ReleaseStringUTFChars(env, jvalue, value);
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_getCustomSdpAttribute(JNIEnv *env, jobject thiz, jlong ptr, jstring jname) {
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = linphone_call_params_get_custom_sdp_attribute((LinphoneCallParams *)ptr, name);
+	ReleaseStringUTFChars(env, jname, name);
+	return value ? env->NewStringUTF(value) : NULL;
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_getCustomSdpMediaAttribute(JNIEnv *env, jobject thiz, jlong ptr, jint jtype, jstring jname) {
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = linphone_call_params_get_custom_sdp_media_attribute((LinphoneCallParams *)ptr, (LinphoneStreamType)jtype, name);
+	ReleaseStringUTFChars(env, jname, name);
+	return value ? env->NewStringUTF(value) : NULL;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_clearCustomSdpAttributes(JNIEnv *env, jobject thiz, jlong ptr) {
+	linphone_call_params_clear_custom_sdp_attributes((LinphoneCallParams *)ptr);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_clearCustomSdpMediaAttributes(JNIEnv *env, jobject thiz, jlong ptr, jint jtype) {
+	linphone_call_params_clear_custom_sdp_media_attributes((LinphoneCallParams *)ptr, (LinphoneStreamType)jtype);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_setRecordFile(JNIEnv *env, jobject thiz, jlong lcp, jstring jrecord_file){
 	if (jrecord_file){
-		const char* record_file=env->GetStringUTFChars(jrecord_file, NULL);
+		const char* record_file = GetStringUTFChars(env, jrecord_file);
 		linphone_call_params_set_record_file((LinphoneCallParams*)lcp,record_file);
-		env->ReleaseStringUTFChars(jrecord_file, record_file);
+		ReleaseStringUTFChars(env, jrecord_file, record_file);
 	}else linphone_call_params_set_record_file((LinphoneCallParams*)lcp,NULL);
 }
 
@@ -3680,11 +4929,34 @@ extern "C" jintArray Java_org_linphone_core_LinphoneCallParamsImpl_getReceivedVi
 	return arr;
 }
 
+JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_getAudioDirection(JNIEnv *env, jobject thiz, jlong ptr) {
+	return (jint)linphone_call_params_get_audio_direction((LinphoneCallParams *)ptr);
+}
+
+JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_getVideoDirection(JNIEnv *env, jobject thiz, jlong ptr) {
+	return (jint)linphone_call_params_get_video_direction((LinphoneCallParams *)ptr);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_setAudioDirection(JNIEnv *env, jobject thiz, jlong ptr, jint jdir) {
+	linphone_call_params_set_audio_direction((LinphoneCallParams *)ptr, (LinphoneMediaDirection)jdir);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallParamsImpl_setVideoDirection(JNIEnv *env, jobject thiz, jlong ptr, jint jdir) {
+	linphone_call_params_set_video_direction((LinphoneCallParams *)ptr, (LinphoneMediaDirection)jdir);
+}
+
+
 extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_destroy(JNIEnv *env, jobject thiz, jlong lc){
 	return linphone_call_params_destroy((LinphoneCallParams*)lc);
 }
-extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createDefaultCallParams(JNIEnv *env, jobject thiz, jlong lc){
-	return (jlong) linphone_core_create_default_call_parameters((LinphoneCore*)lc);
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    createCallParams
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_linphone_core_LinphoneCoreImpl_createCallParams(JNIEnv *env, jobject jcore, jlong coreptr, jlong callptr){
+	return (jlong)linphone_core_create_call_params((LinphoneCore*)coreptr, (LinphoneCall*)callptr);
 }
 
 extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getRemoteParams(JNIEnv *env, jobject thiz, jlong lc){
@@ -3742,9 +5014,9 @@ extern "C" float Java_org_linphone_core_LinphoneCoreImpl_getPreferredFramerate(J
 }
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setPreferredVideoSizeByName(JNIEnv *env, jobject thiz, jlong lc, jstring jName) {
-	const char* cName = env->GetStringUTFChars(jName, NULL);
+	const char* cName = GetStringUTFChars(env, jName);
 	linphone_core_set_preferred_video_size_by_name((LinphoneCore *)lc, cName);
-	env->ReleaseStringUTFChars(jName, cName);
+	ReleaseStringUTFChars(env, jName, cName);
 }
 
 extern "C" jintArray Java_org_linphone_core_LinphoneCoreImpl_getPreferredVideoSize(JNIEnv *env, jobject thiz, jlong lc){
@@ -3851,9 +5123,9 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_getQuality
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_setQualityReportingCollector(JNIEnv *env, jobject thiz, jlong ptr, jstring jcollector) {
 	if (jcollector){
-		const char *collector=env->GetStringUTFChars(jcollector, NULL);
+		const char *collector = GetStringUTFChars(env, jcollector);
 		linphone_proxy_config_set_quality_reporting_collector((LinphoneProxyConfig *)ptr, collector);
-		env->ReleaseStringUTFChars(jcollector,collector);
+		ReleaseStringUTFChars(env, jcollector, collector);
 	}
 }
 
@@ -3864,9 +5136,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_getQual
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_setRealm(JNIEnv *env, jobject thiz, jlong ptr, jstring jrealm) {
 	if (jrealm){
-		const char *realm=env->GetStringUTFChars(jrealm, NULL);
+		const char *realm = GetStringUTFChars(env, jrealm);
 		linphone_proxy_config_set_realm((LinphoneProxyConfig *)ptr, realm);
-		env->ReleaseStringUTFChars(jrealm,realm);
+		ReleaseStringUTFChars(env, jrealm, realm);
 	}
 }
 
@@ -3877,15 +5149,31 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_getReal
 
 JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_isPhoneNumber(JNIEnv *env, jobject thiz, jlong ptr, jstring jusername) {
 	if(jusername){
-		const char *username=env->GetStringUTFChars(jusername, NULL);
+		const char *username = GetStringUTFChars(env, jusername);
 		bool_t res = linphone_proxy_config_is_phone_number((LinphoneProxyConfig *)ptr, username);
-		env->ReleaseStringUTFChars(jusername,username);
+		ReleaseStringUTFChars(env, jusername, username);
 		return (jboolean) res;
 	} else {
 		return JNI_FALSE;
 	}
 }
 
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_setCustomHeader(JNIEnv *env, jobject thiz, jlong prt, jstring jname, jstring jvalue) {
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = GetStringUTFChars(env, jvalue);
+	linphone_proxy_config_set_custom_header((LinphoneProxyConfig*) prt, name, value);
+	ReleaseStringUTFChars(env, jname, name);
+	ReleaseStringUTFChars(env, jvalue, value);
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_getCustomHeader(JNIEnv *env, jobject thiz, jlong ptr, jstring jname) {
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = linphone_proxy_config_get_custom_header((LinphoneProxyConfig *)ptr, name);
+	ReleaseStringUTFChars(env, jname, name);
+	return value ? env->NewStringUTF(value) : NULL;
+}
+
+
 extern "C" jint Java_org_linphone_core_LinphoneCallImpl_getDuration(JNIEnv*  env,jobject thiz,jlong ptr) {
 	return (jint)linphone_call_get_duration((LinphoneCall *) ptr);
 }
@@ -3898,6 +5186,10 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getSipDscp(JNIEnv* env,j
 	return linphone_core_get_sip_dscp((LinphoneCore*)ptr);
 }
 
+extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getGlobalState(JNIEnv* env,jobject thiz,jlong ptr){
+	return linphone_core_get_global_state((LinphoneCore*)ptr);
+}
+
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getSignalingTransportPort(JNIEnv* env,jobject thiz,jlong ptr, jint code) {
 	LCSipTransports tr;
 	linphone_core_get_sip_transports((LinphoneCore *) ptr, &tr);
@@ -3974,12 +5266,34 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getConferenceSize(JNIEnv
 	return (jint)linphone_core_get_conference_size((LinphoneCore *) pCore);
 }
 
+extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_createConference(JNIEnv *env, jobject thiz, jlong corePtr, jobject jparams) {
+	jclass params_class = env->FindClass("org/linphone/core/LinphoneConferenceParamsImpl");
+	jclass conference_class = env->FindClass("org/linphone/core/LinphoneConferenceImpl");
+	jfieldID params_native_ptr_attr = env->GetFieldID(params_class, "nativePtr", "J");
+	jmethodID conference_constructor = env->GetMethodID(conference_class, "<init>", "(J)V");
+	LinphoneConferenceParams *params = NULL;
+	LinphoneConference *conference;
+
+	if(jparams) params = (LinphoneConferenceParams *)env->GetLongField(jparams, params_native_ptr_attr);
+	conference = linphone_core_create_conference_with_params((LinphoneCore *)corePtr, params);
+	if(conference) return env->NewObject(conference_class, conference_constructor, (jlong)conference);
+	else return NULL;
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getConference(JNIEnv *env, jobject thiz, jlong pCore) {
+	jclass conference_class = env->FindClass("org/linphone/core/LinphoneConferenceImpl");
+	jmethodID conference_constructor = env->GetMethodID(conference_class, "<init>", "(J)V");
+	LinphoneConference *conf = linphone_core_get_conference((LinphoneCore *)pCore);
+	if(conf) return env->NewObject(conference_class, conference_constructor, (jlong)conf);
+	else return NULL;
+}
+
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startConferenceRecording(JNIEnv *env,jobject thiz,jlong pCore, jstring jpath){
 	int err=-1;
 	if (jpath){
-		const char *path=env->GetStringUTFChars(jpath, NULL);
+		const char *path = GetStringUTFChars(env, jpath);
 		err=linphone_core_start_conference_recording((LinphoneCore*)pCore,path);
-		env->ReleaseStringUTFChars(jpath,path);
+		ReleaseStringUTFChars(env, jpath, path);
 	}
 	return err;
 }
@@ -3993,17 +5307,17 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_terminateAllCalls(JNIEnv
 	linphone_core_terminate_all_calls((LinphoneCore *) pCore);
 }
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getCall(JNIEnv *env,jobject thiz,jlong pCore,jint position) {
-	LinphoneCall* lCall = (LinphoneCall*) ms_list_nth_data(linphone_core_get_calls((LinphoneCore *) pCore),position);
+	LinphoneCall* lCall = (LinphoneCall*) bctbx_list_nth_data(linphone_core_get_calls((LinphoneCore *) pCore),position);
 	return getCall(env,lCall);
 }
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getCallsNb(JNIEnv *env,jobject thiz,jlong pCore) {
-	return (jint)ms_list_size(linphone_core_get_calls((LinphoneCore *) pCore));
+	return (jint)bctbx_list_size(linphone_core_get_calls((LinphoneCore *) pCore));
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_transferCall(JNIEnv *env,jobject thiz,jlong pCore, jlong pCall, jstring jReferTo) {
-	const char* cReferTo=env->GetStringUTFChars(jReferTo, NULL);
+	const char* cReferTo = GetStringUTFChars(env, jReferTo);
 	jint err = linphone_core_transfer_call((LinphoneCore *) pCore, (LinphoneCall *) pCall, cReferTo);
-	env->ReleaseStringUTFChars(jReferTo, cReferTo);
+	ReleaseStringUTFChars(env, jReferTo, cReferTo);
 	return err;
 }
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_transferCallToAnother(JNIEnv *env,jobject thiz,jlong pCore, jlong pCall, jlong pDestCall) {
@@ -4016,18 +5330,18 @@ extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_startReferedCall(JNIE
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setZrtpSecretsCache(JNIEnv *env,jobject thiz,jlong pCore, jstring jFile) {
 	if (jFile) {
-		const char* cFile=env->GetStringUTFChars(jFile, NULL);
+		const char* cFile =GetStringUTFChars(env, jFile);
 		linphone_core_set_zrtp_secrets_file((LinphoneCore *) pCore,cFile);
-		env->ReleaseStringUTFChars(jFile, cFile);
+		ReleaseStringUTFChars(env, jFile, cFile);
 	} else {
 		linphone_core_set_zrtp_secrets_file((LinphoneCore *) pCore,NULL);
 	}
 }
 
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_findCallFromUri(JNIEnv *env,jobject thiz,jlong pCore, jstring jUri) {
-	const char* cUri=env->GetStringUTFChars(jUri, NULL);
+	const char* cUri = GetStringUTFChars(env, jUri);
 	const LinphoneCall *call=linphone_core_find_call_from_uri((const LinphoneCore *) pCore,cUri);
-	env->ReleaseStringUTFChars(jUri, cUri);
+	ReleaseStringUTFChars(env, jUri, cUri);
 	return (jobject) getCall(env,(LinphoneCall*)call);
 }
 
@@ -4108,6 +5422,14 @@ extern "C" void Java_org_linphone_core_LinphoneCallImpl_setAuthenticationTokenVe
 	linphone_call_set_authentication_token_verified(call, verified);
 }
 
+extern "C" jobject Java_org_linphone_core_LinphoneCallImpl_getConference(JNIEnv *env, jobject thiz, jlong ptr) {
+	jclass conference_class = env->FindClass("org/linphone/core/LinphoneConferenceImpl");
+	jmethodID conference_constructor = env->GetMethodID(conference_class, "<init>", "(J)V");
+	LinphoneConference *conf = linphone_call_get_conference((LinphoneCall *)ptr);
+	if(conf) return env->NewObject(conference_class, conference_constructor, (jlong)conf);
+	return NULL;
+}
+
 extern "C" jfloat Java_org_linphone_core_LinphoneCallImpl_getPlayVolume(JNIEnv* env, jobject thiz, jlong ptr) {
 	LinphoneCall *call = (LinphoneCall *) ptr;
 	return (jfloat)linphone_call_get_play_volume(call);
@@ -4142,37 +5464,25 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServerAndMirror
 	LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel;
 	if (!tunnel) return;
 
-	const char* cHost=env->GetStringUTFChars(jHost, NULL);
+	const char* cHost = GetStringUTFChars(env, jHost);
 	LinphoneTunnelConfig *tunnelconfig = linphone_tunnel_config_new();
 	linphone_tunnel_config_set_host(tunnelconfig, cHost);
 	linphone_tunnel_config_set_port(tunnelconfig, port);
 	linphone_tunnel_config_set_delay(tunnelconfig, delay);
 	linphone_tunnel_config_set_remote_udp_mirror_port(tunnelconfig, mirror);
 	linphone_tunnel_add_server(tunnel, tunnelconfig);
-	env->ReleaseStringUTFChars(jHost, cHost);
+	ReleaseStringUTFChars(env, jHost, cHost);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServer(JNIEnv *env, jobject thiz, jlong pCore, jobject config) {
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServer(JNIEnv *env, jobject thiz, jlong pCore, jlong tunnelconfigptr) {
 	LinphoneTunnel *tunnel = linphone_core_get_tunnel((LinphoneCore *)pCore);
 	if(tunnel != NULL) {
-		jclass TunnelConfigClass = env->FindClass("org/linphone/core/TunnelConfig");
-		jmethodID getHostMethod = env->GetMethodID(TunnelConfigClass, "getHost", "()Ljava/lang/String;");
-		jmethodID getPortMethod = env->GetMethodID(TunnelConfigClass, "getPort", "()I");
-		jmethodID getRemoteUdpMirrorPortMethod = env->GetMethodID(TunnelConfigClass, "getRemoteUdpMirrorPort", "()I");
-		jmethodID getDelayMethod = env->GetMethodID(TunnelConfigClass, "getDelay", "()I");
-		jstring hostString = (jstring)env->CallObjectMethod(config, getHostMethod);
-		const char *host = env->GetStringUTFChars(hostString, NULL);
-		if(host == NULL || strlen(host)==0) {
-			ms_error("LinphoneCore.tunnelAddServer(): no tunnel host defined");
+		LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig*) tunnelconfigptr;
+		if (cfg) {
+			linphone_tunnel_add_server(tunnel, cfg);
+		}else{
+			ms_error("Java TunnelConfig object has no associated C object");
 		}
-		LinphoneTunnelConfig *tunnelConfig = linphone_tunnel_config_new();
-		linphone_tunnel_config_set_host(tunnelConfig, host);
-		linphone_tunnel_config_set_port(tunnelConfig, env->CallIntMethod(config, getPortMethod));
-		linphone_tunnel_config_set_remote_udp_mirror_port(tunnelConfig, env->CallIntMethod(config, getRemoteUdpMirrorPortMethod));
-		linphone_tunnel_config_set_delay(tunnelConfig, env->CallIntMethod(config, getDelayMethod));
-		linphone_tunnel_add_server(tunnel, tunnelConfig);
-		env->ReleaseStringUTFChars(hostString, host);
-		env->DeleteLocalRef(TunnelConfigClass);
 	} else {
 		ms_error("LinphoneCore.tunnelAddServer(): tunnel feature is not enabled");
 	}
@@ -4180,31 +5490,22 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServer(JNIEnv *
 
 extern "C" jobjectArray Java_org_linphone_core_LinphoneCoreImpl_tunnelGetServers(JNIEnv *env, jobject thiz, jlong pCore) {
 	LinphoneTunnel *tunnel = linphone_core_get_tunnel((LinphoneCore *)pCore);
-	jclass TunnelConfigClass = env->FindClass("org/linphone/core/TunnelConfig");
-	jmethodID setHostMethod = env->GetMethodID(TunnelConfigClass, "setHost", "(Ljava/lang/String;)V");
-	jmethodID setPortMethod = env->GetMethodID(TunnelConfigClass, "setPort", "(I)V");
-	jmethodID setRemoteUdpMirrorPortMethod = env->GetMethodID(TunnelConfigClass, "setRemoteUdpMirrorPort", "(I)V");
-	jmethodID setDelayMethod = env->GetMethodID(TunnelConfigClass, "setDelay", "(I)V");
+	jclass tunnelConfigClass = env->FindClass("org/linphone/core/TunnelConfigImpl");
 	jobjectArray tunnelConfigArray = NULL;
 
 	if(tunnel != NULL) {
-		const MSList *servers = linphone_tunnel_get_servers(tunnel);
-		const MSList *it;
+		const bctbx_list_t *servers = linphone_tunnel_get_servers(tunnel);
+		const bctbx_list_t *it;
 		int i;
-		ms_message("servers=%p", (void *)servers);
-		ms_message("taille=%i", ms_list_size(servers));
-		tunnelConfigArray = env->NewObjectArray(ms_list_size(servers), TunnelConfigClass, NULL);
+
+		tunnelConfigArray = env->NewObjectArray(bctbx_list_size(servers), tunnelConfigClass, NULL);
 		for(it = servers, i=0; it != NULL; it = it->next, i++) {
-			const LinphoneTunnelConfig *conf = (const LinphoneTunnelConfig *)it->data;
-			jobject elt = env->AllocObject(TunnelConfigClass);
-			env->CallVoidMethod(elt, setHostMethod, env->NewStringUTF(linphone_tunnel_config_get_host(conf)));
-			env->CallVoidMethod(elt, setPortMethod, linphone_tunnel_config_get_port(conf));
-			env->CallVoidMethod(elt, setRemoteUdpMirrorPortMethod, linphone_tunnel_config_get_remote_udp_mirror_port(conf));
-			env->CallVoidMethod(elt, setDelayMethod, linphone_tunnel_config_get_delay(conf));
+			LinphoneTunnelConfig *conf =  (LinphoneTunnelConfig *)it->data;
+			jobject elt = getTunnelConfig(env, conf);
 			env->SetObjectArrayElement(tunnelConfigArray, i, elt);
-			env->DeleteLocalRef(TunnelConfigClass);
 		}
 	}
+	env->DeleteLocalRef(tunnelConfigClass);
 	return tunnelConfigArray;
 }
 
@@ -4213,13 +5514,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelSetHttpProxy(JNIEn
 
 	LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel;
 	if (!tunnel) return;
-	const char* cHost=(jHost!=NULL) ? env->GetStringUTFChars(jHost, NULL) : NULL;
-	const char* cUsername= (username!=NULL) ? env->GetStringUTFChars(username, NULL) : NULL;
-	const char* cPassword= (password!=NULL) ? env->GetStringUTFChars(password, NULL) : NULL;
+	const char* cHost = GetStringUTFChars(env, jHost);
+	const char* cUsername = GetStringUTFChars(env, username);
+	const char* cPassword = GetStringUTFChars(env, password);
 	linphone_tunnel_set_http_proxy(tunnel,cHost, port,cUsername,cPassword);
-	if (cHost) env->ReleaseStringUTFChars(jHost, cHost);
-	if (cUsername) env->ReleaseStringUTFChars(username, cUsername);
-	if (cPassword) env->ReleaseStringUTFChars(password, cPassword);
+	ReleaseStringUTFChars(env, jHost, cHost);
+	ReleaseStringUTFChars(env, username, cUsername);
+	ReleaseStringUTFChars(env, password, cPassword);
 }
 
 
@@ -4271,11 +5572,11 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_tunnelSipEnabled(JNI
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setUserAgent(JNIEnv *env,jobject thiz,jlong pCore, jstring name, jstring version){
-	const char* cname=env->GetStringUTFChars(name, NULL);
-	const char* cversion=env->GetStringUTFChars(version, NULL);
+	const char* cname = GetStringUTFChars(env, name);
+	const char* cversion = GetStringUTFChars(env, version);
 	linphone_core_set_user_agent((LinphoneCore *)pCore,cname,cversion);
-	env->ReleaseStringUTFChars(name, cname);
-	env->ReleaseStringUTFChars(version, cversion);
+	ReleaseStringUTFChars(env, name, cname);
+	ReleaseStringUTFChars(env, version, cversion);
 }
 
 extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isTunnelAvailable(JNIEnv *env,jobject thiz){
@@ -4300,13 +5601,14 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_getVideoAutoAcceptPo
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setStaticPicture(JNIEnv *env, jobject thiz, jlong lc, jstring path) {
-	const char *cpath = env->GetStringUTFChars(path, NULL);
+	const char *cpath = GetStringUTFChars(env, path);
 	linphone_core_set_static_picture((LinphoneCore *)lc, cpath);
-	env->ReleaseStringUTFChars(path, cpath);
+	ReleaseStringUTFChars(env, path, cpath);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setCpuCountNative(JNIEnv *env, jobject thiz, jint count) {
-	ms_set_cpu_count(count);
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setCpuCountNative(JNIEnv *env, jobject thiz, jlong coreptr, jint count) {
+	MSFactory *factory = linphone_core_get_ms_factory((LinphoneCore*)coreptr);
+	ms_factory_set_cpu_count(factory, count);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAudioJittcomp(JNIEnv *env, jobject thiz, jlong lc, jint value) {
@@ -4339,8 +5641,8 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAudioDscp(JNIEnv* env
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setAndroidPowerManager(JNIEnv *env, jclass cls, jobject pm) {
 #ifdef ANDROID
-	if(pm != NULL) bellesip_wake_lock_init(env, pm);
-	else bellesip_wake_lock_uninit(env);
+	if(pm != NULL) belle_sip_wake_lock_init(env, pm);
+	else belle_sip_wake_lock_uninit(env);
 #endif
 }
 
@@ -4427,6 +5729,34 @@ extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getUpnpExternalIpaddr
 	return jvalue;
 }
 
+static LinphoneContent *create_content_from_java_args(JNIEnv *env, LinphoneCore *lc, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding, jstring jname){
+	LinphoneContent *content = NULL;
+	if (jtype){
+		content = linphone_core_create_content(lc);
+		void *data = (void*)env->GetByteArrayElements(jdata,NULL);
+		const char *tmp;
+
+		linphone_content_set_type(content, tmp = GetStringUTFChars(env, jtype));
+		ReleaseStringUTFChars(env, jtype, tmp);
+
+		linphone_content_set_subtype(content, tmp = GetStringUTFChars(env, jsubtype));
+		ReleaseStringUTFChars(env, jsubtype, tmp);
+
+		if (jname){
+			linphone_content_set_name(content, tmp = GetStringUTFChars(env, jname));
+			ReleaseStringUTFChars(env, jname, tmp);
+		}
+
+		if (jencoding){
+			linphone_content_set_encoding(content, tmp = GetStringUTFChars(env, jencoding));
+			ReleaseStringUTFChars(env, jencoding, tmp);
+		}
+
+		linphone_content_set_buffer(content, data, env->GetArrayLength(jdata));
+		env->ReleaseByteArrayElements(jdata,(jbyte*)data,JNI_ABORT);
+	}
+	return content;
+}
 
 /*
  * Class:     org_linphone_core_LinphoneCoreImpl
@@ -4437,26 +5767,15 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_subscribe(JNIE
 		jstring jevname, jint expires, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
 	LinphoneCore *lc=(LinphoneCore*)coreptr;
 	LinphoneAddress *addr=(LinphoneAddress*)addrptr;
-	LinphoneContentPrivate content={0};
+	LinphoneContent * content = create_content_from_java_args(env, (LinphoneCore*)coreptr, jtype, jsubtype, jdata, jencoding, NULL);
 	LinphoneEvent *ev;
 	jobject jev=NULL;
-	const char *evname=env->GetStringUTFChars(jevname,NULL);
+	const char *evname = GetStringUTFChars(env, jevname);
 
-	if (jtype){
-		content.type=(char*)env->GetStringUTFChars(jtype,NULL);
-		content.subtype=(char*)env->GetStringUTFChars(jsubtype,NULL);
-		content.encoding=jencoding ? (char*)env->GetStringUTFChars(jencoding,NULL) : NULL;
-		content.data=(void*)env->GetByteArrayElements(jdata,NULL);
-		content.size=env->GetArrayLength(jdata);
-	}
-	ev=linphone_core_subscribe(lc,addr,evname,expires,content.type ? LINPHONE_CONTENT(&content) : NULL);
-	if (jtype){
-		env->ReleaseStringUTFChars(jtype,content.type);
-		env->ReleaseStringUTFChars(jsubtype,content.subtype);
-		if (jencoding) env->ReleaseStringUTFChars(jencoding,content.encoding);
-		env->ReleaseByteArrayElements(jdata,(jbyte*)content.data,JNI_ABORT);
-	}
-	env->ReleaseStringUTFChars(jevname,evname);
+
+	ev=linphone_core_subscribe(lc,addr,evname,expires, content);
+	if (content) linphone_content_unref(content);
+	ReleaseStringUTFChars(env, jevname, evname);
 	if (ev){
 		jev=getEvent(env,ev);
 	}
@@ -4472,26 +5791,14 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_publish(JNIEnv
 																		  jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
 	LinphoneCore *lc=(LinphoneCore*)coreptr;
 	LinphoneAddress *addr=(LinphoneAddress*)addrptr;
-	LinphoneContentPrivate content={0};
+	LinphoneContent * content = create_content_from_java_args(env, (LinphoneCore*)coreptr, jtype, jsubtype, jdata, jencoding, NULL);
 	LinphoneEvent *ev;
 	jobject jev=NULL;
-	const char *evname=env->GetStringUTFChars(jevname,NULL);
+	const char *evname = GetStringUTFChars(env, jevname);
 
-	if (jtype){
-		content.type=(char*)env->GetStringUTFChars(jtype,NULL);
-		content.subtype=(char*)env->GetStringUTFChars(jsubtype,NULL);
-		content.encoding=jencoding ? (char*)env->GetStringUTFChars(jencoding,NULL) : NULL;
-		content.data=(void*)env->GetByteArrayElements(jdata,NULL);
-		content.size=env->GetArrayLength(jdata);
-	}
-	ev=linphone_core_publish(lc,addr,evname,expires,content.type ? LINPHONE_CONTENT(&content) : NULL);
-	if (jtype){
-		env->ReleaseStringUTFChars(jtype,content.type);
-		env->ReleaseStringUTFChars(jsubtype,content.subtype);
-		if (jencoding) env->ReleaseStringUTFChars(jencoding,content.encoding);
-		env->ReleaseByteArrayElements(jdata,(jbyte*)content.data,JNI_ABORT);
-	}
-	env->ReleaseStringUTFChars(jevname,evname);
+	ev=linphone_core_publish(lc,addr,evname,expires, content);
+	if (content) linphone_content_unref(content);
+	ReleaseStringUTFChars(env, jevname, evname);
 	if (ev){
 		jev=getEvent(env,ev);
 	}
@@ -4500,9 +5807,16 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_publish(JNIEnv
 
 // LpConfig
 extern "C" jlong Java_org_linphone_core_LpConfigImpl_newLpConfigImpl(JNIEnv *env, jobject thiz, jstring file) {
-		const char *cfile = env->GetStringUTFChars(file, NULL);
-		LpConfig *lp = lp_config_new(cfile);
-	env->ReleaseStringUTFChars(file, cfile);
+	const char *cfile = GetStringUTFChars(env, file);
+	LpConfig *lp = lp_config_new(cfile);
+	ReleaseStringUTFChars(env, file, cfile);
+	return (jlong) lp;
+}
+
+extern "C" jlong Java_org_linphone_core_LpConfigImpl_newLpConfigImplFromBuffer(JNIEnv *env, jobject thiz, jstring buffer) {
+	const char *cbuffer = GetStringUTFChars(env, buffer);
+	LpConfig *lp = lp_config_new_from_buffer(cbuffer);
+	ReleaseStringUTFChars(env, buffer, cbuffer);
 	return (jlong) lp;
 }
 
@@ -4518,77 +5832,77 @@ extern "C" void Java_org_linphone_core_LpConfigImpl_delete(JNIEnv *env, jobject
 
 extern "C" void Java_org_linphone_core_LpConfigImpl_setInt(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jint value) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		lp_config_set_int((LpConfig *)lpc, csection, ckey, (int) value);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 }
 
 extern "C" jint Java_org_linphone_core_LpConfigImpl_getInt(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jint defaultValue) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		int returnValue = lp_config_get_int((LpConfig *)lpc, csection, ckey, (int) defaultValue);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 		return (jint) returnValue;
 }
 
 extern "C" void Java_org_linphone_core_LpConfigImpl_setFloat(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jfloat value) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		lp_config_set_float((LpConfig *)lpc, csection, ckey, (float) value);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 }
 
 extern "C" jfloat Java_org_linphone_core_LpConfigImpl_getFloat(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jfloat defaultValue) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		float returnValue = lp_config_get_float((LpConfig *)lpc, csection, ckey, (float) defaultValue);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 		return (jfloat) returnValue;
 }
 
 extern "C" void Java_org_linphone_core_LpConfigImpl_setBool(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jboolean value) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		lp_config_set_int((LpConfig *)lpc, csection, ckey, value ? 1 : 0);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 }
 
 extern "C" jboolean Java_org_linphone_core_LpConfigImpl_getBool(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jboolean defaultValue) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		int returnValue = lp_config_get_int((LpConfig *)lpc, csection, ckey, defaultValue ? 1 : 0);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 		return (jboolean) returnValue == 1;
 }
 
 extern "C" void Java_org_linphone_core_LpConfigImpl_setString(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jstring value) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
-		const char *cvalue = value ? env->GetStringUTFChars(value, NULL) : NULL;
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
+		const char *cvalue = GetStringUTFChars(env, value);
 		lp_config_set_string((LpConfig *)lpc, csection, ckey, cvalue);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
-		if (value) env->ReleaseStringUTFChars(value, cvalue);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
+		ReleaseStringUTFChars(env, value, cvalue);
 }
 
 extern "C" jstring Java_org_linphone_core_LpConfigImpl_getString(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jstring defaultValue) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
-		const char *cvalue = defaultValue ? env->GetStringUTFChars(defaultValue, NULL) : NULL;
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
+		const char *cvalue = GetStringUTFChars(env, defaultValue);
 
 		const char *returnValue = lp_config_get_string((LpConfig *)lpc, csection, ckey, cvalue);
 
@@ -4596,33 +5910,32 @@ extern "C" jstring Java_org_linphone_core_LpConfigImpl_getString(JNIEnv *env, jo
 		if (returnValue)
 			jreturnValue = env->NewStringUTF(returnValue);
 
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
-		if (cvalue)
-			env->ReleaseStringUTFChars(defaultValue, cvalue);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
+		ReleaseStringUTFChars(env, defaultValue, cvalue);
 
 		return jreturnValue;
 }
 extern "C" void Java_org_linphone_core_LpConfigImpl_setIntRange(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jint min, jint max) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		lp_config_set_range((LpConfig *)lpc, csection, ckey, min, max);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 }
 
 extern "C" jintArray Java_org_linphone_core_LpConfigImpl_getIntRange(JNIEnv *env, jobject thiz, jlong lpc,
 		jstring section, jstring key, jint defaultmin, jint defaultmax) {
-		const char *csection = env->GetStringUTFChars(section, NULL);
-		const char *ckey = env->GetStringUTFChars(key, NULL);
+		const char *csection = GetStringUTFChars(env, section);
+		const char *ckey = GetStringUTFChars(env, key);
 		int *values = (int*)calloc(2, sizeof(int));
 		lp_config_get_range((LpConfig *)lpc, csection, ckey, &values[0], &values[1], defaultmin, defaultmax);
 		jintArray returnValues = env->NewIntArray(2);
 		env->SetIntArrayRegion(returnValues, 0, 2, values);
 		ms_free(values);
-		env->ReleaseStringUTFChars(section, csection);
-		env->ReleaseStringUTFChars(key, ckey);
+		ReleaseStringUTFChars(env, section, csection);
+		ReleaseStringUTFChars(env, key, ckey);
 		return returnValues;
 }
 
@@ -4632,24 +5945,26 @@ static jobject create_java_linphone_content(JNIEnv *env, const LinphoneContent *
 	jstring jtype, jsubtype, jencoding, jname;
 	jbyteArray jdata = NULL;
 	jint jsize = 0;
-	const LinphoneContentPrivate *content = LINPHONE_CONTENT_PRIVATE(icontent);
+	const char *tmp;
+	void *data;
 
 	contentClass = (jclass)env->FindClass("org/linphone/core/LinphoneContentImpl");
 	ctor = env->GetMethodID(contentClass,"<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[BLjava/lang/String;I)V");
 
-	jtype = env->NewStringUTF(content->type);
-	jsubtype = env->NewStringUTF(content->subtype);
-	jencoding = content->encoding ? env->NewStringUTF(content->encoding) : NULL;
-	jname = content->name ? env->NewStringUTF(content->name) : NULL;
-	jsize = (jint) content->size;
+	jtype = env->NewStringUTF(linphone_content_get_type(icontent));
+	jsubtype = env->NewStringUTF(linphone_content_get_subtype(icontent));
+	jencoding = ((tmp = linphone_content_get_encoding(icontent))) ? env->NewStringUTF(tmp) : NULL;
+	jname = ((tmp = linphone_content_get_name(icontent))) ? env->NewStringUTF(tmp) : NULL;
+	jsize = (jint) linphone_content_get_size(icontent);
 
-	if (content->data){
-		jdata = env->NewByteArray(content->size);
-		env->SetByteArrayRegion(jdata, 0, content->size, (jbyte*)content->data);
+	data = (!linphone_content_is_multipart(icontent) ? linphone_content_get_buffer(icontent) : NULL);
+	if (data){
+		jdata = env->NewByteArray(linphone_content_get_size(icontent));
+		env->SetByteArrayRegion(jdata, 0, linphone_content_get_size(icontent), (jbyte*)data);
 	}
 
 	jobject jobj = env->NewObject(contentClass, ctor, jname, jtype, jsubtype, jdata, jencoding, jsize);
-	
+
 	env->DeleteLocalRef(contentClass);
 	env->DeleteLocalRef(jtype);
 	env->DeleteLocalRef(jsubtype);
@@ -4659,7 +5974,7 @@ static jobject create_java_linphone_content(JNIEnv *env, const LinphoneContent *
 	if (jname) {
 		env->DeleteLocalRef(jname);
 	}
-	
+
 	return jobj;
 }
 
@@ -4695,7 +6010,7 @@ static LinphoneBuffer* create_c_linphone_buffer_from_java_linphone_buffer(JNIEnv
 	bufferClass = (jclass)env->FindClass("org/linphone/core/LinphoneBufferImpl");
 	getSizeMethod = env->GetMethodID(bufferClass, "getSize", "()I");
 	getDataMethod = env->GetMethodID(bufferClass, "getContent", "()[B");
-	
+
 	jsize = env->CallIntMethod(jbuffer, getSizeMethod);
 	jdata = env->CallObjectMethod(jbuffer, getDataMethod);
 	jcontent = reinterpret_cast<jbyteArray>(jdata);
@@ -4705,7 +6020,7 @@ static LinphoneBuffer* create_c_linphone_buffer_from_java_linphone_buffer(JNIEnv
 		env->ReleaseByteArrayElements(jcontent, (jbyte*)content, JNI_ABORT);
 	}
 	env->DeleteLocalRef(bufferClass);
-	
+
 	return buffer;
 }
 
@@ -4728,16 +6043,21 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_getCont
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_setContent(JNIEnv *env, jobject jobj, jlong infoptr, jstring jtype, jstring jsubtype, jstring jdata){
-	LinphoneContentPrivate content={0};
+	LinphoneInfoMessage *infomsg = (LinphoneInfoMessage*) infoptr;
+	LinphoneContent * content = linphone_content_new();
+	const char *tmp;
 
-	content.type=(char*)env->GetStringUTFChars(jtype,NULL);
-	content.subtype=(char*)env->GetStringUTFChars(jsubtype,NULL);
-	content.data=(void*)env->GetStringUTFChars(jdata,NULL);
-	content.size=strlen((char*)content.data);
-	linphone_info_message_set_content((LinphoneInfoMessage*)infoptr,LINPHONE_CONTENT(&content));
-	env->ReleaseStringUTFChars(jtype,content.type);
-	env->ReleaseStringUTFChars(jsubtype,content.subtype);
-	env->ReleaseStringUTFChars(jdata,(char*)content.data);
+	linphone_content_set_type(content, tmp = GetStringUTFChars(env, jtype));
+	ReleaseStringUTFChars(env, jtype, tmp);
+
+	linphone_content_set_type(content, tmp = GetStringUTFChars(env, jsubtype));
+	ReleaseStringUTFChars(env, jsubtype, tmp);
+
+	linphone_content_set_string_buffer(content, tmp = GetStringUTFChars(env, jdata));
+	ReleaseStringUTFChars(env, jdata, tmp);
+
+	linphone_info_message_set_content(infomsg, content);
+	linphone_content_unref(content);
 }
 
 /*
@@ -4746,12 +6066,11 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_setContent
  * Signature: (JLjava/lang/String;Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_addHeader(JNIEnv *env, jobject jobj, jlong infoptr, jstring jname, jstring jvalue){
-	const char *name=NULL,*value=NULL;
-	name=env->GetStringUTFChars(jname,NULL);
-	value=env->GetStringUTFChars(jvalue,NULL);
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = GetStringUTFChars(env, jvalue);
 	linphone_info_message_add_header((LinphoneInfoMessage*)infoptr,name,value);
-	env->ReleaseStringUTFChars(jname,name);
-	env->ReleaseStringUTFChars(jvalue,value);
+	ReleaseStringUTFChars(env, jname, name);
+	ReleaseStringUTFChars(env, jvalue, value);
 }
 
 /*
@@ -4760,9 +6079,9 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_addHeader(
  * Signature: (JLjava/lang/String;)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_getHeader(JNIEnv *env, jobject jobj, jlong infoptr, jstring jname){
-	const char *name=env->GetStringUTFChars(jname,NULL);
+	const char *name = GetStringUTFChars(env, jname);
 	const char *ret=linphone_info_message_get_header((LinphoneInfoMessage*)infoptr,name);
-	env->ReleaseStringUTFChars(jname,name);
+	ReleaseStringUTFChars(env, jname, name);
 	return ret ? env->NewStringUTF(ret) : NULL;
 }
 
@@ -4775,27 +6094,10 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneInfoMessageImpl_delete(JNI
 	linphone_info_message_destroy((LinphoneInfoMessage*)infoptr);
 }
 
-JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreFactoryImpl__1setLogHandler(JNIEnv *env, jobject jfactory, jobject jhandler){
-	static int init_done=FALSE;
-
-	if (!init_done){
-		handler_class=(jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneLogHandler"));
-		loghandler_id=env->GetMethodID(handler_class,"log", "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V");
-		if (loghandler_id==NULL) ms_fatal("log method not found");
-		init_done=TRUE;
-	}
-	if (handler_obj) {
-		env->DeleteGlobalRef(handler_obj);
-		handler_obj=NULL;
-	}
-	if (jhandler){
-		handler_obj=env->NewGlobalRef(jhandler);
-	}
-}
-
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneEventImpl_getCore(JNIEnv *env, jobject jobj, jlong evptr){
 	LinphoneCore *lc=linphone_event_get_core((LinphoneEvent*)evptr);
-	jobject core = (jobject)linphone_core_get_user_data(lc);
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	jobject core = ljb->getCore();
 	return core;
 }
 
@@ -4836,25 +6138,15 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_denySubscription
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_notify(JNIEnv *env, jobject jobj, jlong evptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
-	LinphoneContentPrivate content={0};
+	LinphoneContent * content = create_content_from_java_args(env, linphone_event_get_core((LinphoneEvent *)evptr),
+						jtype, jsubtype, jdata, jencoding, NULL);
 	LinphoneEvent *ev=(LinphoneEvent*)evptr;
 	jint err;
 
-	if (jtype){
-		content.type=(char*)env->GetStringUTFChars(jtype,NULL);
-		content.subtype=(char*)env->GetStringUTFChars(jsubtype,NULL);
-		content.encoding=jencoding ? (char*)env->GetStringUTFChars(jsubtype,NULL) : NULL;
-		content.data=(void*)env->GetByteArrayElements(jdata,NULL);
-		content.size=env->GetArrayLength(jdata);
-	}
+	err=linphone_event_notify(ev, content);
 
-	err=linphone_event_notify(ev,content.type ? LINPHONE_CONTENT(&content) : NULL);
-
-	if (jtype){
-		env->ReleaseStringUTFChars(jtype,content.type);
-		env->ReleaseStringUTFChars(jsubtype,content.subtype);
-		if (jencoding) env->ReleaseStringUTFChars(jencoding,content.encoding);
-		env->ReleaseByteArrayElements(jdata,(jbyte*)content.data,JNI_ABORT);
+	if (content){
+		linphone_content_unref(content);
 	}
 	return err;
 }
@@ -4865,26 +6157,14 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_notify(JNIEnv *e
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updateSubscribe(JNIEnv *env, jobject jobj, jlong evptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
-	LinphoneContentPrivate content={0};
+	LinphoneContent * content = create_content_from_java_args(env, linphone_event_get_core((LinphoneEvent *)evptr),
+						jtype, jsubtype, jdata, jencoding, NULL);
 	LinphoneEvent *ev=(LinphoneEvent*)evptr;
 	jint err;
 
-	if (jtype){
-		content.type=(char*)env->GetStringUTFChars(jtype,NULL);
-		content.subtype=(char*)env->GetStringUTFChars(jsubtype,NULL);
-		content.encoding=jencoding ? (char*)env->GetStringUTFChars(jsubtype,NULL) : NULL;
-		content.data=(void*)env->GetByteArrayElements(jdata,NULL);
-		content.size=env->GetArrayLength(jdata);
-	}
+	err=linphone_event_update_subscribe(ev, content);
 
-	err=linphone_event_update_subscribe(ev,content.type ? LINPHONE_CONTENT(&content) : NULL);
-
-	if (jtype){
-		env->ReleaseStringUTFChars(jtype,content.type);
-		env->ReleaseStringUTFChars(jsubtype,content.subtype);
-		if (jencoding) env->ReleaseStringUTFChars(jencoding,content.encoding);
-		env->ReleaseByteArrayElements(jdata,(jbyte*)content.data,JNI_ABORT);
-	}
+	if (content) linphone_content_unref(content);
 	return err;
 }
 
@@ -4894,26 +6174,14 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updateSubscribe(
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneEventImpl_updatePublish(JNIEnv *env, jobject jobj, jlong evptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding){
-	LinphoneContentPrivate content={0};
+	LinphoneContent * content = create_content_from_java_args(env, linphone_event_get_core((LinphoneEvent *)evptr),
+						jtype, jsubtype, jdata, jencoding, NULL);
 	LinphoneEvent *ev=(LinphoneEvent*)evptr;
 	jint err;
 
-	if (jtype){
-		content.type=(char*)env->GetStringUTFChars(jtype,NULL);
-		content.subtype=(char*)env->GetStringUTFChars(jsubtype,NULL);
-		content.encoding=jencoding ? (char*)env->GetStringUTFChars(jsubtype,NULL) : NULL;
-		content.data=(void*)env->GetByteArrayElements(jdata,NULL);
-		content.size=env->GetArrayLength(jdata);
-	}
+	err=linphone_event_update_publish(ev, content);
 
-	err=linphone_event_update_publish(ev,content.type ? LINPHONE_CONTENT(&content) : NULL);
-
-	if (jtype){
-		env->ReleaseStringUTFChars(jtype,content.type);
-		env->ReleaseStringUTFChars(jsubtype,content.subtype);
-		if (jencoding) env->ReleaseStringUTFChars(jencoding,content.encoding);
-		env->ReleaseByteArrayElements(jdata,(jbyte*)content.data,JNI_ABORT);
-	}
+	if (content) linphone_content_unref(content);
 	return err;
 }
 
@@ -4968,32 +6236,22 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createSubscrib
 	LinphoneAddress *addr = (LinphoneAddress*) jaddr;
 	LinphoneEvent *event;
 	jobject jevent = NULL;
-	const char *event_name = env->GetStringUTFChars(jeventname, NULL);
+	const char *event_name = GetStringUTFChars(env, jeventname);
 
 	event = linphone_core_create_subscribe(lc, addr, event_name, expires);
-	env->ReleaseStringUTFChars(jeventname, event_name);
+	ReleaseStringUTFChars(env, jeventname, event_name);
 	if (event) {
 		jevent = getEvent(env, event);
 	}
 	return jevent;
 }
 
-JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendSubscribe(JNIEnv *env, jobject thiz, jlong jevent, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding) {
-	LinphoneContentPrivate content = {0};
-	if (jtype) {
-		content.type = (char*) env->GetStringUTFChars(jtype, NULL);
-		content.subtype = (char*) env->GetStringUTFChars(jsubtype, NULL);
-		content.encoding = jencoding ? (char*) env->GetStringUTFChars(jencoding, NULL) : NULL;
-		content.data = (void*) env->GetByteArrayElements(jdata, NULL);
-		content.size = env->GetArrayLength(jdata);
-	}
-	linphone_event_send_subscribe((LinphoneEvent*) jevent, content.type ? LINPHONE_CONTENT(&content) : NULL);
-	if (jtype) {
-		env->ReleaseStringUTFChars(jtype, content.type);
-		env->ReleaseStringUTFChars(jsubtype, content.subtype);
-		if (jencoding) env->ReleaseStringUTFChars(jencoding, content.encoding);
-		env->ReleaseByteArrayElements(jdata, (jbyte*) content.data, JNI_ABORT);
-	}
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendSubscribe(JNIEnv *env, jobject thiz, jlong eventptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding) {
+	LinphoneContent *content = create_content_from_java_args(env, linphone_event_get_core((LinphoneEvent*)eventptr),
+							jtype, jsubtype, jdata, jencoding, NULL);
+
+	linphone_event_send_subscribe((LinphoneEvent*) eventptr, content);
+	if (content) linphone_content_unref(content);
 }
 
 JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createPublish(JNIEnv *env, jobject thiz, jlong jcore, jlong jaddr, jstring jeventname, jint expires) {
@@ -5001,47 +6259,36 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneCoreImpl_createPublish(
 	LinphoneAddress *addr = (LinphoneAddress*) jaddr;
 	LinphoneEvent *event;
 	jobject jevent = NULL;
-	const char *event_name = env->GetStringUTFChars(jeventname, NULL);
+	const char *event_name = GetStringUTFChars(env, jeventname);
 
 	event = linphone_core_create_publish(lc, addr, event_name, expires);
-	env->ReleaseStringUTFChars(jeventname, event_name);
+	ReleaseStringUTFChars(env, jeventname, event_name);
 	if (event) {
 		jevent = getEvent(env, event);
 	}
 	return jevent;
 }
 
-JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendPublish(JNIEnv *env, jobject thiz, jlong jevent, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding) {
-	LinphoneContentPrivate content = {0};
-	if (jtype) {
-		content.type = (char*) env->GetStringUTFChars(jtype, NULL);
-		content.subtype = (char*) env->GetStringUTFChars(jsubtype, NULL);
-		content.encoding = jencoding ? (char*) env->GetStringUTFChars(jencoding, NULL) : NULL;
-		content.data = (void*) env->GetByteArrayElements(jdata, NULL);
-		content.size = env->GetArrayLength(jdata);
-	}
-	linphone_event_send_publish((LinphoneEvent*) jevent, content.type ? LINPHONE_CONTENT(&content) : NULL);
-	if (jtype) {
-		env->ReleaseStringUTFChars(jtype, content.type);
-		env->ReleaseStringUTFChars(jsubtype, content.subtype);
-		if (jencoding) env->ReleaseStringUTFChars(jencoding, content.encoding);
-		env->ReleaseByteArrayElements(jdata, (jbyte*) content.data, JNI_ABORT);
-	}
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_sendPublish(JNIEnv *env, jobject thiz, jlong eventptr, jstring jtype, jstring jsubtype, jbyteArray jdata, jstring jencoding) {
+	LinphoneContent *content = create_content_from_java_args(env, linphone_event_get_core((LinphoneEvent*)eventptr),
+							jtype, jsubtype, jdata, jencoding, NULL);
+	linphone_event_send_publish((LinphoneEvent*) eventptr, content);
+	if (content) linphone_content_unref(content);
 }
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneEventImpl_addCustomHeader(JNIEnv *env, jobject thiz, jlong jevent, jstring jname, jstring jvalue) {
-	const char *name = jname ? env->GetStringUTFChars(jname, NULL) : NULL;
-	const char *value = jvalue ? env->GetStringUTFChars(jvalue, NULL) : NULL;
+	const char *name = GetStringUTFChars(env, jname);
+	const char *value = GetStringUTFChars(env, jvalue);
 	linphone_event_add_custom_header((LinphoneEvent*) jevent, name, value);
-	if (jname) env->ReleaseStringUTFChars(jname, name);
-	if (jvalue) env->ReleaseStringUTFChars(jvalue, value);
+	ReleaseStringUTFChars(env, jname, name);
+	ReleaseStringUTFChars(env, jvalue, value);
 }
 
 JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneEventImpl_getCustomHeader(JNIEnv *env, jobject thiz, jlong jevent, jstring jname) {
-	const char *name = jname ? env->GetStringUTFChars(jname, NULL) : NULL;
+	const char *name = GetStringUTFChars(env, jname);
 	const char *header = linphone_event_get_custom_header((LinphoneEvent*) jevent, name);
 	jstring jheader = header ? env->NewStringUTF(header) : NULL;
-	if (jname) env->ReleaseStringUTFChars(jname, name);
+	ReleaseStringUTFChars(env, jname, name);
 	return jheader;
 }
 
@@ -5073,10 +6320,10 @@ JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_newPresenceMode
  */
 JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_newPresenceModelImpl__ILjava_lang_String_2(JNIEnv *env, jobject jobj, jint type, jstring description) {
 	LinphonePresenceModel *model;
-	const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
+	const char *cdescription = GetStringUTFChars(env, description);
 	model = linphone_presence_model_new_with_activity((LinphonePresenceActivityType)type, cdescription);
 	model = linphone_presence_model_ref(model);
-	if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
+	ReleaseStringUTFChars(env, description, cdescription);
 	return (jlong)model;
 }
 
@@ -5088,14 +6335,14 @@ JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_newPresenceMode
 JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceModelImpl_newPresenceModelImpl__ILjava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(
 		JNIEnv *env, jobject jobj, jint type, jstring description, jstring note, jstring lang) {
 	LinphonePresenceModel *model;
-	const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
-	const char *cnote = note ? env->GetStringUTFChars(note, NULL) : NULL;
-	const char *clang = lang ? env->GetStringUTFChars(lang, NULL) : NULL;
+	const char *cdescription = GetStringUTFChars(env, description);
+	const char *cnote =GetStringUTFChars(env, note);
+	const char *clang = GetStringUTFChars(env, lang);
 	model = linphone_presence_model_new_with_activity_and_note((LinphonePresenceActivityType)type, cdescription, cnote, clang);
 	model = linphone_presence_model_ref(model);
-	if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
-	if (cnote) env->ReleaseStringUTFChars(note, cnote);
-	if (clang) env->ReleaseStringUTFChars(lang, clang);
+	ReleaseStringUTFChars(env, description, cdescription);
+	ReleaseStringUTFChars(env, note, cnote);
+	ReleaseStringUTFChars(env, lang, clang);
 	return (jlong)model;
 }
 
@@ -5160,9 +6407,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PresenceModelImpl_getContact(JN
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_PresenceModelImpl_setContact(JNIEnv *env, jobject jobj, jlong ptr, jstring contact) {
 	LinphonePresenceModel *model = (LinphonePresenceModel *)ptr;
-	const char *ccontact = contact ? env->GetStringUTFChars(contact, NULL) : NULL;
+	const char *ccontact = GetStringUTFChars(env, contact);
 	linphone_presence_model_set_contact(model, ccontact);
-	if (ccontact) env->ReleaseStringUTFChars(contact, ccontact);
+	ReleaseStringUTFChars(env, contact, ccontact);
 }
 
 /*
@@ -5184,9 +6431,9 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_PresenceModelImpl_getActivity(J
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceModelImpl_setActivity(JNIEnv *env, jobject jobj, jlong ptr, jint acttype, jstring description) {
 	LinphonePresenceModel *model = (LinphonePresenceModel *)ptr;
-	const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
+	const char *cdescription = GetStringUTFChars(env, description);
 	jint res = (jint)linphone_presence_model_set_activity(model, (LinphonePresenceActivityType)acttype, cdescription);
-	if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
+	ReleaseStringUTFChars(env, description, cdescription);
 	return res;
 }
 
@@ -5238,9 +6485,9 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceModelImpl_clearActivities(
  */
 JNIEXPORT jobject JNICALL Java_org_linphone_core_PresenceModelImpl_getNote(JNIEnv *env , jobject jobj, jlong ptr, jstring lang) {
 	LinphonePresenceModel *model = (LinphonePresenceModel *)ptr;
-	const char *clang = lang ? env->GetStringUTFChars(lang, NULL) : NULL;
+	const char *clang = GetStringUTFChars(env, lang);
 	LinphonePresenceNote *note = linphone_presence_model_get_note(model, clang);
-	if (clang) env->ReleaseStringUTFChars(lang, clang);
+	ReleaseStringUTFChars(env, lang, clang);
 	if (note == NULL) return NULL;
 	RETURN_USER_DATA_OBJECT("PresenceNoteImpl", linphone_presence_note, note)
 }
@@ -5252,11 +6499,11 @@ JNIEXPORT jobject JNICALL Java_org_linphone_core_PresenceModelImpl_getNote(JNIEn
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceModelImpl_addNote(JNIEnv *env, jobject jobj, jlong ptr, jstring description, jstring lang) {
 	LinphonePresenceModel *model = (LinphonePresenceModel *)ptr;
-	const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
-	const char *clang = lang ? env->GetStringUTFChars(lang, NULL) : NULL;
+	const char *cdescription = GetStringUTFChars(env, description);
+	const char *clang = GetStringUTFChars(env, lang);
 	jint res = (jint)linphone_presence_model_add_note(model, cdescription, clang);
-	if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
-	if (clang) env->ReleaseStringUTFChars(lang, clang);
+	ReleaseStringUTFChars(env, description, cdescription);
+	ReleaseStringUTFChars(env, lang, clang);
 	return res;
 }
 
@@ -5359,10 +6606,10 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceModelImpl_clearPersons(JNI
  */
 JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceActivityImpl_newPresenceActivityImpl(JNIEnv *env, jobject jobj, jint type, jstring description) {
 	LinphonePresenceActivity *activity;
-	const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
+	const char *cdescription = GetStringUTFChars(env, description);
 	activity = linphone_presence_activity_new((LinphonePresenceActivityType)type, cdescription);
 	activity = linphone_presence_activity_ref(activity);
-	if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
+	ReleaseStringUTFChars(env, description, cdescription);
 	return (jlong)activity;
 }
 
@@ -5427,9 +6674,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PresenceActivityImpl_getDescrip
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceActivityImpl_setDescription(JNIEnv *env, jobject jobj, jlong ptr, jstring description) {
 	LinphonePresenceActivity *activity = (LinphonePresenceActivity *)ptr;
-	const char *cdescription = description ? env->GetStringUTFChars(description, NULL) : NULL;
+	const char *cdescription = GetStringUTFChars(env, description);
 	linphone_presence_activity_set_description(activity, cdescription);
-	if (cdescription) env->ReleaseStringUTFChars(description, cdescription);
+	ReleaseStringUTFChars(env, description, cdescription);
 	return (jint)0;
 }
 
@@ -5440,12 +6687,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceActivityImpl_setDescriptio
  */
 JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceServiceImpl_newPresenceServiceImpl(JNIEnv *env, jobject jobj, jstring id, jint basic_status, jstring contact) {
 	LinphonePresenceService *service;
-	const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
-	const char *ccontact = contact ? env->GetStringUTFChars(contact, NULL) : NULL;
+	const char *cid = GetStringUTFChars(env, id);
+	const char *ccontact = GetStringUTFChars(env, contact);
 	service = linphone_presence_service_new(cid, (LinphonePresenceBasicStatus)basic_status, ccontact);
 	service = linphone_presence_service_ref(service);
-	if (cid) env->ReleaseStringUTFChars(id, cid);
-	if (ccontact) env->ReleaseStringUTFChars(contact, ccontact);
+	ReleaseStringUTFChars(env, id, cid);
+	ReleaseStringUTFChars(env, contact, ccontact);
 	return (jlong)service;
 }
 
@@ -5479,9 +6726,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PresenceServiceImpl_getId(JNIEn
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_setId(JNIEnv *env, jobject jobj, jlong ptr, jstring id) {
 	LinphonePresenceService *service = (LinphonePresenceService *)ptr;
-	const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
+	const char *cid = GetStringUTFChars(env, id);
 	linphone_presence_service_set_id(service, cid);
-	if (cid) env->ReleaseStringUTFChars(id, cid);
+	ReleaseStringUTFChars(env, id, cid);
 	return (jint)0;
 }
 
@@ -5525,9 +6772,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PresenceServiceImpl_getContact(
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_setContact(JNIEnv *env, jobject jobj, jlong ptr, jstring contact) {
 	LinphonePresenceService *service = (LinphonePresenceService *)ptr;
-	const char *ccontact = contact ? env->GetStringUTFChars(contact, NULL) : NULL;
+	const char *ccontact = GetStringUTFChars(env, contact);
 	linphone_presence_service_set_contact(service, ccontact);
-	if (ccontact) env->ReleaseStringUTFChars(contact, ccontact);
+	ReleaseStringUTFChars(env, contact, ccontact);
 	return (jint)0;
 }
 
@@ -5579,10 +6826,10 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceServiceImpl_clearNotes(JNI
  */
 JNIEXPORT jlong JNICALL Java_org_linphone_core_PresencePersonImpl_newPresencePersonImpl(JNIEnv *env, jobject jobj, jstring id) {
 	LinphonePresencePerson *person;
-	const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
+	const char *cid = GetStringUTFChars(env, id);
 	person = linphone_presence_person_new(cid);
 	person = linphone_presence_person_ref(person);
-	if (cid) env->ReleaseStringUTFChars(id, cid);
+	ReleaseStringUTFChars(env, id, cid);
 	return (jlong)person;
 }
 
@@ -5616,9 +6863,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PresencePersonImpl_getId(JNIEnv
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresencePersonImpl_setId(JNIEnv *env, jobject jobj, jlong ptr, jstring id) {
 	LinphonePresencePerson *person = (LinphonePresencePerson *)ptr;
-	const char *cid = id ? env->GetStringUTFChars(id, NULL) : NULL;
+	const char *cid = GetStringUTFChars(env, id);
 	linphone_presence_person_set_id(person, cid);
-	if (cid) env->ReleaseStringUTFChars(id, cid);
+	ReleaseStringUTFChars(env, id, cid);
 	return (jint)0;
 }
 
@@ -5752,12 +6999,12 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresencePersonImpl_clearActivitesN
  */
 JNIEXPORT jlong JNICALL Java_org_linphone_core_PresenceNoteImpl_newPresenceNoteImpl(JNIEnv *env, jobject jobj, jstring content, jstring lang) {
 	LinphonePresenceNote *note;
-	const char *ccontent = content ? env->GetStringUTFChars(content, NULL) : NULL;
-	const char *clang = lang ? env->GetStringUTFChars(lang, NULL) : NULL;
+	const char *ccontent = GetStringUTFChars(env, content);
+	const char *clang = GetStringUTFChars(env, lang);
 	note = linphone_presence_note_new(ccontent, clang);
 	note = linphone_presence_note_ref(note);
-	if (clang) env->ReleaseStringUTFChars(lang, clang);
-	if (ccontent) env->ReleaseStringUTFChars(content, ccontent);
+	ReleaseStringUTFChars(env, lang, clang);
+	ReleaseStringUTFChars(env, content, ccontent);
 	return (jlong)note;
 }
 
@@ -5789,9 +7036,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PresenceNoteImpl_getContent(JNI
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceNoteImpl_setContent(JNIEnv *env, jobject jobj, jlong ptr, jstring content) {
 	LinphonePresenceNote *note = (LinphonePresenceNote *)ptr;
-	const char *ccontent = content ? env->GetStringUTFChars(content, NULL) : NULL;
+	const char *ccontent = GetStringUTFChars(env, content);
 	linphone_presence_note_set_content(note, ccontent);
-	if (ccontent) env->ReleaseStringUTFChars(content, ccontent);
+	ReleaseStringUTFChars(env, content, ccontent);
 	return (jint)0;
 }
 
@@ -5813,9 +7060,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PresenceNoteImpl_getLang(JNIEnv
  */
 JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceNoteImpl_setLang(JNIEnv *env, jobject jobj, jlong ptr, jstring lang) {
 	LinphonePresenceNote *note = (LinphonePresenceNote *)ptr;
-	const char *clang = lang ? env->GetStringUTFChars(lang, NULL) : NULL;
+	const char *clang = GetStringUTFChars(env, lang);
 	linphone_presence_note_set_lang(note, clang);
-	if (clang) env->ReleaseStringUTFChars(lang, clang);
+	ReleaseStringUTFChars(env, lang, clang);
 	return (jint)0;
 }
 
@@ -5826,9 +7073,9 @@ JNIEXPORT jint JNICALL Java_org_linphone_core_PresenceNoteImpl_setLang(JNIEnv *e
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_PayloadTypeImpl_setRecvFmtp(JNIEnv *env, jobject jobj, jlong ptr, jstring jfmtp){
 	PayloadType *pt=(PayloadType *)ptr;
-	const char *fmtp=jfmtp ? env->GetStringUTFChars(jfmtp,NULL) : NULL;
+	const char *fmtp = GetStringUTFChars(env, jfmtp);
 	payload_type_set_recv_fmtp(pt,fmtp);
-	if (fmtp) env->ReleaseStringUTFChars(jfmtp,fmtp);
+	ReleaseStringUTFChars(env, jfmtp, fmtp);
 }
 
 /*
@@ -5849,9 +7096,9 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PayloadTypeImpl_getRecvFmtp(JNI
  */
 JNIEXPORT void JNICALL Java_org_linphone_core_PayloadTypeImpl_setSendFmtp(JNIEnv *env, jobject jobj, jlong ptr , jstring jfmtp){
 	PayloadType *pt=(PayloadType *)ptr;
-	const char *fmtp=jfmtp ? env->GetStringUTFChars(jfmtp,NULL) : NULL;
+	const char *fmtp = GetStringUTFChars(env, jfmtp);
 	payload_type_set_send_fmtp(pt,fmtp);
-	if (fmtp) env->ReleaseStringUTFChars(jfmtp,fmtp);
+	ReleaseStringUTFChars(env, jfmtp, fmtp);
 }
 
 /*
@@ -5963,14 +7210,17 @@ static void _eof_callback(LinphonePlayer *player, void *user_data) {
 extern "C" jint Java_org_linphone_core_LinphonePlayerImpl_open(JNIEnv *env, jobject jPlayer, jlong ptr, jstring filename, jobject listener) {
 	LinphonePlayerData *data = NULL;
 	LinphonePlayerEofCallback cb = NULL;
+	const char *cfilename = GetStringUTFChars(env, filename);
 	if(listener) {
 		data = new LinphonePlayerData(env, listener, jPlayer);
 		cb = _eof_callback;
 	}
-	if(linphone_player_open((LinphonePlayer *)ptr, env->GetStringUTFChars(filename, NULL), cb, data) == -1) {
+	if(linphone_player_open((LinphonePlayer *)ptr, cfilename, cb, data) == -1) {
 		if(data) delete data;
+		ReleaseStringUTFChars(env, filename, cfilename);
 		return -1;
 	}
+	ReleaseStringUTFChars(env, filename, cfilename);
 	return 0;
 }
 
@@ -6043,10 +7293,10 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createLocalPlayer(JNIEn
  */
 extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticastAddr
   (JNIEnv * env , jobject, jlong ptr, jstring value) {
-	const char *char_value = value ? env->GetStringUTFChars(value, NULL) : NULL;
+	const char *char_value = GetStringUTFChars(env, value);
 	LinphoneCore *lc=(LinphoneCore*)ptr;
 	int result = linphone_core_set_audio_multicast_addr(lc,char_value);
-	if (char_value) env->ReleaseStringUTFChars(value, char_value);
+	ReleaseStringUTFChars(env, value, char_value);
 	return result;
 }
 
@@ -6057,10 +7307,10 @@ extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setAudioMulticas
  */
 extern "C" jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoMulticastAddr
   (JNIEnv * env, jobject, jlong ptr, jstring value) {
-	const char *char_value = value ? env->GetStringUTFChars(value, NULL) : NULL;
+	const char *char_value = GetStringUTFChars(env, value);
 	LinphoneCore *lc=(LinphoneCore*)ptr;
 	int result = linphone_core_set_video_multicast_addr(lc,char_value);
-	if (char_value) env->ReleaseStringUTFChars(value, char_value);
+	ReleaseStringUTFChars(env, value, char_value);
 	return result;
 }
 
@@ -6166,6 +7416,25 @@ extern "C" jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_videoMultica
 	return linphone_core_video_multicast_enabled((LinphoneCore*)ptr);
 }
 
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setDnsServers(JNIEnv *env, jobject thiz, jlong lc, jobjectArray servers){
+	bctbx_list_t *l = NULL;
+
+	if (servers != NULL){
+		int count = env->GetArrayLength(servers);
+
+		for (int i=0; i < count; i++) {
+			jstring server = (jstring) env->GetObjectArrayElement(servers, i);
+			const char *str = GetStringUTFChars(env, server);
+			if (str){
+				l = bctbx_list_append(l, ms_strdup(str));
+				ReleaseStringUTFChars(env, server, str);
+			}
+		}
+	}
+	linphone_core_set_dns_servers((LinphoneCore*)lc, l);
+	bctbx_list_free_with_data(l, ms_free);
+}
+
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_enableDnsSrv(JNIEnv *env, jobject thiz, jlong lc, jboolean yesno) {
 	linphone_core_enable_dns_srv((LinphoneCore *)lc, yesno);
 }
@@ -6175,12 +7444,1077 @@ JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneCoreImpl_dnsSrvEnabled
 }
 
 JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setVideoPreset(JNIEnv *env, jobject thiz, jlong lc, jstring preset) {
-	const char *char_preset = preset ? env->GetStringUTFChars(preset, NULL) : NULL;
+	const char *char_preset = GetStringUTFChars(env, preset);
 	linphone_core_set_video_preset((LinphoneCore *)lc, char_preset);
-	if (char_preset) env->ReleaseStringUTFChars(preset, char_preset);
+	ReleaseStringUTFChars(env, preset, char_preset);
 }
 
 JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getVideoPreset(JNIEnv *env, jobject thiz, jlong lc) {
 	const char *tmp = linphone_core_get_video_preset((LinphoneCore *)lc);
 	return tmp ? env->NewStringUTF(tmp) : NULL;
 }
+
+extern "C" jobject Java_org_linphone_core_LinphoneCallImpl_getChatRoom(JNIEnv* env ,jobject thiz, jlong ptr) {
+	return getChatRoom(env, linphone_call_get_chat_room((LinphoneCall *) ptr));
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_enableRealTimeText(JNIEnv* env ,jobject thiz, jlong ptr, jboolean yesno) {
+	linphone_call_params_enable_realtime_text((LinphoneCallParams *)ptr, yesno);
+}
+
+extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_realTimeTextEnabled(JNIEnv* env ,jobject thiz, jlong ptr) {
+	return linphone_call_params_realtime_text_enabled((LinphoneCallParams *)ptr);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_putChar(JNIEnv* env ,jobject thiz, jlong ptr, jlong character) {
+	linphone_chat_message_put_char((LinphoneChatMessage *)ptr, character);
+}
+
+extern "C" void  Java_org_linphone_core_LinphoneChatRoomImpl_finalize(JNIEnv* env, jobject thiz, jlong ptr) {
+	LinphoneChatRoom *room = (LinphoneChatRoom *)ptr;
+	linphone_chat_room_set_user_data(room, NULL);
+	linphone_chat_room_unref(room);
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneChatRoomImpl_getCall(JNIEnv* env ,jobject thiz, jlong ptr) {
+	return getCall(env, linphone_chat_room_get_call((LinphoneChatRoom *)ptr));
+}
+
+extern "C" jlong Java_org_linphone_core_LinphoneChatRoomImpl_getChar(JNIEnv* env ,jobject thiz, jlong ptr) {
+	return linphone_chat_room_get_char((LinphoneChatRoom *)ptr);
+}
+
+static void _next_video_frame_decoded_callback(LinphoneCall *call, void *user_data) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	jobject listener = (jobject) user_data;
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onNextVideoFrameDecoded","(Lorg/linphone/core/LinphoneCall;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject jcall = getCall(env, call);
+	env->CallVoidMethod(listener, method, jcall);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallImpl_setListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
+	jobject listener = env->NewGlobalRef(jlistener);
+	LinphoneCall *call = (LinphoneCall *)ptr;
+	linphone_call_set_next_video_frame_decoded_callback(call, _next_video_frame_decoded_callback, listener);
+}
+
+
+/*
+ * returns the java TunnelConfig associated with a C LinphoneTunnelConfig.
+**/
+static jobject getTunnelConfig(JNIEnv *env, LinphoneTunnelConfig *cfg){
+	jobject jobj=0;
+
+	if (cfg != NULL){
+		jclass tunnelConfigClass = env->FindClass("org/linphone/core/TunnelConfigImpl");
+		jmethodID ctor = env->GetMethodID(tunnelConfigClass,"<init>", "(J)V");
+
+		void *up=linphone_tunnel_config_get_user_data(cfg);
+
+		if (up==NULL){
+			jobj=env->NewObject(tunnelConfigClass,ctor,(jlong)cfg);
+			linphone_tunnel_config_set_user_data(cfg,(void*)env->NewWeakGlobalRef(jobj));
+			linphone_tunnel_config_ref(cfg);
+		}else{
+			//promote the weak ref to local ref
+			jobj=env->NewLocalRef((jobject)up);
+			if (jobj == NULL){
+				//the weak ref was dead
+				jobj=env->NewObject(tunnelConfigClass,ctor,(jlong)cfg);
+				linphone_tunnel_config_set_user_data(cfg,(void*)env->NewWeakGlobalRef(jobj));
+			}
+		}
+		env->DeleteLocalRef(tunnelConfigClass);
+	}
+	return jobj;
+}
+
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    getHost
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_linphone_core_TunnelConfigImpl_getHost(JNIEnv *env, jobject obj, jlong ptr){
+	LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	const char *host = linphone_tunnel_config_get_host(cfg);
+	if (host){
+		return env->NewStringUTF(host);
+	}
+	return NULL;
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    setHost
+ * Signature: (JLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_TunnelConfigImpl_setHost(JNIEnv *env, jobject obj, jlong ptr, jstring jstr){
+	LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	const char* host = GetStringUTFChars(env, jstr);
+	linphone_tunnel_config_set_host(cfg, host);
+	ReleaseStringUTFChars(env, jstr, host);
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    getPort
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_org_linphone_core_TunnelConfigImpl_getPort(JNIEnv *env, jobject jobj, jlong ptr){
+	LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	return linphone_tunnel_config_get_port(cfg);
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    setPort
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_TunnelConfigImpl_setPort(JNIEnv *env, jobject jobj, jlong ptr, jint port){
+	LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	linphone_tunnel_config_set_port(cfg, port);
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    getRemoteUdpMirrorPort
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_org_linphone_core_TunnelConfigImpl_getRemoteUdpMirrorPort(JNIEnv *env, jobject jobj, jlong ptr){
+	LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	return linphone_tunnel_config_get_remote_udp_mirror_port(cfg);
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    setRemoteUdpMirrorPort
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_TunnelConfigImpl_setRemoteUdpMirrorPort(JNIEnv *env, jobject jobj, jlong ptr, jint port){
+	 LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	 linphone_tunnel_config_set_remote_udp_mirror_port(cfg, port);
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    getDelay
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_org_linphone_core_TunnelConfigImpl_getDelay(JNIEnv *env, jobject jobj, jlong ptr){
+	 LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	 return linphone_tunnel_config_get_delay(cfg);
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    setDelay
+ * Signature: (JI)I
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_TunnelConfigImpl_setDelay(JNIEnv *env, jobject jobj, jlong ptr, jint delay){
+	LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	linphone_tunnel_config_set_delay(cfg, delay);
+}
+
+/*
+ * Class:     org_linphone_core_TunnelConfigImpl
+ * Method:    destroy
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_TunnelConfigImpl_destroy(JNIEnv *env, jobject jobj, jlong ptr){
+	LinphoneTunnelConfig *cfg = (LinphoneTunnelConfig *)ptr;
+	linphone_tunnel_config_set_user_data(cfg, NULL);
+	linphone_tunnel_config_unref(cfg);
+}
+
+
+/*
+ * Class:     org_linphone_core_LinphoneCallLogImpl
+ * Method:    getCallId
+ * Signature: (J)I
+ */
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneCallLogImpl_getCallId(JNIEnv *env, jobject jobj, jlong pcl){
+	const char *str = linphone_call_log_get_call_id((LinphoneCallLog*)pcl);
+	return str ? env->NewStringUTF(str) : NULL;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setHttpProxyHost
+ * Signature: (JLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setHttpProxyHost(JNIEnv *env, jobject jobj, jlong core, jstring jhost){
+	const char *host = GetStringUTFChars(env, jhost);
+	linphone_core_set_http_proxy_host((LinphoneCore*)core, host);
+	ReleaseStringUTFChars(env, jhost, host);
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setHttpProxyPort
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setHttpProxyPort(JNIEnv *env, jobject jobj, jlong core, jint port){
+	linphone_core_set_http_proxy_port((LinphoneCore*)core, port);
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getHttpProxyHost
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneCoreImpl_getHttpProxyHost(JNIEnv *env , jobject jobj, jlong core){
+	const char * host = linphone_core_get_http_proxy_host((LinphoneCore *)core);
+	return host ? env->NewStringUTF(host) : NULL;
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getHttpProxyPort
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getHttpProxyPort(JNIEnv *env, jobject jobj, jlong core){
+	return linphone_core_get_http_proxy_port((LinphoneCore *)core);
+}
+
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setSipTransportTimeout
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setSipTransportTimeout(JNIEnv *env, jobject jobj, jlong pcore, jint timeout){
+	linphone_core_set_sip_transport_timeout((LinphoneCore*)pcore, timeout);
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getSipTransportTimeout
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getSipTransportTimeout(JNIEnv *env, jobject jobj, jlong pcore){
+	return linphone_core_get_sip_transport_timeout((LinphoneCore*)pcore);
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setNortpTimeout
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setNortpTimeout(JNIEnv *env, jobject obj, jlong core, jint timeout){
+	linphone_core_set_nortp_timeout((LinphoneCore*)core, timeout);
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    getNortpTimeout
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_org_linphone_core_LinphoneCoreImpl_getNortpTimeout(JNIEnv *env, jobject obj, jlong core){
+	return linphone_core_get_nortp_timeout((LinphoneCore*)core);
+}
+
+
+
+extern "C" jlong Java_org_linphone_core_LinphoneConferenceParamsImpl_createInstance(JNIEnv *env, jobject thiz, jobject jcore) {
+	jclass core_class = env->FindClass("org/linphone/core/LinphoneCoreImpl");
+	jfieldID native_ptr_attr = env->GetFieldID(core_class, "nativePtr", "J");
+	LinphoneCore *core = NULL;
+	if(jcore) core = (LinphoneCore *)env->GetLongField(jcore, native_ptr_attr);
+	return (jlong)linphone_conference_params_new(core);
+}
+
+extern "C" jlong Java_org_linphone_core_LinphoneConferenceParamsImpl_copyInstance(JNIEnv *env, jobject thiz, jlong paramsPtr) {
+	return (jlong)linphone_conference_params_clone((LinphoneConferenceParams *)paramsPtr);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneConferenceParamsImpl_destroyInstance(JNIEnv *env, jobject thiz, jlong paramsPtr) {
+	linphone_conference_params_free((LinphoneConferenceParams *)paramsPtr);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneConferenceParamsImpl_enableVideo(JNIEnv *env, jobject thiz, jlong paramsPtr, jboolean enable) {
+	linphone_conference_params_enable_video((LinphoneConferenceParams *)paramsPtr, enable);
+}
+
+extern "C" jboolean Java_org_linphone_core_LinphoneConferenceParamsImpl_isVideoRequested(JNIEnv *env, jobject thiz, jlong paramsPtr) {
+	return linphone_conference_params_video_requested((LinphoneConferenceParams *)paramsPtr);
+}
+
+
+
+extern "C" jobjectArray Java_org_linphone_core_LinphoneConferenceImpl_getParticipants(JNIEnv *env, jobject thiz, jlong pconference) {
+	bctbx_list_t *participants, *it;
+	jclass addr_class = env->FindClass("org/linphone/core/LinphoneAddressImpl");
+	jmethodID addr_constructor = env->GetMethodID(addr_class, "<init>", "(J)V");
+	jobjectArray jaddr_list;
+	int i;
+
+	participants = linphone_conference_get_participants((LinphoneConference *)pconference);
+	jaddr_list = env->NewObjectArray(bctbx_list_size(participants), addr_class, NULL);
+	for(it=participants, i=0; it; it=bctbx_list_next(it), i++) {
+		LinphoneAddress *addr = (LinphoneAddress *)it->data;
+		jobject jaddr = env->NewObject(addr_class, addr_constructor, (jlong)addr);
+		env->SetObjectArrayElement(jaddr_list, i, jaddr);
+	}
+	bctbx_list_free(participants);
+	return jaddr_list;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneConferenceImpl_removeParticipant(JNIEnv *env, jobject thiz, jlong pconference, jobject uri) {
+	jfieldID native_ptr_attr = env->GetFieldID(env->GetObjectClass(uri), "nativePtr", "J");
+	LinphoneAddress *addr = (LinphoneAddress *)env->GetLongField(uri, native_ptr_attr);
+	return linphone_conference_remove_participant((LinphoneConference *)pconference, addr);
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setSipNetworkReachable
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setSipNetworkReachable(JNIEnv *env, jobject jobj, jlong pcore, jboolean reachable){
+	linphone_core_set_sip_network_reachable((LinphoneCore*)pcore, (bool_t) reachable);
+}
+
+/*
+ * Class:     org_linphone_core_LinphoneCoreImpl
+ * Method:    setMediaNetworkReachable
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setMediaNetworkReachable(JNIEnv *env, jobject jobj, jlong pcore, jboolean reachable){
+	linphone_core_set_media_network_reachable((LinphoneCore*)pcore, (bool_t) reachable);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setUserCertificatesPath(JNIEnv *env, jobject jobj, jlong pcore, jstring jpath){
+	const char *path = GetStringUTFChars(env, jpath);
+	linphone_core_set_user_certificates_path((LinphoneCore*)pcore, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_reloadMsPlugins(JNIEnv *env, jobject jobj, jlong pcore, jstring jpath) {
+	const char *path = GetStringUTFChars(env, jpath);
+	linphone_core_reload_ms_plugins((LinphoneCore*)pcore, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_reloadSoundDevices(JNIEnv *env, jobject jobj, jlong pcore) {
+	linphone_core_reload_sound_devices((LinphoneCore*)pcore);
+}
+
+JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_getCore(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneCore *lc = ((LinphoneNatPolicy *)jNatPolicy)->lc;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+	return ljb->getCore();
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_clear(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	linphone_nat_policy_clear(nat_policy);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_stunEnabled(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	return (linphone_nat_policy_stun_enabled(nat_policy) == FALSE) ? JNI_FALSE : JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_enableStun(JNIEnv *env, jobject thiz, jlong jNatPolicy, jboolean jEnable) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	linphone_nat_policy_enable_stun(nat_policy, (jEnable == JNI_FALSE) ? FALSE : TRUE);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_turnEnabled(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	return (linphone_nat_policy_turn_enabled(nat_policy) == FALSE) ? JNI_FALSE : JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_enableTurn(JNIEnv *env, jobject thiz, jlong jNatPolicy, jboolean jEnable) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	linphone_nat_policy_enable_turn(nat_policy, (jEnable == JNI_FALSE) ? FALSE : TRUE);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_iceEnabled(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	return (linphone_nat_policy_ice_enabled(nat_policy) == FALSE) ? JNI_FALSE : JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_enableIce(JNIEnv *env, jobject thiz, jlong jNatPolicy, jboolean jEnable) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	linphone_nat_policy_enable_ice(nat_policy, (jEnable == JNI_FALSE) ? FALSE : TRUE);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_upnpEnabled(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	return (linphone_nat_policy_upnp_enabled(nat_policy) == FALSE) ? JNI_FALSE : JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_enableUpnp(JNIEnv *env, jobject thiz, jlong jNatPolicy, jboolean jEnable) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	linphone_nat_policy_enable_upnp(nat_policy, (jEnable == JNI_FALSE) ? FALSE : TRUE);
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_getStunServer(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	const char *stun_server = linphone_nat_policy_get_stun_server(nat_policy);
+	return (stun_server != NULL) ? env->NewStringUTF(stun_server) : NULL;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_setStunServer(JNIEnv *env, jobject thiz, jlong jNatPolicy, jstring jStunServer) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	const char *stun_server = GetStringUTFChars(env, jStunServer);
+	linphone_nat_policy_set_stun_server(nat_policy, stun_server);
+	ReleaseStringUTFChars(env, jStunServer, stun_server);
+}
+
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_getStunServerUsername(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	const char *stun_server = linphone_nat_policy_get_stun_server_username(nat_policy);
+	return (stun_server != NULL) ? env->NewStringUTF(stun_server) : NULL;
+}
+
+JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_setStunServerUsername(JNIEnv *env, jobject thiz, jlong jNatPolicy, jstring jStunServerUsername) {
+	LinphoneNatPolicy *nat_policy = (LinphoneNatPolicy *)jNatPolicy;
+	const char *stun_server_username = GetStringUTFChars(env, jStunServerUsername);
+	linphone_nat_policy_set_stun_server_username(nat_policy, stun_server_username);
+	ReleaseStringUTFChars(env, jStunServerUsername, stun_server_username);
+}
+
+// XML RPC wrapper
+
+static void xml_request_response(LinphoneXmlRpcRequest *request) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneXmlRpcRequestCbs *cbs = linphone_xml_rpc_request_get_callbacks(request);
+	jobject listener = (jobject) linphone_xml_rpc_request_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("xml_request_response() notification without listener");
+		return ;
+	}
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onXmlRpcRequestResponse","(Lorg/linphone/core/LinphoneXmlRpcRequest;)V");
+	env->DeleteLocalRef(clazz);
+
+	env->CallVoidMethod(listener, method, getXmlRpcRequest(env, request));
+}
+
+extern "C" jlong Java_org_linphone_core_LinphoneXmlRpcRequestImpl_newLinphoneXmlRpcRequest(JNIEnv *env, jobject thiz, jstring jmethodname, jint returntype) {
+	const char *methodname = GetStringUTFChars(env, jmethodname);
+	LinphoneXmlRpcRequest *request = linphone_xml_rpc_request_new(methodname, (LinphoneXmlRpcArgType)returntype);
+	ReleaseStringUTFChars(env, jmethodname, methodname);
+	return (jlong) request;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneXmlRpcRequestImpl_unref(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	linphone_xml_rpc_request_set_user_data(request, NULL);
+	linphone_xml_rpc_request_unref(request);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneXmlRpcRequestImpl_addIntArg(JNIEnv *env, jobject thiz, jlong ptr, jint arg) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	linphone_xml_rpc_request_add_int_arg(request, (int)arg);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneXmlRpcRequestImpl_addStringArg(JNIEnv *env, jobject thiz, jlong ptr, jstring jarg) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	const char *arg = GetStringUTFChars(env, jarg);
+	linphone_xml_rpc_request_add_string_arg(request, arg);
+	ReleaseStringUTFChars(env, jarg, arg);
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneXmlRpcRequestImpl_getContent(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	const char *content = linphone_xml_rpc_request_get_content(request);
+	return content ? env->NewStringUTF(content) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneXmlRpcRequestImpl_getStatus(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	return (jint) linphone_xml_rpc_request_get_status(request);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneXmlRpcRequestImpl_getIntResponse(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	return (jint) linphone_xml_rpc_request_get_int_response(request);
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneXmlRpcRequestImpl_getStringResponse(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	const char *response = linphone_xml_rpc_request_get_string_response(request);
+	return response ? env->NewStringUTF(response) : NULL;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneXmlRpcRequestImpl_setListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)ptr;
+	jobject listener = env->NewGlobalRef(jlistener);
+	LinphoneXmlRpcRequestCbs *cbs;
+
+	cbs = linphone_xml_rpc_request_get_callbacks(request);
+	linphone_xml_rpc_request_cbs_set_user_data(cbs, listener);
+	linphone_xml_rpc_request_cbs_set_response(cbs, xml_request_response);
+}
+
+
+extern "C" jlong Java_org_linphone_core_LinphoneXmlRpcSessionImpl_newLinphoneXmlRpcSession(JNIEnv *env, jobject thiz, jlong ptr, jstring jurl) {
+	LinphoneCore *lc = (LinphoneCore *)ptr;
+	const char *url = GetStringUTFChars(env, jurl);
+	LinphoneXmlRpcSession *session = linphone_xml_rpc_session_new(lc, url);
+	ReleaseStringUTFChars(env, jurl, url);
+	return (jlong) session;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneXmlRpcSessionImpl_unref(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneXmlRpcSession *session = (LinphoneXmlRpcSession *)ptr;
+	linphone_xml_rpc_session_set_user_data(session, NULL);
+	linphone_xml_rpc_session_unref(session);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneXmlRpcSessionImpl_sendRequest(JNIEnv *env, jobject thiz, jlong ptr, jlong requestPtr) {
+	LinphoneXmlRpcSession *session = (LinphoneXmlRpcSession *)ptr;
+	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)requestPtr;
+	linphone_xml_rpc_session_send_request(session, request);
+}
+
+// Account creator
+
+static void account_creator_is_account_used(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorIsAccountUsed","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_create_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorAccountCreated","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_activate_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorAccountActivated","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_link_phone_number_with_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorAccountLinkedWithPhoneNumber","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_activate_phone_number_link(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorPhoneNumberLinkActivated","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_is_account_linked(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorIsAccountLinked","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_is_phone_number_used(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorIsPhoneNumberUsed","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_is_account_activated(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorIsAccountActivated","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+static void account_creator_phone_account_recovered(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *resp) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+
+	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
+	jobject listener = (jobject) linphone_account_creator_cbs_get_user_data(cbs);
+	if (listener == NULL) {
+		ms_error("account_creator_response() notification without listener");
+		return ;
+	}
+
+	LinphoneCore *lc = (LinphoneCore *)creator->core;
+	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
+
+	jclass clazz = (jclass) env->GetObjectClass(listener);
+	jmethodID method = env->GetMethodID(clazz, "onAccountCreatorPhoneAccountRecovered","(Lorg/linphone/core/LinphoneAccountCreator;Lorg/linphone/core/LinphoneAccountCreator$Status;)V");
+	env->DeleteLocalRef(clazz);
+
+	jobject statusObject = env->CallStaticObjectMethod(ljb->accountCreatorStatusClass, ljb->accountCreatorStatusFromIntId, (jint)status);
+	env->CallVoidMethod(listener, method, getAccountCreator(env, creator), statusObject);
+}
+
+extern "C" jlong Java_org_linphone_core_LinphoneAccountCreatorImpl_newLinphoneAccountCreator(JNIEnv *env, jobject thiz, jlong core, jstring jurl) {
+	const char *url = GetStringUTFChars(env, jurl);
+	LinphoneAccountCreator *account_creator = linphone_account_creator_new((LinphoneCore *)core, url);
+	ReleaseStringUTFChars(env, jurl, url);
+	return (jlong) account_creator;
+}
+
+extern "C" void Java_org_linphone_core_LinphoneAccountCreatorImpl_unref(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	linphone_account_creator_set_user_data(account_creator, NULL);
+	linphone_account_creator_unref(account_creator);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneAccountCreatorImpl_setListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	jobject listener = env->NewGlobalRef(jlistener);
+	LinphoneAccountCreatorCbs *cbs;
+
+	cbs = linphone_account_creator_get_callbacks(account_creator);
+	linphone_account_creator_cbs_set_user_data(cbs, listener);
+	linphone_account_creator_cbs_set_is_account_used(cbs, account_creator_is_account_used);
+	linphone_account_creator_cbs_set_create_account(cbs, account_creator_create_account);
+	linphone_account_creator_cbs_set_activate_account(cbs, account_creator_activate_account);
+	linphone_account_creator_cbs_set_link_phone_number_with_account(cbs, account_creator_link_phone_number_with_account);
+	linphone_account_creator_cbs_set_activate_phone_number_link(cbs, account_creator_activate_phone_number_link);
+	linphone_account_creator_cbs_set_is_account_activated(cbs, account_creator_is_account_activated);
+	linphone_account_creator_cbs_set_recover_phone_account(cbs, account_creator_phone_account_recovered);
+	linphone_account_creator_cbs_set_is_phone_number_used(cbs, account_creator_is_phone_number_used);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setUsername(JNIEnv *env, jobject thiz, jlong ptr, jstring jusername) {
+	const char *username = GetStringUTFChars(env, jusername);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_username(account_creator, username);
+	ReleaseStringUTFChars(env, jusername, username);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getUsername(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *username = linphone_account_creator_get_username(account_creator);
+	return username ? env->NewStringUTF(username) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setPhoneNumber(JNIEnv *env, jobject thiz, jlong ptr, jstring jphonenumber, jstring jcountrycode) {
+	const char *phone_number = GetStringUTFChars(env, jphonenumber);
+	const char *country_code = GetStringUTFChars(env, jcountrycode);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_phone_number(account_creator, phone_number, country_code);
+	ReleaseStringUTFChars(env, jphonenumber, phone_number);
+	ReleaseStringUTFChars(env, jcountrycode, country_code);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getPhoneNumber(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *phone_number = linphone_account_creator_get_phone_number(account_creator);
+	return phone_number ? env->NewStringUTF(phone_number) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setPassword(JNIEnv *env, jobject thiz, jlong ptr, jstring jpassword) {
+	const char *password = GetStringUTFChars(env, jpassword);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_password(account_creator, password);
+	ReleaseStringUTFChars(env, jpassword, password);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getPassword(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *password = linphone_account_creator_get_password(account_creator);
+	return password ? env->NewStringUTF(password) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setHa1(JNIEnv *env, jobject thiz, jlong ptr, jstring jha1) {
+	const char *ha1 = GetStringUTFChars(env, jha1);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_ha1(account_creator, ha1);
+	ReleaseStringUTFChars(env, jha1, ha1);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getHa1(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *ha1 = linphone_account_creator_get_ha1(account_creator);
+	return ha1 ? env->NewStringUTF(ha1) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setActivationCode(JNIEnv *env, jobject thiz, jlong ptr, jstring jcode) {
+	const char *activation_code = GetStringUTFChars(env, jcode);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_activation_code(account_creator, activation_code);
+	ReleaseStringUTFChars(env, jcode, activation_code);
+	return (jint) status;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setLanguage(JNIEnv *env, jobject thiz, jlong ptr, jstring jlang) {
+	const char *lang = GetStringUTFChars(env, jlang);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_language(account_creator, lang);
+	ReleaseStringUTFChars(env, jlang, lang);
+	return (jint) status;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setTransport(JNIEnv *env, jobject thiz, jlong ptr, jint jtransport) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_transport(account_creator, (LinphoneTransportType)jtransport);
+	return (jint) status;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_getTransport(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneTransportType transport = linphone_account_creator_get_transport(account_creator);
+	return (jint) transport;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setDomain(JNIEnv *env, jobject thiz, jlong ptr, jstring jdomain) {
+	const char *domain = GetStringUTFChars(env, jdomain);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_domain(account_creator, domain);
+	ReleaseStringUTFChars(env, jdomain, domain);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getDomain(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *domain = linphone_account_creator_get_domain(account_creator);
+	return domain ? env->NewStringUTF(domain) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setRoute(JNIEnv *env, jobject thiz, jlong ptr, jstring jroute) {
+	const char *route = GetStringUTFChars(env, jroute);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_route(account_creator, route);
+	ReleaseStringUTFChars(env, jroute, route);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getRoute(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *route = linphone_account_creator_get_route(account_creator);
+	return route ? env->NewStringUTF(route) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setDisplayName(JNIEnv *env, jobject thiz, jlong ptr, jstring jname) {
+	const char *name = GetStringUTFChars(env, jname);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_display_name(account_creator, name);
+	ReleaseStringUTFChars(env, jname, name);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getDisplayName(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *display_name = linphone_account_creator_get_display_name(account_creator);
+	return display_name ? env->NewStringUTF(display_name) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_setEmail(JNIEnv *env, jobject thiz, jlong ptr, jstring jemail) {
+	const char *email = GetStringUTFChars(env, jemail);
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneAccountCreatorStatus status = linphone_account_creator_set_email(account_creator, email);
+	ReleaseStringUTFChars(env, jemail, email);
+	return (jint) status;
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getPrefix(JNIEnv *env, jobject thiz, jlong ptr, jstring jphonenumber) {
+	char buff[4];
+	const char *phone_number = GetStringUTFChars(env, jphonenumber);
+	int prefix = linphone_dial_plan_lookup_ccc_from_e164(phone_number);
+	snprintf(buff, sizeof(buff), "%d", prefix);
+	ReleaseStringUTFChars(env, jphonenumber, phone_number);
+	return (jstring) env->NewStringUTF(buff);
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneAccountCreatorImpl_getEmail(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	const char *email = linphone_account_creator_get_email(account_creator);
+	return email ? env->NewStringUTF(email) : NULL;
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_isAccountUsed(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_is_account_used(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_createAccount(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_create_account(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_activateAccount(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_activate_account(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_isAccountLinked(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_is_account_linked(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_isPhoneNumberUsed(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_is_phone_number_used(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_isAccountActivated(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_is_account_activated(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_linkPhoneNumberWithAccount(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_link_phone_number_with_account(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_activatePhoneNumberLink(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_activate_phone_number_link(account_creator);
+}
+
+extern "C" jint Java_org_linphone_core_LinphoneAccountCreatorImpl_recoverPhoneAccount(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	return (jint) linphone_account_creator_recover_phone_account(account_creator);
+}
+
+extern "C" jobject Java_org_linphone_core_LinphoneAccountCreatorImpl_configure(JNIEnv *env, jobject thiz, jlong ptr) {
+	LinphoneAccountCreator *account_creator = (LinphoneAccountCreator *)ptr;
+	LinphoneProxyConfig  *lpc = linphone_account_creator_configure(account_creator);
+	LinphoneCore *lc = account_creator->core;
+	LinphoneCoreVTable *table = linphone_core_get_current_vtable(lc);
+	LinphoneCoreData* lcData = (LinphoneCoreData*)linphone_core_v_table_get_user_data(table);
+	return getProxy(env, lpc, lcData->core);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setTlsCertificate(JNIEnv *env, jobject thiz, jlong lc, jstring jcert) {
+	const char* cert = GetStringUTFChars(env, jcert);
+	linphone_core_set_tls_cert((LinphoneCore*)lc, cert);
+	ReleaseStringUTFChars(env, jcert, cert);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setTlsKey(JNIEnv *env, jobject, jlong lc, jstring jkey) {
+	const char* key = GetStringUTFChars(env, jkey);
+	linphone_core_set_tls_key((LinphoneCore*)lc, key);
+	ReleaseStringUTFChars(env, jkey, key);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setTlsCertificatePath(JNIEnv *env, jobject, jlong lc, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_core_set_tls_cert_path((LinphoneCore*)lc, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setTlsKeyPath(JNIEnv *env, jobject, jlong lc, jstring jpath) {
+	const char* path = GetStringUTFChars(env, jpath);
+	linphone_core_set_tls_key_path((LinphoneCore*)lc, path);
+	ReleaseStringUTFChars(env, jpath, path);
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getTlsCertificate(JNIEnv *env , jobject, jlong lc) {
+	const char* cert = linphone_core_get_tls_cert((LinphoneCore*)lc);
+	if (cert) {
+		return env->NewStringUTF(cert);
+	} else {
+		return NULL;
+	}
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getTlsKey(JNIEnv *env , jobject, jlong lc) {
+	const char* key = linphone_core_get_tls_key((LinphoneCore*)lc);
+	if (key) {
+		return env->NewStringUTF(key);
+	} else {
+		return NULL;
+	}
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getTlsCertificatePath(JNIEnv *env , jobject, jlong lc) {
+	const char* path = linphone_core_get_tls_cert_path((LinphoneCore*)lc);
+	if (path) {
+		return env->NewStringUTF(path);
+	} else {
+		return NULL;
+	}
+}
+
+extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getTlsKeyPath(JNIEnv *env , jobject, jlong lc) {
+	const char* path = linphone_core_get_tls_key_path((LinphoneCore*)lc);
+	if (path) {
+		return env->NewStringUTF(path);
+	} else {
+		return NULL;
+	}
+}
diff --git a/coreapi/linphonecore_utils.h b/coreapi/linphonecore_utils.h
index eaf7c1218..83c46054c 100644
--- a/coreapi/linphonecore_utils.h
+++ b/coreapi/linphonecore_utils.h
@@ -44,7 +44,7 @@ bool_t lsd_player_loop_enabled(const LsdPlayer *p);
 void lsd_player_set_gain(LsdPlayer *p, float gain);
 LinphoneSoundDaemon *lsd_player_get_daemon(const LsdPlayer *p);
 
-LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname, int rate, int nchannels);
+LinphoneSoundDaemon * linphone_sound_daemon_new(MSFactory* factory, const char *cardname, int rate, int nchannels);
 LsdPlayer * linphone_sound_daemon_get_player(LinphoneSoundDaemon *lsd);
 void linphone_sound_daemon_release_player(LinphoneSoundDaemon *lsd, LsdPlayer *lsdplayer);
 void linphone_sound_daemon_stop_all_players(LinphoneSoundDaemon *obj);
@@ -73,6 +73,15 @@ typedef void (*LinphoneEcCalibrationAudioUninit)(void *data);
 **/
 LINPHONE_PUBLIC int linphone_core_start_echo_calibration(LinphoneCore *lc, LinphoneEcCalibrationCallback cb,
 					 LinphoneEcCalibrationAudioInit audio_init_cb, LinphoneEcCalibrationAudioUninit audio_uninit_cb, void *cb_data);
+/**
+ * Start the simulation of call to test the latency with an external device
+ *@param bitrate
+**/
+LINPHONE_PUBLIC int linphone_core_start_echo_tester(LinphoneCore *lc, unsigned int rate);
+/**
+ * Stop the simulation of call
+**/
+LINPHONE_PUBLIC int linphone_core_stop_echo_tester(LinphoneCore *lc);
 /**
  * @ingroup IOS
  * Special function to warm up  dtmf feeback stream. #linphone_core_stop_dtmf_stream must() be called before entering FG mode
@@ -90,13 +99,22 @@ typedef bool_t (*LinphoneCoreIterateHook)(void *data);
 void linphone_core_add_iterate_hook(LinphoneCore *lc, LinphoneCoreIterateHook hook, void *hook_data);
 
 void linphone_core_remove_iterate_hook(LinphoneCore *lc, LinphoneCoreIterateHook hook, void *hook_data);
+
+typedef struct _LinphoneDialPlan {
+	const char *country;
+	const char* iso_country_code; /* ISO 3166-1 alpha-2 code, ex: FR for France*/
+	char  ccc[8]; /*country calling code*/
+	int nnl; /*maximum national number length*/
+	const char * icp; /*international call prefix, ex: 00 in europe*/
+} LinphoneDialPlan;
+
 /**
  * @ingroup misc
  *Function to get  call country code from  ISO 3166-1 alpha-2 code, ex: FR returns 33
  *@param iso country code alpha2
  *@return call country code or -1 if not found
  */
-LINPHONE_PUBLIC	int linphone_dial_plan_lookup_ccc_from_iso(const char* iso); 
+LINPHONE_PUBLIC	int linphone_dial_plan_lookup_ccc_from_iso(const char* iso);
 /**
  * @ingroup misc
  *Function to get  call country code from  an e164 number, ex: +33952650121 will return 33
@@ -105,6 +123,22 @@ LINPHONE_PUBLIC	int linphone_dial_plan_lookup_ccc_from_iso(const char* iso);
  */
 LINPHONE_PUBLIC	int linphone_dial_plan_lookup_ccc_from_e164(const char* e164);
 
+/**
+ * Return NULL-terminated array of all known dial plans
+**/
+LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_get_all(void);
+
+/**
+ * Find best match for given CCC
+ * @return Return matching dial plan, or a generic one if none found
+**/
+LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_by_ccc(const char *ccc);
+
+/**
+ * Return if given plan is generic
+**/
+LINPHONE_PUBLIC bool_t linphone_dial_plan_is_generic(const LinphoneDialPlan *ccc);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/linphonefriend.h b/coreapi/linphonefriend.h
index 9ca04137c..af6f995d8 100644
--- a/coreapi/linphonefriend.h
+++ b/coreapi/linphonefriend.h
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define LINPHONEFRIEND_H_
 
 #include "linphonepresence.h"
+#include "vcard.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -118,15 +119,17 @@ typedef struct _LinphoneFriend LinphoneFriend;
 /**
  * Contructor
  * @return a new empty #LinphoneFriend
+ * @deprecated use #linphone_core_create_friend instead
  */
-LINPHONE_PUBLIC LinphoneFriend * linphone_friend_new(void);
+LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneFriend * linphone_friend_new(void);
 
 /**
  * Contructor same as linphone_friend_new() + linphone_friend_set_address()
  * @param addr a buddy address, must be a sip uri like sip:joe@sip.linphone.org
  * @return a new #LinphoneFriend with \link linphone_friend_get_address() address initialized \endlink
+ * @deprecated use #linphone_core_create_friend_with_address instead
  */
-LINPHONE_PUBLIC	LinphoneFriend *linphone_friend_new_with_address(const char *addr);
+LINPHONE_PUBLIC	LINPHONE_DEPRECATED LinphoneFriend *linphone_friend_new_with_address(const char *addr);
 
 /**
  * Contructor same as linphone_friend_new() + linphone_friend_set_address()
@@ -155,11 +158,54 @@ LINPHONE_PUBLIC int linphone_friend_set_address(LinphoneFriend *fr, const Linpho
 #define linphone_friend_set_addr linphone_friend_set_address
 
 /**
- * Get address of this friend
+ * Get address of this friend.
+ * @note the LinphoneAddress object returned is hold by the LinphoneFriend, however calling several time this function may return different objects.
  * @param lf #LinphoneFriend object
  * @return #LinphoneAddress
  */
-LINPHONE_PUBLIC	const LinphoneAddress *linphone_friend_get_address(const LinphoneFriend *lf);
+LINPHONE_PUBLIC const LinphoneAddress * linphone_friend_get_address(const LinphoneFriend *lf);
+
+/**
+ * Adds an address in this friend
+ * @param lf #LinphoneFriend object
+ * @param addr #LinphoneAddress object
+ */
+LINPHONE_PUBLIC void linphone_friend_add_address(LinphoneFriend *lf, const LinphoneAddress *addr);
+
+/**
+ * Returns a list of #LinphoneAddress for this friend
+ * @param lf #LinphoneFriend object
+ * @return \mslist{LinphoneAddress}
+ */
+LINPHONE_PUBLIC const bctbx_list_t* linphone_friend_get_addresses(const LinphoneFriend *lf);
+
+/**
+ * Removes an address in this friend
+ * @param lf #LinphoneFriend object
+ * @param addr #LinphoneAddress object
+ */
+LINPHONE_PUBLIC void linphone_friend_remove_address(LinphoneFriend *lf, const LinphoneAddress *addr);
+
+/**
+ * Adds a phone number in this friend
+ * @param lf #LinphoneFriend object
+ * @param phone number to add
+ */
+LINPHONE_PUBLIC void linphone_friend_add_phone_number(LinphoneFriend *lf, const char *phone);
+
+/**
+ * Returns a list of phone numbers for this friend
+ * @param lf #LinphoneFriend object
+ * @return \mslist{const char *}
+ */
+LINPHONE_PUBLIC bctbx_list_t* linphone_friend_get_phone_numbers(LinphoneFriend *lf);
+
+/**
+ * Removes a phone number in this friend
+ * @param lf #LinphoneFriend object
+ * @param phone number to remove
+ */
+LINPHONE_PUBLIC void linphone_friend_remove_phone_number(LinphoneFriend *lf, const char *phone);
 
 /**
  * Set the display name for this friend
@@ -233,12 +279,50 @@ LINPHONE_PUBLIC	void linphone_friend_done(LinphoneFriend *fr);
  */
 LINPHONE_PUBLIC LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFriend *lf);
 
+/**
+ * Get subscription state of a friend
+ * @param[in] lf A #LinphoneFriend object
+ * @return #LinphoneSubscriptionState
+ */
+
+LINPHONE_PUBLIC LinphoneSubscriptionState linphone_friend_get_subscription_state(const LinphoneFriend *lf);
+
 /**
  * Get the presence model of a friend
  * @param[in] lf A #LinphoneFriend object
  * @return A #LinphonePresenceModel object, or NULL if the friend do not have presence information (in which case he is considered offline)
  */
-LINPHONE_PUBLIC const LinphonePresenceModel * linphone_friend_get_presence_model(LinphoneFriend *lf);
+LINPHONE_PUBLIC const LinphonePresenceModel * linphone_friend_get_presence_model(const LinphoneFriend *lf);
+
+/**
+ * Get the presence model for a specific SIP URI or phone number of a friend
+ * @param[in] lf A #LinphoneFriend object
+ * @param[in] uri_or_tel The SIP URI or phone number for which to get the presence model
+ * @return A #LinphonePresenceModel object, or NULL if the friend do not have presence information for this SIP URI or phone number
+ */
+LINPHONE_PUBLIC const LinphonePresenceModel * linphone_friend_get_presence_model_for_uri_or_tel(const LinphoneFriend *lf, const char *uri_or_tel);
+
+/**
+ * Set the presence model of a friend
+ * @param[in] lf A #LinphoneFriend object
+ * @param[in] presence The #LinphonePresenceModel object to set for the friend
+ */
+LINPHONE_PUBLIC void linphone_friend_set_presence_model(LinphoneFriend *lf, LinphonePresenceModel *presence);
+
+/**
+ * Set the presence model for a specific SIP URI or phone number of a friend
+ * @param[in] lf A #LinphoneFriend object
+ * @param[in] uri_or_tel The SIP URI or phone number for which to set the presence model
+ * @param[in] presence The #LinphonePresenceModel object to set
+ */
+LINPHONE_PUBLIC void linphone_friend_set_presence_model_for_uri_or_tel(LinphoneFriend *lf, const char *uri_or_tel, LinphonePresenceModel *presence);
+
+/**
+ * Tells whether we already received presence information for a friend.
+ * @param[in] lf A #LinphoneFriend object
+ * @return TRUE if presence information has been received for the friend, FALSE otherwise.
+ */
+LINPHONE_PUBLIC bool_t linphone_friend_is_presence_received(const LinphoneFriend *lf);
 
 /**
  * Store user pointer to friend object.
@@ -338,13 +422,15 @@ LINPHONE_PUBLIC void linphone_core_interpret_friend_uri(LinphoneCore *lc, const
  * Add a friend to the current buddy list, if \link linphone_friend_enable_subscribes() subscription attribute \endlink is set, a SIP SUBSCRIBE message is sent.
  * @param lc #LinphoneCore object
  * @param fr #LinphoneFriend to add
+ * @deprecated use linphone_friend_list_add_friend() instead.
  */
 LINPHONE_PUBLIC	void linphone_core_add_friend(LinphoneCore *lc, LinphoneFriend *fr);
 
 /**
- * remove a friend from the buddy list
+ * Removes a friend from the buddy list
  * @param lc #LinphoneCore object
- * @param fr #LinphoneFriend to add
+ * @param fr #LinphoneFriend to remove
+ * @deprecated use linphone_friend_list_remove_friend() instead.
  */
 LINPHONE_PUBLIC void linphone_core_remove_friend(LinphoneCore *lc, LinphoneFriend *fr);
 
@@ -359,8 +445,9 @@ LINPHONE_PUBLIC void linphone_core_reject_subscriber(LinphoneCore *lc, LinphoneF
  * Get Buddy list of LinphoneFriend
  * @param[in] lc #LinphoneCore object
  * @return \mslist{LinphoneFriend}
+ * @deprecated use linphone_core_get_friends_lists() or linphone_friend_list_get_friends() instead.
  */
-LINPHONE_PUBLIC	const MSList * linphone_core_get_friend_list(const LinphoneCore *lc);
+LINPHONE_PUBLIC	const bctbx_list_t * linphone_core_get_friend_list(const LinphoneCore *lc);
 
 /**
  * Notify all friends that have subscribed
@@ -403,14 +490,67 @@ LINPHONE_PUBLIC LinphoneFriend * linphone_friend_ref(LinphoneFriend *lf);
 
 /**
  * Release a reference to the linphone friend.
- * @param[in] lf LinohoneFriend object
+ * @param[in] lf LinphoneFriend object
 **/
 LINPHONE_PUBLIC void linphone_friend_unref(LinphoneFriend *lf);
 
 /**
  * Returns the LinphoneCore object managing this friend, if any.
+ * @param[in] fr LinphoneFriend object
  */
 LINPHONE_PUBLIC LinphoneCore *linphone_friend_get_core(const LinphoneFriend *fr);
+
+/**
+ * Returns the vCard object associated to this friend, if any
+ * @param[in] fr LinphoneFriend object
+ */
+LINPHONE_PUBLIC LinphoneVcard* linphone_friend_get_vcard(LinphoneFriend *fr);
+
+/**
+ * Binds a vCard object to a friend
+ * @param[in] fr LinphoneFriend object
+ * @param[in] vcard The vCard object to bind
+ */
+LINPHONE_PUBLIC void linphone_friend_set_vcard(LinphoneFriend *fr, LinphoneVcard *vcard);
+
+/**
+ * Creates a vCard object associated to this friend if there isn't one yet and if the full name is available, either by the parameter or the one in the friend's SIP URI
+ * @param[in] fr LinphoneFriend object
+ * @param[in] name The full name of the friend or NULL to use the one from the friend's SIP URI
+ * @return true if the vCard has been created, false if it wasn't possible (for exemple if name and the friend's SIP URI are null or if the friend's SIP URI doesn't have a display name), or if there is already one vcard
+ */
+LINPHONE_PUBLIC bool_t linphone_friend_create_vcard(LinphoneFriend *fr, const char *name);
+
+/**
+ * Contructor same as linphone_friend_new() + linphone_friend_set_address()
+ * @param vcard a vCard object
+ * @return a new #LinphoneFriend with \link linphone_friend_get_vcard() vCard initialized \endlink
+ */
+LINPHONE_PUBLIC	LinphoneFriend *linphone_friend_new_from_vcard(LinphoneVcard *vcard);
+
+/**
+ * Sets the database filename where friends will be stored.
+ * If the file does not exist, it will be created.
+ * @ingroup initializing
+ * @param lc the linphone core
+ * @param path filesystem path
+**/
+LINPHONE_PUBLIC void linphone_core_set_friends_database_path(LinphoneCore *lc, const char *path);
+
+/**
+ * Migrates the friends from the linphonerc to the database if not done yet
+ * @ingroup initializing
+ * @param lc the linphone core
+**/
+LINPHONE_PUBLIC void linphone_core_migrate_friends_from_rc_to_db(LinphoneCore *lc);
+
+/**
+ * Saves a friend either in database if configured, otherwise in linphonerc
+ * @param fr the linphone friend to save
+ * @param lc the linphone core
+ */
+void linphone_friend_save(LinphoneFriend *fr, LinphoneCore *lc);
+
 /**
  * @}
  */
diff --git a/coreapi/linphonepresence.h b/coreapi/linphonepresence.h
index 3f5ea2423..a5350fa69 100644
--- a/coreapi/linphonepresence.h
+++ b/coreapi/linphonepresence.h
@@ -261,6 +261,21 @@ LINPHONE_PUBLIC char * linphone_presence_model_get_contact(const LinphonePresenc
  */
 LINPHONE_PUBLIC int linphone_presence_model_set_contact(LinphonePresenceModel *model, const char *contact);
 
+/**
+ * Sets the presentity of a presence model.
+ * @param[in] model The #LinphonePresenceModel object for which to set the contact.
+ * @param[in] presentity The presentity address to set (presentity is copied).
+ * @return 0 if successful, a value < 0 in case of error.
+ */
+LINPHONE_PUBLIC int linphone_presence_model_set_presentity(LinphonePresenceModel *model, const LinphoneAddress *presentity);
+/**
+ * Gets the presentity of a presence model.
+ * @param[in] model The #LinphonePresenceModel object to get the contact from.
+ * @return A pointer to a const LinphoneAddress, or NULL if no contact is found.
+ *
+ */
+LINPHONE_PUBLIC const LinphoneAddress * linphone_presence_model_get_presentity(const LinphonePresenceModel *model);
+	
 /**
  * Gets the first activity of a presence model (there is usually only one).
  * @param[in] model The #LinphonePresenceModel object to get the activity from.
diff --git a/coreapi/localplayer.c b/coreapi/localplayer.c
index 374d67a0f..eb7fc3f21 100644
--- a/coreapi/localplayer.c
+++ b/coreapi/localplayer.c
@@ -36,7 +36,7 @@ LinphonePlayer *linphone_core_create_local_player(LinphoneCore *lc, MSSndCard *s
 	LinphonePlayer *obj = ms_new0(LinphonePlayer, 1);
 	if(snd_card == NULL) snd_card = lc->sound_conf.ring_sndcard;
 	if(video_out == NULL) video_out = linphone_core_get_video_display_filter(lc);
-	obj->impl = ms_media_player_new(snd_card, video_out, window_id);
+	obj->impl = ms_media_player_new(lc->factory, snd_card, video_out, window_id);
 	obj->open = _local_player_open;
 	obj->start = _local_player_start;
 	obj->pause = _local_player_pause;
diff --git a/coreapi/lpc2xml.c b/coreapi/lpc2xml.c
index a946f1e70..b4dd3cbfc 100644
--- a/coreapi/lpc2xml.c
+++ b/coreapi/lpc2xml.c
@@ -24,6 +24,36 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <libxml/xmlversion.h>
 
 #define LPC2XML_BZ 2048
+#define ISO_ENCODING "ISO-8859-1"
+
+static xmlChar* convert_iso_to_utf8(const char *in) {
+	xmlChar *out = NULL;
+	int ret, size, out_size, temp;
+	xmlCharEncodingHandlerPtr handler;
+
+	size = (int)strlen(in) + 1; 
+	out_size = size * 2 - 1; 
+	out = ms_malloc((size_t)out_size); 
+
+	if (out) {
+		handler = xmlFindCharEncodingHandler(ISO_ENCODING);
+		if (!handler) {
+			ms_free(out);
+			return NULL;
+		}
+		
+		temp = size-1;
+		ret = handler->input(out, &out_size, (const xmlChar *)in, &temp);
+		if (ret < 0 || temp - size + 1) {
+			ms_free(out);
+			return NULL;
+		} else {
+			out = ms_realloc(out, out_size + 1); 
+			out[out_size] = '\0';
+		}
+	}
+	return out;
+}	
 
 struct _lpc2xml_context {
 	const LpConfig *lpc;
@@ -74,7 +104,7 @@ static void lpc2xml_log(lpc2xml_context *xmlCtx, int level, const char *fmt, ...
 
 static void lpc2xml_genericxml_error(void *ctx, const char *fmt, ...) {
 	lpc2xml_context *xmlCtx = (lpc2xml_context *)ctx;
-	int sl = strlen(xmlCtx->errorBuffer);
+	size_t sl = strlen(xmlCtx->errorBuffer);
 	va_list args;
 	va_start(args, fmt);
 	vsnprintf(xmlCtx->errorBuffer + sl, LPC2XML_BZ-sl, fmt, args);
@@ -94,13 +124,28 @@ static void lpc2xml_genericxml_warning(void *ctx, const char *fmt, ...) {
 
 static int processEntry(const char *section, const char *entry, xmlNode *node, lpc2xml_context *ctx) {
 	const char *content = lp_config_get_string(ctx->lpc, section, entry, NULL);
+	xmlChar *converted_content = NULL;
 	if (content == NULL) {
 		lpc2xml_log(ctx, LPC2XML_ERROR, "Issue when reading the lpc");
 		return -1;
 	}
-
 	lpc2xml_log(ctx, LPC2XML_MESSAGE, "Set %s|%s = %s", section, entry, content);
-	xmlNodeSetContent(node, (const xmlChar *) content);
+	converted_content = convert_iso_to_utf8(content);
+	
+	if (converted_content) {
+		// xmlNodeSetContent expects special characters to be escaped, xmlNodeAddContent doesn't (and escapes what needs to be)
+		xmlNodeSetContent(node, (const xmlChar *) "");
+		xmlNodeAddContent(node, (const xmlChar *) converted_content);
+		ms_free(converted_content);
+	} else {
+		// xmlNodeSetContent expects special characters to be escaped, xmlNodeAddContent doesn't (and escapes what needs to be)
+		xmlNodeSetContent(node, (const xmlChar *) "");
+		xmlNodeAddContent(node, (const xmlChar *) content);
+	}
+	
+	if (lp_config_get_overwrite_flag_for_entry(ctx->lpc, section, entry) || lp_config_get_overwrite_flag_for_section(ctx->lpc, section)) {
+		xmlSetProp(node, (const xmlChar *)"overwrite", (const xmlChar *) "true");
+	}
 	return 0;
 }
 
@@ -121,6 +166,12 @@ static void processSection_cb(const char *entry, struct __processSectionCtx *ctx
 			ctx->ret = 0;
 			return;
 		}
+		
+		if (lp_config_get_skip_flag_for_entry(ctx->ctx->lpc, ctx->section, entry)) {
+			lpc2xml_log(ctx->ctx, LPC2XML_WARNING, "Skipped entry %s", entry);
+			ctx->ret = 0;
+			return;
+		}
 
 		node = xmlNewChild(ctx->node, NULL, (const xmlChar *)"entry", NULL);
 		if(node == NULL) {
@@ -155,8 +206,16 @@ struct __processConfigCtx {
 
 static void processConfig_cb(const char *section, struct __processConfigCtx *ctx) {
 	if(ctx->ret == 0) {
-		xmlNode *node = xmlNewChild(ctx->node, NULL, (const xmlChar *)"section", NULL);
+		xmlNode *node;
 		xmlAttr *name_attr;
+		
+		if (lp_config_get_skip_flag_for_section(ctx->ctx->lpc, section)) {
+			lpc2xml_log(ctx->ctx, LPC2XML_WARNING, "Skipped section %s", section);
+			ctx->ret = 0;
+			return;
+		}
+		
+		node = xmlNewChild(ctx->node, NULL, (const xmlChar *)"section", NULL);
 		if(node == NULL) {
 			lpc2xml_log(ctx->ctx, LPC2XML_ERROR, "Can't create \"section\" element");
 			ctx->ret = -1;
diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c
index ba15adbe0..38bd74125 100644
--- a/coreapi/lpconfig.c
+++ b/coreapi/lpconfig.c
@@ -25,6 +25,7 @@
 #define MAX_LEN 16384
 
 #include "linphonecore.h"
+#include "bctoolbox/vfs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -56,12 +57,14 @@
 #define lp_new0(type,n)	(type*)calloc(sizeof(type),n)
 
 #include "lpconfig.h"
-
+#include "lpc2xml.h"
 
 typedef struct _LpItem{
 	char *key;
 	char *value;
 	int is_comment;
+	bool_t overwrite; // If set to true, will add overwrite=true when converted to xml
+	bool_t skip; // If set to true, won't be dumped when converted to xml
 } LpItem;
 
 typedef struct _LpSectionParam{
@@ -71,20 +74,25 @@ typedef struct _LpSectionParam{
 
 typedef struct _LpSection{
 	char *name;
-	MSList *items;
-	MSList *params;
+	bctbx_list_t *items;
+	bctbx_list_t *params;
+	bool_t overwrite; // If set to true, will add overwrite=true to all items of this section when converted to xml
+	bool_t skip; // If set to true, won't be dumped when converted to xml
 } LpSection;
 
 struct _LpConfig{
 	int refcnt;
-	FILE *file;
+	bctbx_vfs_file_t* pFile;
 	char *filename;
 	char *tmpfilename;
-	MSList *sections;
+	bctbx_list_t *sections;
 	int modified;
 	int readonly;
+	bctbx_vfs_t* g_bctbx_vfs;
 };
 
+
+
 char* lp_realpath(const char* file, char* name) {
 #if defined(_WIN32) || defined(__QNX__) || defined(ANDROID)
 	return ms_strdup(file);
@@ -148,29 +156,34 @@ void lp_section_param_destroy(void *section_param){
 
 void lp_section_destroy(LpSection *sec){
 	ortp_free(sec->name);
-	ms_list_for_each(sec->items,lp_item_destroy);
-	ms_list_for_each(sec->params,lp_section_param_destroy);
-	ms_list_free(sec->items);
+	bctbx_list_for_each(sec->items,lp_item_destroy);
+	bctbx_list_for_each(sec->params,lp_section_param_destroy);
+	bctbx_list_free(sec->items);
 	free(sec);
 }
 
 void lp_section_add_item(LpSection *sec,LpItem *item){
-	sec->items=ms_list_append(sec->items,(void *)item);
+	sec->items=bctbx_list_append(sec->items,(void *)item);
 }
 
 void lp_config_add_section(LpConfig *lpconfig, LpSection *section){
-	lpconfig->sections=ms_list_append(lpconfig->sections,(void *)section);
+	lpconfig->sections=bctbx_list_append(lpconfig->sections,(void *)section);
 }
 
 void lp_config_add_section_param(LpSection *section, LpSectionParam *param){
-	section->params = ms_list_append(section->params, (void *)param);
+	section->params = bctbx_list_append(section->params, (void *)param);
 }
 
 void lp_config_remove_section(LpConfig *lpconfig, LpSection *section){
-	lpconfig->sections=ms_list_remove(lpconfig->sections,(void *)section);
+	lpconfig->sections=bctbx_list_remove(lpconfig->sections,(void *)section);
 	lp_section_destroy(section);
 }
 
+void lp_section_remove_item(LpSection *sec, LpItem *item){
+	sec->items=bctbx_list_remove(sec->items,(void *)item);
+	lp_item_destroy(item);
+}
+
 static bool_t is_first_char(const char *start, const char *pos){
 	const char *p;
 	for(p=start;p<pos;p++){
@@ -189,9 +202,9 @@ static int is_a_comment(const char *str){
 
 LpSection *lp_config_find_section(const LpConfig *lpconfig, const char *name){
 	LpSection *sec;
-	MSList *elem;
+	bctbx_list_t *elem;
 	/*printf("Looking for section %s\n",name);*/
-	for (elem=lpconfig->sections;elem!=NULL;elem=ms_list_next(elem)){
+	for (elem=lpconfig->sections;elem!=NULL;elem=bctbx_list_next(elem)){
 		sec=(LpSection*)elem->data;
 		if (strcmp(sec->name,name)==0){
 			/*printf("Section %s found\n",name);*/
@@ -202,9 +215,9 @@ LpSection *lp_config_find_section(const LpConfig *lpconfig, const char *name){
 }
 
 LpSectionParam *lp_section_find_param(const LpSection *sec, const char *key){
-	MSList *elem;
+	bctbx_list_t *elem;
 	LpSectionParam *param;
-	for (elem = sec->params; elem != NULL; elem = ms_list_next(elem)){
+	for (elem = sec->params; elem != NULL; elem = bctbx_list_next(elem)){
 		param = (LpSectionParam*)elem->data;
 		if (strcmp(param->key, key) == 0) {
 			return param;
@@ -213,11 +226,25 @@ LpSectionParam *lp_section_find_param(const LpSection *sec, const char *key){
 	return NULL;
 }
 
-LpItem *lp_section_find_item(const LpSection *sec, const char *name){
-	MSList *elem;
+LpItem *lp_section_find_comment(const LpSection *sec, const char *comment){
+	bctbx_list_t *elem;
 	LpItem *item;
 	/*printf("Looking for item %s\n",name);*/
-	for (elem=sec->items;elem!=NULL;elem=ms_list_next(elem)){
+	for (elem=sec->items;elem!=NULL;elem=bctbx_list_next(elem)){
+		item=(LpItem*)elem->data;
+		if (item->is_comment && strcmp(item->value,comment)==0) {
+			/*printf("Item %s found\n",name);*/
+			return item;
+		}
+	}
+	return NULL;
+}
+
+LpItem *lp_section_find_item(const LpSection *sec, const char *name){
+	bctbx_list_t *elem;
+	LpItem *item;
+	/*printf("Looking for item %s\n",name);*/
+	for (elem=sec->items;elem!=NULL;elem=bctbx_list_next(elem)){
 		item=(LpItem*)elem->data;
 		if (!item->is_comment && strcmp(item->key,name)==0) {
 			/*printf("Item %s found\n",name);*/
@@ -231,7 +258,7 @@ static LpSection* lp_config_parse_line(LpConfig* lpconfig, const char* line, LpS
 	LpSectionParam *params = NULL;
 	char *pos1,*pos2;
 	int nbs;
-	int size=strlen(line)+1;
+	size_t size=strlen(line)+1;
 	char *secname=ms_malloc(size);
 	char *key=ms_malloc(size);
 	char *value=ms_malloc(size);
@@ -283,6 +310,10 @@ static LpSection* lp_config_parse_line(LpConfig* lpconfig, const char* line, LpS
 		if (is_a_comment(line)){
 			if (cur){
 				LpItem *comment=lp_comment_new(line);
+				item=lp_section_find_comment(cur,comment->value);
+				if (item!=NULL) {
+					lp_section_remove_item(cur, item);
+				}
 				lp_section_add_item(cur,comment);
 			}
 		}else{
@@ -330,14 +361,13 @@ static LpSection* lp_config_parse_line(LpConfig* lpconfig, const char* line, LpS
 	return cur;
 }
 
-void lp_config_parse(LpConfig *lpconfig, FILE *file){
+void lp_config_parse(LpConfig *lpconfig, bctbx_vfs_file_t* pFile){
 	char tmp[MAX_LEN]= {'\0'};
 	LpSection* current_section = NULL;
-
-	if (file==NULL) return;
-
-	while(fgets(tmp,MAX_LEN,file)!=NULL){
-		tmp[sizeof(tmp) -1] = '\0';
+	int size  =0;
+	if (pFile==NULL) return;
+	while(( size = bctbx_file_get_nxtline(pFile, tmp, MAX_LEN)) > 0){
+		//tmp[size] = '\0';
 		current_section = lp_config_parse_line(lpconfig, tmp, current_section);
 	}
 }
@@ -368,6 +398,8 @@ LpConfig * lp_config_new_from_buffer(const char *buffer){
 
 LpConfig *lp_config_new_with_factory(const char *config_filename, const char *factory_config_filename) {
 	LpConfig *lpconfig=lp_new0(LpConfig,1);
+	lpconfig->g_bctbx_vfs = bctbx_vfs_get_default();
+	
 	lpconfig->refcnt=1;
 	if (config_filename!=NULL){
 		if(ortp_file_exist(config_filename) == 0) {
@@ -394,21 +426,21 @@ LpConfig *lp_config_new_with_factory(const char *config_filename, const char *fa
 			}
 		}
 #endif /*_WIN32*/
+
 		/*open with r+ to check if we can write on it later*/
-		lpconfig->file=fopen(lpconfig->filename,"r+");
+		lpconfig->pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,lpconfig->filename, "r+");
 #ifdef RENAME_REQUIRES_NONEXISTENT_NEW_PATH
-		if (lpconfig->file==NULL){
-			lpconfig->file=fopen(lpconfig->tmpfilename,"r+");
-			if (lpconfig->file){
+		if (lpconfig->pFile == NULL){
+			lpconfig->pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,lpconfig->tmpfilename, "r+");
+			if (lpconfig->pFile == NULL){
 				ms_warning("Could not open %s but %s works, app may have crashed during last sync.",lpconfig->filename,lpconfig->tmpfilename);
 			}
 		}
 #endif
-		if (lpconfig->file!=NULL){
-			lp_config_parse(lpconfig,lpconfig->file);
-			fclose(lpconfig->file);
-
-			lpconfig->file=NULL;
+		if (lpconfig->pFile != NULL){
+		    lp_config_parse(lpconfig, lpconfig->pFile);
+			bctbx_file_close(lpconfig->pFile);
+			lpconfig->pFile = NULL;
 			lpconfig->modified=0;
 		}
 	}
@@ -416,7 +448,7 @@ LpConfig *lp_config_new_with_factory(const char *config_filename, const char *fa
 		lp_config_read_file(lpconfig, factory_config_filename);
 	}
 	return lpconfig;
-	
+
 fail:
 	ms_free(lpconfig);
 	return NULL;
@@ -424,11 +456,12 @@ fail:
 
 int lp_config_read_file(LpConfig *lpconfig, const char *filename){
 	char* path = lp_realpath(filename, NULL);
-	FILE* f=fopen(path,"r");
-	if (f!=NULL){
+	bctbx_vfs_file_t* pFile = bctbx_file_open(lpconfig->g_bctbx_vfs, path, "r");
+	if (pFile != NULL){
 		ms_message("Reading config information from %s", path);
-		lp_config_parse(lpconfig,f);
-		fclose(f);
+		lp_config_parse(lpconfig, pFile);
+		bctbx_file_close(pFile);
+		ms_free(path);
 		return 0;
 	}
 	ms_warning("Fail to open file %s",path);
@@ -446,8 +479,8 @@ void lp_item_set_value(LpItem *item, const char *value){
 static void _lp_config_destroy(LpConfig *lpconfig){
 	if (lpconfig->filename!=NULL) ortp_free(lpconfig->filename);
 	if (lpconfig->tmpfilename) ortp_free(lpconfig->tmpfilename);
-	ms_list_for_each(lpconfig->sections,(void (*)(void*))lp_section_destroy);
-	ms_list_free(lpconfig->sections);
+	bctbx_list_for_each(lpconfig->sections,(void (*)(void*))lp_section_destroy);
+	bctbx_list_free(lpconfig->sections);
 	free(lpconfig);
 }
 
@@ -466,11 +499,6 @@ void lp_config_destroy(LpConfig *lpconfig){
 	lp_config_unref(lpconfig);
 }
 
-void lp_section_remove_item(LpSection *sec, LpItem *item){
-	sec->items=ms_list_remove(sec->items,(void *)item);
-	lp_item_destroy(item);
-}
-
 const char *lp_config_get_section_param_string(const LpConfig *lpconfig, const char *section, const char *key, const char *default_value){
 	LpSection *sec;
 	LpSectionParam *param;
@@ -493,6 +521,31 @@ const char *lp_config_get_string(const LpConfig *lpconfig, const char *section,
 	return default_string;
 }
 
+bctbx_list_t * lp_config_get_string_list(const LpConfig *lpconfig, const char *section, const char *key, bctbx_list_t *default_list) {
+	LpItem *item;
+	LpSection *sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL) {
+		item = lp_section_find_item(sec, key);
+		if (item != NULL) {
+			bctbx_list_t *l = NULL;
+			char *str;
+			char *ptr;
+			str = ptr = ms_strdup(item->value);
+			while (ptr != NULL) {
+				char *next = strstr(ptr, ",");
+				if (next != NULL) {
+					*(next++) = '\0';
+				}
+				l = bctbx_list_append(l, ms_strdup(ptr));
+				ptr = next;
+			}
+			ms_free(str);
+			return l;
+		}
+	}
+	return default_list;
+}
+
 bool_t lp_config_get_range(const LpConfig *lpconfig, const char *section, const char *key, int *min, int *max, int default_min, int default_max) {
 	const char *str = lp_config_get_string(lpconfig, section, key, NULL);
 	if (str != NULL) {
@@ -547,6 +600,46 @@ float lp_config_get_float(const LpConfig *lpconfig,const char *section, const ch
 	return ret;
 }
 
+bool_t lp_config_get_overwrite_flag_for_entry(const LpConfig *lpconfig, const char *section, const char *key) {
+	LpSection *sec;
+	LpItem *item;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL){
+		item = lp_section_find_item(sec, key);
+		if (item != NULL) return item->overwrite;
+	}
+	return FALSE;
+}
+
+bool_t lp_config_get_overwrite_flag_for_section(const LpConfig *lpconfig, const char *section) {
+	LpSection *sec;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL){
+		return sec->overwrite;
+	}
+	return FALSE;
+}
+
+bool_t lp_config_get_skip_flag_for_entry(const LpConfig *lpconfig, const char *section, const char *key) {
+	LpSection *sec;
+	LpItem *item;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL){
+		item = lp_section_find_item(sec, key);
+		if (item != NULL) return item->skip;
+	}
+	return FALSE;
+}
+
+bool_t lp_config_get_skip_flag_for_section(const LpConfig *lpconfig, const char *section) {
+	LpSection *sec;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL){
+		return sec->skip;
+	}
+	return FALSE;
+}
+
 void lp_config_set_string(LpConfig *lpconfig,const char *section, const char *key, const char *value){
 	LpItem *item;
 	LpSection *sec=lp_config_find_section(lpconfig,section);
@@ -568,6 +661,22 @@ void lp_config_set_string(LpConfig *lpconfig,const char *section, const char *ke
 	lpconfig->modified++;
 }
 
+void lp_config_set_string_list(LpConfig *lpconfig, const char *section, const char *key, const bctbx_list_t *value) {
+	char *strvalue = NULL;
+	char *tmp = NULL;
+	const bctbx_list_t *elem;
+	for (elem = value; elem != NULL; elem = elem->next) {
+		if (strvalue) {
+			tmp = ms_strdup_printf("%s,%s", strvalue, (const char *)elem->data);
+			ms_free(strvalue);
+			strvalue = tmp;
+		}
+		else strvalue = ms_strdup((const char *)elem->data);
+	}
+	lp_config_set_string(lpconfig, section, key, strvalue);
+	if (strvalue) ms_free(strvalue);
+}
+
 void lp_config_set_range(LpConfig *lpconfig, const char *section, const char *key, int min_value, int max_value) {
 	char tmp[30];
 	snprintf(tmp, sizeof(tmp), "%i-%i", min_value, max_value);
@@ -599,48 +708,101 @@ void lp_config_set_float(LpConfig *lpconfig,const char *section, const char *key
 	lp_config_set_string(lpconfig,section,key,tmp);
 }
 
-void lp_item_write(LpItem *item, FILE *file){
-	if (item->is_comment)
-		fprintf(file,"%s\n",item->value);
-	else if (item->value && item->value[0] != '\0' )
-		fprintf(file,"%s=%s\n",item->key,item->value);
-	else {
-		ms_warning("Not writing item %s to file, it is empty", item->key);
+void lp_config_set_overwrite_flag_for_entry(LpConfig *lpconfig, const char *section, const char *key, bool_t value) {
+	LpSection *sec;
+	LpItem *item;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL) {
+		item = lp_section_find_item(sec, key);
+		if (item != NULL) item->overwrite = value;
 	}
 }
 
-void lp_section_param_write(LpSectionParam *param, FILE *file){
+void lp_config_set_overwrite_flag_for_section(LpConfig *lpconfig, const char *section, bool_t value) {
+	LpSection *sec;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL) {
+		sec->overwrite = value;
+	}
+}
+
+void lp_config_set_skip_flag_for_entry(LpConfig *lpconfig, const char *section, const char *key, bool_t value) {
+	LpSection *sec;
+	LpItem *item;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL) {
+		item = lp_section_find_item(sec, key);
+		if (item != NULL) item->skip = value;
+	}
+}
+
+void lp_config_set_skip_flag_for_section(LpConfig *lpconfig, const char *section, bool_t value) {
+	LpSection *sec;
+	sec = lp_config_find_section(lpconfig, section);
+	if (sec != NULL) {
+		sec->skip = value;
+	}
+}
+
+void lp_item_write(LpItem *item, LpConfig *lpconfig){
+	int ret =-1 ;
+	if (item->is_comment){	
+		ret =bctbx_file_fprintf(lpconfig->pFile, 0, "%s\n",item->value);
+
+	}
+	else if (item->value && item->value[0] != '\0' ){
+		ret =bctbx_file_fprintf(lpconfig->pFile, 0, "%s=%s\n",item->key,item->value);
+	}
+	
+	else {
+		ms_warning("Not writing item %s to file, it is empty", item->key);
+	}
+	if (ret < 0){
+		ms_error("lp_item_write : not writing item to file" );
+	}
+}
+
+void lp_section_param_write(LpSectionParam *param, LpConfig *lpconfig){
 	if( param->value && param->value[0] != '\0') {
-		fprintf(file, " %s=%s", param->key, param->value);
+		bctbx_file_fprintf(lpconfig->pFile, 0, " %s=%s", param->key, param->value);
+
 	} else {
 		ms_warning("Not writing param %s to file, it is empty", param->key);
 	}
 }
 
-void lp_section_write(LpSection *sec, FILE *file){
-	fprintf(file, "[%s",sec->name);
-	ms_list_for_each2(sec->params, (void (*)(void*, void*))lp_section_param_write, (void *)file);
-	fprintf(file, "]\n");
-	ms_list_for_each2(sec->items, (void (*)(void*, void*))lp_item_write, (void *)file);
-	fprintf(file, "\n");
+void lp_section_write(LpSection *sec,LpConfig *lpconfig){
+
+	if (bctbx_file_fprintf(lpconfig->pFile, 0, "[%s",sec->name) < 0) ms_error("lp_section_write : write error on %s", sec->name);
+	bctbx_list_for_each2(sec->params, (void (*)(void*, void*))lp_section_param_write, (void *)lpconfig);
+
+	if (bctbx_file_fprintf(lpconfig->pFile, 0, "]\n")< 0) ms_error("lp_section_write : write error ");
+	bctbx_list_for_each2(sec->items, (void (*)(void*, void*))lp_item_write, (void *)lpconfig);
+
+	if (bctbx_file_fprintf(lpconfig->pFile, 0, "\n")< 0) ms_error("lp_section_write : write error");
+	
 }
 
 int lp_config_sync(LpConfig *lpconfig){
-	FILE *file;
+	bctbx_vfs_file_t *pFile = NULL;
 	if (lpconfig->filename==NULL) return -1;
 	if (lpconfig->readonly) return 0;
+
 #ifndef _WIN32
 	/* don't create group/world-accessible files */
 	(void) umask(S_IRWXG | S_IRWXO);
 #endif
-	file=fopen(lpconfig->tmpfilename,"w");
-	if (file==NULL){
+	pFile  = bctbx_file_open(lpconfig->g_bctbx_vfs,lpconfig->tmpfilename, "w");
+	lpconfig->pFile = pFile;
+	if (pFile == NULL){
 		ms_warning("Could not write %s ! Maybe it is read-only. Configuration will not be saved.",lpconfig->filename);
 		lpconfig->readonly=1;
 		return -1;
 	}
-	ms_list_for_each2(lpconfig->sections,(void (*)(void *,void*))lp_section_write,(void *)file);
-	fclose(file);
+	
+	bctbx_list_for_each2(lpconfig->sections,(void (*)(void *,void*))lp_section_write,(void *)lpconfig);
+	bctbx_file_close(pFile);
+
 #ifdef RENAME_REQUIRES_NONEXISTENT_NEW_PATH
 	/* On windows, rename() does not accept that the newpath is an existing file, while it is accepted on Unix.
 	 * As a result, we are forced to first delete the linphonerc file, and then rename.*/
@@ -662,8 +824,8 @@ int lp_config_has_section(const LpConfig *lpconfig, const char *section){
 
 void lp_config_for_each_section(const LpConfig *lpconfig, void (*callback)(const char *section, void *ctx), void *ctx) {
 	LpSection *sec;
-	MSList *elem;
-	for (elem=lpconfig->sections;elem!=NULL;elem=ms_list_next(elem)){
+	bctbx_list_t *elem;
+	for (elem=lpconfig->sections;elem!=NULL;elem=bctbx_list_next(elem)){
 		sec=(LpSection*)elem->data;
 		callback(sec->name, ctx);
 	}
@@ -671,10 +833,10 @@ void lp_config_for_each_section(const LpConfig *lpconfig, void (*callback)(const
 
 void lp_config_for_each_entry(const LpConfig *lpconfig, const char *section, void (*callback)(const char *entry, void *ctx), void *ctx) {
 	LpItem *item;
-	MSList *elem;
+	bctbx_list_t *elem;
 	LpSection *sec=lp_config_find_section(lpconfig,section);
 	if (sec!=NULL){
-		for (elem=sec->items;elem!=NULL;elem=ms_list_next(elem)){
+		for (elem=sec->items;elem!=NULL;elem=bctbx_list_next(elem)){
 			item=(LpItem*)elem->data;
 			if (!item->is_comment)
 				callback(item->key, ctx);
@@ -756,26 +918,26 @@ static const char *_lp_config_dirname(char *path) {
 }
 
 bool_t lp_config_relative_file_exists(const LpConfig *lpconfig, const char *filename) {
+	bctbx_vfs_file_t *pFile;
 	if (lpconfig->filename == NULL) {
 		return FALSE;
 	} else {
-		char *filename = ms_strdup(lpconfig->filename);
-		const char *dir = _lp_config_dirname(filename);
+		char *conf_path = ms_strdup(lpconfig->filename);
+		const char *dir = _lp_config_dirname(conf_path);
 		char *filepath = ms_strdup_printf("%s/%s", dir, filename);
 		char *realfilepath = lp_realpath(filepath, NULL);
-		FILE *file;
-		
-		ms_free(filename);
+
+		ms_free(conf_path);
 		ms_free(filepath);
-		
+
 		if(realfilepath == NULL) return FALSE;
-		
-		file = fopen(realfilepath, "r");
+
+		pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,realfilepath, "r");
 		ms_free(realfilepath);
-		if (file) {
-			fclose(file);
+		if (pFile != NULL) {
+			bctbx_file_close(pFile);
 		}
-		return file != NULL;
+		return pFile != NULL;
 	}
 }
 
@@ -784,15 +946,15 @@ void lp_config_write_relative_file(const LpConfig *lpconfig, const char *filenam
 	const char *dir = NULL;
 	char *filepath = NULL;
 	char *realfilepath = NULL;
-	FILE *file;
-	
+	bctbx_vfs_file_t *pFile;
+
 	if (lpconfig->filename == NULL) return;
-	
+
 	if(strlen(data) == 0) {
 		ms_warning("%s has not been created because there is no data to write", filename);
 		return;
 	}
-	
+
 	dup_config_file = ms_strdup(lpconfig->filename);
 	dir = _lp_config_dirname(dup_config_file);
 	filepath = ms_strdup_printf("%s/%s", dir, filename);
@@ -801,16 +963,15 @@ void lp_config_write_relative_file(const LpConfig *lpconfig, const char *filenam
 		ms_error("Could not resolv %s: %s", filepath, strerror(errno));
 		goto end;
 	}
-	
-	file = fopen(realfilepath, "w");
-	if(file == NULL) {
+
+	pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,realfilepath, "w");
+	if(pFile == NULL) {
 		ms_error("Could not open %s for write", realfilepath);
 		goto end;
 	}
-	
-	fprintf(file, "%s", data);
-	fclose(file);
-	
+	bctbx_file_fprintf(pFile, 0, "%s",data);
+	bctbx_file_close(pFile);
+
 end:
 	ms_free(dup_config_file);
 	ms_free(filepath);
@@ -821,11 +982,12 @@ int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename,
 	char *dup_config_file = NULL;
 	const char *dir = NULL;
 	char *filepath = NULL;
-	FILE *file = NULL;
+	bctbx_vfs_file_t* pFile = NULL;
+
 	char* realfilepath = NULL;
-	
+
 	if (lpconfig->filename == NULL) return -1;
-	
+
 	dup_config_file = ms_strdup(lpconfig->filename);
 	dir = _lp_config_dirname(dup_config_file);
 	filepath = ms_strdup_printf("%s/%s", dir, filename);
@@ -834,27 +996,106 @@ int lp_config_read_relative_file(const LpConfig *lpconfig, const char *filename,
 		ms_error("Could not resolv %s: %s", filepath, strerror(errno));
 		goto err;
 	}
-	
-	file = fopen(realfilepath, "r");
-	if(file == NULL) {
-		ms_error("Could not open %s for read. %s", realfilepath, strerror(errno));
+
+	pFile = bctbx_file_open(lpconfig->g_bctbx_vfs,realfilepath,"r");
+	if (pFile == NULL) {
+		ms_error("Could not open %s for read.", realfilepath);
 		goto err;
 	}
-	
-	if(fread(data, 1, max_length, file)<=0) {
-		ms_error("%s could not be loaded. %s", realfilepath, strerror(errno));
+
+	if(bctbx_file_read(pFile, data, 1, (off_t)max_length) < 0){
+		ms_error("%s could not be loaded.", realfilepath);
 		goto err;
+		
 	}
-	fclose(file);
-	
+
+	bctbx_file_close(pFile);
+
 	ms_free(dup_config_file);
 	ms_free(filepath);
 	ms_free(realfilepath);
 	return 0;
 
 err:
-	ms_free(filepath);
+	ms_free(dup_config_file);
 	ms_free(filepath);
 	if(realfilepath) ms_free(realfilepath);
 	return -1;
 }
+
+const char** lp_config_get_sections_names(LpConfig *lpconfig) {
+	const char **sections_names;
+	const bctbx_list_t *sections = lpconfig->sections;
+	size_t ndev;
+	int i;
+
+	ndev = bctbx_list_size(sections);
+	sections_names = ms_malloc((ndev + 1) * sizeof(const char *));
+
+	for (i = 0; sections != NULL; sections = sections->next, i++) {
+		LpSection *section = (LpSection *)sections->data;
+		sections_names[i] = ms_strdup(section->name);
+	}
+
+	sections_names[ndev] = NULL;
+	return sections_names;
+}
+
+char* lp_config_dump_as_xml(const LpConfig *lpconfig) {
+	char *buffer;
+
+	lpc2xml_context *ctx = lpc2xml_context_new(NULL, NULL);
+	lpc2xml_set_lpc(ctx, lpconfig);
+	lpc2xml_convert_string(ctx, &buffer);
+	lpc2xml_context_destroy(ctx);
+
+	return buffer;
+}
+
+struct _entry_data {
+	const LpConfig *conf;
+	const char *section;
+	char** buffer;
+};
+
+static void dump_entry(const char *entry, void *data) {
+	struct _entry_data *d = (struct _entry_data *) data;
+	const char *value = lp_config_get_string(d->conf, d->section, entry, "");
+	*d->buffer = ms_strcat_printf(*d->buffer, "\t%s=%s\n", entry, value);
+}
+
+static void dump_section(const char *section, void *data) {
+	struct _entry_data *d = (struct _entry_data *) data;
+	d->section = section;
+	*d->buffer = ms_strcat_printf(*d->buffer, "[%s]\n", section);
+	lp_config_for_each_entry(d->conf, section, dump_entry, d);
+}
+
+char* lp_config_dump(const LpConfig *lpconfig) {
+	char* buffer = NULL;
+	struct _entry_data d = { lpconfig, NULL, &buffer };
+	lp_config_for_each_section(lpconfig, dump_section, &d);
+
+	return buffer;
+}
+
+void lp_config_clean_entry(LpConfig *lpconfig, const char *section, const char *key) {
+	LpSection *sec;
+	LpItem *item;
+	sec=lp_config_find_section(lpconfig,section);
+	if (sec!=NULL){
+		item=lp_section_find_item(sec,key);
+		if (item!=NULL)
+			lp_section_remove_item(sec,item);
+	}
+	return ;
+}
+int lp_config_has_entry(const LpConfig *lpconfig, const char *section, const char *key) {
+	LpSection *sec;
+	sec=lp_config_find_section(lpconfig,section);
+	if (sec!=NULL){
+		return lp_section_find_item(sec,key) != NULL;
+	} else
+		return FALSE;
+	
+}
diff --git a/coreapi/lpconfig.h b/coreapi/lpconfig.h
index b03bfa57f..59269098e 100644
--- a/coreapi/lpconfig.h
+++ b/coreapi/lpconfig.h
@@ -104,6 +104,18 @@ LINPHONE_PUBLIC int lp_config_read_file(LpConfig *lpconfig, const char *filename
 **/
 LINPHONE_PUBLIC const char *lp_config_get_string(const LpConfig *lpconfig, const char *section, const char *key, const char *default_string);
 
+/**
+ * Retrieves a configuration item as a list of strings, given its section, key, and default value.
+ * The default value is returned if the config item is not found.
+ * @ingroup misc
+ * @param[in] lpconfig A LpConfig object
+ * @param[in] section The section from which to retrieve a configuration item
+ * @param[in] key The name of the configuration item to retrieve
+ * @param[in] default_list \mslist{const char *}
+ * @return \mslist{const char *}
+ */
+LINPHONE_PUBLIC bctbx_list_t * lp_config_get_string_list(const LpConfig *lpconfig, const char *section, const char *key, bctbx_list_t *default_list);
+
 /**
  * Retrieves a configuration item as a range, given its section, key, and default min and max values.
  *
@@ -144,6 +156,16 @@ LINPHONE_PUBLIC float lp_config_get_float(const LpConfig *lpconfig,const char *s
 **/
 LINPHONE_PUBLIC void lp_config_set_string(LpConfig *lpconfig,const char *section, const char *key, const char *value);
 
+/**
+ * Sets a string list config item
+ * @ingroup misc
+ * @param[in] lpconfig A LpConfig object
+ * @param[in] section The name of the section to put the configuration item into
+ * @param[in] key The name of the configuration item to set
+ * @param[in] value \mslist{const char *} The value to set
+ */
+LINPHONE_PUBLIC void lp_config_set_string_list(LpConfig *lpconfig, const char *section, const char *key, const bctbx_list_t *value);
+
 /**
  * Sets a range config item
  *
@@ -200,6 +222,33 @@ LINPHONE_PUBLIC int lp_config_has_section(const LpConfig *lpconfig, const char *
 **/
 LINPHONE_PUBLIC void lp_config_clean_section(LpConfig *lpconfig, const char *section);
 
+/**
+ * Returns 1 if a given section  with a given key is present in the configuration.
+ * @param[in] lpconfig The LpConfig object
+ * @param[in] section
+ * @param[in] key
+ *
+ * @ingroup misc
+ **/
+LINPHONE_PUBLIC int lp_config_has_entry(const LpConfig *lpconfig, const char *section, const char *key);
+
+/**
+ * Removes entries for key,value in a section.
+ * @param[in] lpconfig The LpConfig object
+ * @param[in] section
+ * @param[in] key
+ *
+ * @ingroup misc
+ **/
+LINPHONE_PUBLIC void lp_config_clean_entry(LpConfig *lpconfig, const char *section, const char *key);
+	
+/**
+ * Returns the list of sections' names in the LpConfig.
+ * @param[in] lpconfig The LpConfig object
+ * @return a null terminated static array of strings
+**/
+LINPHONE_PUBLIC const char** lp_config_get_sections_names(LpConfig *lpconfig);
+
 /**
  * Call a function for each section present in the configuration.
  *
@@ -295,6 +344,80 @@ LINPHONE_PUBLIC int lp_config_read_relative_file(const LpConfig *lpconfig, const
 **/
 LINPHONE_PUBLIC bool_t lp_config_relative_file_exists(const LpConfig *lpconfig, const char *filename);
 
+/**
+ * Dumps the LpConfig as XML into a buffer
+ * @param[in] lpconfig The LpConfig object
+ * @return The buffer that contains the XML dump
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC char* lp_config_dump_as_xml(const LpConfig *lpconfig);
+
+/**
+ * Dumps the LpConfig as INI into a buffer
+ * @param[in] lpconfig The LpConfig object
+ * @return The buffer that contains the config dump
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC char* lp_config_dump(const LpConfig *lpconfig);
+
+/**
+ * Retrieves the overwrite flag for a config item
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC bool_t lp_config_get_overwrite_flag_for_entry(const LpConfig *lpconfig, const char *section, const char *key);
+
+/**
+ * Sets the overwrite flag for a config item (used when dumping config as xml)
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC void lp_config_set_overwrite_flag_for_entry(LpConfig *lpconfig, const char *section, const char *key, bool_t value);
+
+/**
+ * Retrieves the overwrite flag for a config section
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC bool_t lp_config_get_overwrite_flag_for_section(const LpConfig *lpconfig, const char *section);
+
+/**
+ * Sets the overwrite flag for a config section (used when dumping config as xml)
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC void lp_config_set_overwrite_flag_for_section(LpConfig *lpconfig, const char *section, bool_t value);
+
+/**
+ * Retrieves the skip flag for a config item
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC bool_t lp_config_get_skip_flag_for_entry(const LpConfig *lpconfig, const char *section, const char *key);
+
+/**
+ * Sets the skip flag for a config item (used when dumping config as xml)
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC void lp_config_set_skip_flag_for_entry(LpConfig *lpconfig, const char *section, const char *key, bool_t value);
+
+/**
+ * Retrieves the skip flag for a config section
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC bool_t lp_config_get_skip_flag_for_section(const LpConfig *lpconfig, const char *section);
+
+/**
+ * Sets the skip flag for a config section (used when dumping config as xml)
+ *
+ * @ingroup misc
+**/
+LINPHONE_PUBLIC void lp_config_set_skip_flag_for_section(LpConfig *lpconfig, const char *section, bool_t value);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/lsd.c b/coreapi/lsd.c
index 4ca1ede63..b88b21bf0 100644
--- a/coreapi/lsd.c
+++ b/coreapi/lsd.c
@@ -61,7 +61,7 @@ struct _LinphoneSoundDaemon {
 
 static MSFilter *create_writer(MSSndCard *c){
 	LinphoneSoundDaemon *lsd=(LinphoneSoundDaemon*)c->data;
-	MSFilter *itcsink=ms_filter_new(MS_ITC_SINK_ID);
+	MSFilter *itcsink=ms_factory_create_filter(ms_snd_card_get_factory(c), MS_ITC_SINK_ID);
 	ms_filter_call_method(itcsink,MS_ITC_SINK_CONNECT,lsd->branches[0].player);
 	return itcsink;
 }
@@ -77,7 +77,10 @@ static MSSndCardDesc proxycard={
 	NULL,
 	/*create_reader*/ NULL,
 	create_writer,
-	/*uninit,*/
+	NULL, /*uninit*/
+	NULL, /* duplicate */
+	NULL, /*unload */
+	NULL /*usage_hint */
 };
 
 LsdPlayer *linphone_sound_daemon_get_player(LinphoneSoundDaemon *obj){
@@ -114,11 +117,11 @@ int lsd_player_stop(LsdPlayer *p){
 	return 0;
 }
 
-static void lsd_player_init(LsdPlayer *p, MSConnectionPoint mixer, MSFilterId playerid, LinphoneSoundDaemon *lsd){
+static void lsd_player_init(MSFactory* factory, LsdPlayer *p, MSConnectionPoint mixer, MSFilterId playerid, LinphoneSoundDaemon *lsd){
 	MSConnectionHelper h;
-	p->player=ms_filter_new(playerid);
-	p->rateconv=ms_filter_new(MS_RESAMPLE_ID);
-	p->chanadapter=ms_filter_new(MS_CHANNEL_ADAPTER_ID);
+	p->player=ms_factory_create_filter(factory, playerid);
+	p->rateconv=ms_factory_create_filter(factory,MS_RESAMPLE_ID);
+	p->chanadapter=ms_factory_create_filter(factory,MS_CHANNEL_ADAPTER_ID);
 	
 	ms_connection_helper_start(&h);
 	ms_connection_helper_link(&h,p->player,-1,0);
@@ -219,16 +222,15 @@ void lsd_player_set_gain(LsdPlayer *p, float gain){
 	ms_filter_call_method(p->lsd->mixer,MS_AUDIO_MIXER_SET_INPUT_GAIN,&gainctl);
 }
 
-LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname, int rate, int nchannels){
+LinphoneSoundDaemon * linphone_sound_daemon_new(MSFactory* factory, const char *cardname, int rate, int nchannels){
 	int i;
 	MSConnectionPoint mp;
 	LinphoneSoundDaemon *lsd;
-	MSSndCard *card=ms_snd_card_manager_get_card(
-	                                             ms_snd_card_manager_get(),
+	MSSndCard *card=ms_snd_card_manager_get_card(ms_factory_get_snd_card_manager(factory),
 	                                             cardname);
 	if (card==NULL){
 		card=ms_snd_card_manager_get_default_playback_card (
-		                                                    ms_snd_card_manager_get());
+		                                                   ms_factory_get_snd_card_manager(factory));
 		if (card==NULL){
 			ms_error("linphone_sound_daemon_new(): No playback soundcard available");
 			return NULL;
@@ -237,7 +239,7 @@ LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname, int rate,
 	
 	lsd=ms_new0(LinphoneSoundDaemon,1);
 	lsd->soundout=ms_snd_card_create_writer(card);
-	lsd->mixer=ms_filter_new(MS_AUDIO_MIXER_ID);
+	lsd->mixer=ms_factory_create_filter(ms_snd_card_get_factory(card),MS_AUDIO_MIXER_ID);
 	lsd->out_rate=rate;
 	lsd->out_nchans=nchannels;
 	ms_filter_call_method(lsd->soundout,MS_FILTER_SET_SAMPLE_RATE,&lsd->out_rate);
@@ -248,11 +250,11 @@ LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname, int rate,
 	mp.filter=lsd->mixer;
 	mp.pin=0;
 
-	lsd_player_init(&lsd->branches[0],mp,MS_ITC_SOURCE_ID,lsd);
+	lsd_player_init(factory, &lsd->branches[0],mp,MS_ITC_SOURCE_ID,lsd);
 	ms_filter_add_notify_callback(lsd->branches[0].player,(MSFilterNotifyFunc)lsd_player_configure,&lsd->branches[0],FALSE);
 	for(i=1;i<MAX_BRANCHES;++i){
 		mp.pin=i;
-		lsd_player_init(&lsd->branches[i],mp,MS_FILE_PLAYER_ID,lsd);
+		lsd_player_init(factory,&lsd->branches[i],mp,MS_FILE_PLAYER_ID,lsd);
 	}
 	ms_filter_link(lsd->mixer,0,lsd->soundout,0);
 	lsd->ticker=ms_ticker_new();
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index ff5462c76..c85402c26 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -20,16 +20,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "private.h"
 #include "linphonecore.h"
 
-#ifdef MSG_STORAGE_ENABLED
+
+#ifdef SQLITE_STORAGE_ENABLED
+
 #ifndef PRIu64
 #define PRIu64 "I64u"
 #endif
 
 #ifndef _WIN32
-#if !defined(ANDROID) && !defined(__QNXNTO__)
-#	include <langinfo.h>
-#	include <iconv.h>
-#	include <string.h>
+#if !defined(__QNXNTO__)
+#include <langinfo.h>
+#include <locale.h>
+#include <iconv.h>
+#include <string.h>
 #endif
 #else
 #include <Windows.h>
@@ -40,8 +43,82 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sqlite3.h"
 #include <assert.h>
 
+
+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);
+#elif defined(__QNXNTO__)
+	strncpy(db_file_utf8, filename, MAX_PATH_SIZE - 1);
+#else
+	char db_file_locale[MAX_PATH_SIZE] = {'\0'};
+	char *inbuf=db_file_locale, *outbuf=db_file_utf8;
+	size_t inbyteleft = MAX_PATH_SIZE, outbyteleft = MAX_PATH_SIZE;
+	iconv_t cb;
+
+	if (strcasecmp("UTF-8", nl_langinfo(CODESET)) == 0) {
+		strncpy(db_file_utf8, filename, MAX_PATH_SIZE - 1);
+	} else {
+		strncpy(db_file_locale, filename, MAX_PATH_SIZE-1);
+		cb = iconv_open("UTF-8", nl_langinfo(CODESET));
+		if (cb != (iconv_t)-1) {
+			int ret;
+			ret = iconv(cb, &inbuf, &inbyteleft, &outbuf, &outbyteleft);
+			if(ret == -1) db_file_utf8[0] = '\0';
+			iconv_close(cb);
+		}
+	}
+#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
+
+	/*since we plug our vfs into sqlite, we convert to UTF-8.
+	 * On Windows, the filename has to be converted back to windows native charset.*/
+	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
+	// see http ://www.sqlite.org/compile.html#temp_store
+	ret = sqlite3_exec(*db, "PRAGMA temp_store=MEMORY", NULL, NULL, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("Cannot set sqlite3 temporary store to memory: %s.", errmsg);
+		sqlite3_free(errmsg);
+	}
+#if TARGET_OS_IPHONE
+	ret = sqlite3_exec(*db, "PRAGMA journal_mode = OFF", NULL, NULL, &errmsg);
+	if (ret != SQLITE_OK) {
+		ms_error("Cannot set sqlite3 journal_mode to off: %s.", errmsg);
+		sqlite3_free(errmsg);
+	}
+#endif
+	return ret;
+}
+#endif
+
+
+
+#ifdef SQLITE_STORAGE_ENABLED
+
+
 static ORTP_INLINE LinphoneChatMessage* get_transient_message(LinphoneChatRoom* cr, unsigned int storage_id){
-	MSList* transients = cr->transient_messages;
+	bctbx_list_t* transients = cr->transient_messages;
 	LinphoneChatMessage* chat;
 	while( transients ){
 		chat = (LinphoneChatMessage*)transients->data;
@@ -60,7 +137,9 @@ static ORTP_INLINE LinphoneChatMessage* get_transient_message(LinphoneChatRoom*
  * | 3  | name
  * | 4  | encoding
  * | 5  | size
- * | 6  | data
+ * | 6  | data (currently not stored)
+ * | 7  | key size
+ * | 8  | key
  */
 // Callback for sql request when getting linphone content
 static int callback_content(void *data, int argc, char **argv, char **colName) {
@@ -76,6 +155,7 @@ static int callback_content(void *data, int argc, char **argv, char **colName) {
 	if (argv[3]) linphone_content_set_name(message->file_transfer_information, argv[3]);
 	if (argv[4]) linphone_content_set_encoding(message->file_transfer_information, argv[4]);
 	linphone_content_set_size(message->file_transfer_information, (size_t)atoi(argv[5]));
+	if (argv[8]) linphone_content_set_key(message->file_transfer_information, argv[8], (size_t)atol(argv[7]));
 
 	return 0;
 }
@@ -124,9 +204,7 @@ static int callback_all(void *data, int argc, char **argv, char **colName){
  */
 static int create_chat_message(void *data, int argc, char **argv, char **colName){
 	LinphoneChatRoom *cr = (LinphoneChatRoom *)data;
-	LinphoneAddress *from;
-	LinphoneAddress *to;
-	unsigned int storage_id = atoi(argv[0]);
+	unsigned int storage_id = (unsigned int)atoi(argv[0]);
 
 	// check if the message exists in the transient list, in which case we should return that one.
 	LinphoneChatMessage* new_message = get_transient_message(cr, storage_id);
@@ -135,18 +213,12 @@ static int create_chat_message(void *data, int argc, char **argv, char **colName
 
 		if(atoi(argv[3])==LinphoneChatMessageIncoming){
 			new_message->dir=LinphoneChatMessageIncoming;
-			from=linphone_address_new(argv[2]);
-			to=linphone_address_new(argv[1]);
+			linphone_chat_message_set_from(new_message,linphone_chat_room_get_peer_address(cr));
+			new_message->to = NULL; /*will be filled at the end */
 		} else {
 			new_message->dir=LinphoneChatMessageOutgoing;
-			from=linphone_address_new(argv[1]);
-			to=linphone_address_new(argv[2]);
-		}
-		linphone_chat_message_set_from(new_message,from);
-		linphone_address_destroy(from);
-		if (to){
-			linphone_chat_message_set_to(new_message,to);
-			linphone_address_destroy(to);
+			new_message->from = NULL; /*will be filled at the end */
+			linphone_chat_message_set_to(new_message,linphone_chat_room_get_peer_address(cr));
 		}
 
 		new_message->time = (time_t)atol(argv[9]);
@@ -154,7 +226,7 @@ static int create_chat_message(void *data, int argc, char **argv, char **colName
 		new_message->state=atoi(argv[7]);
 		new_message->storage_id=storage_id;
 		new_message->external_body_url= ms_strdup(argv[8]);
-		new_message->appdata          = ms_strdup(argv[10]);
+		new_message->appdata = ms_strdup(argv[10]);
 
 		if (argv[11] != NULL) {
 			int id = atoi(argv[11]);
@@ -163,7 +235,7 @@ static int create_chat_message(void *data, int argc, char **argv, char **colName
 			}
 		}
 	}
-	cr->messages_hist=ms_list_prepend(cr->messages_hist,new_message);
+	cr->messages_hist=bctbx_list_prepend(cr->messages_hist,new_message);
 
 	return 0;
 }
@@ -201,17 +273,19 @@ void linphone_sql_request_all(sqlite3* db,const char *stmt, LinphoneCore* lc){
 }
 
 static int linphone_chat_message_store_content(LinphoneChatMessage *msg) {
-	LinphoneCore *lc = linphone_chat_room_get_lc(msg->chat_room);
+	LinphoneCore *lc = linphone_chat_room_get_core(msg->chat_room);
 	int id = -1;
 	if (lc->db) {
 		LinphoneContent *content = msg->file_transfer_information;
-		char *buf = sqlite3_mprintf("INSERT INTO content VALUES(NULL,%Q,%Q,%Q,%Q,%i,%Q);",
+		char *buf = sqlite3_mprintf("INSERT INTO content VALUES(NULL,%Q,%Q,%Q,%Q,%i,%Q,%lld,%Q);",
 						linphone_content_get_type(content),
 						linphone_content_get_subtype(content),
 						linphone_content_get_name(content),
 						linphone_content_get_encoding(content),
 						linphone_content_get_size(content),
-						NULL
+						NULL,
+						(int64_t)linphone_content_get_key_size(content),
+						linphone_content_get_key(content)
 					);
 		linphone_sql_request(lc->db, buf);
 		sqlite3_free(buf);
@@ -221,7 +295,7 @@ static int linphone_chat_message_store_content(LinphoneChatMessage *msg) {
 }
 
 unsigned int linphone_chat_message_store(LinphoneChatMessage *msg){
-	LinphoneCore *lc=linphone_chat_room_get_lc(msg->chat_room);
+	LinphoneCore *lc=linphone_chat_room_get_core(msg->chat_room);
 	int id = 0;
 
 	if (lc->db){
@@ -260,7 +334,7 @@ unsigned int linphone_chat_message_store(LinphoneChatMessage *msg){
 void linphone_chat_message_store_state(LinphoneChatMessage *msg){
 	LinphoneCore *lc=msg->chat_room->lc;
 	if (lc->db){
-		char *buf=sqlite3_mprintf("UPDATE history SET status=%i WHERE (id = %i);",
+		char *buf=sqlite3_mprintf("UPDATE history SET status=%i WHERE (id = %u);",
 								  msg->state,msg->storage_id);
 		linphone_sql_request(lc->db,buf);
 		sqlite3_free(buf);
@@ -270,7 +344,7 @@ void linphone_chat_message_store_state(LinphoneChatMessage *msg){
 void linphone_chat_message_store_appdata(LinphoneChatMessage* msg){
 	LinphoneCore *lc=msg->chat_room->lc;
 	if (lc->db){
-		char *buf=sqlite3_mprintf("UPDATE history SET appdata=%Q WHERE id=%i;",
+		char *buf=sqlite3_mprintf("UPDATE history SET appdata=%Q WHERE id=%u;",
 								  msg->appdata,msg->storage_id);
 		linphone_sql_request(lc->db,buf);
 		sqlite3_free(buf);
@@ -278,7 +352,7 @@ void linphone_chat_message_store_appdata(LinphoneChatMessage* msg){
 }
 
 void linphone_chat_room_mark_as_read(LinphoneChatRoom *cr){
-	LinphoneCore *lc=linphone_chat_room_get_lc(cr);
+	LinphoneCore *lc=linphone_chat_room_get_core(cr);
 	int read=1;
 	char *peer;
 	char *buf;
@@ -299,18 +373,18 @@ void linphone_chat_room_mark_as_read(LinphoneChatRoom *cr){
 }
 
 void linphone_chat_room_update_url(LinphoneChatRoom *cr, LinphoneChatMessage *msg) {
-	LinphoneCore *lc=linphone_chat_room_get_lc(cr);
+	LinphoneCore *lc=linphone_chat_room_get_core(cr);
 	char *buf;
 
 	if (lc->db==NULL) return ;
 
-	buf=sqlite3_mprintf("UPDATE history SET url=%Q WHERE id=%i;",msg->external_body_url,msg->storage_id);
+	buf=sqlite3_mprintf("UPDATE history SET url=%Q WHERE id=%u;",msg->external_body_url,msg->storage_id);
 	linphone_sql_request(lc->db,buf);
 	sqlite3_free(buf);
 }
 
 static int linphone_chat_room_get_messages_count(LinphoneChatRoom *cr, bool_t unread_only){
-	LinphoneCore *lc=linphone_chat_room_get_lc(cr);
+	LinphoneCore *lc=linphone_chat_room_get_core(cr);
 	int numrows=0;
 	char *peer;
 	char *buf;
@@ -355,14 +429,13 @@ void linphone_chat_room_delete_message(LinphoneChatRoom *cr, LinphoneChatMessage
 
 	if (lc->db==NULL) return ;
 
-	buf=sqlite3_mprintf("DELETE FROM history WHERE id = %i;", msg->storage_id);
+	buf=sqlite3_mprintf("DELETE FROM history WHERE id = %u;", msg->storage_id);
 	linphone_sql_request(lc->db,buf);
 	sqlite3_free(buf);
 
-	if(cr->unread_count >= 0 && !msg->is_read) {
-		assert(cr->unread_count > 0);
-		cr->unread_count--;
-	}
+	/* Invalidate unread_count when we modify the database, so that next
+	 time we need it it will be recomputed from latest database state */
+	cr->unread_count = -1;
 }
 
 void linphone_chat_room_delete_history(LinphoneChatRoom *cr){
@@ -381,9 +454,9 @@ void linphone_chat_room_delete_history(LinphoneChatRoom *cr){
 	if(cr->unread_count > 0) cr->unread_count = 0;
 }
 
-MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int startm, int endm){
-	LinphoneCore *lc=linphone_chat_room_get_lc(cr);
-	MSList *ret;
+bctbx_list_t *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int startm, int endm){
+	LinphoneCore *lc=linphone_chat_room_get_core(cr);
+	bctbx_list_t *ret;
 	char *buf,*buf2;
 	char *peer;
 	uint64_t begin,end;
@@ -421,23 +494,39 @@ MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int startm, i
 	begin=ortp_get_cur_time_ms();
 	linphone_sql_request_message(lc->db,buf,cr);
 	end=ortp_get_cur_time_ms();
-	ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+
+	if (endm+1-startm > 1) {
+		//display message only if at least 2 messages are loaded
+		ms_message("%s(): completed in %i ms",__FUNCTION__, (int)(end-begin));
+	}
 	ms_free(buf);
+
+	if (cr->messages_hist) {
+		//fill local addr with core identity instead of per message
+		LinphoneAddress* local_addr = linphone_address_new(linphone_core_get_identity(cr->lc));
+		bctbx_list_t* it = cr->messages_hist;
+		while (it) {
+			LinphoneChatMessage* msg = it->data;
+			if (msg->dir == LinphoneChatMessageOutgoing) {
+				msg->from = linphone_address_ref(local_addr);
+			} else {
+				msg->to = linphone_address_ref(local_addr);
+			}
+			it = it->next;
+		}
+		linphone_address_unref(local_addr);
+	}
+
 	ret=cr->messages_hist;
 	cr->messages_hist=NULL;
 	ms_free(peer);
 	return ret;
 }
 
-MSList *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message){
+bctbx_list_t *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message){
 	return linphone_chat_room_get_history_range(cr, 0, nb_message-1);
 }
 
-
-void linphone_close_storage(sqlite3* db){
-	sqlite3_close(db);
-}
-
 void linphone_create_table(sqlite3* db){
 	char* errmsg=NULL;
 	int ret;
@@ -577,6 +666,21 @@ void linphone_update_table(sqlite3* db) {
 			ms_debug("Table content successfully created.");
 		}
 	}
+
+	// new fields for content key storage when using lime
+	ret=sqlite3_exec(db,"ALTER TABLE content ADD COLUMN key_size INTEGER;",NULL,NULL,&errmsg);
+	if(ret != SQLITE_OK) {
+		ms_message("Table already up to date: %s.", errmsg);
+		sqlite3_free(errmsg);
+	} else {
+		ret=sqlite3_exec(db,"ALTER TABLE content ADD COLUMN key TEXT;",NULL,NULL,&errmsg);
+		if(ret != SQLITE_OK) {
+			ms_message("Table already up to date: %s.", errmsg);
+			sqlite3_free(errmsg);
+		} else {
+			ms_debug("Table history content successfully for lime key storage data.");
+		}
+	}
 }
 
 void linphone_message_storage_init_chat_rooms(LinphoneCore *lc) {
@@ -609,38 +713,10 @@ void linphone_core_message_storage_set_debug(LinphoneCore *lc, bool_t debug){
 	}
 }
 
-static int _linphone_sqlite3_open(const char *db_file, sqlite3 **db) {
-#if defined(ANDROID) || defined(__QNXNTO__)
-	return sqlite3_open(db_file, db);
-#elif defined(_WIN32)
-	int ret;
-	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';
-	return sqlite3_open16(db_file_utf16, db);
-#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);
-	cb = iconv_open("UTF-8", nl_langinfo(CODESET));
-	if(cb != (iconv_t)-1) {
-		int ret;
-		ret = iconv(cb, &inbuf, &inbyteleft, &outbuf, &outbyteleft);
-		if(ret == -1) db_file_utf8[0] = '\0';
-		iconv_close(cb);
-	}
-	return sqlite3_open(db_file_utf8, db);
-#endif
-}
-
 void linphone_core_message_storage_init(LinphoneCore *lc){
 	int ret;
 	const char *errmsg;
-	sqlite3 *db;
+	sqlite3 *db = NULL;
 
 	linphone_core_message_storage_close(lc);
 
@@ -684,11 +760,11 @@ void linphone_chat_message_store_appdata(LinphoneChatMessage *msg){
 void linphone_chat_room_mark_as_read(LinphoneChatRoom *cr){
 }
 
-MSList *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message){
+bctbx_list_t *linphone_chat_room_get_history(LinphoneChatRoom *cr,int nb_message){
 	return NULL;
 }
 
-LINPHONE_PUBLIC MSList *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int begin, int end){
+LINPHONE_PUBLIC bctbx_list_t *linphone_chat_room_get_history_range(LinphoneChatRoom *cr, int begin, int end){
 	return NULL;
 }
 
diff --git a/coreapi/misc.c b/coreapi/misc.c
index e20f021f3..7f586108c 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -62,7 +62,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 static void clear_ice_check_list(LinphoneCall *call, IceCheckList *removed);
 
 bool_t linphone_core_payload_type_enabled(LinphoneCore *lc, const LinphonePayloadType *pt){
-	if (ms_list_find(lc->codecs_conf.audio_codecs, (PayloadType*) pt) || ms_list_find(lc->codecs_conf.video_codecs, (PayloadType*)pt)){
+	if (bctbx_list_find(lc->codecs_conf.audio_codecs, (PayloadType*) pt) || bctbx_list_find(lc->codecs_conf.video_codecs, (PayloadType*)pt) || bctbx_list_find(lc->codecs_conf.text_codecs, (PayloadType*)pt)){
 		return payload_type_enabled(pt);
 	}
 	ms_error("Getting enablement status of codec not in audio or video list of PayloadType !");
@@ -75,7 +75,7 @@ bool_t linphone_core_payload_type_is_vbr(LinphoneCore *lc, const LinphonePayload
 }
 
 int linphone_core_enable_payload_type(LinphoneCore *lc, LinphonePayloadType *pt, bool_t enabled){
-	if (ms_list_find(lc->codecs_conf.audio_codecs,pt) || ms_list_find(lc->codecs_conf.video_codecs,pt)){
+	if (bctbx_list_find(lc->codecs_conf.audio_codecs,pt) || bctbx_list_find(lc->codecs_conf.video_codecs,pt) || bctbx_list_find(lc->codecs_conf.text_codecs,pt)){
 		payload_type_set_enable(pt,enabled);
 		_linphone_core_codec_config_write(lc);
 		linphone_core_update_allocated_audio_bandwidth(lc);
@@ -94,8 +94,9 @@ void linphone_core_set_payload_type_number(LinphoneCore *lc, PayloadType *pt, in
 }
 
 const char *linphone_core_get_payload_type_description(LinphoneCore *lc, PayloadType *pt){
-	if (ms_filter_codec_supported(pt->mime_type)){
-		MSFilterDesc *desc=ms_filter_get_encoder(pt->mime_type);
+	//if (ms_filter_codec_supported(pt->mime_type)){
+	if (ms_factory_codec_supported(lc->factory, pt->mime_type)){
+		MSFilterDesc *desc=ms_factory_get_encoder(lc->factory, pt->mime_type);
 #ifdef ENABLE_NLS
 		return dgettext("mediastreamer",desc->text);
 #else
@@ -106,7 +107,7 @@ const char *linphone_core_get_payload_type_description(LinphoneCore *lc, Payload
 }
 
 void linphone_core_set_payload_type_bitrate(LinphoneCore *lc, LinphonePayloadType *pt, int bitrate){
-	if (ms_list_find(lc->codecs_conf.audio_codecs, (PayloadType*) pt) || ms_list_find(lc->codecs_conf.video_codecs, (PayloadType*)pt)){
+	if (bctbx_list_find(lc->codecs_conf.audio_codecs, (PayloadType*) pt) || bctbx_list_find(lc->codecs_conf.video_codecs, (PayloadType*)pt) || bctbx_list_find(lc->codecs_conf.text_codecs, (PayloadType*)pt)){
 		if (pt->type==PAYLOAD_VIDEO || pt->flags & PAYLOAD_TYPE_IS_VBR){
 			pt->normal_bitrate=bitrate*1000;
 			pt->flags|=PAYLOAD_TYPE_BITRATE_OVERRIDE;
@@ -203,7 +204,7 @@ void linphone_core_update_allocated_audio_bandwidth_in_call(LinphoneCall *call,
 }
 
 void linphone_core_update_allocated_audio_bandwidth(LinphoneCore *lc){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	int maxbw=get_min_bandwidth(linphone_core_get_download_bandwidth(lc),
 					linphone_core_get_upload_bandwidth(lc));
 	int max_codec_bitrate=0;
@@ -233,7 +234,7 @@ bool_t linphone_core_is_payload_type_usable_for_bandwidth(LinphoneCore *lc, cons
 		case PAYLOAD_AUDIO_CONTINUOUS:
 		case PAYLOAD_AUDIO_PACKETIZED:
 			codec_band=get_audio_payload_bandwidth(lc,pt,bandwidth_limit);
-			ret=bandwidth_is_greater(bandwidth_limit,codec_band);
+			ret=bandwidth_is_greater(bandwidth_limit,(int)codec_band);
 			/*ms_message("Payload %s: codec_bandwidth=%g, bandwidth_limit=%i",pt->mime_type,codec_band,bandwidth_limit);*/
 			break;
 		case PAYLOAD_VIDEO:
@@ -242,6 +243,9 @@ bool_t linphone_core_is_payload_type_usable_for_bandwidth(LinphoneCore *lc, cons
 			}
 			else ret=FALSE;
 			break;
+		case PAYLOAD_TEXT:
+			ret=TRUE;
+			break;
 	}
 	return ret;
 }
@@ -257,7 +261,7 @@ bool_t linphone_core_check_payload_type_usability(LinphoneCore *lc, const Payloa
 		&& linphone_core_echo_cancellation_enabled(lc)
 		&& (pt->clock_rate!=16000 && pt->clock_rate!=8000)
 		&& strcasecmp(pt->mime_type,"opus")!=0
-		&& ms_filter_lookup_by_name("MSWebRTCAEC")!=NULL){
+		&& ms_factory_lookup_filter_by_name(lc->factory, "MSWebRTCAEC")!=NULL){
 		ms_warning("Payload type %s/%i cannot be used because software echo cancellation is required but is unable to operate at this rate.",
 			   pt->mime_type,pt->clock_rate);
 		ret=FALSE;
@@ -313,28 +317,30 @@ static ortp_socket_t create_socket(int local_port){
 	return sock;
 }
 
-static int sendStunRequest(int sock, const struct sockaddr *server, socklen_t addrlen, int id, bool_t changeAddr){
-	char buf[STUN_MAX_MESSAGE_SIZE];
-	int len = STUN_MAX_MESSAGE_SIZE;
-	StunAtrString username;
-	StunAtrString password;
-	StunMessage req;
-	int err;
-	memset(&req, 0, sizeof(StunMessage));
-	memset(&username,0,sizeof(username));
-	memset(&password,0,sizeof(password));
-	stunBuildReqSimple( &req, &username, changeAddr , changeAddr , id);
-	len = stunEncodeMessage( &req, buf, len, &password);
-	if (len<=0){
+static int send_stun_request(int sock, const struct sockaddr *server, socklen_t addrlen, int id, bool_t change_addr){
+	char *buf = NULL;
+	size_t len;
+	int err = 0;
+	MSStunMessage *req = ms_stun_binding_request_create();
+	UInt96 tr_id = ms_stun_message_get_tr_id(req);
+	tr_id.octet[0] = id;
+	ms_stun_message_set_tr_id(req, tr_id);
+	ms_stun_message_enable_change_ip(req, change_addr);
+	ms_stun_message_enable_change_port(req, change_addr);
+	len = ms_stun_message_encode(req, &buf);
+	if (len <= 0) {
 		ms_error("Fail to encode stun message.");
-		return -1;
+		err = -1;
+	} else {
+		err = bctbx_sendto(sock, buf, len, 0, server, addrlen);
+		if (err < 0) {
+			ms_error("sendto failed: %s",strerror(errno));
+			err = -1;
+		}
 	}
-	err=sendto(sock,buf,len,0,server,addrlen);
-	if (err<0){
-		ms_error("sendto failed: %s",strerror(errno));
-		return -1;
-	}
-	return 0;
+	if (buf != NULL) ms_free(buf);
+	ms_free(req);
+	return err;
 }
 
 int linphone_parse_host_port(const char *input, char *host, size_t hostlen, int *port){
@@ -378,28 +384,37 @@ int parse_hostname_to_addr(const char *server, struct sockaddr_storage *ss, sock
 	}
 	if (!res) return -1;
 	memcpy(ss,res->ai_addr,res->ai_addrlen);
-	*socklen=res->ai_addrlen;
+	*socklen=(socklen_t)res->ai_addrlen;
 	freeaddrinfo(res);
 	return 0;
 }
 
-static int recvStunResponse(ortp_socket_t sock, char *ipaddr, int *port, int *id){
-	char buf[STUN_MAX_MESSAGE_SIZE];
-	int len = STUN_MAX_MESSAGE_SIZE;
-	StunMessage resp;
-	len=recv(sock,buf,len,0);
-	if (len>0){
+static int recv_stun_response(ortp_socket_t sock, char *ipaddr, int *port, int *id) {
+	char buf[MS_STUN_MAX_MESSAGE_SIZE];
+	int len = MS_STUN_MAX_MESSAGE_SIZE;
+	MSStunMessage *resp;
+
+	len = recv(sock, buf, len, 0);
+	if (len > 0) {
 		struct in_addr ia;
-		stunParseMessage(buf,len, &resp );
-		*id=resp.msgHdr.tr_id.octet[0];
-		if (resp.hasXorMappedAddress){
-			*port = resp.xorMappedAddress.ipv4.port;
-			ia.s_addr=htonl(resp.xorMappedAddress.ipv4.addr);
-		}else if (resp.hasMappedAddress){
-			*port = resp.mappedAddress.ipv4.port;
-			ia.s_addr=htonl(resp.mappedAddress.ipv4.addr);
-		}else return -1;
-		strncpy(ipaddr,inet_ntoa(ia),LINPHONE_IPADDR_SIZE);
+		resp = ms_stun_message_create_from_buffer_parsing((uint8_t *)buf, (ssize_t)len);
+		if (resp != NULL) {
+			const MSStunAddress *stun_addr;
+			UInt96 tr_id = ms_stun_message_get_tr_id(resp);
+			*id = tr_id.octet[0];
+			stun_addr = ms_stun_message_get_xor_mapped_address(resp);
+			if (stun_addr != NULL) {
+				*port = stun_addr->ip.v4.port;
+				ia.s_addr = htonl(stun_addr->ip.v4.addr);
+			} else {
+				stun_addr = ms_stun_message_get_mapped_address(resp);
+				if (stun_addr != NULL) {
+					*port = stun_addr->ip.v4.port;
+					ia.s_addr = htonl(stun_addr->ip.v4.addr);
+				} else len = -1;
+			}
+			if (len > 0) strncpy(ipaddr, inet_ntoa(ia), LINPHONE_IPADDR_SIZE);
+		}
 	}
 	return len;
 }
@@ -409,22 +424,23 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
 	const char *server=linphone_core_get_stun_server(lc);
 	StunCandidate *ac=&call->ac;
 	StunCandidate *vc=&call->vc;
+	StunCandidate *tc=&call->tc;
 
 	if (lc->sip_conf.ipv6_enabled){
 		ms_warning("stun support is not implemented for ipv6");
 		return -1;
 	}
-	if (call->media_ports[0].rtp_port==-1){
+	if (call->media_ports[call->main_audio_stream_index].rtp_port==-1){
 		ms_warning("Stun-only support not available for system random port");
 		return -1;
 	}
 	if (server!=NULL){
 		const struct addrinfo *ai=linphone_core_get_stun_server_addrinfo(lc);
-		ortp_socket_t sock1=-1, sock2=-1;
+		ortp_socket_t sock1=-1, sock2=-1, sock3=-1;
 		int loops=0;
 		bool_t video_enabled=linphone_core_video_enabled(lc);
-		bool_t got_audio,got_video;
-		bool_t cone_audio=FALSE,cone_video=FALSE;
+		bool_t got_audio,got_video,got_text;
+		bool_t cone_audio=FALSE,cone_video=FALSE,cone_text=FALSE;
 		struct timeval init,cur;
 		double elapsed;
 		int ret=0;
@@ -436,47 +452,52 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
 		linphone_core_notify_display_status(lc,_("Stun lookup in progress..."));
 
 		/*create the two audio and video RTP sockets, and send STUN message to our stun server */
-		sock1=create_socket(call->media_ports[0].rtp_port);
+		sock1=create_socket(call->media_ports[call->main_audio_stream_index].rtp_port);
 		if (sock1==-1) return -1;
 		if (video_enabled){
-			sock2=create_socket(call->media_ports[1].rtp_port);
+			sock2=create_socket(call->media_ports[call->main_video_stream_index].rtp_port);
 			if (sock2==-1) return -1;
 		}
+		sock3=create_socket(call->media_ports[call->main_text_stream_index].rtp_port);
+		if (sock3==-1) return -1;
+		
 		got_audio=FALSE;
 		got_video=FALSE;
+		got_text=FALSE;
 		ortp_gettimeofday(&init,NULL);
 		do{
 
 			int id;
 			if (loops%20==0){
 				ms_message("Sending stun requests...");
-				sendStunRequest(sock1,ai->ai_addr,ai->ai_addrlen,11,TRUE);
-				sendStunRequest(sock1,ai->ai_addr,ai->ai_addrlen,1,FALSE);
+				send_stun_request((int)sock1,ai->ai_addr,(socklen_t)ai->ai_addrlen,11,TRUE);
+				send_stun_request((int)sock1,ai->ai_addr,(socklen_t)ai->ai_addrlen,1,FALSE);
 				if (sock2!=-1){
-					sendStunRequest(sock2,ai->ai_addr,ai->ai_addrlen,22,TRUE);
-					sendStunRequest(sock2,ai->ai_addr,ai->ai_addrlen,2,FALSE);
+					send_stun_request((int)sock2,ai->ai_addr,(socklen_t)ai->ai_addrlen,22,TRUE);
+					send_stun_request((int)sock2,ai->ai_addr,(socklen_t)ai->ai_addrlen,2,FALSE);
+				}
+				if (sock3!=-1){
+					send_stun_request((int)sock3,ai->ai_addr,(socklen_t)ai->ai_addrlen,33,TRUE);
+					send_stun_request((int)sock3,ai->ai_addr,(socklen_t)ai->ai_addrlen,3,FALSE);
 				}
 			}
 			ms_usleep(10000);
 
-			if (recvStunResponse(sock1,ac->addr,
-						&ac->port,&id)>0){
-				ms_message("STUN test result: local audio port maps to %s:%i",
-						ac->addr,
-						ac->port);
-				if (id==11)
-					cone_audio=TRUE;
+			if (recv_stun_response(sock1, ac->addr, &ac->port, &id) > 0) {
+				ms_message("STUN test result: local audio port maps to %s:%i", ac->addr, ac->port);
+				if (id==11) cone_audio=TRUE;
 				got_audio=TRUE;
 			}
-			if (recvStunResponse(sock2,vc->addr,
-							&vc->port,&id)>0){
-				ms_message("STUN test result: local video port maps to %s:%i",
-					vc->addr,
-					vc->port);
-				if (id==22)
-					cone_video=TRUE;
+			if (recv_stun_response(sock2, vc->addr, &vc->port, &id) > 0) {
+				ms_message("STUN test result: local video port maps to %s:%i", vc->addr, vc->port);
+				if (id==22) cone_video=TRUE;
 				got_video=TRUE;
 			}
+			if (recv_stun_response(sock3, tc->addr, &tc->port, &id)>0) {
+				ms_message("STUN test result: local text port maps to %s:%i", tc->addr, tc->port);
+				if (id==33) cone_text=TRUE;
+				got_text=TRUE;
+			}
 			ortp_gettimeofday(&cur,NULL);
 			elapsed=((cur.tv_sec-init.tv_sec)*1000.0) +  ((cur.tv_usec-init.tv_usec)/1000.0);
 			if (elapsed>2000)  {
@@ -485,7 +506,7 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
 				break;
 			}
 			loops++;
-		}while(!(got_audio && (got_video||sock2==-1)  ) );
+		}while(!(got_audio && (got_video||sock2==-1) && (got_text||sock3==-1)  ) );
 		if (ret==0) ret=(int)elapsed;
 		if (!got_audio){
 			ms_error("No stun server response for audio port.");
@@ -503,8 +524,18 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
 				}
 			}
 		}
+		if (sock3!=-1){
+			if (!got_text){
+				ms_error("No stun server response for text port.");
+			}else{
+				if (!cone_text) {
+					ms_message("NAT is symmetric for text port.");
+				}
+			}
+		}
 		close_socket(sock1);
 		if (sock2!=-1) close_socket(sock2);
+		if (sock3!=-1) close_socket(sock3);
 		return ret;
 	}
 	return -1;
@@ -538,104 +569,189 @@ void linphone_core_adapt_to_network(LinphoneCore *lc, int ping_time_ms, Linphone
 	}
 }
 
-static void stun_server_resolved(LinphoneCore *lc, const char *name, struct addrinfo *addrinfo){
-	if (lc->net_conf.stun_addrinfo){
-		belle_sip_freeaddrinfo(lc->net_conf.stun_addrinfo);
-		lc->net_conf.stun_addrinfo=NULL;
-	}
-	if (addrinfo){
-		ms_message("Stun server resolution successful.");
-	}else{
-		ms_warning("Stun server resolution failed.");
-	}
-	lc->net_conf.stun_addrinfo=addrinfo;
-	lc->net_conf.stun_res=NULL;
-}
 
 void linphone_core_resolve_stun_server(LinphoneCore *lc){
-	/*
-	 * WARNING: stun server resolution only done in IPv4.
-	 * TODO: use IPv6 resolution if linphone_core_ipv6_enabled()==TRUE and use V4Mapped addresses for ICE gathering.
-	 */
-	const char *server=lc->net_conf.stun_server;
-	if (lc->sal && server && !lc->net_conf.stun_res){
-		char host[NI_MAXHOST];
-		int port=3478;
-		linphone_parse_host_port(server,host,sizeof(host),&port);
-		lc->net_conf.stun_res=sal_resolve_a(lc->sal,host,port,AF_INET,(SalResolverCallback)stun_server_resolved,lc);
+	if (lc->nat_policy != NULL) {
+		linphone_nat_policy_resolve_stun_server(lc->nat_policy);
+	} else {
+		ms_error("linphone_core_resolve_stun_server(): called without nat_policy, this should not happen.");
 	}
 }
 
-/*
- * This function returns the addrinfo representation of the stun server address.
- * It is critical not to block for a long time if it can't be resolved, otherwise this stucks the main thread when making a call.
- * On the contrary, a fully asynchronous call initiation is complex to develop.
- * The compromise is then:
- * - have a cache of the stun server addrinfo
- * - this cached value is returned when it is non-null
- * - an asynchronous resolution is asked each time this function is called to ensure frequent refreshes of the cached value.
- * - if no cached value exists, block for a short time; this case must be unprobable because the resolution will be asked each time the stun server value is
- * changed.
-**/
 const struct addrinfo *linphone_core_get_stun_server_addrinfo(LinphoneCore *lc){
-	const char *server=linphone_core_get_stun_server(lc);
-	if (server){
-		int wait_ms=0;
-		int wait_limit=1000;
-		linphone_core_resolve_stun_server(lc);
-		while (!lc->net_conf.stun_addrinfo && lc->net_conf.stun_res!=NULL && wait_ms<wait_limit){
-			sal_iterate(lc->sal);
-			ms_usleep(50000);
-			wait_ms+=50;
+	if (lc->nat_policy != NULL) {
+		return linphone_nat_policy_get_stun_server_addrinfo(lc->nat_policy);
+	} else {
+		ms_error("linphone_core_get_stun_server_addrinfo(): called without nat_policy, this should not happen.");
+	}
+	return NULL;
+}
+
+void linphone_core_enable_forced_ice_relay(LinphoneCore *lc, bool_t enable) {
+	lc->forced_ice_relay = enable;
+}
+
+void linphone_core_enable_short_turn_refresh(LinphoneCore *lc, bool_t enable) {
+	lc->short_turn_refresh = enable;
+}
+
+static void stun_auth_requested_cb(LinphoneCall *call, const char *realm, const char *nonce, const char **username, const char **password, const char **ha1) {
+	LinphoneProxyConfig *proxy = NULL;
+	const LinphoneNatPolicy *nat_policy = NULL;
+	const LinphoneAddress *addr = NULL;
+	const LinphoneAuthInfo *auth_info = NULL;
+	LinphoneCore *lc = call->core;
+	const char *user = NULL;
+
+	// Get the username from the nat policy or the proxy config
+	if (call->dest_proxy != NULL) proxy = call->dest_proxy;
+	else proxy = linphone_core_get_default_proxy_config(call->core);
+	if (proxy == NULL) return;
+	nat_policy = linphone_proxy_config_get_nat_policy(proxy);
+	if (nat_policy != NULL) {
+		user = linphone_nat_policy_get_stun_server_username(nat_policy);
+	} else {
+		nat_policy = linphone_core_get_nat_policy(call->core);
+		if (nat_policy != NULL) {
+			user = linphone_nat_policy_get_stun_server_username(nat_policy);
 		}
 	}
-	return lc->net_conf.stun_addrinfo;
+	if (user == NULL) {
+		/* If the username has not been found in the nat_policy, take the username from the currently used proxy config. */
+		addr = linphone_proxy_config_get_identity_address(proxy);
+		if (addr == NULL) return;
+		user = linphone_address_get_username(addr);
+	}
+	if (user == NULL) return;
+
+	auth_info = linphone_core_find_auth_info(lc, realm, user, NULL);
+	if (auth_info != NULL) {
+		const char *hash = linphone_auth_info_get_ha1(auth_info);
+		if (hash != NULL) {
+			*ha1 = hash;
+		} else {
+			*password = linphone_auth_info_get_passwd(auth_info);
+		}
+		*username = user;
+	} else {
+		ms_warning("No auth info found for STUN auth request");
+	}
 }
 
-int linphone_core_gather_ice_candidates(LinphoneCore *lc, LinphoneCall *call)
-{
-	char local_addr[64];
-	const struct addrinfo *ai;
-	IceCheckList *audio_check_list;
-	IceCheckList *video_check_list;
-	const char *server = linphone_core_get_stun_server(lc);
-
-	if ((server == NULL) || (call->ice_session == NULL)) return -1;
-	audio_check_list = ice_session_check_list(call->ice_session, 0);
-	video_check_list = ice_session_check_list(call->ice_session, 1);
-	if (audio_check_list == NULL) return -1;
-
-	if (call->af==AF_INET6){
-		ms_warning("Ice gathering is not implemented for ipv6");
-		return -1;
+static void linphone_core_add_local_ice_candidates(LinphoneCall *call, int family, const char *addr, IceCheckList *audio_cl, IceCheckList *video_cl, IceCheckList *text_cl) {
+	if ((ice_check_list_state(audio_cl) != ICL_Completed) && (ice_check_list_candidates_gathered(audio_cl) == FALSE)) {
+		ice_add_local_candidate(audio_cl, "host", family, addr, call->media_ports[call->main_audio_stream_index].rtp_port, 1, NULL);
+		ice_add_local_candidate(audio_cl, "host", family, addr, call->media_ports[call->main_audio_stream_index].rtcp_port, 2, NULL);
+		call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateInProgress;
 	}
-	ai=linphone_core_get_stun_server_addrinfo(lc);
-	if (ai==NULL){
-		ms_warning("Fail to resolve STUN server for ICE gathering.");
-		return -1;
+	if (linphone_core_video_enabled(call->core) && (video_cl != NULL)
+		&& (ice_check_list_state(video_cl) != ICL_Completed) && (ice_check_list_candidates_gathered(video_cl) == FALSE)) {
+		ice_add_local_candidate(video_cl, "host", family, addr, call->media_ports[call->main_video_stream_index].rtp_port, 1, NULL);
+		ice_add_local_candidate(video_cl, "host", family, addr, call->media_ports[call->main_video_stream_index].rtcp_port, 2, NULL);
+		call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateInProgress;
+	}
+	if (call->params->realtimetext_enabled && (text_cl != NULL)
+		&& (ice_check_list_state(text_cl) != ICL_Completed) && (ice_check_list_candidates_gathered(text_cl) == FALSE)) {
+		ice_add_local_candidate(text_cl, "host", family, addr, call->media_ports[call->main_text_stream_index].rtp_port, 1, NULL);
+		ice_add_local_candidate(text_cl, "host", family, addr, call->media_ports[call->main_text_stream_index].rtcp_port, 2, NULL);
+		call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateInProgress;
+	}
+}
+
+static const struct addrinfo * get_preferred_stun_server_addrinfo(const struct addrinfo *ai) {
+	char ip[NI_MAXHOST];
+	const struct addrinfo *preferred_ai = NULL;
+
+	while (ai != NULL) {
+		bctbx_addrinfo_to_printable_ip_address(ai, ip, sizeof(ip));
+		if (ai->ai_family == AF_INET) {
+			preferred_ai = ai;
+			break;
+		}
+		else if (ai->ai_family == AF_INET6) {
+			struct sockaddr_storage ss;
+			socklen_t sslen = sizeof(ss);
+			bctbx_sockaddr_ipv6_to_ipv4(ai->ai_addr, (struct sockaddr *)&ss, &sslen);
+			if ((ss.ss_family == AF_INET) && (preferred_ai == NULL)) preferred_ai = ai;
+		}
+		ai = ai->ai_next;
+	}
+
+	bctbx_addrinfo_to_printable_ip_address(preferred_ai, ip, sizeof(ip));
+	return preferred_ai;
+}
+
+/* Return values:
+ * 1 :  STUN gathering is started
+ * 0 :  no STUN gathering is started, but it's ok to proceed with ICE anyway (with local candidates only or because STUN gathering was already done before)
+ * -1: no gathering started and something went wrong with local candidates. There is no way to start the ICE session.
+ */
+int linphone_core_gather_ice_candidates(LinphoneCore *lc, LinphoneCall *call){
+	char local_addr[64];
+	const struct addrinfo *ai = NULL;
+	IceCheckList *audio_cl;
+	IceCheckList *video_cl;
+	IceCheckList *text_cl;
+	LinphoneNatPolicy *nat_policy = NULL;
+	const char *server = NULL;
+
+	if (call->dest_proxy != NULL) nat_policy = linphone_proxy_config_get_nat_policy(call->dest_proxy);
+	if (nat_policy == NULL) nat_policy = linphone_core_get_nat_policy(lc);
+	if (nat_policy != NULL) server = linphone_nat_policy_get_stun_server(nat_policy);
+
+	if (call->ice_session == NULL) return -1;
+	audio_cl = ice_session_check_list(call->ice_session, call->main_audio_stream_index);
+	video_cl = ice_session_check_list(call->ice_session, call->main_video_stream_index);
+	text_cl = ice_session_check_list(call->ice_session, call->main_text_stream_index);
+	if (audio_cl == NULL) return -1;
+
+	if ((nat_policy != NULL) && (server != NULL) && (server[0] != '\0')) {
+		ai=linphone_nat_policy_get_stun_server_addrinfo(nat_policy);
+		if (ai==NULL){
+			ms_warning("Fail to resolve STUN server for ICE gathering, continuing without stun.");
+		} else {
+			ai = get_preferred_stun_server_addrinfo(ai);
+		}
+	}else{
+		ms_warning("Ice is used without stun server.");
 	}
 	linphone_core_notify_display_status(lc, _("ICE local candidates gathering in progress..."));
 
-	/* Gather local host candidates. */
-	if (linphone_core_get_local_ip_for(AF_INET, NULL, local_addr) < 0) {
-		ms_error("Fail to get local ip");
-		return -1;
-	}
-	if ((ice_check_list_state(audio_check_list) != ICL_Completed) && (ice_check_list_candidates_gathered(audio_check_list) == FALSE)) {
-		ice_add_local_candidate(audio_check_list, "host", local_addr, call->media_ports[0].rtp_port, 1, NULL);
-		ice_add_local_candidate(audio_check_list, "host", local_addr, call->media_ports[0].rtcp_port, 2, NULL);
-		call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateInProgress;
-	}
-	if (linphone_core_video_enabled(lc) && (video_check_list != NULL)
-		&& (ice_check_list_state(video_check_list) != ICL_Completed) && (ice_check_list_candidates_gathered(video_check_list) == FALSE)) {
-		ice_add_local_candidate(video_check_list, "host", local_addr, call->media_ports[1].rtp_port, 1, NULL);
-		ice_add_local_candidate(video_check_list, "host", local_addr, call->media_ports[1].rtcp_port, 2, NULL);
-		call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateInProgress;
-	}
+	ice_session_enable_forced_relay(call->ice_session, lc->forced_ice_relay);
+	ice_session_enable_short_turn_refresh(call->ice_session, lc->short_turn_refresh);
 
-	ms_message("ICE: gathering candidate from [%s]",server);
-	/* Gather local srflx candidates. */
-	ice_session_gather_candidates(call->ice_session, ai->ai_addr, ai->ai_addrlen);
+	/* Gather local host candidates. */
+	if (call->af == AF_INET6) {
+		if (linphone_core_get_local_ip_for(AF_INET6, NULL, local_addr) < 0) {
+			ms_error("Fail to get local IPv6");
+			return -1;
+		} else {
+			linphone_core_add_local_ice_candidates(call, AF_INET6, local_addr, audio_cl, video_cl, text_cl);
+		}
+	}
+	if (linphone_core_get_local_ip_for(AF_INET, NULL, local_addr) < 0) {
+		if (call->af != AF_INET6) {
+			ms_error("Fail to get local IPv4");
+			return -1;
+		}
+	} else {
+		linphone_core_add_local_ice_candidates(call, AF_INET, local_addr, audio_cl, video_cl, text_cl);
+	}
+	if ((ai != NULL) && (nat_policy != NULL)
+		&& (linphone_nat_policy_stun_enabled(nat_policy) || linphone_nat_policy_turn_enabled(nat_policy))) {
+		bool_t gathering_in_progress;
+		ms_message("ICE: gathering candidate from [%s] using %s", server, linphone_nat_policy_turn_enabled(nat_policy) ? "TURN" : "STUN");
+		/* Gather local srflx candidates. */
+		ice_session_enable_turn(call->ice_session, linphone_nat_policy_turn_enabled(nat_policy));
+		ice_session_set_stun_auth_requested_cb(call->ice_session, (MSStunAuthRequestedCb)stun_auth_requested_cb, call);
+		gathering_in_progress = ice_session_gather_candidates(call->ice_session, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+		return (gathering_in_progress == FALSE) ? 0 : 1;
+	} else {
+		ms_message("ICE: bypass candidates gathering");
+		ice_session_compute_candidates_foundations(call->ice_session);
+		ice_session_eliminate_redundant_candidates(call->ice_session);
+		ice_session_choose_default_candidates(call->ice_session);
+	}
 	return 0;
 }
 
@@ -661,31 +777,40 @@ void linphone_core_update_ice_state_in_call_stats(LinphoneCall *call)
 {
 	IceCheckList *audio_check_list;
 	IceCheckList *video_check_list;
+	IceCheckList *text_check_list;
 	IceSessionState session_state;
 
 	if (call->ice_session == NULL) return;
-	audio_check_list = ice_session_check_list(call->ice_session, 0);
-	video_check_list = ice_session_check_list(call->ice_session, 1);
+	audio_check_list = ice_session_check_list(call->ice_session, call->main_audio_stream_index);
+	video_check_list = ice_session_check_list(call->ice_session, call->main_video_stream_index);
+	text_check_list = ice_session_check_list(call->ice_session, call->main_text_stream_index);
 	if (audio_check_list == NULL) return;
 
 	session_state = ice_session_state(call->ice_session);
 	if ((session_state == IS_Completed) || ((session_state == IS_Failed) && (ice_session_has_completed_check_list(call->ice_session) == TRUE))) {
-		if (ice_check_list_state(audio_check_list) == ICL_Completed) {
-			switch (ice_check_list_selected_valid_candidate_type(audio_check_list)) {
-				case ICT_HostCandidate:
-					call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateHostConnection;
-					break;
-				case ICT_ServerReflexiveCandidate:
-				case ICT_PeerReflexiveCandidate:
-					call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateReflexiveConnection;
-					break;
-				case ICT_RelayedCandidate:
-					call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateRelayConnection;
-					break;
+		if (call->params->has_audio && (audio_check_list != NULL)) {
+			if (ice_check_list_state(audio_check_list) == ICL_Completed) {
+				switch (ice_check_list_selected_valid_candidate_type(audio_check_list)) {
+					case ICT_HostCandidate:
+						call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateHostConnection;
+						break;
+					case ICT_ServerReflexiveCandidate:
+					case ICT_PeerReflexiveCandidate:
+						call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateReflexiveConnection;
+						break;
+					case ICT_RelayedCandidate:
+						call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateRelayConnection;
+						break;
+					case ICT_CandidateInvalid:
+					case ICT_CandidateTypeMax:
+						/*shall not happen*/
+						break;
+				}
+			} else {
+				call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateFailed;
 			}
-		} else {
-			call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateFailed;
-		}
+		}else call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateNotActivated;
+		
 		if (call->params->has_video && (video_check_list != NULL)) {
 			if (ice_check_list_state(video_check_list) == ICL_Completed) {
 				switch (ice_check_list_selected_valid_candidate_type(video_check_list)) {
@@ -699,35 +824,67 @@ void linphone_core_update_ice_state_in_call_stats(LinphoneCall *call)
 					case ICT_RelayedCandidate:
 						call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateRelayConnection;
 						break;
+					case ICT_CandidateInvalid:
+					case ICT_CandidateTypeMax:
+						/*shall not happen*/
+						break;
 				}
 			} else {
 				call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateFailed;
 			}
 		}else call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateNotActivated;
+		
+		if (call->params->realtimetext_enabled && (text_check_list != NULL)) {
+			if (ice_check_list_state(text_check_list) == ICL_Completed) {
+				switch (ice_check_list_selected_valid_candidate_type(text_check_list)) {
+					case ICT_HostCandidate:
+						call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateHostConnection;
+						break;
+					case ICT_ServerReflexiveCandidate:
+					case ICT_PeerReflexiveCandidate:
+						call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateReflexiveConnection;
+						break;
+					case ICT_RelayedCandidate:
+						call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateRelayConnection;
+						break;
+					case ICT_CandidateInvalid:
+					case ICT_CandidateTypeMax:
+						/*shall not happen*/
+						break;
+				}
+			} else {
+				call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateFailed;
+			}
+		}else call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateNotActivated;
 	} else if (session_state == IS_Running) {
 		call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateInProgress;
 		if (call->params->has_video && (video_check_list != NULL)) {
 			call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateInProgress;
 		}
+		if (call->params->realtimetext_enabled && (text_check_list != NULL)) {
+			call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateInProgress;
+		}
 	} else {
 		call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state = LinphoneIceStateFailed;
 		if (call->params->has_video && (video_check_list != NULL)) {
 			call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state = LinphoneIceStateFailed;
 		}
+		if (call->params->realtimetext_enabled && (text_check_list != NULL)) {
+			call->stats[LINPHONE_CALL_STATS_TEXT].ice_state = LinphoneIceStateFailed;
+		}
 	}
-	ms_message("Call [%p] New ICE state: audio: [%s]    video: [%s]", call,
-		   linphone_ice_state_to_string(call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state), linphone_ice_state_to_string(call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state));
+	ms_message("Call [%p] New ICE state: audio: [%s]    video: [%s]    text: [%s]", call,
+		   linphone_ice_state_to_string(call->stats[LINPHONE_CALL_STATS_AUDIO].ice_state), linphone_ice_state_to_string(call->stats[LINPHONE_CALL_STATS_VIDEO].ice_state), linphone_ice_state_to_string(call->stats[LINPHONE_CALL_STATS_TEXT].ice_state));
 }
 
-void linphone_call_stop_ice_for_inactive_streams(LinphoneCall *call) {
+void linphone_call_stop_ice_for_inactive_streams(LinphoneCall *call, SalMediaDescription *desc) {
 	int i;
 	IceSession *session = call->ice_session;
-	SalMediaDescription *desc = call->localdesc;
 
 	if (session == NULL) return;
 	if (ice_session_state(session) == IS_Completed) return;
 
-	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+	for (i = 0; i < desc->nb_streams; i++) {
 		IceCheckList *cl = ice_session_check_list(session, i);
 		if (!sal_stream_description_active(&desc->streams[i]) && cl) {
 			ice_session_remove_check_list(session, cl);
@@ -738,24 +895,26 @@ void linphone_call_stop_ice_for_inactive_streams(LinphoneCall *call) {
 	linphone_core_update_ice_state_in_call_stats(call);
 }
 
-void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSession *session) {
-	const char *rtp_addr, *rtcp_addr;
+void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSession *session, bool_t use_nortpproxy) {
+	IceCandidate *rtp_candidate = NULL;
+	IceCandidate *rtcp_candidate = NULL;
 	IceSessionState session_state = ice_session_state(session);
 	int nb_candidates;
-	int i, j;
+	int i;
+	int j;
 	bool_t result;
 
 	if (session_state == IS_Completed) {
-		desc->ice_completed = TRUE;
-		result = ice_check_list_selected_valid_local_candidate(ice_session_check_list(session, 0), &rtp_addr, NULL, NULL, NULL);
+		if (use_nortpproxy) desc->set_nortpproxy = TRUE;
+		result = ice_check_list_selected_valid_local_candidate(ice_session_check_list(session, 0), &rtp_candidate, NULL);
 		if (result == TRUE) {
-			strncpy(desc->addr, rtp_addr, sizeof(desc->addr));
+			strncpy(desc->addr, rtp_candidate->taddr.ip, sizeof(desc->addr));
 		} else {
-			ms_warning("If ICE has completed successfully, rtp_addr should be set!");
+			ms_warning("If ICE has completed successfully, rtp_candidate should be set!");
 		}
 	}
 	else {
-		desc->ice_completed = FALSE;
+		desc->set_nortpproxy = FALSE;
 	}
 	strncpy(desc->ice_pwd, ice_session_local_pwd(session), sizeof(desc->ice_pwd));
 	strncpy(desc->ice_ufrag, ice_session_local_ufrag(session), sizeof(desc->ice_ufrag));
@@ -763,17 +922,20 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess
 		SalStreamDescription *stream = &desc->streams[i];
 		IceCheckList *cl = ice_session_check_list(session, i);
 		nb_candidates = 0;
+		rtp_candidate = rtcp_candidate = NULL;
 		if (!sal_stream_description_active(stream) || (cl == NULL)) continue;
 		if (ice_check_list_state(cl) == ICL_Completed) {
-			stream->ice_completed = TRUE;
-			result = ice_check_list_selected_valid_local_candidate(ice_session_check_list(session, i), &rtp_addr, &stream->rtp_port, &rtcp_addr, &stream->rtcp_port);
+			if (use_nortpproxy) stream->set_nortpproxy = TRUE;
+			result = ice_check_list_selected_valid_local_candidate(ice_session_check_list(session, i), &rtp_candidate, &rtcp_candidate);
 		} else {
-			stream->ice_completed = FALSE;
-			result = ice_check_list_default_local_candidate(ice_session_check_list(session, i), &rtp_addr, &stream->rtp_port, &rtcp_addr, &stream->rtcp_port);
+			stream->set_nortpproxy = FALSE;
+			result = ice_check_list_default_local_candidate(ice_session_check_list(session, i), &rtp_candidate, &rtcp_candidate);
 		}
 		if (result == TRUE) {
-			strncpy(stream->rtp_addr, rtp_addr, sizeof(stream->rtp_addr));
-			strncpy(stream->rtcp_addr, rtcp_addr, sizeof(stream->rtcp_addr));
+			strncpy(stream->rtp_addr, rtp_candidate->taddr.ip, sizeof(stream->rtp_addr));
+			strncpy(stream->rtcp_addr, rtcp_candidate->taddr.ip, sizeof(stream->rtcp_addr));
+			stream->rtp_port = rtp_candidate->taddr.port;
+			stream->rtcp_port = rtcp_candidate->taddr.port;
 		} else {
 			memset(stream->rtp_addr, 0, sizeof(stream->rtp_addr));
 			memset(stream->rtcp_addr, 0, sizeof(stream->rtcp_addr));
@@ -789,9 +951,9 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess
 		stream->ice_mismatch = ice_check_list_is_mismatch(cl);
 		if ((ice_check_list_state(cl) == ICL_Running) || (ice_check_list_state(cl) == ICL_Completed)) {
 			memset(stream->ice_candidates, 0, sizeof(stream->ice_candidates));
-			for (j = 0; j < MIN(ms_list_size(cl->local_candidates), SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES); j++) {
+			for (j = 0; j < MIN((int)bctbx_list_size(cl->local_candidates), SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES); j++) {
 				SalIceCandidate *sal_candidate = &stream->ice_candidates[nb_candidates];
-				IceCandidate *ice_candidate = ms_list_nth_data(cl->local_candidates, j);
+				IceCandidate *ice_candidate = bctbx_list_nth_data(cl->local_candidates, j);
 				const char *default_addr = NULL;
 				int default_port = 0;
 				if (ice_candidate->componentID == 1) {
@@ -820,13 +982,12 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess
 			}
 		}
 		if ((ice_check_list_state(cl) == ICL_Completed) && (ice_session_role(session) == IR_Controlling)) {
-			int rtp_port, rtcp_port;
 			memset(stream->ice_remote_candidates, 0, sizeof(stream->ice_remote_candidates));
-			if (ice_check_list_selected_valid_remote_candidate(cl, &rtp_addr, &rtp_port, &rtcp_addr, &rtcp_port) == TRUE) {
-				strncpy(stream->ice_remote_candidates[0].addr, rtp_addr, sizeof(stream->ice_remote_candidates[0].addr));
-				stream->ice_remote_candidates[0].port = rtp_port;
-				strncpy(stream->ice_remote_candidates[1].addr, rtcp_addr, sizeof(stream->ice_remote_candidates[1].addr));
-				stream->ice_remote_candidates[1].port = rtcp_port;
+			if (ice_check_list_selected_valid_remote_candidate(cl, &rtp_candidate, &rtcp_candidate) == TRUE) {
+				strncpy(stream->ice_remote_candidates[0].addr, rtp_candidate->taddr.ip, sizeof(stream->ice_remote_candidates[0].addr));
+				stream->ice_remote_candidates[0].port = rtp_candidate->taddr.port;
+				strncpy(stream->ice_remote_candidates[1].addr, rtcp_candidate->taddr.ip, sizeof(stream->ice_remote_candidates[1].addr));
+				stream->ice_remote_candidates[1].port = rtcp_candidate->taddr.port;
 			} else {
 				ms_error("ice: Selected valid remote candidates should be present if the check list is in the Completed state");
 			}
@@ -856,152 +1017,24 @@ static void clear_ice_check_list(LinphoneCall *call, IceCheckList *removed){
 		call->audiostream->ms.ice_check_list=NULL;
 	if (call->videostream && call->videostream->ms.ice_check_list==removed)
 		call->videostream->ms.ice_check_list=NULL;
+	if (call->textstream && call->textstream->ms.ice_check_list==removed)
+		call->textstream->ms.ice_check_list=NULL;
 }
 
-void linphone_call_update_ice_from_remote_media_description(LinphoneCall *call, const SalMediaDescription *md)
-{
-	bool_t ice_restarted = FALSE;
-	bool_t ice_params_found=FALSE;
-	if ((md->ice_pwd[0] != '\0') && (md->ice_ufrag[0] != '\0'))  {
-		ice_params_found=TRUE;
-	} else {
-		int i;
-		for (i = 0; i < md->nb_streams; i++) {
-			const SalStreamDescription *stream = &md->streams[i];
-			IceCheckList *cl = ice_session_check_list(call->ice_session, i);
-			if (cl) {
-				if ((stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0')) {
-					ice_params_found=TRUE;
-				} else {
-					ice_params_found=FALSE;
-					break;
-				}
-			}
+void linphone_call_clear_unused_ice_candidates(LinphoneCall *call, const SalMediaDescription *md){
+	int i;
+	
+	if (!call->localdesc) return;
+	for (i = 0; i < md->nb_streams; i++) {
+		const SalStreamDescription *local_stream = &call->localdesc->streams[i];
+		const SalStreamDescription *stream = &md->streams[i];
+		IceCheckList *cl = ice_session_check_list(call->ice_session, i);
+		if (!cl || !local_stream) continue;
+		
+		if (stream->rtcp_mux && local_stream->rtcp_mux){
+			ice_check_list_remove_rtcp_candidates(cl);
 		}
 	}
-	if (ice_params_found) {
-		int i, j;
-
-		/* Check for ICE restart and set remote credentials. */
-		if ((strcmp(md->addr, "0.0.0.0") == 0) || (strcmp(md->addr, "::0") == 0)) {
-			ice_session_restart(call->ice_session);
-			ice_restarted = TRUE;
-		} else {
-			for (i = 0; i < md->nb_streams; i++) {
-				const SalStreamDescription *stream = &md->streams[i];
-				IceCheckList *cl = ice_session_check_list(call->ice_session, i);
-				if (cl && (strcmp(stream->rtp_addr, "0.0.0.0") == 0)) {
-					ice_session_restart(call->ice_session);
-					ice_restarted = TRUE;
-					break;
-				}
-			}
-		}
-		if ((ice_session_remote_ufrag(call->ice_session) == NULL) && (ice_session_remote_pwd(call->ice_session) == NULL)) {
-			ice_session_set_remote_credentials(call->ice_session, md->ice_ufrag, md->ice_pwd);
-		} else if (ice_session_remote_credentials_changed(call->ice_session, md->ice_ufrag, md->ice_pwd)) {
-			if (ice_restarted == FALSE) {
-				ice_session_restart(call->ice_session);
-				ice_restarted = TRUE;
-			}
-			ice_session_set_remote_credentials(call->ice_session, md->ice_ufrag, md->ice_pwd);
-		}
-		for (i = 0; i < md->nb_streams; i++) {
-			const SalStreamDescription *stream = &md->streams[i];
-			IceCheckList *cl = ice_session_check_list(call->ice_session, i);
-			if (cl && (stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0')) {
-				if (ice_check_list_remote_credentials_changed(cl, stream->ice_ufrag, stream->ice_pwd)) {
-					if (ice_restarted == FALSE
-							&& ice_check_list_get_remote_ufrag(cl)
-							&& ice_check_list_get_remote_pwd(cl)) {
-							/* restart onlu if remote ufrag/paswd was already set*/
-						ice_session_restart(call->ice_session);
-						ice_restarted = TRUE;
-					}
-					ice_check_list_set_remote_credentials(cl, stream->ice_ufrag, stream->ice_pwd);
-					break;
-				}
-			}
-		}
-
-		/* Create ICE check lists if needed and parse ICE attributes. */
-		for (i = 0; i < md->nb_streams; i++) {
-			const SalStreamDescription *stream = &md->streams[i];
-			IceCheckList *cl = ice_session_check_list(call->ice_session, i);
-			/*
-			if ((cl == NULL) && (i < md->n_active_streams)) {
-				cl = ice_check_list_new();
-				ice_session_add_check_list(call->ice_session, cl);
-				switch (stream->type) {
-					case SalAudio:
-						if (call->audiostream != NULL) call->audiostream->ms.ice_check_list = cl;
-						break;
-					case SalVideo:
-						if (call->videostream != NULL) call->videostream->ms.ice_check_list = cl;
-						break;
-					default:
-						break;
-				}
-			}
-			*/
-			if (cl==NULL) continue;
-			if (stream->ice_mismatch == TRUE) {
-				ice_check_list_set_state(cl, ICL_Failed);
-			} else if (stream->rtp_port == 0) {
-				ice_session_remove_check_list(call->ice_session, cl);
-				clear_ice_check_list(call,cl);
-			} else {
-				if ((stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0'))
-					ice_check_list_set_remote_credentials(cl, stream->ice_ufrag, stream->ice_pwd);
-				for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES; j++) {
-					const SalIceCandidate *candidate = &stream->ice_candidates[j];
-					bool_t default_candidate = FALSE;
-					const char *addr = NULL;
-					int port = 0;
-					if (candidate->addr[0] == '\0') break;
-					if ((candidate->componentID == 0) || (candidate->componentID > 2)) continue;
-					get_default_addr_and_port(candidate->componentID, md, stream, &addr, &port);
-					if (addr && (candidate->port == port) && (strlen(candidate->addr) == strlen(addr)) && (strcmp(candidate->addr, addr) == 0))
-						default_candidate = TRUE;
-					ice_add_remote_candidate(cl, candidate->type, candidate->addr, candidate->port, candidate->componentID,
-						candidate->priority, candidate->foundation, default_candidate);
-				}
-				if (ice_restarted == FALSE) {
-					bool_t losing_pairs_added = FALSE;
-					for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_ICE_REMOTE_CANDIDATES; j++) {
-						const SalIceRemoteCandidate *candidate = &stream->ice_remote_candidates[j];
-						const char *addr = NULL;
-						int port = 0;
-						int componentID = j + 1;
-						if (candidate->addr[0] == '\0') break;
-						get_default_addr_and_port(componentID, md, stream, &addr, &port);
-						if (j == 0) {
-							/* If we receive a re-invite and we finished ICE processing on our side, use the candidates given by the remote. */
-							ice_check_list_unselect_valid_pairs(cl);
-						}
-						ice_add_losing_pair(cl, j + 1, candidate->addr, candidate->port, addr, port);
-						losing_pairs_added = TRUE;
-					}
-					if (losing_pairs_added == TRUE) ice_check_list_check_completed(cl);
-				}
-			}
-		}
-		for (i = 0; i < md->nb_streams; i++) {
-			IceCheckList * cl = ice_session_check_list(call->ice_session, i);
-			if (!sal_stream_description_active(&md->streams[i]) && (cl != NULL)) {
-				ice_session_remove_check_list_from_idx(call->ice_session, i);
-				clear_ice_check_list(call, cl);
-			}
-		}
-		ice_session_check_mismatch(call->ice_session);
-	} else {
-		/* Response from remote does not contain mandatory ICE attributes, delete the session. */
-		linphone_call_delete_ice_session(call);
-		return;
-	}
-	if (ice_session_nb_check_lists(call->ice_session) == 0) {
-		linphone_call_delete_ice_session(call);
-	}
 }
 
 bool_t linphone_core_media_description_contains_video_stream(const SalMediaDescription *md){
@@ -1058,142 +1091,8 @@ bool_t linphone_core_tone_indications_enabled(LinphoneCore*lc){
 	return lp_config_get_int(lc->config,"sound","tone_indications",1);
 }
 
-#ifdef HAVE_GETIFADDRS
-
-#include <ifaddrs.h>
-static int get_local_ip_with_getifaddrs(int type, char *address, int size){
-	struct ifaddrs *ifp;
-	struct ifaddrs *ifpstart;
-	char retaddr[LINPHONE_IPADDR_SIZE]={0};
-	bool_t found=FALSE;
-
-	if (getifaddrs(&ifpstart) < 0) {
-		return -1;
-	}
-#ifndef __linux
-	#define UP_FLAG IFF_UP /* interface is up */
-#else
-	#define UP_FLAG IFF_RUNNING /* resources allocated */
-#endif
-
-	for (ifp = ifpstart; ifp != NULL; ifp = ifp->ifa_next) {
-		if (ifp->ifa_addr && ifp->ifa_addr->sa_family == type
-			&& (ifp->ifa_flags & UP_FLAG) && !(ifp->ifa_flags & IFF_LOOPBACK))
-		{
-			if(getnameinfo(ifp->ifa_addr,
-						(type == AF_INET6) ?
-						sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in),
-						retaddr, size, NULL, 0, NI_NUMERICHOST) == 0) {
-				if (strchr(retaddr, '%') == NULL) {	/*avoid ipv6 link-local addresses */
-					/*ms_message("getifaddrs() found %s",address);*/
-					found=TRUE;
-					break;
-				}
-			}
-		}
-	}
-	freeifaddrs(ifpstart);
-	if (found) strncpy(address,retaddr,size);
-	return found;
-}
-#endif
-
-
-static int get_local_ip_for_with_connect(int type, const char *dest, char *result){
-	int err,tmp;
-	struct addrinfo hints;
-	struct addrinfo *res=NULL;
-	struct sockaddr_storage addr;
-	struct sockaddr *p_addr=(struct sockaddr*)&addr;
-	ortp_socket_t sock;
-	socklen_t s;
-
-	memset(&hints,0,sizeof(hints));
-	hints.ai_family=type;
-	hints.ai_socktype=SOCK_DGRAM;
-	/*hints.ai_flags=AI_NUMERICHOST|AI_CANONNAME;*/
-	err=getaddrinfo(dest,"5060",&hints,&res);
-	if (err!=0){
-		ms_error("getaddrinfo() error for %s : %s",dest, gai_strerror(err));
-		return -1;
-	}
-	if (res==NULL){
-		ms_error("bug: getaddrinfo returned nothing.");
-		return -1;
-	}
-	sock=socket(res->ai_family,SOCK_DGRAM,0);
-	tmp=1;
-	err=setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(SOCKET_OPTION_VALUE)&tmp,sizeof(int));
-	if (err<0){
-		ms_warning("Error in setsockopt: %s",strerror(errno));
-	}
-	err=connect(sock,res->ai_addr,res->ai_addrlen);
-	if (err<0) {
-		/*the network isn't reachable*/
-		if (getSocketErrorCode()!=ENETUNREACH) ms_error("Error in connect: %s",strerror(errno));
-		freeaddrinfo(res);
-		close_socket(sock);
-		return -1;
-	}
-	freeaddrinfo(res);
-	res=NULL;
-	s=sizeof(addr);
-	err=getsockname(sock,(struct sockaddr*)&addr,&s);
-	if (err!=0) {
-		ms_error("Error in getsockname: %s",strerror(errno));
-		close_socket(sock);
-		return -1;
-	}
-	if (p_addr->sa_family==AF_INET){
-		struct sockaddr_in *p_sin=(struct sockaddr_in*)p_addr;
-		if (p_sin->sin_addr.s_addr==0){
-			close_socket(sock);
-			return -1;
-		}
-	}
-	err=getnameinfo((struct sockaddr *)&addr,s,result,LINPHONE_IPADDR_SIZE,NULL,0,NI_NUMERICHOST);
-	if (err!=0){
-		ms_error("getnameinfo error: %s",strerror(errno));
-	}
-	/*avoid ipv6 link-local addresses*/
-	if (p_addr->sa_family==AF_INET6 && strchr(result,'%')!=NULL){
-		strcpy(result,"::1");
-		close_socket(sock);
-		return -1;
-	}
-	close_socket(sock);
-	return 0;
-}
-
 int linphone_core_get_local_ip_for(int type, const char *dest, char *result){
-	int err;
-#ifdef HAVE_GETIFADDRS
-	int found_ifs;
-#endif
-	strcpy(result,type==AF_INET ? "127.0.0.1" : "::1");
-
-	if (dest==NULL){
-		if (type==AF_INET)
-			dest="87.98.157.38"; /*a public IP address*/
-		else dest="2a00:1450:8002::68";
-	}
-	err=get_local_ip_for_with_connect(type,dest,result);
-	if (err==0) return 0;
-
-	/* if the connect method failed, which happens when no default route is set,
-	 * try to find 'the' running interface with getifaddrs*/
-
-#ifdef HAVE_GETIFADDRS
-	/*we use getifaddrs for lookup of default interface */
-	found_ifs=get_local_ip_with_getifaddrs(type,result,LINPHONE_IPADDR_SIZE);
-	if (found_ifs==1){
-		return 0;
-	}else if (found_ifs<=0){
-		/*absolutely no network on this machine */
-		return -1;
-	}
-#endif
-	return 0;
+	return bctbx_get_local_ip_for(type, dest, 5060, result, LINPHONE_IPADDR_SIZE);
 }
 
 void linphone_core_get_local_ip(LinphoneCore *lc, int af, const char *dest, char *result) {
@@ -1433,7 +1332,7 @@ static int get_unique_transport(LinphoneCore *lc, LinphoneTransportType *type, i
 }
 
 static void linphone_core_migrate_proxy_config(LinphoneCore *lc, LinphoneTransportType type){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	for(elem=linphone_core_get_proxy_config_list(lc);elem!=NULL;elem=elem->next){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
 		const char *proxy=linphone_proxy_config_get_addr(cfg);
@@ -1505,7 +1404,7 @@ void linphone_tone_description_destroy(LinphoneToneDescription *obj){
 }
 
 LinphoneToneDescription *linphone_core_get_call_error_tone(const LinphoneCore *lc, LinphoneReason reason){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	for (elem=lc->tones;elem!=NULL;elem=elem->next){
 		LinphoneToneDescription *tone=(LinphoneToneDescription*)elem->data;
 		if (tone->reason==reason) return tone;
@@ -1514,7 +1413,7 @@ LinphoneToneDescription *linphone_core_get_call_error_tone(const LinphoneCore *l
 }
 
 const char *linphone_core_get_tone_file(const LinphoneCore *lc, LinphoneToneID id){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	for (elem=lc->tones;elem!=NULL;elem=elem->next){
 		LinphoneToneDescription *tone=(LinphoneToneDescription*)elem->data;
 		if (tone->toneid==id && tone->reason==LinphoneReasonNone && tone->audiofile!=NULL) return tone->audiofile;
@@ -1525,11 +1424,11 @@ const char *linphone_core_get_tone_file(const LinphoneCore *lc, LinphoneToneID i
 void _linphone_core_set_tone(LinphoneCore *lc, LinphoneReason reason, LinphoneToneID id, const char *audiofile){
 	LinphoneToneDescription *tone=linphone_core_get_call_error_tone(lc,reason);
 	if (tone){
-		lc->tones=ms_list_remove(lc->tones,tone);
+		lc->tones=bctbx_list_remove(lc->tones,tone);
 		linphone_tone_description_destroy(tone);
 	}
 	tone=linphone_tone_description_new(reason,id,audiofile);
-	lc->tones=ms_list_append(lc->tones,tone);
+	lc->tones=bctbx_list_append(lc->tones,tone);
 }
 
 /**
@@ -1555,8 +1454,9 @@ void linphone_core_set_tone(LinphoneCore *lc, LinphoneToneID id, const char *aud
 }
 
 const MSCryptoSuite * linphone_core_get_srtp_crypto_suites(LinphoneCore *lc){
-	const char *config=lp_config_get_string(lc->config,"sip","srtp_crypto_suites","AES_CM_128_HMAC_SHA1_80, AES_CM_128_HMAC_SHA1_32, AES_CM_256_HMAC_SHA1_80, AES_CM_256_HMAC_SHA1_32");
+	const char *config= lp_config_get_string(lc->config, "sip", "srtp_crypto_suites", "AES_CM_128_HMAC_SHA1_80, AES_CM_128_HMAC_SHA1_32, AES_256_CM_HMAC_SHA1_80, AES_256_CM_HMAC_SHA1_32");
 	char *tmp=ms_strdup(config);
+
 	char *sep;
 	char *pos;
 	char *nextpos;
@@ -1737,13 +1637,21 @@ const char ** linphone_core_get_supported_file_formats(LinphoneCore *core){
 	if (core->supported_formats==NULL){
 		core->supported_formats=ms_malloc0(3*sizeof(char*));
 		core->supported_formats[0]=wav;
-        if (ms_factory_lookup_filter_by_id(ms_factory_get_fallback(),MS_MKV_RECORDER_ID)){
+        if (ms_factory_lookup_filter_by_id(core->factory,MS_MKV_RECORDER_ID)){
 			core->supported_formats[1]=mkv;
 		}
 	}
 	return core->supported_formats;
 }
 
+bool_t linphone_core_file_format_supported(LinphoneCore *lc, const char *fmt){
+	const char **formats=linphone_core_get_supported_file_formats(lc);
+	for(;*formats!=NULL;++formats){
+		if (strcasecmp(*formats,fmt)==0) return TRUE;
+	}
+	return FALSE;
+}
+
 bool_t linphone_core_symmetric_rtp_enabled(LinphoneCore*lc){
 	return lp_config_get_int(lc->config,"rtp","symmetric",1);
 }
@@ -1810,15 +1718,15 @@ static void hook_invoke(Hook *h){
 }
 
 void linphone_task_list_add(LinphoneTaskList *t, LinphoneCoreIterateHook hook, void *hook_data){
-	t->hooks = ms_list_append(t->hooks,hook_new(hook,hook_data));
+	t->hooks = bctbx_list_append(t->hooks,hook_new(hook,hook_data));
 }
 
 void linphone_task_list_remove(LinphoneTaskList *t, LinphoneCoreIterateHook hook, void *hook_data){
-	MSList *elem;
+	bctbx_list_t *elem;
 	for(elem=t->hooks;elem!=NULL;elem=elem->next){
 		Hook *h=(Hook*)elem->data;
 		if (h->fun==hook && h->data==hook_data){
-			t->hooks = ms_list_remove_link(t->hooks,elem);
+			t->hooks = bctbx_list_erase_link(t->hooks,elem);
 			ms_free(h);
 			return;
 		}
@@ -1827,10 +1735,191 @@ void linphone_task_list_remove(LinphoneTaskList *t, LinphoneCoreIterateHook hook
 }
 
 void linphone_task_list_run(LinphoneTaskList *t){
-	ms_list_for_each(t->hooks,(void (*)(void*))hook_invoke);
+	bctbx_list_for_each(t->hooks,(void (*)(void*))hook_invoke);
 }
 
 void linphone_task_list_free(LinphoneTaskList *t){
-	t->hooks = ms_list_free_with_data(t->hooks, (void (*)(void*))ms_free);
+	t->hooks = bctbx_list_free_with_data(t->hooks, (void (*)(void*))ms_free);
 }
 
+static bool_t _ice_params_found_in_remote_media_description(IceSession *ice_session, const SalMediaDescription *md) {
+	const SalStreamDescription *stream;
+	IceCheckList *cl = NULL;
+	int i;
+	bool_t ice_params_found = FALSE;
+	if ((md->ice_pwd[0] != '\0') && (md->ice_ufrag[0] != '\0')) {
+		ice_params_found=TRUE;
+	} else {
+		for (i = 0; i < md->nb_streams; i++) {
+			stream = &md->streams[i];
+			cl = ice_session_check_list(ice_session, i);
+			if (cl) {
+				if ((stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0')) {
+					ice_params_found=TRUE;
+				} else {
+					ice_params_found=FALSE;
+					break;
+				}
+			}
+		}
+	}
+	return ice_params_found;
+}
+
+static bool_t _check_for_ice_restart_and_set_remote_credentials(IceSession *ice_session, const SalMediaDescription *md, bool_t is_offer) {
+	const SalStreamDescription *stream;
+	IceCheckList *cl = NULL;
+	bool_t ice_restarted = FALSE;
+	int i;
+
+	if ((strcmp(md->addr, "0.0.0.0") == 0) || (strcmp(md->addr, "::0") == 0)) {
+		ice_session_restart(ice_session, is_offer ? IR_Controlled : IR_Controlling);
+		ice_restarted = TRUE;
+	} else {
+		for (i = 0; i < md->nb_streams; i++) {
+			stream = &md->streams[i];
+			cl = ice_session_check_list(ice_session, i);
+			if (cl && (strcmp(stream->rtp_addr, "0.0.0.0") == 0)) {
+				ice_session_restart(ice_session, is_offer ? IR_Controlled : IR_Controlling);
+				ice_restarted = TRUE;
+				break;
+			}
+		}
+	}
+	if ((ice_session_remote_ufrag(ice_session) == NULL) && (ice_session_remote_pwd(ice_session) == NULL)) {
+		ice_session_set_remote_credentials(ice_session, md->ice_ufrag, md->ice_pwd);
+	} else if (ice_session_remote_credentials_changed(ice_session, md->ice_ufrag, md->ice_pwd)) {
+		if (ice_restarted == FALSE) {
+			ice_session_restart(ice_session, is_offer ? IR_Controlled : IR_Controlling);
+			ice_restarted = TRUE;
+		}
+		ice_session_set_remote_credentials(ice_session, md->ice_ufrag, md->ice_pwd);
+	}
+	for (i = 0; i < md->nb_streams; i++) {
+		stream = &md->streams[i];
+		cl = ice_session_check_list(ice_session, i);
+		if (cl && (stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0')) {
+			if (ice_check_list_remote_credentials_changed(cl, stream->ice_ufrag, stream->ice_pwd)) {
+				if (ice_restarted == FALSE
+						&& ice_check_list_get_remote_ufrag(cl)
+						&& ice_check_list_get_remote_pwd(cl)) {
+						/* restart only if remote ufrag/paswd was already set*/
+					ice_session_restart(ice_session, is_offer ? IR_Controlled : IR_Controlling);
+					ice_restarted = TRUE;
+				}
+				ice_check_list_set_remote_credentials(cl, stream->ice_ufrag, stream->ice_pwd);
+				break;
+			}
+		}
+	}
+	return ice_restarted;
+}
+
+static void _create_ice_check_lists_and_parse_ice_attributes(LinphoneCall *call, const SalMediaDescription *md, bool_t ice_restarted) {
+	const SalStreamDescription *stream;
+	IceCheckList *cl = NULL;
+	bool_t default_candidate = FALSE;
+	const char *addr = NULL;
+	int port = 0;
+	int componentID = 0;
+	int remote_family;
+	int family;
+	int i, j;
+
+	for (i = 0; i < md->nb_streams; i++) {
+		stream = &md->streams[i];
+		cl = ice_session_check_list(call->ice_session, i);
+
+		if (cl==NULL) continue;
+		if (stream->ice_mismatch == TRUE) {
+			ice_check_list_set_state(cl, ICL_Failed);
+			continue;
+		}
+		if (stream->rtp_port == 0) {
+			ice_session_remove_check_list(call->ice_session, cl);
+			clear_ice_check_list(call,cl);
+			continue;
+		}
+
+		if ((stream->ice_pwd[0] != '\0') && (stream->ice_ufrag[0] != '\0'))
+			ice_check_list_set_remote_credentials(cl, stream->ice_ufrag, stream->ice_pwd);
+		for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES; j++) {
+			const SalIceCandidate *candidate = &stream->ice_candidates[j];
+			default_candidate = FALSE;
+			addr = NULL;
+			port = 0;
+			if (candidate->addr[0] == '\0') break;
+			if ((candidate->componentID == 0) || (candidate->componentID > 2)) continue;
+			get_default_addr_and_port(candidate->componentID, md, stream, &addr, &port);
+			if (addr && (candidate->port == port) && (strlen(candidate->addr) == strlen(addr)) && (strcmp(candidate->addr, addr) == 0))
+				default_candidate = TRUE;
+			if (strchr(candidate->addr, ':') != NULL) family = AF_INET6;
+			else family = AF_INET;
+			ice_add_remote_candidate(cl, candidate->type, family, candidate->addr, candidate->port, candidate->componentID,
+				candidate->priority, candidate->foundation, default_candidate);
+		}
+		if (ice_restarted == FALSE) {
+			bool_t losing_pairs_added = FALSE;
+			for (j = 0; j < SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES; j++) {
+				const SalIceRemoteCandidate *remote_candidate = &stream->ice_remote_candidates[j];
+				addr = NULL;
+				port = 0;
+				componentID = j + 1;
+				if (remote_candidate->addr[0] == '\0') break;
+				get_default_addr_and_port(componentID, md, stream, &addr, &port);
+				if (j == 0) {
+					/* If we receive a re-invite and we finished ICE processing on our side, use the candidates given by the remote. */
+					ice_check_list_unselect_valid_pairs(cl);
+				}
+				if (strchr(remote_candidate->addr, ':') != NULL) remote_family = AF_INET6;
+				else remote_family = AF_INET;
+				if (strchr(addr, ':') != NULL) family = AF_INET6;
+				else family = AF_INET;
+				
+				ice_add_losing_pair(cl, j + 1, remote_family, remote_candidate->addr, remote_candidate->port, family, addr, port);
+				losing_pairs_added = TRUE;
+			}
+			if (losing_pairs_added == TRUE) ice_check_list_check_completed(cl);
+		}
+	}
+}
+
+static void _update_ice_from_remote_media_description(LinphoneCall *call, const SalMediaDescription *md, bool_t is_offer) {
+	const SalStreamDescription *stream;
+	IceCheckList *cl = NULL;
+	bool_t ice_restarted = FALSE;
+	int i;
+
+	/* Check for ICE restart and set remote credentials. */
+	ice_restarted = _check_for_ice_restart_and_set_remote_credentials(call->ice_session, md, is_offer);
+
+	/* Create ICE check lists if needed and parse ICE attributes. */
+	_create_ice_check_lists_and_parse_ice_attributes(call, md, ice_restarted);
+	for (i = 0; i < md->nb_streams; i++) {
+		stream = &md->streams[i];
+		cl = ice_session_check_list(call->ice_session, i);
+		if (!cl) continue;
+			
+		if (!sal_stream_description_active(stream)) {
+			ice_session_remove_check_list_from_idx(call->ice_session, i);
+			clear_ice_check_list(call, cl);
+		}
+	}
+	linphone_call_clear_unused_ice_candidates(call, md);
+	ice_session_check_mismatch(call->ice_session);
+}
+
+void linphone_call_update_ice_from_remote_media_description(LinphoneCall *call, const SalMediaDescription *md, bool_t is_offer){
+	if (_ice_params_found_in_remote_media_description(call->ice_session, md) == TRUE) {
+		_update_ice_from_remote_media_description(call, md, is_offer);
+	} else {
+		/* Response from remote does not contain mandatory ICE attributes, delete the session. */
+		linphone_call_delete_ice_session(call);
+		linphone_call_set_symmetric_rtp(call, linphone_core_symmetric_rtp_enabled(linphone_call_get_core(call)));
+		return;
+	}
+	if (ice_session_nb_check_lists(call->ice_session) == 0) {
+		linphone_call_delete_ice_session(call);
+		linphone_call_set_symmetric_rtp(call, linphone_core_symmetric_rtp_enabled(linphone_call_get_core(call)));
+	}
+}
diff --git a/coreapi/nat_policy.c b/coreapi/nat_policy.c
new file mode 100644
index 000000000..2d0826ef9
--- /dev/null
+++ b/coreapi/nat_policy.c
@@ -0,0 +1,306 @@
+/*
+linphone
+Copyright (C) 2010-2016 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "linphonecore.h"
+#include "private.h"
+
+
+static LinphoneNatPolicy * _linphone_nat_policy_new_with_ref(LinphoneCore *lc, const char *ref) {
+	LinphoneNatPolicy *policy = belle_sip_object_new(LinphoneNatPolicy);
+	policy->lc = lc;
+	policy->ref = belle_sip_strdup(ref);
+	return policy;
+}
+
+static LinphoneNatPolicy * linphone_nat_policy_new(LinphoneCore *lc) {
+	char ref[17] = { 0 };
+	belle_sip_random_token(ref, 16);
+	return _linphone_nat_policy_new_with_ref(lc, ref);
+}
+
+static void linphone_nat_policy_destroy(LinphoneNatPolicy *policy) {
+	if (policy->ref) belle_sip_free(policy->ref);
+	if (policy->stun_server) belle_sip_free(policy->stun_server);
+	if (policy->stun_server_username) belle_sip_free(policy->stun_server_username);
+	if (policy->stun_addrinfo) bctbx_freeaddrinfo(policy->stun_addrinfo);
+	if (policy->stun_resolver_context) {
+		sal_resolve_cancel(policy->stun_resolver_context);
+	}
+}
+
+static bool_t linphone_nat_policy_stun_server_activated(LinphoneNatPolicy *policy) {
+	const char *server = linphone_nat_policy_get_stun_server(policy);
+	return (server != NULL) && (server[0] != '\0')
+		&& ((linphone_nat_policy_stun_enabled(policy) == TRUE) || (linphone_nat_policy_turn_enabled(policy) == TRUE));
+}
+
+
+
+BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneNatPolicy);
+
+BELLE_SIP_INSTANCIATE_VPTR(LinphoneNatPolicy, belle_sip_object_t,
+	(belle_sip_object_destroy_t)linphone_nat_policy_destroy,
+	NULL, // clone
+	NULL, // marshal
+	FALSE
+);
+
+
+static void _linphone_nat_policy_save_to_config(const LinphoneNatPolicy *policy, LpConfig *config, int index) {
+	char *section;
+	bctbx_list_t *l = NULL;
+
+	section = belle_sip_strdup_printf("nat_policy_%i", index);
+	lp_config_set_string(config, section, "ref", policy->ref);
+	lp_config_set_string(config, section, "stun_server", policy->stun_server);
+	lp_config_set_string(config, section, "stun_server_username", policy->stun_server_username);
+	if (linphone_nat_policy_upnp_enabled(policy)) {
+		l = bctbx_list_append(l, "upnp");
+	} else {
+		if (linphone_nat_policy_stun_enabled(policy)) l = bctbx_list_append(l, "stun");
+		if (linphone_nat_policy_turn_enabled(policy)) l = bctbx_list_append(l, "turn");
+		if (linphone_nat_policy_ice_enabled(policy)) l = bctbx_list_append(l, "ice");
+	}
+	lp_config_set_string_list(config, section, "protocols", l);
+	belle_sip_free(section);
+	bctbx_list_free(l);
+}
+
+void linphone_nat_policy_save_to_config(const LinphoneNatPolicy *policy) {
+	LpConfig *config = policy->lc->config;
+	char *section;
+	int index;
+	bool_t finished = FALSE;
+
+	for (index = 0; finished != TRUE; index++) {
+		section = belle_sip_strdup_printf("nat_policy_%i", index);
+		if (lp_config_has_section(config, section)) {
+			const char *config_ref = lp_config_get_string(config, section, "ref", NULL);
+			if ((config_ref != NULL) && (strcmp(config_ref, policy->ref) == 0)) {
+				_linphone_nat_policy_save_to_config(policy, config, index);
+				finished = TRUE;
+			}
+		} else {
+			_linphone_nat_policy_save_to_config(policy, config, index);
+			finished = TRUE;
+		}
+		belle_sip_free(section);
+	}
+}
+
+LinphoneNatPolicy * linphone_nat_policy_ref(LinphoneNatPolicy *policy) {
+	belle_sip_object_ref(policy);
+	return policy;
+}
+
+void linphone_nat_policy_unref(LinphoneNatPolicy *policy) {
+	belle_sip_object_unref(policy);
+}
+
+void *linphone_nat_policy_get_user_data(const LinphoneNatPolicy *policy) {
+	return policy->user_data;
+}
+
+void linphone_nat_policy_set_user_data(LinphoneNatPolicy *policy, void *ud) {
+	policy->user_data = ud;
+}
+
+
+void linphone_nat_policy_clear(LinphoneNatPolicy *policy) {
+	linphone_nat_policy_enable_stun(policy, FALSE);
+	linphone_nat_policy_enable_turn(policy, FALSE);
+	linphone_nat_policy_enable_ice(policy, FALSE);
+	linphone_nat_policy_enable_upnp(policy, FALSE);
+	linphone_nat_policy_set_stun_server(policy, NULL);
+	linphone_nat_policy_set_stun_server_username(policy, NULL);
+}
+
+bool_t linphone_nat_policy_stun_enabled(const LinphoneNatPolicy *policy) {
+	return policy->stun_enabled;
+}
+
+void linphone_nat_policy_enable_stun(LinphoneNatPolicy *policy, bool_t enable) {
+	policy->stun_enabled = enable;
+}
+
+bool_t linphone_nat_policy_turn_enabled(const LinphoneNatPolicy *policy) {
+	return policy->turn_enabled;
+}
+
+void linphone_nat_policy_enable_turn(LinphoneNatPolicy *policy, bool_t enable) {
+	policy->turn_enabled = enable;
+}
+
+bool_t linphone_nat_policy_ice_enabled(const LinphoneNatPolicy *policy) {
+	return policy->ice_enabled;
+}
+
+void linphone_nat_policy_enable_ice(LinphoneNatPolicy *policy, bool_t enable) {
+	policy->ice_enabled = enable;
+}
+
+bool_t linphone_nat_policy_upnp_enabled(const LinphoneNatPolicy *policy) {
+	return policy->upnp_enabled;
+}
+
+void linphone_nat_policy_enable_upnp(LinphoneNatPolicy *policy, bool_t enable) {
+	policy->upnp_enabled = enable;
+	if (enable) {
+#ifdef BUILD_UPNP
+		policy->stun_enabled = policy->turn_enabled = policy->ice_enabled = FALSE;
+		ms_warning("Enabling uPnP NAT policy has disabled any other previously enabled policies");
+#else
+		ms_warning("Cannot enable the uPnP NAT policy because the uPnP support is not compiled in");
+#endif
+	}
+}
+
+const char * linphone_nat_policy_get_stun_server(const LinphoneNatPolicy *policy) {
+	return policy->stun_server;
+}
+
+void linphone_nat_policy_set_stun_server(LinphoneNatPolicy *policy, const char *stun_server) {
+	char *new_stun_server = NULL;
+
+	if (stun_server != NULL) new_stun_server = belle_sip_strdup(stun_server);
+	if (policy->stun_server != NULL) {
+		belle_sip_free(policy->stun_server);
+		policy->stun_server = NULL;
+	}
+	if (new_stun_server != NULL) {
+		policy->stun_server = new_stun_server;
+		linphone_nat_policy_resolve_stun_server(policy);
+	}
+}
+
+const char * linphone_nat_policy_get_stun_server_username(const LinphoneNatPolicy *policy) {
+	return policy->stun_server_username;
+}
+
+void linphone_nat_policy_set_stun_server_username(LinphoneNatPolicy *policy, const char *username) {
+	char *new_username = NULL;
+
+	if (username != NULL) new_username = belle_sip_strdup(username);
+	if (policy->stun_server_username != NULL) {
+		belle_sip_free(policy->stun_server_username);
+		policy->stun_server_username = NULL;
+	}
+	if (new_username != NULL) policy->stun_server_username = new_username;
+}
+
+static void stun_server_resolved(LinphoneNatPolicy *policy, const char *name, struct addrinfo *addrinfo) {
+	if (policy->stun_addrinfo) {
+		bctbx_freeaddrinfo(policy->stun_addrinfo);
+		policy->stun_addrinfo = NULL;
+	}
+	if (addrinfo) {
+		ms_message("Stun server resolution successful.");
+	} else {
+		ms_warning("Stun server resolution failed.");
+	}
+	policy->stun_addrinfo = addrinfo;
+	if (policy->stun_resolver_context){
+		sal_resolver_context_unref(policy->stun_resolver_context);
+		policy->stun_resolver_context = NULL;
+	}
+}
+
+void linphone_nat_policy_resolve_stun_server(LinphoneNatPolicy *policy) {
+	const char *service = NULL;
+
+	if (linphone_nat_policy_stun_server_activated(policy) && (policy->lc->sal != NULL) && !policy->stun_resolver_context) {
+		char host[NI_MAXHOST];
+		int port = 3478;
+		linphone_parse_host_port(policy->stun_server, host, sizeof(host), &port);
+		if (linphone_nat_policy_turn_enabled(policy)) service = "turn";
+		else if (linphone_nat_policy_stun_enabled(policy)) service = "stun";
+		if (service != NULL) {
+			int family = AF_INET;
+			if (linphone_core_ipv6_enabled(policy->lc) == TRUE) family = AF_INET6;
+			policy->stun_resolver_context = sal_resolve(policy->lc->sal, service, "udp", host, port, family, (SalResolverCallback)stun_server_resolved, policy);
+			if (policy->stun_resolver_context) sal_resolver_context_ref(policy->stun_resolver_context);
+		}
+	}
+}
+
+const struct addrinfo * linphone_nat_policy_get_stun_server_addrinfo(LinphoneNatPolicy *policy) {
+	/*
+	 * It is critical not to block for a long time if it can't be resolved, otherwise this stucks the main thread when making a call.
+	 * On the contrary, a fully asynchronous call initiation is complex to develop.
+	 * The compromise is then:
+	 *  - have a cache of the stun server addrinfo
+	 *  - this cached value is returned when it is non-null
+	 *  - an asynchronous resolution is asked each time this function is called to ensure frequent refreshes of the cached value.
+	 *  - if no cached value exists, block for a short time; this case must be unprobable because the resolution will be asked each
+	 *    time the stun server value is changed.
+	 */
+	if (linphone_nat_policy_stun_server_activated(policy)) {
+		int wait_ms = 0;
+		int wait_limit = 1000;
+		linphone_nat_policy_resolve_stun_server(policy);
+		while ((policy->stun_addrinfo == NULL) && (policy->stun_resolver_context != NULL) && (wait_ms < wait_limit)) {
+			sal_iterate(policy->lc->sal);
+			ms_usleep(50000);
+			wait_ms += 50;
+		}
+	}
+	return policy->stun_addrinfo;
+}
+
+LinphoneNatPolicy * linphone_core_create_nat_policy(LinphoneCore *lc) {
+	return linphone_nat_policy_new(lc);
+}
+
+LinphoneNatPolicy * linphone_core_create_nat_policy_from_config(LinphoneCore *lc, const char *ref) {
+	LpConfig *config = lc->config;
+	LinphoneNatPolicy *policy = NULL;
+	char *section;
+	int index;
+	bool_t finished = FALSE;
+
+	for (index = 0; finished != TRUE; index++) {
+		section = belle_sip_strdup_printf("nat_policy_%i", index);
+		if (lp_config_has_section(config, section)) {
+			const char *config_ref = lp_config_get_string(config, section, "ref", NULL);
+			if ((config_ref != NULL) && (strcmp(config_ref, ref) == 0)) {
+				const char *server = lp_config_get_string(config, section, "stun_server", NULL);
+				const char *username = lp_config_get_string(config, section, "stun_server_username", NULL);
+				bctbx_list_t *l = lp_config_get_string_list(config, section, "protocols", NULL);
+				policy = _linphone_nat_policy_new_with_ref(lc, ref);
+				if (server != NULL) linphone_nat_policy_set_stun_server(policy, server);
+				if (username != NULL) linphone_nat_policy_set_stun_server_username(policy, username);
+				if (l != NULL) {
+					bool_t upnp_enabled = FALSE;
+					bctbx_list_t *elem;
+					for (elem = l; elem != NULL; elem = elem->next) {
+						const char *value = (const char *)elem->data;
+						if (strcmp(value, "stun") == 0) linphone_nat_policy_enable_stun(policy, TRUE);
+						else if (strcmp(value, "turn") == 0) linphone_nat_policy_enable_turn(policy, TRUE);
+						else if (strcmp(value, "ice") == 0) linphone_nat_policy_enable_ice(policy, TRUE);
+						else if (strcmp(value, "upnp") == 0) upnp_enabled = TRUE;
+					}
+					if (upnp_enabled) linphone_nat_policy_enable_upnp(policy, TRUE);
+				}
+				finished = TRUE;
+			}
+		} else finished = TRUE;
+		belle_sip_free(section);
+	}
+	return policy;
+}
diff --git a/coreapi/nat_policy.h b/coreapi/nat_policy.h
new file mode 100644
index 000000000..92f6067c1
--- /dev/null
+++ b/coreapi/nat_policy.h
@@ -0,0 +1,205 @@
+/*
+nat_policy.h
+Copyright (C) 2010-2016 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef LINPHONE_NAT_POLICY_H_
+#define LINPHONE_NAT_POLICY_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @addtogroup network_parameters
+ * @{
+ */
+
+/**
+ * Policy to use to pass through NATs/firewalls.
+ */
+typedef struct _LinphoneNatPolicy LinphoneNatPolicy;
+
+
+/**
+ * Acquire a reference to the LinphoneNatPolicy object.
+ * @param[in] policy LinphoneNatPolicy object.
+ * @return The same LinphoneNatPolicy object.
+**/
+LINPHONE_PUBLIC LinphoneNatPolicy * linphone_nat_policy_ref(LinphoneNatPolicy *policy);
+
+/**
+ * Release reference to the LinphoneNatPolicy object.
+ * @param[in] policy LinphoneNatPolicy object.
+**/
+LINPHONE_PUBLIC void linphone_nat_policy_unref(LinphoneNatPolicy *policy);
+
+/**
+ * Retrieve the user pointer associated with the LinphoneNatPolicy object.
+ * @param[in] policy LinphoneNatPolicy object.
+ * @return The user pointer associated with the LinphoneNatPolicy object.
+**/
+LINPHONE_PUBLIC void *linphone_nat_policy_get_user_data(const LinphoneNatPolicy *policy);
+
+/**
+ * Assign a user pointer to the LinphoneNatPolicy object.
+ * @param[in] policy LinphoneNatPolicy object.
+ * @param[in] ud The user pointer to associate with the LinphoneNatPolicy object.
+**/
+LINPHONE_PUBLIC void linphone_nat_policy_set_user_data(LinphoneNatPolicy *policy, void *ud);
+
+/**
+ * Clear a NAT policy (deactivate all protocols and unset the STUN server).
+ * @param[in] policy LinphoneNatPolicy object.
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_clear(LinphoneNatPolicy *policy);
+
+/**
+ * Tell whether STUN is enabled.
+ * @param[in] policy LinphoneNatPolicy object
+ * @return Boolean value telling whether STUN is enabled.
+ */
+LINPHONE_PUBLIC bool_t linphone_nat_policy_stun_enabled(const LinphoneNatPolicy *policy);
+
+/**
+ * Enable STUN.
+ * If TURN is also enabled, TURN will be used instead of STUN.
+ * @param[in] policy LinphoneNatPolicy object
+ * @param[in] enable Boolean value telling whether to enable STUN.
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_enable_stun(LinphoneNatPolicy *policy, bool_t enable);
+
+/**
+ * Tell whether TURN is enabled.
+ * @param[in] policy LinphoneNatPolicy object
+ * @return Boolean value telling whether TURN is enabled.
+ */
+LINPHONE_PUBLIC bool_t linphone_nat_policy_turn_enabled(const LinphoneNatPolicy *policy);
+
+/**
+ * Enable TURN.
+ * If STUN is also enabled, it is ignored and TURN is used.
+ * @param[in] policy LinphoneNatPolicy object
+ * @param[in] enable Boolean value telling whether to enable TURN.
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_enable_turn(LinphoneNatPolicy *policy, bool_t enable);
+
+/**
+ * Tell whether ICE is enabled.
+ * @param[in] policy LinphoneNatPolicy object
+ * @return Boolean value telling whether ICE is enabled.
+ */
+LINPHONE_PUBLIC bool_t linphone_nat_policy_ice_enabled(const LinphoneNatPolicy *policy);
+
+/**
+ * Enable ICE.
+ * ICE can be enabled without STUN/TURN, in which case only the local candidates will be used.
+ * @param[in] policy LinphoneNatPolicy object
+ * @param[in] enable Boolean value telling whether to enable ICE.
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_enable_ice(LinphoneNatPolicy *policy, bool_t enable);
+
+/**
+ * Tell whether uPnP is enabled.
+ * @param[in] policy LinphoneNatPolicy object
+ * @return Boolean value telling whether uPnP is enabled.
+ */
+LINPHONE_PUBLIC bool_t linphone_nat_policy_upnp_enabled(const LinphoneNatPolicy *policy);
+
+/**
+ * Enable uPnP.
+ * This has the effect to disable every other policies (ICE, STUN and TURN).
+ * @param[in] policy LinphoneNatPolicy object
+ * @param[in] enable Boolean value telling whether to enable uPnP.
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_enable_upnp(LinphoneNatPolicy *policy, bool_t enable);
+
+/**
+ * Get the STUN/TURN server to use with this NAT policy.
+ * Used when STUN or TURN are enabled.
+ * @param[in] policy LinphoneNatPolicy object
+ * @return The STUN server used by this NAT policy.
+ */
+LINPHONE_PUBLIC const char * linphone_nat_policy_get_stun_server(const LinphoneNatPolicy *policy);
+
+/**
+ * Set the STUN/TURN server to use with this NAT policy.
+ * Used when STUN or TURN are enabled.
+ * @param[in] policy LinphoneNatPolicy object
+ * @param[in] stun_server The STUN server to use with this NAT policy.
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_set_stun_server(LinphoneNatPolicy *policy, const char *stun_server);
+
+/**
+ * Get the username used to authenticate with the STUN/TURN server.
+ * The authentication will search for a LinphoneAuthInfo with this username.
+ * If it is not set the username of the currently used LinphoneProxyConfig is used to search for a LinphoneAuthInfo.
+ * @param[in] policy LinphoneNatPolicy object
+ * @return The username used to authenticate with the STUN/TURN server.
+ */
+LINPHONE_PUBLIC const char * linphone_nat_policy_get_stun_server_username(const LinphoneNatPolicy *policy);
+
+/**
+ * Set the username used to authenticate with the STUN/TURN server.
+ * The authentication will search for a LinphoneAuthInfo with this username.
+ * If it is not set the username of the currently used LinphoneProxyConfig is used to search for a LinphoneAuthInfo.
+ * @param[in] policy LinphoneNatPolicy object
+ * @param[in] username The username used to authenticate with the STUN/TURN server.
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_set_stun_server_username(LinphoneNatPolicy *policy, const char *username);
+
+/**
+ * Start a STUN server DNS resolution.
+ * @param[in] policy LinphoneNatPolicy object
+ */
+LINPHONE_PUBLIC void linphone_nat_policy_resolve_stun_server(LinphoneNatPolicy *policy);
+
+/**
+ * Get the addrinfo representation of the STUN server address.
+ * WARNING: This function may block for up to 1 second.
+ * @param[in] policy LinphoneNatPolicy object
+ * @return addrinfo representation of the STUN server address.
+ */
+LINPHONE_PUBLIC const struct addrinfo * linphone_nat_policy_get_stun_server_addrinfo(LinphoneNatPolicy *policy);
+
+/**
+ * Create a new LinphoneNatPolicy object with every policies being disabled.
+ * @param[in] lc LinphoneCore object
+ * @return A new LinphoneNatPolicy object.
+ */
+LINPHONE_PUBLIC LinphoneNatPolicy * linphone_core_create_nat_policy(LinphoneCore *lc);
+
+/**
+ * Create a new LinphoneNatPolicy by reading the config of a LinphoneCore according to the passed ref.
+ * @param[in] lc LinphoneCore object
+ * @param[in] ref The reference of a NAT policy in the config of the LinphoneCore
+ * @return A new LinphoneNatPolicy object.
+ */
+LINPHONE_PUBLIC LinphoneNatPolicy * linphone_core_create_nat_policy_from_config(LinphoneCore *lc, const char *ref);
+
+/**
+ * @}
+ */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LINPHONE_NAT_POLICY_H_ */
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index c5c02b12c..793f6539d 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "offeranswer.h"
 #include "private.h"
 
-static bool_t only_telephone_event(const MSList *l){
+static bool_t only_telephone_event(const bctbx_list_t *l){
 	for(;l!=NULL;l=l->next){
 		PayloadType *p=(PayloadType*)l->data;
 		if (strcasecmp(p->mime_type,"telephone-event")!=0){
@@ -31,127 +31,159 @@ static bool_t only_telephone_event(const MSList *l){
 	return TRUE;
 }
 
-typedef struct _PayloadTypeMatcher{
-	const char *mime_type;
-	PayloadType *(*match_func)(const MSList *l, const PayloadType *refpt);
-}PayloadTypeMatcher;
 
-static PayloadType * opus_match(const MSList *l, const PayloadType *refpt){
+static PayloadType * opus_match(MSOfferAnswerContext *ctx, const bctbx_list_t *local_payloads, const PayloadType *refpt, const bctbx_list_t *remote_payloads, bool_t reading_response){
 	PayloadType *pt;
-	const MSList *elem;
-	PayloadType *candidate=NULL;
+	const bctbx_list_t *elem;
+	PayloadType *legacy_opus=NULL;
 
-	for (elem=l;elem!=NULL;elem=elem->next){
+	for (elem=local_payloads;elem!=NULL;elem=elem->next){
 		pt=(PayloadType*)elem->data;
 		
 		/*workaround a bug in earlier versions of linphone where opus/48000/1 is offered, which is uncompliant with opus rtp draft*/
 		if (strcasecmp(pt->mime_type,"opus")==0 ){
 			if (refpt->channels==1){
-				pt->channels=1; /*so that we respond with same number of channels */
-				candidate=pt;
+				legacy_opus=pt;
 			}else if (refpt->channels==2){
-				return pt;
+				return payload_type_clone(pt);
 			}
 		}
 	}
-	return candidate;
+	if (legacy_opus){
+		legacy_opus = payload_type_clone(legacy_opus);
+		legacy_opus->channels=1; /*so that we respond with same number of channels */
+		return legacy_opus;
+	}
+	return NULL;
 }
 
+static MSOfferAnswerContext *opus_offer_answer_create_context(void){
+	static MSOfferAnswerContext opus_oa = {opus_match, NULL, NULL};
+	return &opus_oa;
+}
+
+MSOfferAnswerProvider opus_offer_answer_provider={
+	"opus",
+	opus_offer_answer_create_context
+};
+
 /* the reason for this matcher is for some stupid uncompliant phone that offer G729a mime type !*/
-static PayloadType * g729A_match(const MSList *l, const PayloadType *refpt){
+static PayloadType * g729A_match(MSOfferAnswerContext *ctx, const bctbx_list_t *local_payloads, const PayloadType *refpt, const bctbx_list_t *remote_payloads, bool_t reading_response){
 	PayloadType *pt;
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	PayloadType *candidate=NULL;
 
-	for (elem=l;elem!=NULL;elem=elem->next){
+	for (elem=local_payloads;elem!=NULL;elem=elem->next){
 		pt=(PayloadType*)elem->data;
 		
 		if (strcasecmp(pt->mime_type,"G729")==0 && refpt->channels==pt->channels){
 			candidate=pt;
 		}
 	}
-	return candidate;
+	return candidate ? payload_type_clone(candidate) : NULL;
 }
 
-static PayloadType * amr_match(const MSList *l, const PayloadType *refpt){
-	PayloadType *pt;
-	char value[10];
-	const MSList *elem;
-	PayloadType *candidate=NULL;
+static MSOfferAnswerContext *g729a_offer_answer_create_context(void){
+	static MSOfferAnswerContext g729_oa = {g729A_match, NULL, NULL};
+	return &g729_oa;
+}
 
-	for (elem=l;elem!=NULL;elem=elem->next){
-		pt=(PayloadType*)elem->data;
+MSOfferAnswerProvider g729a_offer_answer_provider={
+	"G729A",
+	g729a_offer_answer_create_context
+};
+
+static PayloadType * red_match(MSOfferAnswerContext *ctx, const bctbx_list_t *local_payloads, const PayloadType *refpt, const bctbx_list_t *remote_payloads, bool_t reading_response) {
+	const bctbx_list_t *elem_local, *elem_remote;
+	PayloadType *red = NULL;
+
+	for (elem_local = local_payloads; elem_local != NULL; elem_local = elem_local->next) {
+		PayloadType *pt = (PayloadType*)elem_local->data;
 		
-		if ( pt->mime_type && refpt->mime_type 
-			&& strcasecmp(pt->mime_type, refpt->mime_type)==0
-			&& pt->clock_rate==refpt->clock_rate
-			&& pt->channels==refpt->channels) {
-			int octedalign1=0,octedalign2=0;
-			if (pt->recv_fmtp!=NULL && fmtp_get_value(pt->recv_fmtp,"octet-align",value,sizeof(value))){
-				octedalign1=atoi(value);
-			}
-			if (refpt->send_fmtp!=NULL && fmtp_get_value(refpt->send_fmtp,"octet-align",value,sizeof(value))){
-				octedalign2=atoi(value);
-			}
-			if (octedalign1==octedalign2) {
-				candidate=pt;
-				break; /*exact match */
+		if (strcasecmp(pt->mime_type, payload_type_t140_red.mime_type) == 0) {
+			red = payload_type_clone(pt);
+			
+			for (elem_remote = remote_payloads; elem_remote != NULL; elem_remote = elem_remote->next) {
+				PayloadType *pt2 = (PayloadType*)elem_remote->data;
+				if (strcasecmp(pt2->mime_type, payload_type_t140.mime_type) == 0) {
+					int t140_payload_number = payload_type_get_number(pt2);
+					char *red_fmtp = ms_strdup_printf("%i/%i/%i", t140_payload_number, t140_payload_number, t140_payload_number);
+					/*modify the local payload and the return value*/
+					payload_type_set_recv_fmtp(pt, red_fmtp);
+					payload_type_set_recv_fmtp(red, red_fmtp);
+					ms_free(red_fmtp);
+					break;
+				}
 			}
+			break;
 		}
 	}
-	return candidate;
+	return red;
 }
 
-static PayloadType * generic_match(const MSList *l, const PayloadType *refpt){
-	PayloadType *pt;
-	const MSList *elem;
+static MSOfferAnswerContext *red_offer_answer_create_context(void){
+	static MSOfferAnswerContext red_oa = {red_match, NULL, NULL};
+	return &red_oa;
+}
 
-	for (elem=l;elem!=NULL;elem=elem->next){
+MSOfferAnswerProvider red_offer_answer_provider={
+	"red",
+	red_offer_answer_create_context
+};
+
+static PayloadType * generic_match(const bctbx_list_t *local_payloads, const PayloadType *refpt, const bctbx_list_t *remote_payloads){
+	PayloadType *pt;
+	const bctbx_list_t *elem;
+
+	for (elem=local_payloads;elem!=NULL;elem=elem->next){
 		pt=(PayloadType*)elem->data;
 		
 		if ( pt->mime_type && refpt->mime_type 
 			&& strcasecmp(pt->mime_type, refpt->mime_type)==0
 			&& pt->clock_rate==refpt->clock_rate
 			&& pt->channels==refpt->channels)
-			return pt;
+			return payload_type_clone(pt);
 	}
 	return NULL;
 }
 
-static PayloadTypeMatcher matchers[]={
-	{"opus", opus_match},
-	{"G729A", g729A_match},
-	{"AMR", amr_match},
-	{"AMR-WB", amr_match},
-	{NULL, NULL}
-};
 
+void linphone_core_register_offer_answer_providers(LinphoneCore *lc){
+	MSFactory *factory = lc->factory;
+	ms_factory_register_offer_answer_provider(factory, &red_offer_answer_provider);
+	ms_factory_register_offer_answer_provider(factory, &g729a_offer_answer_provider);
+	ms_factory_register_offer_answer_provider(factory, &opus_offer_answer_provider);
+}
 
 /*
  * Returns a PayloadType from the local list that matches a PayloadType offered or answered in the remote list
 */
-static PayloadType * find_payload_type_best_match(const MSList *l, const PayloadType *refpt){
-	PayloadTypeMatcher *m;
-	for(m=matchers;m->mime_type!=NULL;++m){
-		if (refpt->mime_type && strcasecmp(m->mime_type,refpt->mime_type)==0){
-			return m->match_func(l,refpt);
-		}
+static PayloadType * find_payload_type_best_match(MSFactory *factory, const bctbx_list_t *local_payloads, const PayloadType *refpt,
+						  const bctbx_list_t *remote_payloads, bool_t reading_response){
+	PayloadType *ret = NULL;
+	MSOfferAnswerContext *ctx = NULL;
+
+	// When a stream is inactive, refpt->mime_type might be null
+	if (refpt->mime_type && (ctx = ms_factory_create_offer_answer_context(factory, refpt->mime_type))) {
+		ms_message("Doing offer/answer processing with specific provider for codec [%s]", refpt->mime_type); 
+		ret = ms_offer_answer_context_match_payload(ctx, local_payloads, refpt, remote_payloads, reading_response);
+		ms_offer_answer_context_destroy(ctx);
+		return ret;
 	}
-	return generic_match(l,refpt);
+	return generic_match(local_payloads, refpt, remote_payloads);
 }
 
 
-static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t reading_response, bool_t one_matching_codec){
-	const MSList *e2,*e1;
-	MSList *res=NULL;
+static bctbx_list_t *match_payloads(MSFactory *factory, const bctbx_list_t *local, const bctbx_list_t *remote, bool_t reading_response, bool_t one_matching_codec){
+	const bctbx_list_t *e2,*e1;
+	bctbx_list_t *res=NULL;
 	PayloadType *matched;
 	bool_t found_codec=FALSE;
 
 	for(e2=remote;e2!=NULL;e2=e2->next){
 		PayloadType *p2=(PayloadType*)e2->data;
-		matched=find_payload_type_best_match(local,p2);
+		matched=find_payload_type_best_match(factory, local, p2, remote, reading_response);
 		if (matched){
-			PayloadType *newp;
 			int local_number=payload_type_get_number(matched);
 			int remote_number=payload_type_get_number(p2);
 
@@ -163,37 +195,39 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 				}
 			}
 
-			newp=payload_type_clone(matched);
 			if (p2->send_fmtp){
-				payload_type_append_send_fmtp(newp,p2->send_fmtp);
+				payload_type_append_send_fmtp(matched,p2->send_fmtp);
 			}
-			newp->flags|=PAYLOAD_TYPE_FLAG_CAN_RECV|PAYLOAD_TYPE_FLAG_CAN_SEND;
-			if (p2->flags & PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED) {
-				newp->flags |= PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED;
+			payload_type_set_flag(matched, PAYLOAD_TYPE_FLAG_CAN_RECV|PAYLOAD_TYPE_FLAG_CAN_SEND);
+			if (matched->flags & PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED && p2->flags & PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED) {
+				payload_type_set_flag(matched, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED);
 				/* Negotiation of AVPF features (keep common features) */
-				newp->avpf.features &= p2->avpf.features;
-				newp->avpf.rpsi_compatibility = p2->avpf.rpsi_compatibility;
+				matched->avpf.features &= p2->avpf.features;
+				matched->avpf.rpsi_compatibility = p2->avpf.rpsi_compatibility;
 				/* Take bigger AVPF trr interval */
-				if (p2->avpf.trr_interval < matched->avpf.trr_interval) {
-					newp->avpf.trr_interval = matched->avpf.trr_interval;
+				if (p2->avpf.trr_interval > matched->avpf.trr_interval) {
+					matched->avpf.trr_interval = p2->avpf.trr_interval;
 				}
+			}else{
+				payload_type_unset_flag(matched, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED);
 			}
-			res=ms_list_append(res,newp);
+			res=bctbx_list_append(res,matched);
 			/* we should use the remote numbering even when parsing a response */
-			payload_type_set_number(newp,remote_number);
-			payload_type_set_flag(newp, PAYLOAD_TYPE_FROZEN_NUMBER);
+			payload_type_set_number(matched,remote_number);
+			payload_type_set_flag(matched, PAYLOAD_TYPE_FROZEN_NUMBER);
 			if (reading_response && remote_number!=local_number){
 				ms_warning("For payload type %s, proposed number was %i but the remote phone answered %i",
-						  newp->mime_type, local_number, remote_number);
+						  matched->mime_type, local_number, remote_number);
 				/*
 				 We must add this payload type with our local numbering in order to be able to receive it.
 				 Indeed despite we must sent with the remote numbering, we must be able to receive with
 				 our local one.
 				*/
-				newp=payload_type_clone(newp);
-				payload_type_set_number(newp,local_number);
-				payload_type_set_flag(newp, PAYLOAD_TYPE_FROZEN_NUMBER);
-				res=ms_list_append(res,newp);
+				matched=payload_type_clone(matched);
+				payload_type_set_number(matched,local_number);
+				payload_type_set_flag(matched, PAYLOAD_TYPE_FLAG_CAN_RECV);
+				payload_type_set_flag(matched, PAYLOAD_TYPE_FROZEN_NUMBER);
+				res=bctbx_list_append(res,matched);
 			}
 		}else{
 			if (p2->channels>0)
@@ -218,7 +252,7 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 				p1=payload_type_clone(p1);
 				payload_type_set_flag(p1, PAYLOAD_TYPE_FLAG_CAN_RECV);
 				payload_type_set_flag(p1, PAYLOAD_TYPE_FROZEN_NUMBER);
-				res=ms_list_append(res,p1);
+				res=bctbx_list_append(res,p1);
 			}
 		}
 	}
@@ -296,11 +330,11 @@ static SalStreamDir compute_dir_incoming(SalStreamDir local, SalStreamDir offere
 	return res;
 }
 
-static void initiate_outgoing(const SalStreamDescription *local_offer,
+static void initiate_outgoing(MSFactory* factory, const SalStreamDescription *local_offer,
 						const SalStreamDescription *remote_answer,
 						SalStreamDescription *result){
 	if (remote_answer->rtp_port!=0)
-		result->payloads=match_payloads(local_offer->payloads,remote_answer->payloads,TRUE,FALSE);
+		result->payloads=match_payloads(factory, local_offer->payloads,remote_answer->payloads,TRUE,FALSE);
 	else {
 		ms_message("Local stream description [%p] rejected by peer",local_offer);
 		result->rtp_port=0;
@@ -310,67 +344,66 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 	result->type=local_offer->type;
 
 	if (local_offer->rtp_addr[0]!='\0' && ms_is_multicast(local_offer->rtp_addr)) {
-		/*6.2 Multicast Streams
-		...
-	   If a multicast stream is accepted, the address and port information
-	   in the answer MUST match that of the offer.  Similarly, the
-	   directionality information in the answer (sendonly, recvonly, or
-	   sendrecv) MUST equal that of the offer.  This is because all
-	   participants in a multicast session need to have equivalent views of
-	   the parameters of the session, an underlying assumption of the
-	   multicast bias of RFC 2327.*/
-	  if (strcmp(local_offer->rtp_addr,remote_answer->rtp_addr) !=0 ) {
-		  ms_message("Remote answered IP [%s] does not match offered [%s] for local stream description [%p]"
-				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->rtp_addr
-				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->rtp_addr
-				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
-		  result->rtp_port=0;
-		  return;
-	  }
-	  if (local_offer->rtp_port!=remote_answer->rtp_port) {
-		  ms_message("Remote answered rtp port [%i] does not match offered [%i] for local stream description [%p]"
-				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->rtp_port
-				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->rtp_port
-				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
-		  result->rtp_port=0;
-		  return;
-	  }
-	  if (local_offer->dir!=remote_answer->dir) {
-		  ms_message("Remote answered dir [%s] does not match offered [%s] for local stream description [%p]"
-				  	  	  	  	  	  	  	  	  	  	  	  ,sal_stream_dir_to_string(remote_answer->dir)
-				  	  	  	  	  	  	  	  	  	  	  	  ,sal_stream_dir_to_string(local_offer->dir)
-				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
-		  result->rtp_port=0;
-		  return;
-	  }
-	  if (local_offer->bandwidth!=remote_answer->bandwidth) {
-		  ms_message("Remote answered bandwidth [%i] does not match offered [%i] for local stream description [%p]"
-				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->bandwidth
-				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->bandwidth
-				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
-		  result->rtp_port=0;
-		  return;
-	  }
-	  if (local_offer->ptime > 0 && local_offer->ptime!=remote_answer->ptime) {
-	  		  ms_message("Remote answered ptime [%i] does not match offered [%i] for local stream description [%p]"
-	  				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->ptime
-	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->ptime
-	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
-	  	  result->rtp_port=0;
-	  	  return;
-	  }
-	  if (local_offer->ttl > 0 && local_offer->ttl!=remote_answer->ttl) {
-	  	  ms_message("Remote answered ttl [%i] does not match offered [%i] for local stream description [%p]"
-	  	  				  	  	  	  	  	  	  	  	  	  	  	  ,remote_answer->ttl
-	  	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer->ttl
-	  	  				  	  	  	  	  	  	  	  	  	  	  	  ,local_offer);
-	   	  result->rtp_port=0;
-	   	  return;
-	   }
-	  result->ttl=local_offer->ttl;
-	  result->dir=local_offer->dir;
-	  result->multicast_role = SalMulticastSender;
-
+			/*6.2 Multicast Streams
+			...
+		If a multicast stream is accepted, the address and port information
+		in the answer MUST match that of the offer.  Similarly, the
+		directionality information in the answer (sendonly, recvonly, or
+		sendrecv) MUST equal that of the offer.  This is because all
+		participants in a multicast session need to have equivalent views of
+		the parameters of the session, an underlying assumption of the
+		multicast bias of RFC 2327.*/
+		if (strcmp(local_offer->rtp_addr,remote_answer->rtp_addr) !=0 ) {
+			ms_message("Remote answered IP [%s] does not match offered [%s] for local stream description [%p]"
+																,remote_answer->rtp_addr
+																,local_offer->rtp_addr
+																,local_offer);
+			result->rtp_port=0;
+			return;
+		}
+		if (local_offer->rtp_port!=remote_answer->rtp_port) {
+			ms_message("Remote answered rtp port [%i] does not match offered [%i] for local stream description [%p]"
+																,remote_answer->rtp_port
+																,local_offer->rtp_port
+																,local_offer);
+			result->rtp_port=0;
+			return;
+		}
+		if (local_offer->dir!=remote_answer->dir) {
+			ms_message("Remote answered dir [%s] does not match offered [%s] for local stream description [%p]"
+																,sal_stream_dir_to_string(remote_answer->dir)
+																,sal_stream_dir_to_string(local_offer->dir)
+																,local_offer);
+			result->rtp_port=0;
+			return;
+		}
+		if (local_offer->bandwidth!=remote_answer->bandwidth) {
+			ms_message("Remote answered bandwidth [%i] does not match offered [%i] for local stream description [%p]"
+																,remote_answer->bandwidth
+																,local_offer->bandwidth
+																,local_offer);
+			result->rtp_port=0;
+			return;
+		}
+		if (local_offer->ptime > 0 && local_offer->ptime!=remote_answer->ptime) {
+			ms_message("Remote answered ptime [%i] does not match offered [%i] for local stream description [%p]"
+																,remote_answer->ptime
+																,local_offer->ptime
+																,local_offer);
+			result->rtp_port=0;
+			return;
+		}
+		if (local_offer->ttl > 0 && local_offer->ttl!=remote_answer->ttl) {
+			ms_message("Remote answered ttl [%i] does not match offered [%i] for local stream description [%p]"
+																		,remote_answer->ttl
+																		,local_offer->ttl
+																		,local_offer);
+			result->rtp_port=0;
+			return;
+		}
+		result->ttl=local_offer->ttl;
+		result->dir=local_offer->dir;
+		result->multicast_role = SalMulticastSender;
 	} else {
 		result->dir=compute_dir_outgoing(local_offer->dir,remote_answer->dir);
 	}
@@ -409,19 +442,19 @@ static void initiate_outgoing(const SalStreamDescription *local_offer,
 		result->dtls_fingerprint[0] = '\0';
 		result->dtls_role = SalDtlsRoleInvalid;
 	}
-
-
+	result->rtcp_mux = remote_answer->rtcp_mux && local_offer->rtcp_mux;
+	result->implicit_rtcp_fb = local_offer->implicit_rtcp_fb && remote_answer->implicit_rtcp_fb;
 }
 
 
-static void initiate_incoming(const SalStreamDescription *local_cap,
+static void initiate_incoming(MSFactory *factory, const SalStreamDescription *local_cap,
 						const SalStreamDescription *remote_offer,
 						SalStreamDescription *result, bool_t one_matching_codec){
-	result->payloads=match_payloads(local_cap->payloads,remote_offer->payloads, FALSE, one_matching_codec);
+	result->payloads=match_payloads(factory, local_cap->payloads,remote_offer->payloads, FALSE, one_matching_codec);
 	result->proto=remote_offer->proto;
 	result->type=local_cap->type;
 	result->dir=compute_dir_incoming(local_cap->dir,remote_offer->dir);
-	if (!result->payloads || only_telephone_event(result->payloads) || remote_offer->rtp_port==0 || remote_offer->dir==SalStreamRecvOnly){
+	if (!result->payloads || only_telephone_event(result->payloads) || remote_offer->rtp_port==0){
 		result->rtp_port=0;
 		return;
 	}
@@ -449,17 +482,28 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 		result->bandwidth=local_cap->bandwidth;
 		result->ptime=local_cap->ptime;
 	}
+
 	if (sal_stream_description_has_srtp(result) == TRUE) {
 		/* select crypto algo */
 		memset(result->crypto, 0, sizeof(result->crypto));
-		if (!match_crypto_algo(local_cap->crypto, remote_offer->crypto, &result->crypto[0], &result->crypto_local_tag, TRUE))
+		if (!match_crypto_algo(local_cap->crypto, remote_offer->crypto, &result->crypto[0], &result->crypto_local_tag, TRUE)) {
 			result->rtp_port = 0;
+			ms_message("No matching crypto algo for remote stream's offer [%p]",remote_offer);
+		}
 
 	}
+
+	if (remote_offer->haveZrtpHash == 1) {
+		if (local_cap->zrtphash[0] != 0) { /* if ZRTP is available, set the zrtp hash even if it is not selected */
+			strncpy((char *)(result->zrtphash), (char *)(local_cap->zrtphash), sizeof(local_cap->zrtphash));
+			result->haveZrtpHash =  1;
+		}
+	}
+
 	strcpy(result->ice_pwd, local_cap->ice_pwd);
 	strcpy(result->ice_ufrag, local_cap->ice_ufrag);
 	result->ice_mismatch = local_cap->ice_mismatch;
-	result->ice_completed = local_cap->ice_completed;
+	result->set_nortpproxy = local_cap->set_nortpproxy;
 	memcpy(result->ice_candidates, local_cap->ice_candidates, sizeof(result->ice_candidates));
 	memcpy(result->ice_remote_candidates, local_cap->ice_remote_candidates, sizeof(result->ice_remote_candidates));
 	strcpy(result->name,local_cap->name);
@@ -478,8 +522,8 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
 		result->dtls_fingerprint[0] = '\0';
 		result->dtls_role = SalDtlsRoleInvalid;
 	}
-
-
+	result->rtcp_mux = remote_offer->rtcp_mux && local_cap->rtcp_mux;
+	result->implicit_rtcp_fb = local_cap->implicit_rtcp_fb && remote_offer->implicit_rtcp_fb;
 }
 
 
@@ -487,31 +531,32 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
  * Returns a media description to run the streams with, based on a local offer
  * and the returned response (remote).
 **/
-int offer_answer_initiate_outgoing(const SalMediaDescription *local_offer,
+int offer_answer_initiate_outgoing(MSFactory *factory, const SalMediaDescription *local_offer,
 					const SalMediaDescription *remote_answer,
 					SalMediaDescription *result){
-	int i,j;
+	int i;
 	const SalStreamDescription *ls,*rs;
 
-	for(i=0,j=0;i<local_offer->nb_streams;++i){
+	for(i=0;i<local_offer->nb_streams;++i){
 		ms_message("Processing for stream %i",i);
 		ls=&local_offer->streams[i];
-		rs=sal_media_description_find_stream((SalMediaDescription*)remote_answer,ls->proto,ls->type);
-		if (rs) {
-			initiate_outgoing(ls,rs,&result->streams[j]);
+		rs=&remote_answer->streams[i];
+		if (rs && ls->proto == rs->proto && rs->type == ls->type) {
+			initiate_outgoing(factory, ls,rs,&result->streams[i]);
 			memcpy(&result->streams[i].rtcp_xr, &ls->rtcp_xr, sizeof(result->streams[i].rtcp_xr));
 			if ((ls->rtcp_xr.enabled == TRUE) && (rs->rtcp_xr.enabled == FALSE)) {
 				result->streams[i].rtcp_xr.enabled = FALSE;
 			}
 			result->streams[i].rtcp_fb.generic_nack_enabled = ls->rtcp_fb.generic_nack_enabled & rs->rtcp_fb.generic_nack_enabled;
 			result->streams[i].rtcp_fb.tmmbr_enabled = ls->rtcp_fb.tmmbr_enabled & rs->rtcp_fb.tmmbr_enabled;
-			++j;
 		}
 		else ms_warning("No matching stream for %i",i);
 	}
 	result->nb_streams=local_offer->nb_streams;
 	result->bandwidth=remote_answer->bandwidth;
 	strcpy(result->addr,remote_answer->addr);
+	strcpy(result->ice_pwd, local_offer->ice_pwd);
+	strcpy(result->ice_ufrag, local_offer->ice_ufrag);
 	memcpy(&result->rtcp_xr, &local_offer->rtcp_xr, sizeof(result->rtcp_xr));
 	if ((local_offer->rtcp_xr.enabled == TRUE) && (remote_answer->rtcp_xr.enabled == FALSE)) {
 		result->rtcp_xr.enabled = FALSE;
@@ -520,57 +565,22 @@ int offer_answer_initiate_outgoing(const SalMediaDescription *local_offer,
 	return 0;
 }
 
-static bool_t local_stream_not_already_used(const SalMediaDescription *result, const SalStreamDescription *stream){
-	int i;
-	for(i=0;i<result->nb_streams;++i){
-		const SalStreamDescription *ss=&result->streams[i];
-		if (strcmp(ss->name,stream->name)==0){
-			ms_message("video stream already used in answer");
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-/*in answering mode, we consider that if we are able to make AVPF/SAVP/SAVPF, then we can do AVP as well*/
-static bool_t proto_compatible(SalMediaProto local, SalMediaProto remote) {
-	if (local == remote) return TRUE;
-	if ((remote == SalProtoRtpAvp) && ((local == SalProtoRtpSavp) || (local == SalProtoRtpSavpf))) return TRUE;
-	if ((remote == SalProtoRtpAvp) && ((local == SalProtoUdpTlsRtpSavp) || (local == SalProtoUdpTlsRtpSavpf))) return TRUE;
-	if ((remote == SalProtoRtpAvpf) && (local == SalProtoRtpSavpf)) return TRUE;
-	if ((remote == SalProtoRtpAvpf) && (local == SalProtoUdpTlsRtpSavpf)) return TRUE;
-	return FALSE;
-}
-
-static const SalStreamDescription *find_local_matching_stream(const SalMediaDescription *result, const SalMediaDescription *local_capabilities, const SalStreamDescription *remote_stream){
-	int i;
-	for(i=0;i<local_capabilities->nb_streams;++i){
-		const SalStreamDescription *ss=&local_capabilities->streams[i];
-		if (!sal_stream_description_active(ss)) continue;
-		if (ss->type==remote_stream->type && proto_compatible(ss->proto,remote_stream->proto)
-			&& local_stream_not_already_used(result,ss)) return ss;
-	}
-	return NULL;
-}
-
 /**
  * Returns a media description to run the streams with, based on the local capabilities and
  * and the received offer.
  * The returned media description is an answer and should be sent to the offerer.
 **/
-int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities,
+int offer_answer_initiate_incoming(MSFactory *factory, const SalMediaDescription *local_capabilities,
 					const SalMediaDescription *remote_offer,
 					SalMediaDescription *result, bool_t one_matching_codec){
 	int i;
 	const SalStreamDescription *ls=NULL,*rs;
 
 	for(i=0;i<remote_offer->nb_streams;++i){
-		rs=&remote_offer->streams[i];
-		if (rs->proto!=SalProtoOther){
-			ls=find_local_matching_stream(result,local_capabilities,rs);
-		}else ms_warning("Unknown protocol for mline %i, declining",i);
-		if (ls){
-			initiate_incoming(ls,rs,&result->streams[i],one_matching_codec);
+		rs = &remote_offer->streams[i];
+		ls = &local_capabilities->streams[i];
+		if (ls && rs->type == ls->type && rs->proto == ls->proto){
+			initiate_incoming(factory, ls,rs,&result->streams[i],one_matching_codec);
 			// Handle global RTCP FB attributes
 			result->streams[i].rtcp_fb.generic_nack_enabled = rs->rtcp_fb.generic_nack_enabled;
 			result->streams[i].rtcp_fb.tmmbr_enabled = rs->rtcp_fb.tmmbr_enabled;
@@ -600,6 +610,7 @@ int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities
 				strncpy(result->streams[i].proto_other,rs->proto_other,sizeof(rs->proto_other)-1);
 			}
 		}
+		result->streams[i].custom_sdp_attributes = sal_custom_sdp_attribute_clone(ls->custom_sdp_attributes);
 	}
 	result->nb_streams=i;
 	strcpy(result->username, local_capabilities->username);
@@ -610,7 +621,8 @@ int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities
 	strcpy(result->ice_pwd, local_capabilities->ice_pwd);
 	strcpy(result->ice_ufrag, local_capabilities->ice_ufrag);
 	result->ice_lite = local_capabilities->ice_lite;
-	result->ice_completed = local_capabilities->ice_completed;
+	result->set_nortpproxy = local_capabilities->set_nortpproxy;
+	result->custom_sdp_attributes = sal_custom_sdp_attribute_clone(local_capabilities->custom_sdp_attributes);
 
 	strcpy(result->name,local_capabilities->name);
 
diff --git a/coreapi/offeranswer.h b/coreapi/offeranswer.h
index 74527529c..1fe7697e2 100644
--- a/coreapi/offeranswer.h
+++ b/coreapi/offeranswer.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  * Returns a media description to run the streams with, based on a local offer
  * and the returned response (remote).
 **/
-int offer_answer_initiate_outgoing(const SalMediaDescription *local_offer,
+int offer_answer_initiate_outgoing(MSFactory *factory, const SalMediaDescription *local_offer,
 									const SalMediaDescription *remote_answer,
 									SalMediaDescription *result);
 
@@ -39,7 +39,7 @@ int offer_answer_initiate_outgoing(const SalMediaDescription *local_offer,
  * and the received offer.
  * The returned media description is an answer and should be sent to the offerer.
 **/
-int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities,
+int offer_answer_initiate_incoming(MSFactory* factory, const SalMediaDescription *local_capabilities,
 						const SalMediaDescription *remote_offer,
 						SalMediaDescription *result, bool_t one_matching_codec);
 
diff --git a/coreapi/player.c b/coreapi/player.c
index c49e07a37..0677909f4 100644
--- a/coreapi/player.c
+++ b/coreapi/player.c
@@ -94,7 +94,7 @@ int linphone_player_get_current_position(LinphonePlayer *obj) {
  * @param obj the player.
 **/
 void linphone_player_close(LinphonePlayer *obj){
-	return obj->close(obj);
+	obj->close(obj);
 }
 
 /**
diff --git a/coreapi/plugins/buddylookup/src/lookup.c b/coreapi/plugins/buddylookup/src/lookup.c
index 736e7aa35..094da0dce 100644
--- a/coreapi/plugins/buddylookup/src/lookup.c
+++ b/coreapi/plugins/buddylookup/src/lookup.c
@@ -108,8 +108,8 @@ static void fill_buddy_info(BLReq *blreq, BuddyInfo *bi, GHashTable *ht){
 
 }
 
-static MSList * make_buddy_list(BLReq *blreq, GValue *retval){
-	MSList *ret=NULL;
+static bctbx_list_t * make_buddy_list(BLReq *blreq, GValue *retval){
+	bctbx_list_t *ret=NULL;
 	if (G_VALUE_TYPE(retval)==G_TYPE_VALUE_ARRAY){
 		GValueArray *array=(GValueArray*)g_value_get_boxed(retval);
 		GValue *gelem;
@@ -120,7 +120,7 @@ static MSList * make_buddy_list(BLReq *blreq, GValue *retval){
 				GHashTable *ht=(GHashTable*)g_value_get_boxed(gelem);
 				BuddyInfo *bi=buddy_info_new();
 				fill_buddy_info(blreq,bi,ht);
-				ret=ms_list_append(ret,bi);
+				ret=bctbx_list_append(ret,bi);
 			}else{
 				ms_error("Element is not a hash table");
 			}
diff --git a/coreapi/presence.c b/coreapi/presence.c
index ed22ffa05..7d3a11336 100644
--- a/coreapi/presence.c
+++ b/coreapi/presence.c
@@ -41,7 +41,7 @@ struct _LinphonePresenceService {
 	char *id;
 	LinphonePresenceBasicStatus status;
 	char *contact;
-	MSList *notes;				/**< A list of _LinphonePresenceNote structures. */
+	bctbx_list_t *notes;				/**< A list of _LinphonePresenceNote structures. */
 	time_t timestamp;
 };
 
@@ -56,9 +56,9 @@ struct _LinphonePresencePerson {
 	void *user_data;
 	int refcnt;
 	char *id;
-	MSList *activities;		/**< A list of _LinphonePresenceActivity structures. */
-	MSList *activities_notes;	/**< A list of _LinphonePresenceNote structures. */
-	MSList *notes;			/**< A list of _LinphonePresenceNote structures. */
+	bctbx_list_t *activities;		/**< A list of _LinphonePresenceActivity structures. */
+	bctbx_list_t *activities_notes;	/**< A list of _LinphonePresenceNote structures. */
+	bctbx_list_t *notes;			/**< A list of _LinphonePresenceNote structures. */
 	time_t timestamp;
 };
 
@@ -67,11 +67,12 @@ struct _LinphonePresencePerson {
  * This model is not complete. For example, it does not handle devices.
  */
 struct _LinphonePresenceModel {
+	LinphoneAddress *presentity; /* "The model seeks to describe the presentity, identified by a presentity URI.*/
 	void *user_data;
 	int refcnt;
-	MSList *services;	/**< A list of _LinphonePresenceService structures. Also named tuples in the RFC. */
-	MSList *persons;	/**< A list of _LinphonePresencePerson structures. */
-	MSList *notes;		/**< A list of _LinphonePresenceNote structures. */
+	bctbx_list_t *services;	/**< A list of _LinphonePresenceService structures. Also named tuples in the RFC. */
+	bctbx_list_t *persons;	/**< A list of _LinphonePresencePerson structures. */
+	bctbx_list_t *notes;		/**< A list of _LinphonePresenceNote structures. */
 };
 
 
@@ -81,9 +82,11 @@ static const char *person_prefix = "/pidf:presence/dm:person";
 /*****************************************************************************
  * PRIVATE FUNCTIONS                                                         *
  ****************************************************************************/
-/*defined in http://www.w3.org/TR/REC-xml/*/
+
+/* Defined in http://www.w3.org/TR/REC-xml/ */
 static char presence_id_valid_characters[] = "0123456789abcdefghijklmnopqrstuvwxyz-.";
-/*NameStartChar (NameChar)**/
+
+/* NameStartChar (NameChar)* */
 static char presence_id_valid_start_characters[] = ":_abcdefghijklmnopqrstuvwxyz";
 
 static char * generate_presence_id(void) {
@@ -134,8 +137,8 @@ static void presence_service_delete(LinphonePresenceService *service) {
 	if (service->contact != NULL) {
 		ms_free(service->contact);
 	}
-	ms_list_for_each(service->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(service->notes);
+	bctbx_list_for_each(service->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(service->notes);
 	ms_free(service);
 };
 
@@ -144,7 +147,7 @@ static void presence_service_set_timestamp(LinphonePresenceService *service, tim
 }
 
 static void presence_service_add_note(LinphonePresenceService *service, LinphonePresenceNote *note) {
-	service->notes = ms_list_append(service->notes, note);
+	service->notes = bctbx_list_append(service->notes, note);
 }
 
 static void presence_activity_delete(LinphonePresenceActivity *activity) {
@@ -157,7 +160,7 @@ static void presence_activity_delete(LinphonePresenceActivity *activity) {
 static time_t parse_timestamp(const char *timestamp) {
 	struct tm ret;
 	time_t seconds;
-#ifdef LINPHONE_WINDOWS_UNIVERSAL
+#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
 	long adjust_timezone;
 #else
 	time_t adjust_timezone;
@@ -174,7 +177,7 @@ static time_t parse_timestamp(const char *timestamp) {
 		ms_error("mktime() failed: %s", strerror(errno));
 		return (time_t)-1;
 	}
-#ifdef LINPHONE_WINDOWS_UNIVERSAL
+#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
 	_get_timezone(&adjust_timezone);
 #else
 	adjust_timezone = timezone;
@@ -213,29 +216,33 @@ static void presence_person_delete(LinphonePresencePerson *person) {
 	if (person->id != NULL) {
 		ms_free(person->id);
 	}
-	ms_list_for_each(person->activities, (MSIterateFunc)linphone_presence_activity_unref);
-	ms_list_free(person->activities);
-	ms_list_for_each(person->activities_notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(person->activities_notes);
-	ms_list_for_each(person->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(person->notes);
+	bctbx_list_for_each(person->activities, (MSIterateFunc)linphone_presence_activity_unref);
+	bctbx_list_free(person->activities);
+	bctbx_list_for_each(person->activities_notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(person->activities_notes);
+	bctbx_list_for_each(person->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(person->notes);
 	ms_free(person);
 }
 
 static void presence_person_add_activities_note(LinphonePresencePerson *person, LinphonePresenceNote *note) {
-	person->activities_notes = ms_list_append(person->activities_notes, note);
+	person->activities_notes = bctbx_list_append(person->activities_notes, note);
 }
 
 static void presence_person_add_note(LinphonePresencePerson *person, LinphonePresenceNote *note) {
-	person->notes = ms_list_append(person->notes, note);
+	person->notes = bctbx_list_append(person->notes, note);
+}
+
+static int presence_model_insert_person_by_timestamp(LinphonePresencePerson *current, LinphonePresencePerson *to_insert) {
+	return current->timestamp < to_insert->timestamp;
 }
 
 static void presence_model_add_person(LinphonePresenceModel *model, LinphonePresencePerson *person) {
-	model->persons = ms_list_append(model->persons, person);
+	model->persons = bctbx_list_insert_sorted(model->persons, linphone_presence_person_ref(person), (bctbx_compare_func)presence_model_insert_person_by_timestamp);
 }
 
 static void presence_model_add_note(LinphonePresenceModel *model, LinphonePresenceNote *note) {
-	model->notes = ms_list_append(model->notes, note);
+	model->notes = bctbx_list_append(model->notes, note);
 }
 
 static void presence_model_find_open_basic_status(LinphonePresenceService *service, LinphonePresenceBasicStatus *status) {
@@ -246,13 +253,14 @@ static void presence_model_find_open_basic_status(LinphonePresenceService *servi
 
 static void presence_model_delete(LinphonePresenceModel *model) {
 	if (model == NULL) return;
-
-	ms_list_for_each(model->services, (MSIterateFunc)linphone_presence_service_unref);
-	ms_list_free(model->services);
-	ms_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_unref);
-	ms_list_free(model->persons);
-	ms_list_for_each(model->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(model->notes);
+	if (model->presentity)
+		linphone_address_unref(model->presentity);
+	bctbx_list_for_each(model->services, (MSIterateFunc)linphone_presence_service_unref);
+	bctbx_list_free(model->services);
+	bctbx_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_unref);
+	bctbx_list_free(model->persons);
+	bctbx_list_for_each(model->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(model->notes);
 	ms_free(model);
 }
 
@@ -283,7 +291,7 @@ LinphonePresenceModel * linphone_presence_model_new_with_activity_and_note(Linph
 LinphonePresenceBasicStatus linphone_presence_model_get_basic_status(const LinphonePresenceModel *model) {
 	LinphonePresenceBasicStatus status = LinphonePresenceBasicStatusClosed;
 	if (model != NULL) {
-		ms_list_for_each2(model->services, (MSIterate2Func)presence_model_find_open_basic_status, &status);
+		bctbx_list_for_each2(model->services, (MSIterate2Func)presence_model_find_open_basic_status, &status);
 	}
 	return status;
 }
@@ -319,8 +327,8 @@ time_t linphone_presence_model_get_timestamp(const LinphonePresenceModel *model)
 	if (model == NULL)
 		return timestamp;
 
-	ms_list_for_each2(model->services, (MSIterate2Func)presence_service_find_newer_timestamp, &timestamp);
-	ms_list_for_each2(model->persons, (MSIterate2Func)presence_person_find_newer_timestamp, &timestamp);
+	bctbx_list_for_each2(model->services, (MSIterate2Func)presence_service_find_newer_timestamp, &timestamp);
+	bctbx_list_for_each2(model->persons, (MSIterate2Func)presence_person_find_newer_timestamp, &timestamp);
 
 	return timestamp;
 }
@@ -332,7 +340,7 @@ static void presence_model_find_contact(LinphonePresenceService *service, char *
 
 char * linphone_presence_model_get_contact(const LinphonePresenceModel *model) {
 	char *contact = NULL;
-	ms_list_for_each2(model->services, (MSIterate2Func)presence_model_find_contact, &contact);
+	bctbx_list_for_each2(model->services, (MSIterate2Func)presence_model_find_contact, &contact);
 	if (contact == NULL) return NULL;
 	return ms_strdup(contact);
 }
@@ -352,7 +360,7 @@ int linphone_presence_model_set_contact(LinphonePresenceModel *model, const char
 }
 
 static void presence_model_count_activities(const LinphonePresencePerson *person, unsigned int *nb) {
-	*nb += ms_list_size(person->activities);
+	*nb += (unsigned int)bctbx_list_size(person->activities);
 }
 
 struct _get_activity_st {
@@ -362,11 +370,14 @@ struct _get_activity_st {
 };
 
 static void presence_model_get_activity(const LinphonePresencePerson *person, struct _get_activity_st *st) {
-	unsigned int size = ms_list_size(person->activities);
-	if (st->requested_idx < (st->current_idx + size)) {
-		st->activity = (LinphonePresenceActivity *)ms_list_nth_data(person->activities, st->requested_idx - st->current_idx);
-	} else {
-		st->current_idx += size;
+	if (st->current_idx != (unsigned)-1) {
+		unsigned int size = (unsigned int)bctbx_list_size(person->activities);
+		if (st->requested_idx < (st->current_idx + size)) {
+			st->activity = (LinphonePresenceActivity *)bctbx_list_nth_data(person->activities, st->requested_idx - st->current_idx);
+			st->current_idx = (unsigned)-1;
+		} else {
+			st->current_idx += size;
+		}
 	}
 }
 
@@ -405,7 +416,7 @@ int linphone_presence_model_set_activity(LinphonePresenceModel *model, LinphoneP
 
 unsigned int linphone_presence_model_get_nb_activities(const LinphonePresenceModel *model) {
 	unsigned int nb = 0;
-	ms_list_for_each2(model->persons, (MSIterate2Func)presence_model_count_activities, &nb);
+	bctbx_list_for_each2(model->persons, (MSIterate2Func)presence_model_count_activities, &nb);
 	return nb;
 }
 
@@ -417,7 +428,7 @@ LinphonePresenceActivity * linphone_presence_model_get_nth_activity(const Linpho
 
 	memset(&st, 0, sizeof(st));
 	st.requested_idx = idx;
-	ms_list_for_each2(model->persons, (MSIterate2Func)presence_model_get_activity, &st);
+	bctbx_list_for_each2(model->persons, (MSIterate2Func)presence_model_get_activity, &st);
 
 	return st.activity;
 }
@@ -428,7 +439,7 @@ int linphone_presence_model_add_activity(LinphonePresenceModel *model, LinphoneP
 
 	if ((model == NULL) || (activity == NULL)) return -1;
 
-	if (ms_list_size(model->persons) == 0) {
+	if (bctbx_list_size(model->persons) == 0) {
 		/* There is no person in the presence model, add one. */
 		id = generate_presence_id();
 		person = presence_person_new(id, time(NULL));
@@ -437,9 +448,10 @@ int linphone_presence_model_add_activity(LinphonePresenceModel *model, LinphoneP
 			return -1;
 
 		presence_model_add_person(model, person);
+		linphone_presence_person_unref(person);
 	} else {
 		/* Add the activity to the first person in the model. */
-		person = (LinphonePresencePerson *)ms_list_nth_data(model->persons, 0);
+		person = (LinphonePresencePerson *)bctbx_list_nth_data(model->persons, 0);
 	}
 
 	linphone_presence_person_add_activity(person, activity);
@@ -449,7 +461,7 @@ int linphone_presence_model_add_activity(LinphonePresenceModel *model, LinphoneP
 int linphone_presence_model_clear_activities(LinphonePresenceModel *model) {
 	if (model == NULL) return -1;
 
-	ms_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_clear_activities);
+	bctbx_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_clear_activities);
 	return 0;
 }
 
@@ -458,13 +470,11 @@ struct _find_note_st {
 	LinphonePresenceNote *note;
 };
 
-static LinphonePresenceNote * find_presence_note_in_list(MSList *list, const char *lang) {
-	int nb;
+static LinphonePresenceNote * find_presence_note_in_list(bctbx_list_t *list, const char *lang) {
 	int i;
-
-	nb = ms_list_size(list);
+	int nb = (int)bctbx_list_size(list);
 	for (i = 0; i < nb; i++) {
-		LinphonePresenceNote *note = (LinphonePresenceNote *)ms_list_nth_data(list, i);
+		LinphonePresenceNote *note = (LinphonePresenceNote *)bctbx_list_nth_data(list, i);
 		if (lang == NULL) {
 			if (note->lang == NULL) {
 				return note;
@@ -492,8 +502,8 @@ static void find_presence_service_note(LinphonePresenceService *service, struct
 	st->note = find_presence_note_in_list(service->notes, st->lang);
 }
 
-static LinphonePresenceNote * get_first_presence_note_in_list(MSList *list) {
-	return (LinphonePresenceNote *)ms_list_nth_data(list, 0);
+static LinphonePresenceNote * get_first_presence_note_in_list(bctbx_list_t *list) {
+	return (LinphonePresenceNote *)bctbx_list_nth_data(list, 0);
 }
 
 static void get_first_presence_person_note(LinphonePresencePerson *person, struct _find_note_st *st) {
@@ -515,9 +525,9 @@ LinphonePresenceNote * linphone_presence_model_get_note(const LinphonePresenceMo
 	if (lang != NULL) {
 		/* First try to find a note in the specified language exactly. */
 		st.lang = lang;
-		ms_list_for_each2(model->persons, (MSIterate2Func)find_presence_person_note, &st);
+		bctbx_list_for_each2(model->persons, (MSIterate2Func)find_presence_person_note, &st);
 		if (st.note == NULL) {
-			ms_list_for_each2(model->services, (MSIterate2Func)find_presence_service_note, &st);
+			bctbx_list_for_each2(model->services, (MSIterate2Func)find_presence_service_note, &st);
 		}
 		if (st.note == NULL) {
 			st.note = find_presence_note_in_list(model->notes, lang);
@@ -527,9 +537,9 @@ LinphonePresenceNote * linphone_presence_model_get_note(const LinphonePresenceMo
 	if (st.note == NULL) {
 		/* No notes in the specified language has been found, try to find one without language. */
 		st.lang = NULL;
-		ms_list_for_each2(model->persons, (MSIterate2Func)find_presence_person_note, &st);
+		bctbx_list_for_each2(model->persons, (MSIterate2Func)find_presence_person_note, &st);
 		if (st.note == NULL) {
-			ms_list_for_each2(model->services, (MSIterate2Func)find_presence_service_note, &st);
+			bctbx_list_for_each2(model->services, (MSIterate2Func)find_presence_service_note, &st);
 		}
 		if (st.note == NULL) {
 			st.note = find_presence_note_in_list(model->notes, NULL);
@@ -538,9 +548,9 @@ LinphonePresenceNote * linphone_presence_model_get_note(const LinphonePresenceMo
 
 	if (st.note == NULL) {
 		/* Still no result, so get the first note even if it is not in the specified language. */
-		ms_list_for_each2(model->persons, (MSIterate2Func)get_first_presence_person_note, &st);
+		bctbx_list_for_each2(model->persons, (MSIterate2Func)get_first_presence_person_note, &st);
 		if (st.note == NULL) {
-			ms_list_for_each2(model->services, (MSIterate2Func)get_first_presence_service_note, &st);
+			bctbx_list_for_each2(model->services, (MSIterate2Func)get_first_presence_service_note, &st);
 		}
 		if (st.note == NULL) {
 			st.note = get_first_presence_note_in_list(model->notes);
@@ -558,7 +568,7 @@ int linphone_presence_model_add_note(LinphonePresenceModel *model, const char *n
 		return -1;
 
 	/* Will put the note in the first service. */
-	service = ms_list_nth_data(model->services, 0);
+	service = bctbx_list_nth_data(model->services, 0);
 	if (service == NULL) {
 		/* If no service exists, create one. */
 		service = presence_service_new(generate_presence_id(), LinphonePresenceBasicStatusClosed);
@@ -582,17 +592,17 @@ int linphone_presence_model_add_note(LinphonePresenceModel *model, const char *n
 }
 
 static void clear_presence_person_notes(LinphonePresencePerson *person) {
-	ms_list_for_each(person->activities_notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(person->activities_notes);
+	bctbx_list_for_each(person->activities_notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(person->activities_notes);
 	person->activities_notes = NULL;
-	ms_list_for_each(person->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(person->notes);
+	bctbx_list_for_each(person->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(person->notes);
 	person->notes = NULL;
 }
 
 static void clear_presence_service_notes(LinphonePresenceService *service) {
-	ms_list_for_each(service->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(service->notes);
+	bctbx_list_for_each(service->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(service->notes);
 	service->notes = NULL;
 }
 
@@ -600,10 +610,10 @@ int linphone_presence_model_clear_notes(LinphonePresenceModel *model) {
 	if (model == NULL)
 		return -1;
 
-	ms_list_for_each(model->persons, (MSIterateFunc)clear_presence_person_notes);
-	ms_list_for_each(model->services, (MSIterateFunc)clear_presence_service_notes);
-	ms_list_for_each(model->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(model->notes);
+	bctbx_list_for_each(model->persons, (MSIterateFunc)clear_presence_person_notes);
+	bctbx_list_for_each(model->services, (MSIterateFunc)clear_presence_service_notes);
+	bctbx_list_for_each(model->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(model->notes);
 	model->notes = NULL;
 
 	return 0;
@@ -620,58 +630,73 @@ LinphonePresenceModel * linphone_presence_model_new(void) {
 }
 
 unsigned int linphone_presence_model_get_nb_services(const LinphonePresenceModel *model) {
-	return ms_list_size(model->services);
+	return (unsigned int)bctbx_list_size(model->services);
 }
 
 LinphonePresenceService * linphone_presence_model_get_nth_service(const LinphonePresenceModel *model, unsigned int idx) {
 	if ((model == NULL) || (idx >= linphone_presence_model_get_nb_services(model)))
 		return NULL;
 
-	return (LinphonePresenceService *)ms_list_nth_data(model->services, idx);
+	return (LinphonePresenceService *)bctbx_list_nth_data(model->services, idx);
 }
 
 int linphone_presence_model_add_service(LinphonePresenceModel *model, LinphonePresenceService *service) {
 	if ((model == NULL) || (service == NULL)) return -1;
-	model->services = ms_list_append(model->services, linphone_presence_service_ref(service));
+	model->services = bctbx_list_append(model->services, linphone_presence_service_ref(service));
 	return 0;
 }
 
 int linphone_presence_model_clear_services(LinphonePresenceModel *model) {
 	if (model == NULL) return -1;
 
-	ms_list_for_each(model->services, (MSIterateFunc)linphone_presence_service_unref);
-	ms_list_free(model->services);
+	bctbx_list_for_each(model->services, (MSIterateFunc)linphone_presence_service_unref);
+	bctbx_list_free(model->services);
 	model->services = NULL;
 	return 0;
 }
 
 unsigned int linphone_presence_model_get_nb_persons(const LinphonePresenceModel *model) {
-	return ms_list_size(model->persons);
+	return (unsigned int)bctbx_list_size(model->persons);
 }
 
 LinphonePresencePerson * linphone_presence_model_get_nth_person(const LinphonePresenceModel *model, unsigned int idx) {
 	if ((model == NULL) || (idx >= linphone_presence_model_get_nb_persons(model)))
 		return NULL;
 
-	return (LinphonePresencePerson *)ms_list_nth_data(model->persons, idx);
+	return (LinphonePresencePerson *)bctbx_list_nth_data(model->persons, idx);
 }
 
 int linphone_presence_model_add_person(LinphonePresenceModel *model, LinphonePresencePerson *person) {
 	if ((model == NULL) || (person == NULL)) return -1;
-	model->persons = ms_list_append(model->persons, linphone_presence_person_ref(person));
+	presence_model_add_person(model, person);
 	return 0;
 }
 
 int linphone_presence_model_clear_persons(LinphonePresenceModel *model) {
 	if (model == NULL) return -1;
 
-	ms_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_unref);
-	ms_list_free(model->persons);
+	bctbx_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_unref);
+	bctbx_list_free(model->persons);
 	model->persons = NULL;
 	return 0;
 }
 
+int linphone_presence_model_set_presentity(LinphonePresenceModel *model, const LinphoneAddress *presentity) {
 
+	if (model->presentity) {
+		linphone_address_unref(model->presentity);
+		model->presentity = NULL;
+	}
+	if (presentity) {
+		model->presentity=linphone_address_clone(presentity);
+		linphone_address_clean(model->presentity);
+	}
+	return 0;
+}
+
+const LinphoneAddress * linphone_presence_model_get_presentity(const LinphonePresenceModel *model) {
+	return model->presentity;
+}
 
 /*****************************************************************************
  * PRESENCE SERVICE FUNCTIONS TO GET ACCESS TO ALL FUNCTIONALITIES           *
@@ -735,27 +760,27 @@ int linphone_presence_service_set_contact(LinphonePresenceService *service, cons
 }
 
 unsigned int linphone_presence_service_get_nb_notes(const LinphonePresenceService *service) {
-	return ms_list_size(service->notes);
+	return (unsigned int)bctbx_list_size(service->notes);
 }
 
 LinphonePresenceNote * linphone_presence_service_get_nth_note(const LinphonePresenceService *service, unsigned int idx) {
 	if ((service == NULL) || (idx >= linphone_presence_service_get_nb_notes(service)))
 		return NULL;
 
-	return (LinphonePresenceNote *)ms_list_nth_data(service->notes, idx);
+	return (LinphonePresenceNote *)bctbx_list_nth_data(service->notes, idx);
 }
 
 int linphone_presence_service_add_note(LinphonePresenceService *service, LinphonePresenceNote *note) {
 	if ((service == NULL) || (note == NULL)) return -1;
-	service->notes = ms_list_append(service->notes, linphone_presence_note_ref(note));
+	service->notes = bctbx_list_append(service->notes, linphone_presence_note_ref(note));
 	return 0;
 }
 
 int linphone_presence_service_clear_notes(LinphonePresenceService *service) {
 	if (service == NULL) return -1;
 
-	ms_list_for_each(service->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(service->notes);
+	bctbx_list_for_each(service->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(service->notes);
 	service->notes = NULL;
 	return 0;
 }
@@ -788,75 +813,76 @@ int linphone_presence_person_set_id(LinphonePresencePerson *person, const char *
 
 unsigned int linphone_presence_person_get_nb_activities(const LinphonePresencePerson *person) {
 	if (person == NULL) return 0;
-	return ms_list_size(person->activities);
+	return (unsigned int)bctbx_list_size(person->activities);
 }
 
 LinphonePresenceActivity * linphone_presence_person_get_nth_activity(const LinphonePresencePerson *person, unsigned int idx) {
 	if ((person == NULL) || (idx >= linphone_presence_person_get_nb_activities(person)))
 		return NULL;
-	return (LinphonePresenceActivity *)ms_list_nth_data(person->activities, idx);
+	return (LinphonePresenceActivity *)bctbx_list_nth_data(person->activities, idx);
 }
 
 int linphone_presence_person_add_activity(LinphonePresencePerson *person, LinphonePresenceActivity *activity) {
 	if ((person == NULL) || (activity == NULL)) return -1;
-	person->activities = ms_list_append(person->activities, linphone_presence_activity_ref(activity));
+	// insert in first position since its the most recent activity!
+	person->activities = bctbx_list_prepend(person->activities, linphone_presence_activity_ref(activity));
 	return 0;
 }
 
 int linphone_presence_person_clear_activities(LinphonePresencePerson *person) {
 	if (person == NULL) return -1;
-	ms_list_for_each(person->activities, (MSIterateFunc)linphone_presence_activity_unref);
-	ms_list_free(person->activities);
+	bctbx_list_for_each(person->activities, (MSIterateFunc)linphone_presence_activity_unref);
+	bctbx_list_free(person->activities);
 	person->activities = NULL;
 	return 0;
 }
 
 unsigned int linphone_presence_person_get_nb_notes(const LinphonePresencePerson *person) {
 	if (person == NULL) return 0;
-	return ms_list_size(person->notes);
+	return (unsigned int)bctbx_list_size(person->notes);
 }
 
 LinphonePresenceNote * linphone_presence_person_get_nth_note(const LinphonePresencePerson *person, unsigned int idx) {
 	if ((person == NULL) || (idx >= linphone_presence_person_get_nb_notes(person)))
 		return NULL;
-	return (LinphonePresenceNote *)ms_list_nth_data(person->notes, idx);
+	return (LinphonePresenceNote *)bctbx_list_nth_data(person->notes, idx);
 }
 
 int linphone_presence_person_add_note(LinphonePresencePerson *person, LinphonePresenceNote *note) {
 	if ((person == NULL) || (note == NULL)) return -1;
-	person->notes = ms_list_append(person->notes, linphone_presence_note_ref(note));
+	person->notes = bctbx_list_append(person->notes, linphone_presence_note_ref(note));
 	return 0;
 }
 
 int linphone_presence_person_clear_notes(LinphonePresencePerson *person) {
 	if (person == NULL) return -1;
-	ms_list_for_each(person->notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(person->notes);
+	bctbx_list_for_each(person->notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(person->notes);
 	person->notes = NULL;
 	return 0;
 }
 
 unsigned int linphone_presence_person_get_nb_activities_notes(const LinphonePresencePerson *person) {
 	if (person == NULL) return 0;
-	return ms_list_size(person->activities_notes);
+	return (unsigned int)bctbx_list_size(person->activities_notes);
 }
 
 LinphonePresenceNote * linphone_presence_person_get_nth_activities_note(const LinphonePresencePerson *person, unsigned int idx) {
 	if ((person == NULL) || (idx >= linphone_presence_person_get_nb_activities_notes(person)))
 		return NULL;
-	return (LinphonePresenceNote *)ms_list_nth_data(person->activities_notes, idx);
+	return (LinphonePresenceNote *)bctbx_list_nth_data(person->activities_notes, idx);
 }
 
 int linphone_presence_person_add_activities_note(LinphonePresencePerson *person, LinphonePresenceNote *note) {
 	if ((person == NULL) || (note == NULL)) return -1;
-	person->notes = ms_list_append(person->activities_notes, linphone_presence_note_ref(note));
+	person->notes = bctbx_list_append(person->activities_notes, linphone_presence_note_ref(note));
 	return 0;
 }
 
 int linphone_presence_person_clear_activities_notes(LinphonePresencePerson *person) {
 	if (person == NULL) return -1;
-	ms_list_for_each(person->activities_notes, (MSIterateFunc)linphone_presence_note_unref);
-	ms_list_free(person->activities_notes);
+	bctbx_list_for_each(person->activities_notes, (MSIterateFunc)linphone_presence_note_unref);
+	bctbx_list_free(person->activities_notes);
 	person->activities_notes = NULL;
 	return 0;
 }
@@ -1225,6 +1251,7 @@ static int process_pidf_xml_presence_services(xmlparsing_context_t *xml_ctx, Lin
 				if (contact_str != NULL) linphone_presence_service_set_contact(service, contact_str);
 				process_pidf_xml_presence_service_notes(xml_ctx, service, i);
 				linphone_presence_model_add_service(model, service);
+				linphone_presence_service_unref(service);
 			}
 			if (timestamp_str != NULL) linphone_free_xml_text_content(timestamp_str);
 			if (contact_str != NULL) linphone_free_xml_text_content(contact_str);
@@ -1277,6 +1304,7 @@ static int process_pidf_xml_presence_person_activities(xmlparsing_context_t *xml
 						if (err < 0) break;
 						activity = linphone_presence_activity_new(acttype, description);
 						linphone_presence_person_add_activity(person, activity);
+						linphone_presence_activity_unref(activity);
 						if (description != NULL) linphone_free_xml_text_content(description);
 					}
 				}
@@ -1359,6 +1387,7 @@ static int process_pidf_xml_presence_persons(xmlparsing_context_t *xml_ctx, Linp
 			else
 				timestamp = parse_timestamp(person_timestamp_str);
 			person = presence_person_new(person_id_str, timestamp);
+
 			if (person != NULL) {
 				err = process_pidf_xml_presence_person_activities(xml_ctx, person, i);
 				if (err == 0) {
@@ -1366,6 +1395,7 @@ static int process_pidf_xml_presence_persons(xmlparsing_context_t *xml_ctx, Linp
 				}
 				if (err == 0) {
 					presence_model_add_person(model, person);
+					linphone_presence_person_unref(person);
 				} else {
 					linphone_presence_person_unref(person);
 					break;
@@ -1379,7 +1409,7 @@ static int process_pidf_xml_presence_persons(xmlparsing_context_t *xml_ctx, Linp
 
 	if (err < 0) {
 		/* Remove all the persons added since there was an error. */
-		ms_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_unref);
+		bctbx_list_for_each(model->persons, (MSIterateFunc)linphone_presence_person_unref);
 	}
 	return err;
 }
@@ -1443,14 +1473,21 @@ static LinphonePresenceModel * process_pidf_xml_presence_notification(xmlparsing
 
 
 void linphone_core_add_subscriber(LinphoneCore *lc, const char *subscriber, SalOp *op){
-	LinphoneFriend *fl=linphone_friend_new_with_address(subscriber);
+	LinphoneFriend *fl=linphone_core_create_friend_with_address(lc,subscriber);
+	const LinphoneAddress *addr;
+	char *tmp;
+
 	if (fl==NULL) return ;
+	fl->lc = lc;
 	linphone_friend_add_incoming_subscription(fl, op);
 	linphone_friend_set_inc_subscribe_policy(fl,LinphoneSPAccept);
 	fl->inc_subscribe_pending=TRUE;
-	lc->subscribers=ms_list_append(lc->subscribers,(void *)fl);
-	{
-		char *tmp=linphone_address_as_string(fl->uri);
+	/* the newly created "not yet" friend ownership is transfered to the lc->subscribers list*/
+	lc->subscribers=bctbx_list_append(lc->subscribers,fl);
+
+	addr = linphone_friend_get_address(fl);
+	if (addr != NULL) {
+		tmp = linphone_address_as_string(addr);
 		linphone_core_notify_new_subscription_requested(lc,fl,tmp);
 		ms_free(tmp);
 	}
@@ -1461,14 +1498,16 @@ void linphone_core_reject_subscriber(LinphoneCore *lc, LinphoneFriend *lf){
 }
 
 void linphone_core_notify_all_friends(LinphoneCore *lc, LinphonePresenceModel *presence){
-	MSList *elem;
 	LinphonePresenceActivity *activity = linphone_presence_model_get_activity(presence);
 	char *activity_str = linphone_presence_activity_to_string(activity);
+	LinphoneFriendList *lfl = linphone_core_get_default_friend_list(lc);
 	ms_message("Notifying all friends that we are [%s]", activity_str);
 	if (activity_str != NULL) ms_free(activity_str);
-	for(elem=lc->friends;elem!=NULL;elem=elem->next){
-		LinphoneFriend *lf=(LinphoneFriend *)elem->data;
-		linphone_friend_notify(lf,presence);
+	
+	if (lfl) {
+		linphone_friend_list_notify_presence(lfl, presence);
+	} else {
+		ms_error("Default friend list is null, skipping...");
 	}
 }
 
@@ -1483,9 +1522,13 @@ void linphone_subscription_new(LinphoneCore *lc, SalOp *op, const char *from){
 	ms_message("Receiving new subscription from %s.",from);
 
 	/* check if we answer to this subscription */
-	if (linphone_find_friend_by_address(lc->friends,uri,&lf)!=NULL){
+	lf = linphone_core_find_friend(lc, uri);
+	if (lf!=NULL){
 		linphone_friend_add_incoming_subscription(lf, op);
 		lf->inc_subscribe_pending=TRUE;
+		if (lp_config_get_int(lc->config,"sip","notify_pending_state",0)) {
+			sal_notify_pending_state(op);
+		}
 		sal_subscribe_accept(op);
 		linphone_friend_done(lf);	/*this will do all necessary actions */
 	}else{
@@ -1497,7 +1540,7 @@ void linphone_subscription_new(LinphoneCore *lc, SalOp *op, const char *from){
 			}
 			else {
 				/* else it is in wait for approval state, because otherwise it is in the friend list.*/
-				ms_message("New subscriber found in friend list, in %s state.",__policy_enum_to_str(lf->pol));
+				ms_message("New subscriber found in subscriber list, in %s state.",__policy_enum_to_str(lf->pol));
 			}
 		}else {
 			sal_subscribe_accept(op);
@@ -1508,7 +1551,7 @@ void linphone_subscription_new(LinphoneCore *lc, SalOp *op, const char *from){
 	ms_free(tmp);
 }
 
-void linphone_notify_parse_presence(SalOp *op, const char *content_type, const char *content_subtype, const char *body, SalPresenceModel **result) {
+void linphone_notify_parse_presence(const char *content_type, const char *content_subtype, const char *body, SalPresenceModel **result) {
 	xmlparsing_context_t *xml_ctx;
 	LinphonePresenceModel *model = NULL;
 
@@ -1549,6 +1592,7 @@ void linphone_notify_parse_presence(SalOp *op, const char *content_type, const c
 			}
 			activity = linphone_presence_activity_new(acttype, NULL);
 			linphone_presence_model_add_activity(model, activity);
+			linphone_presence_activity_unref(activity);
 		}
 	}
 
@@ -1655,7 +1699,7 @@ static int write_xml_presence_service(xmlTextWriterPtr writer, LinphonePresenceS
 		st.writer = writer;
 		st.ns = NULL;
 		st.err = &err;
-		ms_list_for_each2(service->notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
+		bctbx_list_for_each2(service->notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
 	}
 	if (err >= 0) {
 		if (service == NULL)
@@ -1703,7 +1747,7 @@ static void person_has_valid_activity(LinphonePresenceActivity *activity, bool_t
 
 static bool_t person_has_valid_activities(LinphonePresencePerson *person) {
 	bool_t has_valid_activities = FALSE;
-	ms_list_for_each2(person->activities, (MSIterate2Func)person_has_valid_activity, &has_valid_activities);
+	bctbx_list_for_each2(person->activities, (MSIterate2Func)person_has_valid_activity, &has_valid_activities);
 	return has_valid_activities;
 }
 
@@ -1729,13 +1773,13 @@ static int write_xml_presence_person(xmlTextWriterPtr writer, LinphonePresencePe
 			st.writer = writer;
 			st.ns = "rpid";
 			st.err = &err;
-			ms_list_for_each2(person->activities_notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
+			bctbx_list_for_each2(person->activities_notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
 		}
 		if ((err >= 0) && (person->activities != NULL)) {
 			struct _presence_activity_obj_st st;
 			st.writer = writer;
 			st.err = &err;
-			ms_list_for_each2(person->activities, (MSIterate2Func)write_xml_presence_activity_obj, &st);
+			bctbx_list_for_each2(person->activities, (MSIterate2Func)write_xml_presence_activity_obj, &st);
 		}
 		if (err >= 0) {
 			/* Close the "activities" element. */
@@ -1747,7 +1791,7 @@ static int write_xml_presence_person(xmlTextWriterPtr writer, LinphonePresencePe
 		st.writer = writer;
 		st.ns = "dm";
 		st.err = &err;
-		ms_list_for_each2(person->notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
+		bctbx_list_for_each2(person->notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
 	}
 	if (err >= 0) {
 		write_xml_presence_timestamp(writer, person->timestamp);
@@ -1769,24 +1813,28 @@ static void write_xml_presence_person_obj(LinphonePresencePerson *person, struct
 	if (err < 0) *st->err = err;
 }
 
-void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presence, const char *contact, char **content) {
-	LinphonePresenceModel *model;
-	xmlBufferPtr buf;
-	xmlTextWriterPtr writer;
+char *linphone_presence_model_to_xml(LinphonePresenceModel *model) {
+	xmlBufferPtr buf = NULL;
+	xmlTextWriterPtr writer = NULL;
 	int err;
+	char *contact = NULL;
+	char * content = NULL;
 
-	if ((contact == NULL) || (content == NULL)) return;
-
-	model = (LinphonePresenceModel *)presence;
+	if (model->presentity) {
+		contact = linphone_address_as_string_uri_only(model->presentity);
+	} else {
+		ms_error("Cannot convert presence model [%p] to xml because no presentity set", model);
+		goto  end;
+	}
 	buf = xmlBufferCreate();
 	if (buf == NULL) {
 		ms_error("Error creating the XML buffer");
-		return;
+		goto end;
 	}
 	writer = xmlNewTextWriterMemory(buf, 0);
 	if (writer == NULL) {
 		ms_error("Error creating the XML writer");
-		return;
+		goto end;
 	}
 
 	xmlTextWriterSetIndent(writer,1);
@@ -1812,23 +1860,23 @@ void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presen
 		} else {
 			struct _presence_service_obj_st st={0};
 			st.writer = writer;
-			st.contact = contact;
+			st.contact = contact; /*default value*/
 			st.err = &err;
-			ms_list_for_each2(model->services, (MSIterate2Func)write_xml_presence_service_obj, &st);
+			bctbx_list_for_each2(model->services, (MSIterate2Func)write_xml_presence_service_obj, &st);
 		}
 	}
 	if ((err >= 0) && (model != NULL)) {
 		struct _presence_person_obj_st st={0};
 		st.writer = writer;
 		st.err = &err;
-		ms_list_for_each2(model->persons, (MSIterate2Func)write_xml_presence_person_obj, &st);
+		bctbx_list_for_each2(model->persons, (MSIterate2Func)write_xml_presence_person_obj, &st);
 	}
 	if ((err >= 0) && (model != NULL)) {
 		struct _presence_note_obj_st st={0};
 		st.writer = writer;
 		st.ns = NULL;
 		st.err = &err;
-		ms_list_for_each2(model->notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
+		bctbx_list_for_each2(model->notes, (MSIterate2Func)write_xml_presence_note_obj, &st);
 	}
 	if (err >= 0) {
 		/* Close the "presence" element. */
@@ -1839,61 +1887,83 @@ void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presen
 	}
 	if (err > 0) {
 		/* xmlTextWriterEndDocument returns the size of the content. */
-		*content = ms_strdup((char *)buf->content);
+		content =  ms_strdup((char *)buf->content);
 	}
-	xmlFreeTextWriter(writer);
-	xmlBufferFree(buf);
+
+end:
+	if (contact) ms_free(contact);
+	if (writer) xmlFreeTextWriter(writer);
+	if (buf) xmlBufferFree(buf);
+	return content;
 }
 
 void linphone_notify_recv(LinphoneCore *lc, SalOp *op, SalSubscribeStatus ss, SalPresenceModel *model){
 	char *tmp;
-	LinphoneFriend *lf;
-	LinphoneAddress *friend=NULL;
+	LinphoneFriend *lf = NULL;
+	const LinphoneAddress *friend=NULL;
 	LinphonePresenceModel *presence = model ? (LinphonePresenceModel *)model:linphone_presence_model_new_with_activity(LinphonePresenceActivityOffline, NULL);
 
-	lf=linphone_find_friend_by_out_subscribe(lc->friends,op);
+	if (linphone_core_get_default_friend_list(lc) != NULL)
+		lf=linphone_core_find_friend_by_out_subscribe(lc, op);
 	if (lf==NULL && lp_config_get_int(lc->config,"sip","allow_out_of_subscribe_presence",0)){
 		const SalAddress *addr=sal_op_get_from_address(op);
-		lf=NULL;
-		linphone_find_friend_by_address(lc->friends,(LinphoneAddress*)addr,&lf);
+		lf = linphone_core_find_friend(lc, (LinphoneAddress *)addr);
 	}
 	if (lf!=NULL){
 		LinphonePresenceActivity *activity = NULL;
 		char *activity_str;
-		friend=lf->uri;
-		tmp=linphone_address_as_string(friend);
 		activity = linphone_presence_model_get_activity(presence);
-		activity_str = linphone_presence_activity_to_string(activity);
-		ms_message("We are notified that [%s] has presence [%s]", tmp, activity_str);
-		if (activity_str != NULL) ms_free(activity_str);
-		if (lf->presence != NULL) {
-			linphone_presence_model_unref(lf->presence);
+		friend=linphone_friend_get_address(lf);
+		if (friend != NULL) {
+			tmp=linphone_address_as_string(friend);
+			activity_str = linphone_presence_activity_to_string(activity);
+			ms_message("We are notified that [%s] has presence [%s]", tmp, activity_str);
+			if (activity_str != NULL) ms_free(activity_str);
+			ms_free(tmp);
 		}
-		lf->presence = presence;
+		linphone_friend_set_presence_model(lf, presence);
 		lf->subscribe_active=TRUE;
+		lf->presence_received = TRUE;
+		lf->out_sub_state = linphone_subscription_state_from_sal(ss);
 		linphone_core_notify_notify_presence_received(lc,(LinphoneFriend*)lf);
-		ms_free(tmp);
+		if (op != lf->outsub){
+			/*case of a NOTIFY received out of any dialog*/
+			sal_op_release(op);
+			return;
+		}
 	}else{
 		ms_message("But this person is not part of our friend list, so we don't care.");
 		linphone_presence_model_unref(presence);
+		sal_op_release(op);
+		return ;
 	}
 	if (ss==SalSubscribeTerminated){
-		sal_op_release(op);
 		if (lf){
-			lf->outsub=NULL;
+			if (lf->outsub != op){
+				sal_op_release(op);
+			}
+			if (lf->outsub){
+				sal_op_release(lf->outsub);
+				lf->outsub=NULL;
+			}
 			lf->subscribe_active=FALSE;
+		}else{
+			sal_op_release(op);
 		}
 	}
 }
 
 void linphone_subscription_closed(LinphoneCore *lc, SalOp *op){
-	LinphoneFriend *lf;
-	lf=linphone_find_friend_by_inc_subscribe(lc->friends,op);
-	sal_op_release(op);
+	LinphoneFriend *lf = NULL;
+
+	lf = linphone_core_find_friend_by_inc_subscribe(lc, op);
+
 	if (lf!=NULL){
+		/*this will release the op*/
 		linphone_friend_remove_incoming_subscription(lf, op);
 	}else{
-		ms_warning("Receiving unsuscribe for unknown in-subscribtion from %s", sal_op_get_from(op));
+		/*case of an op that we already released because the friend was destroyed*/
+		ms_message("Receiving unsuscribe for unknown in-subscribtion from %s", sal_op_get_from(op));
 	}
 }
 
diff --git a/coreapi/private.h b/coreapi/private.h
index 942f14f2c..f8fe6cda6 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -24,20 +24,25 @@
 
 #ifndef _PRIVATE_H
 #define _PRIVATE_H
-#ifdef __cplusplus
 
-extern "C" {
-#endif
 #include "linphonecore.h"
 #include "linphonefriend.h"
+#include "friendlist.h"
 #include "linphone_tunnel.h"
 #include "linphonecore_utils.h"
+#include "conference.h"
 #include "sal/sal.h"
 #include "sipsetup.h"
 #include "quality_reporting.h"
+#include "ringtoneplayer.h"
+#include "vcard.h"
 
-#include <belle-sip/object.h>
-#include <belle-sip/dict.h>
+#include "bctoolbox/port.h"
+#include "bctoolbox/vfs.h"
+#include "belle-sip/belle-sip.h" /*we need this include for all http operations*/
+
+
+#include <ctype.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -49,9 +54,6 @@ extern "C" {
 #include "upnp.h"
 #endif //BUILD_UPNP
 
-#ifdef MSG_STORAGE_ENABLED
-#include "sqlite3.h"
-#endif
 
 #ifndef LIBLINPHONE_VERSION
 #define LIBLINPHONE_VERSION LINPHONE_VERSION
@@ -79,7 +81,7 @@ extern "C" {
 #endif
 
 #include <libintl.h>
-	
+
 #ifndef _
 #define _(String) dgettext(GETTEXT_PACKAGE,String)
 #endif
@@ -108,6 +110,25 @@ extern "C" {
 #endif
 #endif
 #endif
+#ifdef _MSC_VER
+#if (_MSC_VER >= 1900)
+#define LINPHONE_MSC_VER_GREATER_19
+#endif
+#endif
+
+#include <libxml/xmlreader.h>
+#include <libxml/xmlwriter.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+
+
+#ifdef SQLITE_STORAGE_ENABLED
+#include <sqlite3.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct _LinphoneCallParams{
 	belle_sip_object_t base;
@@ -117,6 +138,7 @@ struct _LinphoneCallParams{
 	LinphoneMediaEncryption media_encryption;
 	PayloadType *audio_codec; /*audio codec currently in use */
 	PayloadType *video_codec; /*video codec currently in use */
+	PayloadType *text_codec; /*text codec currently in use */
 	MSVideoSize sent_vsize; /* Size of the video currently being sent */
 	MSVideoSize recv_vsize; /* Size of the video currently being received */
 	float received_fps,sent_fps;
@@ -127,27 +149,36 @@ struct _LinphoneCallParams{
 	char *record_file;
 	char *session_name;
 	SalCustomHeader *custom_headers;
+	SalCustomSdpAttribute *custom_sdp_attributes;
+	SalCustomSdpAttribute *custom_sdp_media_attributes[LinphoneStreamTypeUnknown];
+	LinphonePrivacyMask privacy;
+	LinphoneMediaDirection audio_dir;
+	LinphoneMediaDirection video_dir;
+	bool_t has_audio;
 	bool_t has_video;
 	bool_t avpf_enabled; /* RTCP feedback messages are enabled */
+	bool_t implicit_rtcp_fb;
+
 	bool_t real_early_media; /*send real media even during early media (for outgoing calls)*/
 	bool_t in_conference; /*in conference mode */
 	bool_t low_bandwidth;
 	bool_t no_user_consent;/*when set to TRUE an UPDATE request will be used instead of reINVITE*/
+
 	uint16_t avpf_rr_interval; /*in milliseconds*/
-	LinphonePrivacyMask privacy;
-	LinphoneMediaDirection audio_dir;
-	LinphoneMediaDirection video_dir;
-	bool_t video_declined; /*use to keep  traces of declined video to avoid to re-offer video in case of automatic RE-INVITE*/
-	bool_t internal_call_update; /*use mark that call update was requested internally (might be by ice)*/
+	bool_t internal_call_update; /*use mark that call update was requested internally (might be by ice) - unused for the moment*/
 	bool_t video_multicast_enabled;
+
 	bool_t audio_multicast_enabled;
+	bool_t realtimetext_enabled;
+	bool_t update_call_when_ice_completed;
+	bool_t encryption_mandatory;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneCallParams);
 
 
 struct _LinphoneQualityReporting{
-	reporting_session_report_t * reports[2]; /**Store information on audio and video media streams (RFC 6035) */
+	reporting_session_report_t * reports[3]; /**Store information on audio and video media streams (RFC 6035) */
 	bool_t was_video_running; /*Keep video state since last check in order to detect its (de)activation*/
 	LinphoneQualityReportingReportSendCb on_report_sent;
 };
@@ -171,6 +202,8 @@ struct _LinphoneCallLog{
 	char* call_id; /**unique id of a call*/
 	struct _LinphoneQualityReporting reporting;
 	bool_t video_enabled;
+	bool_t was_conference; /**<That call was a call with a conference server */
+	unsigned int storage_id;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneCallLog);
@@ -204,8 +237,7 @@ struct _LinphoneChatMessage {
 	LinphoneChatMessageCbs *callbacks;
 	LinphoneChatMessageDir dir;
 	char* message;
-	LinphoneChatMessageStateChangedCb cb;
-	void* cb_ud;
+	void* message_state_changed_user_data;
 	void* message_userdata;
 	char* appdata;
 	char* external_body_url;
@@ -220,7 +252,22 @@ struct _LinphoneChatMessage {
 	LinphoneContent *file_transfer_information; /**< used to store file transfer information when the message is of file transfer type */
 	char *content_type; /**< is used to specified the type of message to be sent, used only for file transfer message */
 	belle_http_request_t *http_request; /**< keep a reference to the http_request in case of file transfer in order to be able to cancel the transfer */
+	belle_http_request_listener_t *http_listener; /* our listener, only owned by us*/
 	char *file_transfer_filepath;
+
+#if defined(__clang__) || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#if defined(__clang__) || defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#ifdef _MSC_VER
+#pragma deprecated(message_state_changed_cb)
+#endif
+	LinphoneChatMessageStateChangedCb message_state_changed_cb;
+#if defined(__clang__) || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneChatMessage);
@@ -233,6 +280,7 @@ typedef struct StunCandidate{
 
 typedef struct _PortConfig{
 	char multicast_ip[LINPHONE_IPADDR_SIZE];
+	char multicast_bind_ip[LINPHONE_IPADDR_SIZE];
 	int rtp_port;
 	int rtcp_port;
 }PortConfig;
@@ -249,10 +297,12 @@ struct _LinphoneCall{
 	SalMediaDescription *resultdesc;
 	struct _RtpProfile *audio_profile;
 	struct _RtpProfile *video_profile;
+	struct _RtpProfile *text_profile;
 	struct _RtpProfile *rtp_io_audio_profile;
 	struct _RtpProfile *rtp_io_video_profile;
 	struct _LinphoneCallLog *log;
 	LinphoneAddress *me; /*Either from or to based on call dir*/
+	LinphoneAddress *diversion_address;
 	SalOp *op;
 	SalOp *ping_op;
 	char media_localip[LINPHONE_IPADDR_SIZE]; /* our best guess for local media ipaddress for this call */
@@ -260,11 +310,13 @@ struct _LinphoneCall{
 	LinphoneCallState prevstate;
 	LinphoneCallState transfer_state; /*idle if no transfer*/
 	LinphoneProxyConfig *dest_proxy;
-	PortConfig media_ports[2];
-	MSMediaStreamSessions sessions[2]; /*the rtp, srtp, zrtp contexts for each stream*/
-	StunCandidate ac,vc; /*audio video ip/port discovered by STUN*/
+	int main_audio_stream_index, main_video_stream_index, main_text_stream_index;
+	PortConfig media_ports[SAL_MEDIA_DESCRIPTION_MAX_STREAMS];
+	MSMediaStreamSessions sessions[SAL_MEDIA_DESCRIPTION_MAX_STREAMS]; /*the rtp, srtp, zrtp contexts for each stream*/
+	StunCandidate ac, vc, tc; /*audio video text ip/port discovered by STUN*/
 	struct _AudioStream *audiostream;  /**/
 	struct _VideoStream *videostream;
+	struct _TextStream *textstream;
 	void *video_window_id;
 	MSAudioEndpoint *endpoint; /*used for conferencing*/
 	char *refer_to;
@@ -276,8 +328,9 @@ struct _LinphoneCall{
 	OrtpEvQueue *audiostream_app_evq;
 	char *auth_token;
 	OrtpEvQueue *videostream_app_evq;
+	OrtpEvQueue *textstream_app_evq;
 	CallCallbackObj nextVideoFrameDecoded;
-	LinphoneCallStats stats[2];
+	LinphoneCallStats stats[3]; /* audio, video, text */
 #ifdef BUILD_UPNP
 	UpnpSession *upnp_session;
 #endif //BUILD_UPNP
@@ -290,11 +343,15 @@ struct _LinphoneCall{
 	int localdesc_changed;/*not a boolean, contains a mask representing changes*/
 	LinphonePlayer *player;
 	unsigned long bg_task_id; /*used to prevent device to suspend app while a call is received in background*/
+	unsigned int nb_media_starts;
 
 	char *dtmf_sequence; /*DTMF sequence needed to be sent using #dtmfs_timer*/
 	belle_sip_source_t *dtmfs_timer; /*DTMF timer needed to send a DTMF sequence*/
 
 	char *dtls_certificate_fingerprint; /**> This fingerprint is computed during stream init and is stored in call to be used when making local media description */
+	char *onhold_file; /*set if a on-hold file is to be played*/
+	LinphoneChatRoom *chat_room;
+	LinphoneConference *conf_ref; /**> Point on the associated conference if this call is part of a conference. NULL instead. */
 	bool_t refer_pending;
 	bool_t expect_media_in_ack;
 	bool_t audio_muted;
@@ -311,6 +368,10 @@ struct _LinphoneCall{
 	bool_t record_active;
 
 	bool_t paused_by_app;
+	bool_t broken; /*set to TRUE when the call is in broken state due to network disconnection or transport */
+	bool_t defer_notify_incoming;
+	bool_t need_localip_refresh;
+	bool_t reinvite_on_cancel_response_requested;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneCall);
@@ -321,23 +382,32 @@ LinphoneCall * linphone_call_new_incoming(struct _LinphoneCore *lc, LinphoneAddr
 void linphone_call_set_new_params(LinphoneCall *call, const LinphoneCallParams *params);
 void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const char *message);
 void linphone_call_set_contact_op(LinphoneCall* call);
-void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, const SalMediaDescription *md);
+void linphone_call_set_compatible_incoming_call_parameters(LinphoneCall *call, SalMediaDescription *md);
+void linphone_call_set_symmetric_rtp(LinphoneCall *call, bool_t val);
 /* private: */
 LinphoneCallLog * linphone_call_log_new(LinphoneCallDir dir, LinphoneAddress *local, LinphoneAddress * remote);
 void linphone_call_log_completed(LinphoneCall *call);
 void linphone_call_log_destroy(LinphoneCallLog *cl);
 void linphone_call_set_transfer_state(LinphoneCall* call, LinphoneCallState state);
 LinphonePlayer *linphone_call_build_player(LinphoneCall*call);
+void linphone_call_refresh_sockets(LinphoneCall *call);
+void linphone_call_replace_op(LinphoneCall *call, SalOp *op);
+void linphone_call_reinvite_to_recover_from_connection_loss(LinphoneCall *call);
 
 LinphoneCallParams * linphone_call_params_new(void);
 SalMediaProto get_proto_from_call_params(const LinphoneCallParams *params);
 SalStreamDir get_audio_dir_from_call_params(const LinphoneCallParams *params);
 SalStreamDir get_video_dir_from_call_params(const LinphoneCallParams *params);
+void linphone_call_params_set_custom_headers(LinphoneCallParams *params, const SalCustomHeader *ch);
+void linphone_call_params_set_custom_sdp_attributes(LinphoneCallParams *params, const SalCustomSdpAttribute *csa);
+void linphone_call_params_set_custom_sdp_media_attributes(LinphoneCallParams *params, LinphoneStreamType type, const SalCustomSdpAttribute *csa);
 
 void linphone_auth_info_write_config(struct _LpConfig *config, LinphoneAuthInfo *obj, int pos);
+void linphone_core_write_auth_info(LinphoneCore *lc, LinphoneAuthInfo *ai);
+const LinphoneAuthInfo *_linphone_core_find_tls_auth_info(LinphoneCore *lc);
+const LinphoneAuthInfo *_linphone_core_find_auth_info(LinphoneCore *lc, const char *realm, const char *username, const char *domain, bool_t ignore_realm);
 
 void linphone_core_update_proxy_register(LinphoneCore *lc);
-void linphone_core_refresh_subscribes(LinphoneCore *lc);
 int linphone_core_abort_call(LinphoneCore *lc, LinphoneCall *call, const char *error);
 const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc);
 
@@ -346,26 +416,54 @@ void linphone_proxy_config_set_state(LinphoneProxyConfig *cfg, LinphoneRegistrat
 void linphone_proxy_config_stop_refreshing(LinphoneProxyConfig *obj);
 void linphone_proxy_config_write_all_to_config_file(LinphoneCore *lc);
 void _linphone_proxy_config_release(LinphoneProxyConfig *cfg);
+void _linphone_proxy_config_unpublish(LinphoneProxyConfig *obj);
+
 /*
  * returns service route as defined in as defined by rfc3608, might be a list instead of just one.
  * Can be NULL
  * */
 const LinphoneAddress* linphone_proxy_config_get_service_route(const LinphoneProxyConfig* cfg);
 
+void linphone_friend_list_invalidate_subscriptions(LinphoneFriendList *list);
+void linphone_friend_list_notify_presence_received(LinphoneFriendList *list, LinphoneEvent *lev, const LinphoneContent *body);
+void linphone_friend_list_subscription_state_changed(LinphoneCore *lc, LinphoneEvent *lev, LinphoneSubscriptionState state);
+void _linphone_friend_list_release(LinphoneFriendList *list);
+/*get rls either from list or core if any*/
+const LinphoneAddress * _linphone_friend_list_get_rls_address(const LinphoneFriendList *list);
+
+void linphone_friend_invalidate_subscription(LinphoneFriend *lf);
 void linphone_friend_close_subscriptions(LinphoneFriend *lf);
-void linphone_friend_update_subscribes(LinphoneFriend *fr, LinphoneProxyConfig *cfg, bool_t only_when_registered);
+void _linphone_friend_release(LinphoneFriend *lf);
+void linphone_friend_update_subscribes(LinphoneFriend *fr, bool_t only_when_registered);
 void linphone_friend_notify(LinphoneFriend *lf, LinphonePresenceModel *presence);
+void linphone_friend_apply(LinphoneFriend *fr, LinphoneCore *lc);
 void linphone_friend_add_incoming_subscription(LinphoneFriend *lf, SalOp *op);
 void linphone_friend_remove_incoming_subscription(LinphoneFriend *lf, SalOp *op);
-LinphoneFriend *linphone_find_friend_by_inc_subscribe(MSList *l, SalOp *op);
-LinphoneFriend *linphone_find_friend_by_out_subscribe(MSList *l, SalOp *op);
+const char * linphone_friend_phone_number_to_sip_uri(LinphoneFriend *lf, const char *phone_number);
+const char * linphone_friend_sip_uri_to_phone_number(LinphoneFriend *lf, const char *uri);
+void linphone_friend_clear_presence_models(LinphoneFriend *lf);
+LinphoneFriend *linphone_friend_list_find_friend_by_inc_subscribe(const LinphoneFriendList *list, SalOp *op);
+LinphoneFriend *linphone_friend_list_find_friend_by_out_subscribe(const LinphoneFriendList *list, SalOp *op);
+LinphoneFriend *linphone_core_find_friend_by_out_subscribe(const LinphoneCore *lc, SalOp *op);
+LinphoneFriend *linphone_core_find_friend_by_inc_subscribe(const LinphoneCore *lc, SalOp *op);
 MSList *linphone_find_friend_by_address(MSList *fl, const LinphoneAddress *addr, LinphoneFriend **lf);
 bool_t linphone_core_should_subscribe_friends_only_when_registered(const LinphoneCore *lc);
-void linphone_core_update_friends_subscriptions(LinphoneCore *lc, LinphoneProxyConfig *cfg, bool_t only_when_registered);
+void linphone_core_update_friends_subscriptions(LinphoneCore *lc);
+void _linphone_friend_list_update_subscriptions(LinphoneFriendList *list, LinphoneProxyConfig *cfg, bool_t only_when_registered);
+void linphone_core_friends_storage_init(LinphoneCore *lc);
+void linphone_core_friends_storage_close(LinphoneCore *lc);
+void linphone_core_store_friend_in_db(LinphoneCore *lc, LinphoneFriend *lf);
+void linphone_core_remove_friend_from_db(LinphoneCore *lc, LinphoneFriend *lf);
+void linphone_core_store_friends_list_in_db(LinphoneCore *lc, LinphoneFriendList *list);
+void linphone_core_remove_friends_list_from_db(LinphoneCore *lc, LinphoneFriendList *list);
+LINPHONE_PUBLIC MSList* linphone_core_fetch_friends_from_db(LinphoneCore *lc, LinphoneFriendList *list);
+LINPHONE_PUBLIC MSList* linphone_core_fetch_friends_lists_from_db(LinphoneCore *lc);
+LINPHONE_PUBLIC LinphoneFriendListStatus linphone_friend_list_import_friend(LinphoneFriendList *list, LinphoneFriend *lf, bool_t synchronize);
 
+int linphone_parse_host_port(const char *input, char *host, size_t hostlen, int *port);
 int parse_hostname_to_addr(const char *server, struct sockaddr_storage *ss, socklen_t *socklen, int default_port);
 
-bool_t host_has_ipv6_network();
+bool_t host_has_ipv6_network(void);
 bool_t lp_spawn_command_line_sync(const char *command, char **result,int *command_ret);
 
 static MS2_INLINE int get_min_bandwidth(int dbw, int ubw){
@@ -386,13 +484,18 @@ static MS2_INLINE int get_remaining_bandwidth_for_video(int total, int audio){
 	return ret;
 }
 
-static MS2_INLINE void set_string(char **dest, const char *src){
+static MS2_INLINE void set_string(char **dest, const char *src, bool_t lowercase){
 	if (*dest){
 		ms_free(*dest);
 		*dest=NULL;
 	}
-	if (src)
+	if (src) {
 		*dest=ms_strdup(src);
+		if (lowercase) {
+			char *cur = *dest;
+			for (; *cur; cur++) *cur = tolower(*cur);
+		}
+	}
 }
 
 #define PAYLOAD_TYPE_ENABLED	PAYLOAD_TYPE_USER_FLAG_0
@@ -403,7 +506,7 @@ void linphone_process_authentication(LinphoneCore* lc, SalOp *op);
 void linphone_authentication_ok(LinphoneCore *lc, SalOp *op);
 void linphone_subscription_new(LinphoneCore *lc, SalOp *op, const char *from);
 void linphone_core_send_presence(LinphoneCore *lc, LinphonePresenceModel *presence);
-void linphone_notify_parse_presence(SalOp *op, const char *content_type, const char *content_subtype, const char *body, SalPresenceModel **result);
+void linphone_notify_parse_presence(const char *content_type, const char *content_subtype, const char *body, SalPresenceModel **result);
 void linphone_notify_convert_presence_to_xml(SalOp *op, SalPresenceModel *presence, const char *contact, char **content);
 void linphone_notify_recv(LinphoneCore *lc, SalOp *op, SalSubscribeStatus ss, SalPresenceModel *model);
 void linphone_proxy_config_process_authentication_failure(LinphoneCore *lc, SalOp *op);
@@ -421,12 +524,15 @@ void linphone_core_resolve_stun_server(LinphoneCore *lc);
 LINPHONE_PUBLIC const struct addrinfo *linphone_core_get_stun_server_addrinfo(LinphoneCore *lc);
 void linphone_core_adapt_to_network(LinphoneCore *lc, int ping_time_ms, LinphoneCallParams *params);
 int linphone_core_gather_ice_candidates(LinphoneCore *lc, LinphoneCall *call);
+LINPHONE_PUBLIC void linphone_core_enable_forced_ice_relay(LinphoneCore *lc, bool_t enable);
+LINPHONE_PUBLIC void linphone_core_enable_short_turn_refresh(LinphoneCore *lc, bool_t enable);
 void linphone_core_update_ice_state_in_call_stats(LinphoneCall *call);
 void linphone_call_stats_fill(LinphoneCallStats *stats, MediaStream *ms, OrtpEvent *ev);
-void linphone_call_stop_ice_for_inactive_streams(LinphoneCall *call);
-void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSession *session);
+void linphone_call_stop_ice_for_inactive_streams(LinphoneCall *call, SalMediaDescription *result);
+void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSession *session, bool_t use_nortpproxy);
 void linphone_call_update_local_media_description_from_ice_or_upnp(LinphoneCall *call);
-void linphone_call_update_ice_from_remote_media_description(LinphoneCall *call, const SalMediaDescription *md);
+void linphone_call_update_ice_from_remote_media_description(LinphoneCall *call, const SalMediaDescription *md, bool_t is_offer);
+void linphone_call_clear_unused_ice_candidates(LinphoneCall *call, const SalMediaDescription *md);
 bool_t linphone_core_media_description_contains_video_stream(const SalMediaDescription *md);
 
 void linphone_core_send_initial_subscribes(LinphoneCore *lc);
@@ -438,18 +544,20 @@ void linphone_proxy_config_update(LinphoneProxyConfig *cfg);
 LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const LinphoneAddress *uri);
 const char *linphone_core_find_best_identity(LinphoneCore *lc, const LinphoneAddress *to);
 int linphone_core_get_local_ip_for(int type, const char *dest, char *result);
-void linphone_core_get_local_ip(LinphoneCore *lc, int af, const char *dest, char *result);
+LINPHONE_PUBLIC void linphone_core_get_local_ip(LinphoneCore *lc, int af, const char *dest, char *result);
 
 LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LinphoneCore *lc, int index);
 void linphone_proxy_config_write_to_config_file(struct _LpConfig* config,LinphoneProxyConfig *obj, int index);
 
 void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessage *msg);
 void linphone_core_is_composing_received(LinphoneCore *lc, SalOp *op, const SalIsComposing *is_composing);
+void linphone_core_real_time_text_received(LinphoneCore *lc, LinphoneChatRoom *cr, uint32_t character, LinphoneCall *call);
 
 void linphone_call_init_stats(LinphoneCallStats *stats, int type);
-void linphone_call_fix_call_parameters(LinphoneCall *call);
+void linphone_call_fix_call_parameters(LinphoneCall *call, SalMediaDescription *rmd);
 void linphone_call_init_audio_stream(LinphoneCall *call);
 void linphone_call_init_video_stream(LinphoneCall *call);
+void linphone_call_init_text_stream(LinphoneCall *call);
 void linphone_call_init_media_streams(LinphoneCall *call);
 void linphone_call_start_media_streams(LinphoneCall *call, LinphoneCallState target_state);
 void linphone_call_start_media_streams_for_ice_gathering(LinphoneCall *call);
@@ -477,7 +585,7 @@ int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call,
 void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call);
 bool_t linphone_core_incompatible_security(LinphoneCore *lc, SalMediaDescription *md);
 extern SalCallbacks linphone_sal_callbacks;
-bool_t linphone_core_rtcp_enabled(const LinphoneCore *lc);
+LINPHONE_PUBLIC bool_t linphone_core_rtcp_enabled(const LinphoneCore *lc);
 bool_t linphone_core_symmetric_rtp_enabled(LinphoneCore*lc);
 
 void linphone_core_queue_task(LinphoneCore *lc, belle_sip_source_func_t task_fun, void *data, const char *task_description);
@@ -499,7 +607,12 @@ void _linphone_proxy_config_release_ops(LinphoneProxyConfig *obj);
 /*chat*/
 void linphone_chat_room_release(LinphoneChatRoom *cr);
 void linphone_chat_message_destroy(LinphoneChatMessage* msg);
-void linphone_chat_message_update_state(LinphoneChatMessage* chat_msg );
+void linphone_chat_message_update_state(LinphoneChatMessage *msg, LinphoneChatMessageState new_state);
+void linphone_chat_message_set_state(LinphoneChatMessage *msg, LinphoneChatMessageState state);
+int linphone_chat_room_upload_file(LinphoneChatMessage *msg);
+void _linphone_chat_room_send_message(LinphoneChatRoom *cr, LinphoneChatMessage *msg);
+LinphoneChatMessageCbs *linphone_chat_message_cbs_new(void);
+LinphoneChatRoom *_linphone_core_create_chat_room_from_call(LinphoneCall *call);
 /**/
 
 struct _LinphoneProxyConfig
@@ -524,8 +637,8 @@ struct _LinphoneProxyConfig
 	int auth_failures;
 	char *dial_prefix;
 	LinphoneRegistrationState state;
-	SalOp *publish_op;
 	LinphoneAVPFMode avpf_mode;
+	LinphoneNatPolicy *nat_policy;
 
 	bool_t commit;
 	bool_t reg_sendregister;
@@ -542,9 +655,15 @@ struct _LinphoneProxyConfig
 	/*use to check if server config has changed  between edit() and done()*/
 	LinphoneAddress *saved_proxy;
 	LinphoneAddress *saved_identity;
+	bool_t register_changed;
+	bool_t unused[3];
 	/*---*/
 	LinphoneAddress *pending_contact; /*use to store previous contact in case of network failure*/
+	LinphoneEvent *long_term_event;
+	unsigned long long previous_publish_config_hash[2];
 
+	char *refkey;
+	char *sip_etag; /*publish context*/
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneProxyConfig);
@@ -557,6 +676,10 @@ struct _LinphoneAuthInfo
 	char *passwd;
 	char *ha1;
 	char *domain;
+	char *tls_cert;
+	char *tls_key;
+	char *tls_cert_path;
+	char *tls_key_path;
 };
 
 typedef enum _LinphoneIsComposingState {
@@ -578,11 +701,29 @@ struct _LinphoneChatRoom{
 	belle_sip_source_t *remote_composing_refresh_timer;
 	belle_sip_source_t *composing_idle_timer;
 	belle_sip_source_t *composing_refresh_timer;
+	LinphoneCall *call;
+	LinphoneChatMessage *pending_message;
+	MSList *received_rtt_characters;
 };
 
+typedef struct _LinphoneChatMessageCharacter {
+	uint32_t value;
+	bool_t has_been_read;
+} LinphoneChatMessageCharacter;
+
 BELLE_SIP_DECLARE_VPTR(LinphoneChatRoom);
 
 
+typedef struct _LinphoneFriendPresence {
+	char *uri_or_tel;
+	LinphonePresenceModel *presence;
+} LinphoneFriendPresence;
+
+typedef struct _LinphoneFriendPhoneNumberSipUri {
+	char *number;
+	char *uri;
+} LinphoneFriendPhoneNumberSipUri;
+
 struct _LinphoneFriend{
 	belle_sip_object_t base;
 	void *user_data;
@@ -590,7 +731,8 @@ struct _LinphoneFriend{
 	MSList *insubs; /*list of SalOp. There can be multiple instances of a same Friend that subscribe to our presence*/
 	SalOp *outsub;
 	LinphoneSubscribePolicy pol;
-	LinphonePresenceModel *presence;
+	MSList *presence_models; /* list of LinphoneFriendPresence. It associates SIP URIs and phone numbers with their respective presence models. */
+	MSList *phone_number_sip_uri_map; /* list of LinphoneFriendPhoneNumberSipUri. It associates phone numbers with their corresponding SIP URIs. */
 	struct _LinphoneCore *lc;
 	BuddyInfo *info;
 	char *refkey;
@@ -599,10 +741,48 @@ struct _LinphoneFriend{
 	bool_t inc_subscribe_pending;
 	bool_t commit;
 	bool_t initial_subscribes_sent; /*used to know if initial subscribe message was sent or not*/
+	bool_t presence_received;
+	LinphoneVcard *vcard;
+	unsigned int storage_id;
+	LinphoneFriendList *friend_list;
+	LinphoneSubscriptionState out_sub_state;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneFriend);
 
+struct _LinphoneFriendListCbs {
+	belle_sip_object_t base;
+	void *user_data;
+	LinphoneFriendListCbsContactCreatedCb contact_created_cb;
+	LinphoneFriendListCbsContactDeletedCb contact_deleted_cb;
+	LinphoneFriendListCbsContactUpdatedCb contact_updated_cb;
+	LinphoneFriendListCbsSyncStateChangedCb sync_state_changed_cb;
+};
+
+BELLE_SIP_DECLARE_VPTR(LinphoneFriendListCbs);
+
+struct _LinphoneFriendList {
+	belle_sip_object_t base;
+	void *user_data;
+	LinphoneCore *lc;
+	LinphoneEvent *event;
+	char *display_name;
+	char *rls_uri; /*this field is take in sync with rls_addr*/
+	LinphoneAddress *rls_addr;
+	MSList *friends;
+	unsigned char *content_digest;
+	int expected_notification_version;
+	unsigned int storage_id;
+	char *uri;
+	MSList *dirty_friends_to_update;
+	int revision;
+	LinphoneFriendListCbs *cbs;
+	bool_t enable_subscriptions;
+};
+
+BELLE_SIP_DECLARE_VPTR(LinphoneFriendList);
+
+
 
 typedef struct sip_config
 {
@@ -651,6 +831,8 @@ typedef struct rtp_config
 	char* video_multicast_addr;
 	int video_multicast_ttl;
 	bool_t video_multicast_enabled;
+	int text_rtp_min_port;
+	int text_rtp_max_port;
 }rtp_config_t;
 
 
@@ -659,9 +841,7 @@ typedef struct net_config
 {
 	char *nat_address; /* may be IP or host name */
 	char *nat_address_ip; /* ip translated from nat_address */
-	char *stun_server;
 	struct addrinfo *stun_addrinfo;
-	SalResolverContext * stun_res;
 	int download_bw;
 	int upload_bw;
 	int mtu;
@@ -696,6 +876,7 @@ typedef struct codecs_config
 {
 	MSList *audio_codecs;  /* list of audio codecs in order of preference*/
 	MSList *video_codecs;
+	MSList *text_codecs;
 	int dyn_pt;
 	int telephone_event_pt;
 }codecs_config_t;
@@ -713,6 +894,10 @@ typedef struct video_config{
 	bool_t reuse_preview_source;
 }video_config_t;
 
+typedef struct text_config{
+	bool_t enabled;
+}text_config_t;
+
 typedef struct ui_config
 {
 	int is_daemon;
@@ -732,16 +917,6 @@ typedef struct autoreplier_config
 	const char *message;		/* the path of the file to be played */
 }autoreplier_config_t;
 
-struct _LinphoneConference{
-	MSAudioConference *conf;
-	AudioStream *local_participant;
-	MSAudioEndpoint *local_endpoint;
-	MSAudioEndpoint *record_endpoint;
-	RtpProfile *local_dummy_profile;
-	bool_t local_muted;
-	bool_t terminated;
-};
-
 
 typedef struct _LinphoneToneDescription{
 	LinphoneReason reason;
@@ -756,7 +931,6 @@ void linphone_core_play_call_error_tone(LinphoneCore *lc, LinphoneReason reason)
 void _linphone_core_set_tone(LinphoneCore *lc, LinphoneReason reason, LinphoneToneID id, const char *audiofile);
 const char *linphone_core_get_tone_file(const LinphoneCore *lc, LinphoneToneID id);
 int _linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params, LinphoneCallState next_state, const char *state_info);
-typedef struct _LinphoneConference LinphoneConference;
 
 typedef struct _LinphoneTaskList{
 	MSList *hooks;
@@ -770,22 +944,26 @@ void linphone_task_list_free(LinphoneTaskList *t);
 
 struct _LinphoneCore
 {
+	MSFactory* factory;
 	MSList* vtable_refs;
+	int vtable_notify_recursion;
 	Sal *sal;
 	LinphoneGlobalState state;
 	struct _LpConfig *config;
 	MSList *default_audio_codecs;
 	MSList *default_video_codecs;
+	MSList *default_text_codecs;
 	net_config_t net_conf;
 	sip_config_t sip_conf;
 	rtp_config_t rtp_conf;
 	sound_config_t sound_conf;
 	video_config_t video_conf;
+	text_config_t text_conf;
 	codecs_config_t codecs_conf;
 	ui_config_t ui_conf;
 	autoreplier_config_t autoreplier_conf;
 	LinphoneProxyConfig *default_proxy;
-	MSList *friends;
+	MSList *friends_lists;
 	MSList *auth_info;
 	struct _RingStream *ringstream;
 	time_t dmfs_playing_start_time;
@@ -807,7 +985,7 @@ struct _LinphoneCore
 	void *data;
 	char *play_file;
 	char *rec_file;
-	time_t prevtime;
+	uint64_t prevtime_ms;
 	int audio_bw; /*IP bw consumed by audio codec, set as soon as used codec is known, its purpose is to know the remaining bw for video*/
 	LinphoneCoreWaitingCallback wait_cb;
 	void *wait_ctx;
@@ -815,12 +993,14 @@ struct _LinphoneCore
 	void *preview_window_id;
 	time_t netup_time; /*time when network went reachable */
 	struct _EcCalibrator *ecc;
+	struct _EchoTester *ect;
 	LinphoneTaskList hooks; /*tasks periodically executed in linphone_core_iterate()*/
-	LinphoneConference conf_ctx;
+	LinphoneConference *conf_ctx;
 	char* zrtp_secrets_cache;
 	char* user_certificates_path;
 	LinphoneVideoPolicy video_policy;
 	time_t network_last_check;
+	LinphoneNatPolicy *nat_policy;
 
 	bool_t use_files;
 	bool_t apply_nat_settings;
@@ -829,13 +1009,19 @@ struct _LinphoneCore
 
 	bool_t preview_finished;
 	bool_t auto_net_state_mon;
-	bool_t network_reachable;
-	bool_t network_reachable_to_be_notified; /*set to true when state must be notified in next iterate*/
+	bool_t sip_network_reachable;
+	bool_t media_network_reachable;
 
+	bool_t network_reachable_to_be_notified; /*set to true when state must be notified in next iterate*/
 	bool_t use_preview_window;
 	bool_t network_last_status;
 	bool_t ringstream_autorelease;
+
 	bool_t vtables_running;
+	bool_t send_call_stats_periodical_updates;
+	bool_t forced_ice_relay;
+	bool_t short_turn_refresh;
+
 	char localip[LINPHONE_IPADDR_SIZE];
 	int device_rotation;
 	int max_calls;
@@ -843,21 +1029,27 @@ struct _LinphoneCore
 	char* device_id;
 	MSList *last_recv_msg_ids;
 	char *chat_db_file;
-#ifdef MSG_STORAGE_ENABLED
+	char *logs_db_file;
+	char *friends_db_file;
+#ifdef SQLITE_STORAGE_ENABLED
 	sqlite3 *db;
+	sqlite3 *logs_db;
+	sqlite3 *friends_db;
 	bool_t debug_storage;
 #endif
 #ifdef BUILD_UPNP
 	UpnpContext *upnp;
 #endif //BUILD_UPNP
 	belle_http_provider_t *http_provider;
-	belle_tls_verify_policy_t *http_verify_policy;
+	belle_tls_crypto_config_t *http_crypto_config;
+	belle_http_request_listener_t *provisioning_http_listener;
 	MSList *tones;
 	LinphoneReason chat_deny_code;
 	char *file_transfer_server;
 	const char **supported_formats;
 	LinphoneContent *log_collection_upload_information;
 	LinphoneCoreVTable *current_vtable; // the latest vtable to call a callback, see linphone_core_get_current_vtable
+	LinphoneRingtonePlayer *ringtoneplayer;
 #ifdef ANDROID
 	jobject wifi_lock;
 	jclass wifi_lock_class;
@@ -868,10 +1060,22 @@ struct _LinphoneCore
 	jmethodID multicast_lock_acquire_id;
 	jmethodID multicast_lock_release_id;
 #endif
+	LinphoneVcardContext *vcard_context;
+
+	/*for tests only*/
+	bool_t zrtp_not_available_simulation;
+
+	/* string for TLS auth instead of path to files */
+	char *tls_cert;
+	char *tls_key;
+
+	/*default resource list server*/
+	LinphoneAddress *default_rls_addr;
 };
 
 
 struct _LinphoneEvent{
+	belle_sip_object_t base;
 	LinphoneSubscriptionDir dir;
 	LinphoneCore *lc;
 	SalOp *op;
@@ -879,13 +1083,15 @@ struct _LinphoneEvent{
 	LinphoneSubscriptionState subscription_state;
 	LinphonePublishState publish_state;
 	void *userdata;
-	int refcnt;
 	char *name;
 	int expires;
 	bool_t terminating;
 	bool_t is_out_of_dialog_op; /*used for out of dialog notify*/
+	bool_t internal;
+	bool_t oneshot;
 };
 
+BELLE_SIP_DECLARE_VPTR(LinphoneEvent);
 
 LinphoneTunnel *linphone_core_tunnel_new(LinphoneCore *lc);
 void linphone_tunnel_destroy(LinphoneTunnel *tunnel);
@@ -895,10 +1101,10 @@ void linphone_tunnel_enable_logs_with_handler(LinphoneTunnel *tunnel, bool_t ena
 bool_t linphone_core_can_we_add_call(LinphoneCore *lc);
 int linphone_core_add_call( LinphoneCore *lc, LinphoneCall *call);
 int linphone_core_del_call( LinphoneCore *lc, LinphoneCall *call);
-int linphone_core_set_as_current_call(LinphoneCore *lc, LinphoneCall *call);
 int linphone_core_get_calls_nb(const LinphoneCore *lc);
 
 void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message);
+void linphone_call_update_biggest_desc(LinphoneCall *call, SalMediaDescription *md);
 void linphone_call_make_local_media_description(LinphoneCall *call);
 void linphone_call_make_local_media_description_with_params(LinphoneCore *lc, LinphoneCall *call, LinphoneCallParams *params);
 void linphone_call_increment_local_media_description(LinphoneCall *call);
@@ -908,9 +1114,10 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 bool_t linphone_core_is_payload_type_usable_for_bandwidth(LinphoneCore *lc, const PayloadType *pt,  int bandwidth_limit);
 
 #define linphone_core_ready(lc) ((lc)->state==LinphoneGlobalOn || (lc)->state==LinphoneGlobalShutdown)
-void _linphone_core_configure_resolver();
+void _linphone_core_configure_resolver(void);
 
 struct _EcCalibrator{
+	MSFactory *factory;
 	ms_thread_t thread;
 	MSSndCard *play_card,*capt_card;
 	MSFilter *sndread,*det,*rec;
@@ -926,6 +1133,7 @@ struct _EcCalibrator{
 	unsigned int rate;
 	LinphoneEcCalibratorStatus status;
 	bool_t freq1,freq2,freq3;
+	bool_t play_cool_tones;
 };
 
 typedef struct _EcCalibrator EcCalibrator;
@@ -934,24 +1142,30 @@ LinphoneEcCalibratorStatus ec_calibrator_get_status(EcCalibrator *ecc);
 
 void ec_calibrator_destroy(EcCalibrator *ecc);
 
+struct _EchoTester {
+    MSFactory *factory;
+    MSFilter *in,*out;
+    MSSndCard *capture_card;
+    MSSndCard *playback_card;
+    MSTicker *ticker;
+    unsigned int rate;
+};
+
+typedef struct _EchoTester EchoTester;
+
 void linphone_call_background_tasks(LinphoneCall *call, bool_t one_second_elapsed);
-void linphone_core_preempt_sound_resources(LinphoneCore *lc);
+void linphone_call_set_broken(LinphoneCall *call);
+void linphone_call_repair_if_broken(LinphoneCall *call);
+void linphone_core_repair_calls(LinphoneCore *lc);
+int linphone_core_preempt_sound_resources(LinphoneCore *lc);
 int _linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call);
 
 /*conferencing subsystem*/
 void _post_configure_audio_stream(AudioStream *st, LinphoneCore *lc, bool_t muted);
-/* When a conference participant pause the conference he may send a music.
- * We don't want to hear that music or to send it to the other participants.
- * Use muted=yes to handle this case.
- */
-void linphone_call_add_to_conf(LinphoneCall *call, bool_t muted);
-void linphone_call_remove_from_conf(LinphoneCall *call);
-void linphone_core_conference_check_uninit(LinphoneCore *lc);
 bool_t linphone_core_sound_resources_available(LinphoneCore *lc);
 void linphone_core_notify_refer_state(LinphoneCore *lc, LinphoneCall *referer, LinphoneCall *newcall);
 unsigned int linphone_core_get_audio_features(LinphoneCore *lc);
 
-void __linphone_core_invalidate_registers(LinphoneCore* lc);
 void _linphone_core_codec_config_write(LinphoneCore *lc);
 
 #define HOLD_OFF	(0)
@@ -960,8 +1174,25 @@ void _linphone_core_codec_config_write(LinphoneCore *lc);
 #ifndef NB_MAX_CALLS
 #define NB_MAX_CALLS	(10)
 #endif
-void call_logs_read_from_config_file(LinphoneCore *lc);
+
+#define LINPHONE_MAX_CALL_HISTORY_UNLIMITED (-1)
+#ifndef LINPHONE_MAX_CALL_HISTORY_SIZE
+	#ifdef SQLITE_STORAGE_ENABLED
+		#define LINPHONE_MAX_CALL_HISTORY_SIZE LINPHONE_MAX_CALL_HISTORY_UNLIMITED
+	#else
+		#define LINPHONE_MAX_CALL_HISTORY_SIZE 30
+	#endif
+#endif
+
+LINPHONE_PUBLIC void call_logs_read_from_config_file(LinphoneCore *lc);
 void call_logs_write_to_config_file(LinphoneCore *lc);
+void linphone_core_call_log_storage_init(LinphoneCore *lc);
+void linphone_core_call_log_storage_close(LinphoneCore *lc);
+void linphone_core_store_call_log(LinphoneCore *lc, LinphoneCallLog *log);
+const MSList *linphone_core_get_call_history(LinphoneCore *lc);
+LINPHONE_PUBLIC void linphone_core_delete_call_history(LinphoneCore *lc);
+LINPHONE_PUBLIC void linphone_core_delete_call_log(LinphoneCore *lc, LinphoneCallLog *log);
+LINPHONE_PUBLIC int linphone_core_get_call_history_size(LinphoneCore *lc);
 
 int linphone_core_get_edge_bw(LinphoneCore *lc);
 int linphone_core_get_edge_ptime(LinphoneCore *lc);
@@ -969,8 +1200,9 @@ int linphone_core_get_edge_ptime(LinphoneCore *lc);
 int linphone_upnp_init(LinphoneCore *lc);
 void linphone_upnp_destroy(LinphoneCore *lc);
 
-#ifdef MSG_STORAGE_ENABLED
-sqlite3 * linphone_message_storage_init();
+#ifdef SQLITE_STORAGE_ENABLED
+int _linphone_sqlite3_open(const char *db_file, sqlite3 **db);
+sqlite3 * linphone_message_storage_init(void);
 void linphone_message_storage_init_chat_rooms(LinphoneCore *lc);
 #endif
 void linphone_chat_message_store_state(LinphoneChatMessage *msg);
@@ -985,29 +1217,37 @@ const char *linphone_core_create_uuid(LinphoneCore *lc);
 void linphone_configure_op(LinphoneCore *lc, SalOp *op, const LinphoneAddress *dest, SalCustomHeader *headers, bool_t with_contact);
 void linphone_call_create_op(LinphoneCall *call);
 int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer);
-void linphone_core_notify_info_message(LinphoneCore* lc,SalOp *op, const SalBody *body);
+void linphone_core_notify_info_message(LinphoneCore* lc,SalOp *op, SalBodyHandler *body);
 LinphoneContent * linphone_content_new(void);
 LinphoneContent * linphone_content_copy(const LinphoneContent *ref);
-SalBody *sal_body_from_content(SalBody *body, const LinphoneContent *content);
+SalBodyHandler *sal_body_handler_from_content(const LinphoneContent *content);
 SalReason linphone_reason_to_sal(LinphoneReason reason);
 LinphoneReason linphone_reason_from_sal(SalReason reason);
 LinphoneEvent *linphone_event_new(LinphoneCore *lc, LinphoneSubscriptionDir dir, const char *name, int expires);
 LinphoneEvent *linphone_event_new_with_op(LinphoneCore *lc, SalOp *op, LinphoneSubscriptionDir dir, const char *name);
+void linphone_event_unpublish(LinphoneEvent *lev);
 /**
  * Useful for out of dialog notify
  * */
 LinphoneEvent *linphone_event_new_with_out_of_dialog_op(LinphoneCore *lc, SalOp *op, LinphoneSubscriptionDir dir, const char *name);
+void linphone_event_set_internal(LinphoneEvent *lev, bool_t internal);
+bool_t linphone_event_is_internal(LinphoneEvent *lev);
 void linphone_event_set_state(LinphoneEvent *lev, LinphoneSubscriptionState state);
 void linphone_event_set_publish_state(LinphoneEvent *lev, LinphonePublishState state);
 LinphoneSubscriptionState linphone_subscription_state_from_sal(SalSubscribeStatus ss);
-LinphoneContent *linphone_content_from_sal_body(const SalBody *ref);
+LinphoneContent *linphone_content_from_sal_body_handler(SalBodyHandler *ref);
 void linphone_core_invalidate_friend_subscriptions(LinphoneCore *lc);
+void linphone_core_register_offer_answer_providers(LinphoneCore *lc);
 
 
 struct _LinphoneContent {
 	belle_sip_object_t base;
 	void *user_data;
-	struct _LinphoneContentPrivate lcp;
+	SalBodyHandler *body_handler;
+	char *name; /**< used by RCS File transfer messages to store the original filename of the file to be downloaded from server */
+	char *key; /**< used by RCS File transfer messages to store the key to encrypt file if needed */
+	size_t keyLength; /**< Length of key in bytes */
+	void *cryptoContext; /**< crypto context used to encrypt file for RCS file transfer */
 	bool_t owned_fields;
 };
 
@@ -1022,6 +1262,25 @@ struct _LinphoneBuffer {
 
 BELLE_SIP_DECLARE_VPTR(LinphoneBuffer);
 
+struct _LinphoneNatPolicy {
+	belle_sip_object_t base;
+	void *user_data;
+	LinphoneCore *lc;
+	SalResolverContext *stun_resolver_context;
+	struct addrinfo *stun_addrinfo;
+	char *stun_server;
+	char *stun_server_username;
+	char *ref;
+	bool_t stun_enabled;
+	bool_t turn_enabled;
+	bool_t ice_enabled;
+	bool_t upnp_enabled;
+};
+
+BELLE_SIP_DECLARE_VPTR(LinphoneNatPolicy);
+
+void linphone_nat_policy_save_to_config(const LinphoneNatPolicy *policy);
+
 
 /*****************************************************************************
  * XML-RPC interface                                                         *
@@ -1061,6 +1320,7 @@ struct _LinphoneXmlRpcSession {
 	void *user_data;
 	LinphoneCore *core;
 	char *url;
+	bool_t released;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneXmlRpcSession);
@@ -1073,9 +1333,15 @@ BELLE_SIP_DECLARE_VPTR(LinphoneXmlRpcSession);
 struct _LinphoneAccountCreatorCbs {
 	belle_sip_object_t base;
 	void *user_data;
-	LinphoneAccountCreatorCbsExistenceTestedCb existence_tested;
-	LinphoneAccountCreatorCbsValidationTestedCb validation_tested;
-	LinphoneAccountCreatorCbsValidatedCb validated;
+	LinphoneAccountCreatorCbsStatusCb is_account_used;
+	LinphoneAccountCreatorCbsStatusCb create_account;
+	LinphoneAccountCreatorCbsStatusCb activate_account;
+	LinphoneAccountCreatorCbsStatusCb is_account_activated;
+	LinphoneAccountCreatorCbsStatusCb is_phone_number_used;
+	LinphoneAccountCreatorCbsStatusCb link_phone_number_with_account;
+	LinphoneAccountCreatorCbsStatusCb activate_phone_number_link;
+	LinphoneAccountCreatorCbsStatusCb recover_phone_account;
+	LinphoneAccountCreatorCbsStatusCb is_account_linked;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneAccountCreatorCbs);
@@ -1088,19 +1354,57 @@ struct _LinphoneAccountCreator {
 	LinphoneCore *core;
 	char *xmlrpc_url;
 	char *username;
+	char *phone_number;
 	char *password;
 	char *domain;
 	char *route;
 	char *email;
 	bool_t subscribe_to_newsletter;
 	char *display_name;
+	LinphoneTransportType transport;
+	char *activation_code;
+	char *ha1;
+	char *phone_country_code;
+	char *language;
 };
 
 BELLE_SIP_DECLARE_VPTR(LinphoneAccountCreator);
 
+/*****************************************************************************
+ * CardDAV interface                                                         *
+ ****************************************************************************/
+
+struct _LinphoneCardDavContext {
+	LinphoneFriendList *friend_list;
+	int ctag;
+	void *user_data;
+	LinphoneCardDavContactCreatedCb contact_created_cb;
+	LinphoneCardDavContactUpdatedCb contact_updated_cb;
+	LinphoneCardDavContactRemovedCb contact_removed_cb;
+	LinphoneCardDavSynchronizationDoneCb sync_done_cb;
+	LinphoneAuthInfo *auth_info;
+};
+
+struct _LinphoneCardDavQuery {
+	LinphoneCardDavContext *context;
+	char *url;
+	const char *method;
+	char *body;
+	const char *depth;
+	const char *ifmatch;
+	belle_http_request_listener_t *http_request_listener;
+	void *user_data;
+	LinphoneCardDavQueryType type;
+};
+
+struct _LinphoneCardDavResponse {
+	char *etag;
+	char *url;
+	char *vcard;
+};
 
 /*****************************************************************************
- * REMOTE PROVISIONING FUNCTIONS                                                     *
+ * REMOTE PROVISIONING FUNCTIONS                                             *
  ****************************************************************************/
 
 void linphone_configuring_terminated(LinphoneCore *lc, LinphoneConfiguringState state, const char *message);
@@ -1108,7 +1412,7 @@ int linphone_remote_provisioning_download_and_apply(LinphoneCore *lc, const char
 LINPHONE_PUBLIC int linphone_remote_provisioning_load_file( LinphoneCore* lc, const char* file_path);
 
 /*****************************************************************************
- * Player interface
+ * Player interface                                                          *
  ****************************************************************************/
 
 struct _LinphonePlayer{
@@ -1133,11 +1437,6 @@ void _linphone_player_destroy(LinphonePlayer *player);
  * XML UTILITY FUNCTIONS                                                     *
  ****************************************************************************/
 
-#include <libxml/xmlreader.h>
-#include <libxml/xmlwriter.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-
 #define XMLPARSING_BUFFER_LEN 2048
 #define MAX_XPATH_LENGTH 256
 
@@ -1153,8 +1452,10 @@ void linphone_xmlparsing_context_destroy(xmlparsing_context_t *ctx);
 void linphone_xmlparsing_genericxml_error(void *ctx, const char *fmt, ...);
 int linphone_create_xml_xpath_context(xmlparsing_context_t *xml_ctx);
 char * linphone_get_xml_text_content(xmlparsing_context_t *xml_ctx, const char *xpath_expression);
+const char * linphone_get_xml_attribute_text_content(xmlparsing_context_t *xml_ctx, const char *xpath_expression, const char *attribute_name);
 void linphone_free_xml_text_content(const char *text);
 xmlXPathObjectPtr linphone_get_xml_xpath_object_for_node_list(xmlparsing_context_t *xml_ctx, const char *xpath_expression);
+void linphone_xml_xpath_context_init_carddav_ns(xmlparsing_context_t *xml_ctx);
 
 /*****************************************************************************
  * OTHER UTILITY FUNCTIONS                                                     *
@@ -1206,9 +1507,14 @@ BELLE_SIP_TYPE_ID(LinphoneLDAPContactProvider),
 BELLE_SIP_TYPE_ID(LinphoneLDAPContactSearch),
 BELLE_SIP_TYPE_ID(LinphoneProxyConfig),
 BELLE_SIP_TYPE_ID(LinphoneFriend),
+BELLE_SIP_TYPE_ID(LinphoneFriendList),
 BELLE_SIP_TYPE_ID(LinphoneXmlRpcRequest),
 BELLE_SIP_TYPE_ID(LinphoneXmlRpcRequestCbs),
-BELLE_SIP_TYPE_ID(LinphoneXmlRpcSession)
+BELLE_SIP_TYPE_ID(LinphoneXmlRpcSession),
+BELLE_SIP_TYPE_ID(LinphoneTunnelConfig),
+BELLE_SIP_TYPE_ID(LinphoneFriendListCbs),
+BELLE_SIP_TYPE_ID(LinphoneEvent),
+BELLE_SIP_TYPE_ID(LinphoneNatPolicy)
 BELLE_SIP_DECLARE_TYPES_END
 
 
@@ -1223,8 +1529,10 @@ void linphone_core_notify_display_message(LinphoneCore *lc, const char *message)
 void linphone_core_notify_display_warning(LinphoneCore *lc, const char *message);
 void linphone_core_notify_display_url(LinphoneCore *lc, const char *message, const char *url);
 void linphone_core_notify_notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf);
+void linphone_core_notify_notify_presence_received_for_uri_or_tel(LinphoneCore *lc, LinphoneFriend *lf, const char *uri_or_tel, const LinphonePresenceModel *presence_model);
 void linphone_core_notify_new_subscription_requested(LinphoneCore *lc, LinphoneFriend *lf, const char *url);
 void linphone_core_notify_auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain);
+void linphone_core_notify_authentication_requested(LinphoneCore *lc, LinphoneAuthInfo *auth_info, LinphoneAuthMethod method);
 void linphone_core_notify_call_log_updated(LinphoneCore *lc, LinphoneCallLog *newcl);
 void linphone_core_notify_text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from, const char *message);
 void linphone_core_notify_message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *message);
@@ -1249,6 +1557,8 @@ void linphone_core_notify_subscription_state_changed(LinphoneCore *lc, LinphoneE
 void linphone_core_notify_publish_state_changed(LinphoneCore *lc, LinphoneEvent *lev, LinphonePublishState state);
 void linphone_core_notify_log_collection_upload_state_changed(LinphoneCore *lc, LinphoneCoreLogCollectionUploadState state, const char *info);
 void linphone_core_notify_log_collection_upload_progress_indication(LinphoneCore *lc, size_t offset, size_t total);
+void linphone_core_notify_friend_list_created(LinphoneCore *lc, LinphoneFriendList *list);
+void linphone_core_notify_friend_list_removed(LinphoneCore *lc, LinphoneFriendList *list);
 
 void set_mic_gain_db(AudioStream *st, float gain);
 void set_playback_gain_db(AudioStream *st, float gain);
@@ -1264,7 +1574,7 @@ SalStreamDir sal_dir_from_call_params_dir(LinphoneMediaDirection cpdir);
  * @param[in] content LinphoneContent object.
  * @return The key to encrypt/decrypt the file associated to this content.
  */
-const char *linphone_content_get_key(const LinphoneContent *content);
+LINPHONE_PUBLIC const char *linphone_content_get_key(const LinphoneContent *content);
 
 /**
  * Get the size of key associated with a RCS file transfer message if encrypted
@@ -1272,10 +1582,12 @@ const char *linphone_content_get_key(const LinphoneContent *content);
  * @return The key size in bytes
  */
 size_t linphone_content_get_key_size(const LinphoneContent *content);
+
 /**
  * Set the key associated with a RCS file transfer message if encrypted
  * @param[in] content LinphoneContent object.
  * @param[in] key The key to be used to encrypt/decrypt file associated to this content.
+ * @param[in] keyLength The lengh of the key.
  */
 void linphone_content_set_key(LinphoneContent *content, const char *key, const size_t keyLength);
 
@@ -1298,18 +1610,32 @@ struct _VTableReference{
 	LinphoneCoreVTable *vtable;
 	bool_t valid;
 	bool_t autorelease;
+	bool_t internal;
 };
 
 typedef struct _VTableReference  VTableReference;
 
 void v_table_reference_destroy(VTableReference *ref);
 
-void _linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable, bool_t autorelease);
+LINPHONE_PUBLIC void _linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable, bool_t autorelease, bool_t internal);
+
 #ifdef VIDEO_ENABLED
 LINPHONE_PUBLIC MSWebCam *linphone_call_get_video_device(const LinphoneCall *call);
-MSWebCam *get_nowebcam_device();
+MSWebCam *get_nowebcam_device(MSFactory *f);
 #endif
-bool_t linphone_core_lime_for_file_sharing_enabled(const LinphoneCore *lc);
+LinphoneLimeState linphone_core_lime_for_file_sharing_enabled(const LinphoneCore *lc);
+
+BELLE_SIP_DECLARE_VPTR(LinphoneTunnelConfig);
+
+int linphone_core_get_default_proxy_config_index(LinphoneCore *lc);
+
+char *linphone_presence_model_to_xml(LinphonePresenceModel *model) ;
+
+#define LINPHONE_SQLITE3_VFS "sqlite3bctbx_vfs"
+
+void linphone_call_check_ice_session(LinphoneCall *call, IceRole role, bool_t is_reinvite);
+
+bool_t linphone_call_state_is_early(LinphoneCallState state);
 
 #ifdef __cplusplus
 }
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 5378236a1..f344f6307 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -19,12 +19,12 @@ Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
  */
 
 #include "linphonecore.h"
+#include "linphonecore_utils.h"
 #include "sipsetup.h"
 #include "lpconfig.h"
 #include "private.h"
 #include "mediastreamer2/mediastream.h"
 #include "enum.h"
-
 #include <ctype.h>
 
 /*store current config related to server location*/
@@ -64,7 +64,7 @@ LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_is_server_confi
 	LinphoneAddress *current_proxy=cfg->reg_proxy?linphone_address_new(cfg->reg_proxy):NULL;
 	LinphoneProxyConfigAddressComparisonResult result_identity;
 	LinphoneProxyConfigAddressComparisonResult result;
-
+	
 	result = linphone_proxy_config_address_equal(cfg->saved_identity,cfg->identity_address);
 	if (result == LinphoneProxyConfigAddressDifferent) goto end;
 	result_identity = result;
@@ -79,21 +79,22 @@ LinphoneProxyConfigAddressComparisonResult linphone_proxy_config_is_server_confi
 
 	end:
 	if (current_proxy) linphone_address_destroy(current_proxy);
+	ms_message("linphone_proxy_config_is_server_config_changed : %i", result);
 	return result;
 }
 
 void linphone_proxy_config_write_all_to_config_file(LinphoneCore *lc){
-	MSList *elem;
+	bctbx_list_t *elem;
 	int i;
 	if (!linphone_core_ready(lc)) return;
 
-	for(elem=lc->sip_conf.proxies,i=0;elem!=NULL;elem=ms_list_next(elem),i++){
+	for(elem=lc->sip_conf.proxies,i=0;elem!=NULL;elem=bctbx_list_next(elem),i++){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
 		linphone_proxy_config_write_to_config_file(lc->config,cfg,i);
 	}
 	/*to ensure removed configs are erased:*/
 	linphone_proxy_config_write_to_config_file(lc->config,NULL,i);
-	lp_config_set_int(lc->config,"sip","default_proxy",linphone_core_get_default_proxy(lc,NULL));
+	lp_config_set_int(lc->config,"sip","default_proxy",linphone_core_get_default_proxy_config_index(lc));
 }
 
 static void linphone_proxy_config_init(LinphoneCore* lc, LinphoneProxyConfig *cfg) {
@@ -105,7 +106,7 @@ static void linphone_proxy_config_init(LinphoneCore* lc, LinphoneProxyConfig *cf
 	const char *quality_reporting_collector = lc ? lp_config_get_default_string(lc->config, "proxy", "quality_reporting_collector", NULL) : NULL;
 	const char *contact_params = lc ? lp_config_get_default_string(lc->config, "proxy", "contact_parameters", NULL) : NULL;
 	const char *contact_uri_params = lc ? lp_config_get_default_string(lc->config, "proxy", "contact_uri_parameters", NULL) : NULL;
-
+	const char *refkey = lc ? lp_config_get_default_string(lc->config, "proxy", "refkey", NULL) : NULL;
 	cfg->expires = lc ? lp_config_get_default_int(lc->config, "proxy", "reg_expires", 3600) : 3600;
 	cfg->reg_sendregister = lc ? lp_config_get_default_int(lc->config, "proxy", "reg_sendregister", 1) : 1;
 	cfg->dial_prefix = dial_prefix ? ms_strdup(dial_prefix) : NULL;
@@ -123,13 +124,58 @@ static void linphone_proxy_config_init(LinphoneCore* lc, LinphoneProxyConfig *cf
 	cfg->contact_uri_params = contact_uri_params ? ms_strdup(contact_uri_params) : NULL;
 	cfg->avpf_mode = lc ? lp_config_get_default_int(lc->config, "proxy", "avpf", LinphoneAVPFDefault) : LinphoneAVPFDefault;
 	cfg->avpf_rr_interval = lc ? lp_config_get_default_int(lc->config, "proxy", "avpf_rr_interval", 5) : 5;
-	cfg->publish_expires=-1;
+	cfg->publish_expires= lc ? lp_config_get_default_int(lc->config, "proxy", "publish_expires", -1) : -1;
+	cfg->refkey = refkey ? ms_strdup(refkey) : NULL;
 }
 
 LinphoneProxyConfig *linphone_proxy_config_new() {
 	return linphone_core_create_proxy_config(NULL);
 }
 
+static char * append_linphone_address(LinphoneAddress *addr,char *out) {
+	char *res = out;
+	if (addr) {
+		char *tmp;
+		tmp = linphone_address_as_string(addr);
+		res = ms_strcat_printf(out, "%s",tmp);
+		ms_free(tmp);
+	}
+	return res;
+};
+static char * append_string(const char * string,char *out) {
+	char *res = out;
+	if (string) {
+		res = ms_strcat_printf(out, "%s",string);
+	}
+	return res;
+}
+/*
+ * return true if computed value has changed
+ */
+bool_t linphone_proxy_config_compute_publish_params_hash(LinphoneProxyConfig * cfg) {
+	char * source = NULL;
+	char hash[33];
+	char saved;
+	unsigned long long previous_hash[2];
+	previous_hash[0] = cfg->previous_publish_config_hash[0];
+	previous_hash[1] = cfg->previous_publish_config_hash[1];
+
+	source = ms_strcat_printf(source, "%i",cfg->privacy);
+	source=append_linphone_address(cfg->identity_address, source);
+	source=append_string(cfg->reg_proxy,source);
+	source=append_string(cfg->reg_route,source);
+	source=append_string(cfg->realm,source);
+	source = ms_strcat_printf(source, "%i",cfg->publish_expires);
+	source = ms_strcat_printf(source, "%i",cfg->publish);
+	belle_sip_auth_helper_compute_ha1(source, "dummy", "dummy", hash);
+	ms_free(source);
+	saved = hash[16];
+	hash[16] = '\0';
+	cfg->previous_publish_config_hash[0] = strtoull(hash, (char **)NULL, 16);
+	hash[16] = saved;
+	cfg->previous_publish_config_hash[1] = strtoull(&hash[16], (char **)NULL, 16);
+	return previous_hash[0] != cfg->previous_publish_config_hash[0] || previous_hash[1] != cfg->previous_publish_config_hash[1];
+}
 static void _linphone_proxy_config_destroy(LinphoneProxyConfig *cfg);
 
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneProxyConfig);
@@ -152,9 +198,10 @@ void _linphone_proxy_config_release_ops(LinphoneProxyConfig *cfg){
 		sal_op_release(cfg->op);
 		cfg->op=NULL;
 	}
-	if (cfg->publish_op){
-		sal_op_release(cfg->publish_op);
-		cfg->publish_op=NULL;
+	if (cfg->long_term_event){
+		linphone_event_terminate(cfg->long_term_event);
+		linphone_event_unref(cfg->long_term_event);
+		cfg->long_term_event=NULL;
 	}
 }
 
@@ -174,6 +221,10 @@ void _linphone_proxy_config_destroy(LinphoneProxyConfig *cfg){
 	if (cfg->saved_identity!=NULL) linphone_address_destroy(cfg->saved_identity);
 	if (cfg->sent_headers!=NULL) sal_custom_header_free(cfg->sent_headers);
 	if (cfg->pending_contact) linphone_address_unref(cfg->pending_contact);
+	if (cfg->refkey) ms_free(cfg->refkey);
+	if (cfg->nat_policy != NULL) {
+		linphone_nat_policy_unref(cfg->nat_policy);
+	}
 	_linphone_proxy_config_release_ops(cfg);
 }
 
@@ -228,8 +279,8 @@ int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *cfg, const char *
 
 int linphone_proxy_config_set_identity_address(LinphoneProxyConfig *cfg, const LinphoneAddress *addr){
 	if (!addr || linphone_address_get_username(addr)==NULL){
-		char* as_string = linphone_address_as_string(addr);
-		ms_warning("Invalid sip identity: %s", addr?as_string:"NULL");
+		char* as_string = addr ? linphone_address_as_string(addr) : ms_strdup("NULL");
+		ms_warning("Invalid sip identity: %s", as_string);
 		ms_free(as_string);
 		return -1;
 	}
@@ -249,7 +300,7 @@ int linphone_proxy_config_set_identity(LinphoneProxyConfig *cfg, const char *ide
 	if (identity!=NULL && strlen(identity)>0){
 		LinphoneAddress *addr=linphone_address_new(identity);
 		int ret=linphone_proxy_config_set_identity_address(cfg, addr);
-		linphone_address_destroy(addr);
+		if (addr) linphone_address_destroy(addr);
 		return ret;
 	}
 	return -1;
@@ -259,11 +310,6 @@ const char *linphone_proxy_config_get_domain(const LinphoneProxyConfig *cfg){
 	return cfg->identity_address ? linphone_address_get_domain(cfg->identity_address) : NULL;
 }
 
-/**
- * Sets a SIP route.
- * When a route is set, all outgoing calls will go to the route's destination if this proxy
- * is the default one (see linphone_core_set_default_proxy() ).
-**/
 int linphone_proxy_config_set_route(LinphoneProxyConfig *cfg, const char *route)
 {
 	if (cfg->reg_route!=NULL){
@@ -280,13 +326,15 @@ int linphone_proxy_config_set_route(LinphoneProxyConfig *cfg, const char *route)
 		addr=sal_address_new(tmp);
 		if (addr!=NULL){
 			sal_address_destroy(addr);
+			cfg->reg_route=tmp;
+			return 0;
 		}else{
 			ms_free(tmp);
-			tmp=NULL;
+			return -1;
 		}
-		cfg->reg_route=tmp;
+	} else {
+		return 0;
 	}
-	return 0;
 }
 
 bool_t linphone_proxy_config_check(LinphoneCore *lc, LinphoneProxyConfig *cfg){
@@ -306,11 +354,13 @@ bool_t linphone_proxy_config_check(LinphoneCore *lc, LinphoneProxyConfig *cfg){
 }
 
 void linphone_proxy_config_enableregister(LinphoneProxyConfig *cfg, bool_t val){
+	if (val != cfg->reg_sendregister) cfg->register_changed = TRUE;
 	cfg->reg_sendregister=val;
 }
 
 void linphone_proxy_config_set_expires(LinphoneProxyConfig *cfg, int val){
 	if (val<0) val=600;
+	if (val != cfg->expires) cfg->register_changed = TRUE;
 	cfg->expires=val;
 }
 
@@ -323,17 +373,14 @@ void linphone_proxy_config_pause_register(LinphoneProxyConfig *cfg){
 }
 
 void linphone_proxy_config_edit(LinphoneProxyConfig *cfg){
-	if (cfg->publish && cfg->publish_op){
-			/*unpublish*/
-			sal_publish_presence(cfg->publish_op,NULL,NULL,0,(SalPresenceModel *)NULL);
-			sal_op_release(cfg->publish_op);
-			cfg->publish_op=NULL;
-	}
 	/*store current config related to server location*/
 	linphone_proxy_config_store_server_config(cfg);
+	linphone_proxy_config_compute_publish_params_hash(cfg);
 
-	/*stop refresher in any case*/
-	linphone_proxy_config_pause_register(cfg);
+	if (cfg->publish && cfg->long_term_event){
+		linphone_event_pause_publish(cfg->long_term_event);
+	}
+	/*Don't stop refresher*/
 }
 
 void linphone_proxy_config_apply(LinphoneProxyConfig *cfg,LinphoneCore *lc){
@@ -354,9 +401,10 @@ void linphone_proxy_config_stop_refreshing(LinphoneProxyConfig * cfg){
 		cfg->pending_contact=contact_addr;
 
 	}
-	if (cfg->publish_op){
-		sal_op_release(cfg->publish_op);
-		cfg->publish_op=NULL;
+	if (cfg->long_term_event){ /*might probably do better*/
+		linphone_event_terminate(cfg->long_term_event);
+		linphone_event_unref(cfg->long_term_event);
+		cfg->long_term_event=NULL;
 	}
 	if (cfg->op){
 		sal_op_release(cfg->op);
@@ -520,302 +568,9 @@ const char *linphone_proxy_config_get_quality_reporting_collector(const Linphone
 }
 
 
-/*
- * http://en.wikipedia.org/wiki/Telephone_numbering_plan
- * http://en.wikipedia.org/wiki/Telephone_numbers_in_Europe
- */
-typedef struct dial_plan{
-	const char *country;
-	const char* iso_country_code; /* ISO 3166-1 alpha-2 code, ex: FR for France*/
-	char  ccc[8]; /*country calling code*/
-	int nnl; /*maximum national number length*/
-	const char * icp; /*international call prefix, ex: 00 in europe*/
-
-}dial_plan_t;
-
-static dial_plan_t const dial_plans[]={
-	//Country					, iso country code, e164 country calling code, number length, international usual prefix
-	{"Afghanistan"                  ,"AF"		, "93"      , 9		, "00"  },
-	{"Albania"                      ,"AL"		, "355"     , 9		, "00"  },
-	{"Algeria"                      ,"DZ"		, "213"     , 9		, "00"  },
-	{"American Samoa"               ,"AS"		, "1"       , 10	, "011"	},
-	{"Andorra"                      ,"AD"		, "376"     , 6		, "00"  },
-	{"Angola"                       ,"AO"		, "244"     , 9		, "00"  },
-	{"Anguilla"                     ,"AI"		, "1"       , 10	, "011" },
-	{"Antigua and Barbuda"          ,"AG"		, "1"       , 10	, "011"	},
-	{"Argentina"                    ,"AR"		, "54"      , 10	, "00"  },
-	{"Armenia"                      ,"AM"		, "374"     , 8		, "00"  },
-	{"Aruba"                        ,"AW"		, "297"     , 7		, "011"	},
-	{"Australia"                    ,"AU"		, "61"      , 9	    , "0011"},
-	{"Austria"                      ,"AT"		, "43"      , 10	, "00"  },
-	{"Azerbaijan"                   ,"AZ"       , "994"     , 9		, "00"  },
-	{"Bahamas"                      ,"BS"		, "1"       , 10    , "011"	},
-	{"Bahrain"                      ,"BH"		, "973"     , 8     , "00"  },
-	{"Bangladesh"                   ,"BD"		, "880"     , 10    , "00"  },
-	{"Barbados"                     ,"BB"		, "1"       , 10    , "011"	},
-	{"Belarus"                      ,"BY"		, "375"     , 9     , "00"  },
-	{"Belgium"                      ,"BE"		, "32"      , 9     , "00"  },
-	{"Belize"                       ,"BZ"		, "501"     , 7     , "00"  },
-	{"Benin"                        ,"BJ"		, "229"     , 8     , "00"	},
-	{"Bermuda"                      ,"BM"		, "1"       , 10    , "011" },
-	{"Bhutan"                       ,"BT"		, "975"     , 8     , "00"  },
-	{"Bolivia"                      ,"BO"		, "591"     , 8     , "00"	},
-	{"Bosnia and Herzegovina"       ,"BA"		, "387"     , 8     , "00"  },
-	{"Botswana"                     ,"BW"		, "267"     , 8     , "00"  },
-	{"Brazil"                       ,"BR"		, "55"      , 10	, "00"  },
-	{"Brunei Darussalam"            ,"BN"		, "673"     , 7		, "00"	},
-	{"Bulgaria"                     ,"BG"		, "359"     , 9		, "00"  },
-	{"Burkina Faso"                 ,"BF"		, "226"     , 8		, "00"  },
-	{"Burundi"                      ,"BI"		, "257"     , 8     , "011" },
-	{"Cambodia"                     ,"KH"		, "855"     , 9		, "00"  },
-	{"Cameroon"                     ,"CM"		, "237"     , 8		, "00"  },
-	{"Canada"                       ,"CA"		, "1"       , 10	, "011" },
-	{"Cape Verde"                   ,"CV"		, "238"     , 7		, "00"	},
-	{"Cayman Islands"               ,"KY"		, "1"       , 10	, "011" },
-	{"Central African Republic"     ,"CF"		, "236"     , 8     , "00"  },
-	{"Chad"                         ,"TD"		, "235"     , 8		, "00"	},
-	{"Chile"                        ,"CL"		, "56"      , 9	    , "00"  },
-	{"China"                        ,"CN"		, "86"      , 11	, "00"  },
-	{"Colombia"                     ,"CO"       , "57"      , 10	, "00"  },
-	{"Comoros"                      ,"KM"		, "269"     , 7     , "00"	},
-	{"Congo"                        ,"CG"		, "242"     , 9		, "00"	},
-	{"Congo Democratic Republic"	,"CD"		, "243"     , 9		, "00"  },
-	{"Cook Islands"                 ,"CK"		, "682"     , 5		, "00"  },
-	{"Costa Rica"                   ,"CR"		, "506"     , 8     , "00"	},
-	{"Cote d'Ivoire"	            ,"AD"		, "225"     , 8     , "00"  },
-	{"Croatia"                      ,"HR"		, "385"     , 9		, "00"  },
-	{"Cuba"                         ,"CU"		, "53"      , 8     , "119" },
-	{"Cyprus"                       ,"CY"		, "357"     , 8     , "00"	},
-	{"Czech Republic"               ,"CZ"		, "420"     , 9     , "00"  },
-	{"Denmark"                      ,"DK"		, "45"      , 8		, "00"  },
-	{"Djibouti"                     ,"DJ"		, "253"     , 8		, "00"	},
-	{"Dominica"                     ,"DM"		, "1"       , 10	, "011" },
-	{"Dominican Republic"	        ,"DO"		, "1"       , 10	, "011" },
-	{"Ecuador"                      ,"EC"       , "593"     , 9		, "00"  },
-	{"Egypt"                        ,"EG"		, "20"      , 10	, "00"	},
-	{"El Salvador"                  ,"SV"		, "503"     , 8		, "00"	},
-	{"Equatorial Guinea"            ,"GQ"		, "240"     , 9		, "00"  },
-	{"Eritrea"                      ,"ER"		, "291"     , 7		, "00"  },
-	{"Estonia"                      ,"EE"		, "372"     , 8     , "00"	},
-	{"Ethiopia"                     ,"ET"		, "251"     , 9     , "00"  },
-	{"Falkland Islands"	            ,"FK"		, "500"     , 5		, "00"  },
-	{"Faroe Islands"	            ,"FO"		, "298"     , 6     , "00"  },
-	{"Fiji"                         ,"FJ"		, "679"     , 7     , "00"	},
-	{"Finland"                      ,"FI"		, "358"     , 9     , "00"  },
-	{"France"                       ,"FR"		, "33"      , 9		, "00"	},
-	{"French Guiana"				,"GF"		, "594"     , 9		, "00"	},
-	{"French Polynesia"             ,"PF"		, "689"     , 6	    , "00"  },
-	{"Gabon"                        ,"GA"		, "241"     , 8     , "00"  },
-	{"Gambia"                       ,"GM"       , "220"     , 7		, "00"  },
-	{"Georgia"                      ,"GE"		, "995"     , 9     , "00"	},
-	{"Germany"                      ,"DE"		, "49"      , 11	, "00"	},
-	{"Ghana"                        ,"GH"		, "233"     , 9		, "00"  },
-	{"Gibraltar"                    ,"GI"		, "350"     , 8		, "00"  },
-	{"Greece"                       ,"GR"		, "30"      ,10     , "00"	},
-	{"Greenland"                    ,"GL"		, "299"     , 6		, "00"  },
-	{"Grenada"                      ,"GD"		, "1"       , 10	, "011" },
-	{"Guadeloupe"                   ,"GP"		, "590"     , 9     , "00"  },
-	{"Guam"                         ,"GU"		, "1"       , 10	, "011"	},
-	{"Guatemala"                    ,"GT"		, "502"     , 8     , "00"  },
-	{"Guinea"                       ,"GN"		, "224"     , 8		, "00"  },
-	{"Guinea-Bissau"				,"GW"		, "245"     , 7		, "00"	},
-	{"Guyana"                       ,"GY"		, "592"     , 7	    , "001" },
-	{"Haiti"                        ,"HT"		, "509"     , 8     , "00"  },
-	{"Honduras"                     ,"HN"       , "504"     , 8		, "00"  },
-	{"Hong Kong"                    ,"HK"		, "852"     , 8     , "001"	},
-	{"Hungary"                      ,"HU"		, "36"      , 9     , "00"  },
-	{"Iceland"                      ,"IS"		, "354"     , 9     , "00"  },
-	{"India"                        ,"IN"		, "91"      , 10    , "00"  },
-	{"Indonesia"                    ,"ID"		, "62"      , 10	, "001"	},
-	{"Iran"                         ,"IR"		, "98"      , 10	, "00"	},
-	{"Iraq"                         ,"IQ"		, "964"     , 10	, "00"  },
-	{"Ireland"                      ,"IE"		, "353"     , 9		, "00"  },
-	{"Israel"                       ,"IL"		, "972"     , 9     , "00"	},
-	{"Italy"                        ,"IT"		, "39"      , 10	, "00"  },
-/*	{"Jersey"                       ,"JE"		, "44"      , 10	, "00"	},*/
-	{"Jamaica"                      ,"JM"		, "1"       , 10	, "011" },
-	{"Japan"                        ,"JP"		, "81"      , 10	, "010" },
-	{"Jordan"                       ,"JO"		, "962"     , 9     , "00"	},
-	{"Kazakhstan"                   ,"KZ"		, "7"       , 10    , "00"  },
-	{"Kenya"                        ,"KE"		, "254"     , 9		, "000" },
-	{"Kiribati"                     ,"KI"		, "686"     , 5		, "00"	},
-	{"Korea, North"                 ,"KP"		, "850"     , 12	, "99"  },
-	{"Korea, South"                 ,"KR"       , "82"      , 12	, "001" },
-	{"Kuwait"                       ,"KW"		, "965"     , 8     , "00"	},
-	{"Kyrgyzstan"                   ,"KG"		, "996"     , 9     , "00"  },
-	{"Laos"                         ,"LA"		, "856"     , 10    , "00"  },
-	{"Latvia"                       ,"LV"		, "371"     , 8     , "00"	},
-	{"Lebanon"                      ,"LB"		, "961"     , 7     , "00"	},
-	{"Lesotho"                      ,"LS"		, "266"     , 8		, "00"	},
-	{"Liberia"                      ,"LR"		, "231"     , 8		, "00"  },
-	{"Libya"                        ,"LY"		, "218"     , 8		, "00"  },
-	{"Liechtenstein"                ,"LI"		, "423"     , 7     , "00"	},
-	{"Lithuania"                    ,"LT"		, "370"     , 8		, "00"  },
-	{"Luxembourg"                   ,"LU"		, "352"     , 9		, "00"  },
-	{"Macau"                        ,"MO"		, "853"     , 8     , "00"  },
-	{"Macedonia"                    ,"MK"		, "389"     , 8     , "00"	},
-	{"Madagascar"                   ,"MG"		, "261"     , 9     , "00"  },
-	{"Malawi"                       ,"MW"		, "265"     , 9		, "00"  },
-	{"Malaysia"                     ,"MY"		, "60"      , 9		, "00"	},
-	{"Maldives"                     ,"MV"		, "960"     , 7	    , "00"  },
-	{"Mali"                         ,"ML"		, "223"     , 8     , "00"  },
-	{"Malta"                        ,"MT"       , "356"     , 8		, "00"  },
-	{"Marshall Islands"				,"MH"		, "692"     , 7     , "011"	},
-	{"Martinique"                   ,"MQ"		, "596"     , 9     , "00"  },
-	{"Mauritania"                   ,"MR"		, "222"     , 8     , "00"  },
-	{"Mauritius"                    ,"MU"		, "230"     , 7     , "00"	},
-	{"Mayotte Island"               ,"YT"		, "262"     , 9     , "00"	},
-	{"Mexico"                       ,"MX"		, "52"      , 10	, "00"	},
-	{"Micronesia"                   ,"FM"		, "691"     , 7		, "011" },
-	{"Moldova"                      ,"MD"		, "373"     , 8		, "00"  },
-	{"Monaco"                       ,"MC"		, "377"     , 8     , "00"	},
-	{"Mongolia"                     ,"MN"		, "976"     , 8     , "001" },
-	{"Montenegro"                   ,"ME"		, "382"     , 8		, "00"  },
-	{"Montserrat"                   ,"MS"		, "664"     , 10	, "011" },
-	{"Morocco"                      ,"MA"		, "212"     , 9     , "00"	},
-	{"Mozambique"                   ,"MZ"		, "258"     , 9     , "00"  },
-	{"Myanmar"                      ,"MM"		, "95"      , 8		, "00"  },
-	{"Namibia"                      ,"NA"		, "264"     , 9		, "00"	},
-	{"Nauru"                        ,"NR"		, "674"     , 7	    , "00"  },
-	{"Nepal"                        ,"NP"		, "43"      , 10	, "00"  },
-	{"Netherlands"                  ,"NL"       , "31"      , 9		, "00"  },
-	{"New Caledonia"				,"NC"		, "687"     , 6     , "00"	},
-	{"New Zealand"                  ,"NZ"		, "64"      , 10	, "00"  },
-	{"Nicaragua"                    ,"NI"		, "505"     , 8     , "00"  },
-	{"Niger"                        ,"NE"		, "227"     , 8     , "00"	},
-	{"Nigeria"                      ,"NG"		, "234"     , 10	, "009"	},
-	{"Niue"                         ,"NU"		, "683"     , 4		, "00"	},
-	{"Norfolk Island"	            ,"NF"		, "672"     , 5		, "00"  },
-	{"Northern Mariana Islands"	    ,"MP"		, "1"       , 10	, "011" },
-	{"Norway"                       ,"NO"		, "47"      , 8     , "00"	},
-	{"Oman"                         ,"OM"		, "968"     , 8		, "00"  },
-	{"Pakistan"                     ,"PK"		, "92"      , 10	, "00"  },
-	{"Palau"                        ,"PW"		, "680"     , 7     , "011" },
-	{"Palestine"                    ,"PS"		, "970"     , 9     , "00"	},
-	{"Panama"                       ,"PA"		, "507"     , 8     , "00"  },
-	{"Papua New Guinea"	            ,"PG"		, "675"     , 8		, "00"  },
-	{"Paraguay"                     ,"PY"		, "595"     , 9		, "00"	},
-	{"Peru"                         ,"PE"		, "51"      , 9	    , "00"  },
-	{"Philippines"                  ,"PH"		, "63"      , 10	, "00"  },
-	{"Poland"                       ,"PL"       , "48"      , 9		, "00"  },
-	{"Portugal"                     ,"PT"		, "351"     , 9     , "00"	},
-	{"Puerto Rico"                  ,"PR"		, "1"       , 10	, "011" },
-	{"Qatar"                        ,"QA"		, "974"     , 8     , "00"  },
-	{"R�union Island"				,"RE"		, "262"     , 9     , "011"	},
-	{"Romania"                      ,"RO"		, "40"      , 9     , "00"	},
-	{"Russian Federation"           ,"RU"		, "7"       , 10	, "8"	},
-	{"Rwanda"                       ,"RW"		, "250"     , 9		, "00"  },
-	{"Saint Helena"                 ,"SH"		, "290"     , 4		, "00"  },
-	{"Saint Kitts and Nevis"		,"KN"		, "1"       , 10	, "011"	},
-	{"Saint Lucia"                  ,"LC"		, "1"       , 10	, "011" },
-	{"Saint Pierre and Miquelon"    ,"PM"		, "508"     , 6		, "00"  },
-	{"Saint Vincent and the Grenadines","VC"	, "1"       , 10	, "011" },
-	{"Samoa"                        ,"WS"		, "685"     , 7     , "0"	},
-	{"San Marino"                   ,"SM"		, "378"     , 10	, "00"  },
-	{"Sao Tome and Principe"        ,"ST"		, "239"     , 7		, "00"  },
-	{"Saudi Arabia"                 ,"SA"		, "966"     , 9		, "00"	},
-	{"Senegal"                      ,"SN"		, "221"     , 9	    , "00"  },
-	{"Serbia"                       ,"RS"		, "381"     , 9     , "00"  },
-	{"Seychelles"                   ,"SC"       , "248"     , 7		, "00"  },
-	{"Sierra Leone"                 ,"SL"		, "232"     , 8     , "00"	},
-	{"Singapore"                    ,"SG"		, "65"      , 8     , "001" },
-	{"Slovakia"                     ,"SK"		, "421"     , 9     , "00"  },
-	{"Slovenia"                     ,"SI"		, "386"     , 8     , "00"	},
-	{"Solomon Islands"              ,"SB"		, "677"     , 7     , "00"	},
-	{"Somalia"                      ,"SO"		, "252"     , 8		, "00"	},
-	{"South Africa"                 ,"ZA"		, "27"      , 9		, "00"  },
-	{"Spain"                        ,"ES"		, "34"      , 9		, "00"  },
-	{"Sri Lanka"                    ,"LK"		, "94"      , 9     , "00"	},
-	{"Sudan"                        ,"SD"		, "249"     , 9		, "00"  },
-	{"Suriname"                     ,"SR"		, "597"     , 7		, "00"  },
-	{"Swaziland"                    ,"SZ"		, "268"     , 8     , "00"  },
-	{"Sweden"                       ,"SE"		, "1"       , 9     , "00"	},
-	{"Switzerland"                  ,"XK"		, "41"      , 9		, "00"	},
-	{"Syria"                        ,"SY"		, "963"     , 9		, "00"  },
-	{"Taiwan"                       ,"TW"		, "886"     , 9		, "810"	},
-	{"Tajikistan"                   ,"TJ"		, "992"     , 9	    , "002" },
-	{"Tanzania"                     ,"TZ"		, "255"     , 9     , "000" },
-	{"Thailand"                     ,"TH"       , "66"      , 9		, "001" },
-	{"Togo"                         ,"TG"		, "228"     , 8     , "00"	},
-	{"Tokelau"                      ,"TK"		, "690"     , 4     , "00"  },
-	{"Tonga"                        ,"TO"		, "676"     , 5     , "00"  },
-	{"Trinidad and Tobago"			,"TT"		, "1"       , 10    , "011"	},
-	{"Tunisia"                      ,"TN"		, "216"     , 8     , "00"	},
-	{"Turkey"                       ,"TR"		, "90"      , 10	, "00"	},
-	{"Turkmenistan"                 ,"TM"		, "993"     , 8		, "00"  },
-	{"Turks and Caicos Islands"	    ,"TC"		, "1"       , 7		, "0"   },
-	{"Tuvalu"                       ,"TV"		, "688"     , 5     , "00"	},
-	{"Uganda"                       ,"UG"		, "256"     , 9     , "000" },
-	{"Ukraine"                      ,"UA"		, "380"     , 9		, "00"  },
-	{"United Arab Emirates"	        ,"AE"		, "971"     , 9     , "00"  },
-	{"United Kingdom"               ,"GB"		, "44"      , 10	, "00"	},
-/*	{"United Kingdom"               ,"UK"		, "44"      , 10	, "00"	},*/
-	{"United States"                ,"US"		, "1"       , 10	, "011" },
-	{"Uruguay"                      ,"UY"		, "598"     , 8		, "00"  },
-	{"Uzbekistan"                   ,"UZ"		, "998"     , 9		, "8"	},
-	{"Vanuatu"                      ,"VU"		, "678"     , 7	    , "00"  },
-	{"Venezuela"                    ,"VE"		, "58"      , 10	, "00"  },
-	{"Vietnam"                      ,"VN"		, "84"      , 9     , "00"  },
-	{"Wallis and Futuna"	        ,"WF"		, "681"     , 5		, "00"  },
-	{"Yemen"                        ,"YE"		, "967"     , 9     , "00"  },
-	{"Zambia"                       ,"ZM"		, "260"     , 9     , "00"	},
-	{"Zimbabwe"                     ,"ZW"		, "263"     , 9     , "00"  },
-	{NULL                           ,NULL       ,  ""       , 0     , NULL	}
-};
-static dial_plan_t most_common_dialplan={ "generic" ,"", "", 10, "00"};
-
-int linphone_dial_plan_lookup_ccc_from_e164(const char* e164) {
-	dial_plan_t* dial_plan;
-	dial_plan_t* elected_dial_plan=NULL;
-	unsigned int found;
-	unsigned int i=0;
-	if (e164[1]=='1') {
-		/*USA case*/
-		return 1;
-	}
-	do {
-		found=0;
-		i++;
-		for (dial_plan=(dial_plan_t*)dial_plans; dial_plan->country!=NULL; dial_plan++) {
-			if (strncmp(dial_plan->ccc,&e164[1],i) == 0) {
-				elected_dial_plan=dial_plan;
-				found++;
-			}
-		}
-	} while ((found>1 || found==0) && i < sizeof(dial_plan->ccc));
-	if (found==1) {
-		return atoi(elected_dial_plan->ccc);
-	} else {
-		return -1; /*not found */
-	}
-
-}
-int linphone_dial_plan_lookup_ccc_from_iso(const char* iso) {
-	dial_plan_t* dial_plan;
-	for (dial_plan=(dial_plan_t*)dial_plans; dial_plan->country!=NULL; dial_plan++) {
-		if (strcmp(iso, dial_plan->iso_country_code)==0) {
-			return atoi(dial_plan->ccc);
-		}
-	}
-	return -1;
-}
-
-static bool_t lookup_dial_plan_by_ccc(const char *ccc, dial_plan_t *plan){
-	int i;
-	for(i=0;dial_plans[i].country!=NULL;++i){
-		if (strcmp(ccc,dial_plans[i].ccc)==0){
-			*plan=dial_plans[i];
-			return TRUE;
-		}
-	}
-	/*else return a generic "most common" dial plan*/
-	*plan=most_common_dialplan;
-	strcpy(plan->ccc,ccc);
-	return FALSE;
-}
-
 bool_t linphone_proxy_config_is_phone_number(LinphoneProxyConfig *proxy, const char *username){
 	const char *p;
+	if (!username) return FALSE;
 	for(p=username;*p!='\0';++p){
 		if (isdigit(*p) ||
 			*p==' ' ||
@@ -839,8 +594,19 @@ static char *flatten_number(const char *number){
 	char *result=ms_malloc0(strlen(number)+1);
 	char *w=result;
 	const char *r;
+	bool_t removing_trunk_prefix = FALSE;
 	for(r=number;*r!='\0';++r){
-		if (*r=='+' || isdigit(*r)){
+		if (result[0] == '+') {
+			/*e164 case*/
+			if (*r=='(') {
+				/*start removing trunk prefix as we are in form +33 (0) 6 222222*/
+				removing_trunk_prefix=TRUE;
+			} else if (*r==')') {
+				/*stop removing trunk prefix*/
+				removing_trunk_prefix=FALSE;
+			}
+		}
+		if (removing_trunk_prefix == FALSE && (*r=='+' || isdigit(*r))){
 			*w++=*r;
 		}
 	}
@@ -848,135 +614,65 @@ static char *flatten_number(const char *number){
 	return result;
 }
 
-static void replace_plus_with_icp(const char *src, char *dest, size_t destlen, const char *icp){
-	int i=0;
-
-	if (icp && src[0]=='+' && (destlen>(i=strlen(icp))) ){
-		src++;
-		strncpy(dest, icp, destlen);
-	}
-
-	for(;(i<destlen-1) && *src!='\0';++i){
-		dest[i]=*src;
-		src++;
-	}
-	dest[i]='\0';
-}
-
-static void replace_icp_with_plus(const char *src, char *dest, size_t destlen, const char *icp){
-	int i=0;
-	if (strstr(src, icp) == src){
-		dest[0]='+';
-		i++;
-	}
-	strncpy(dest+i, src+strlen(icp), destlen-i-1);
-}
-
-static char* replace_plus_with_icp_new(char *phone, const char* icp){
+static char* replace_plus_with_icp(char *phone, const char* icp){
 	return (icp && phone[0]=='+') ? ms_strdup_printf("%s%s", icp, phone+1) : ms_strdup(phone);
 }
 
-static char* replace_icp_with_plus_new(char *phone, const char *icp){
+static char* replace_icp_with_plus(char *phone, const char *icp){
 	return (strstr(phone, icp) == phone) ?  ms_strdup_printf("+%s", phone+strlen(icp)) : ms_strdup(phone);
 }
 
 bool_t linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char *username, char *result, size_t result_len){
-	bool_t ret;
-	LinphoneProxyConfig *tmpproxy = proxy ? proxy : linphone_proxy_config_new();
+	char * normalized_phone = linphone_proxy_config_normalize_phone_number(proxy, username);
+	const char * output = normalized_phone ? normalized_phone : username;
 	memset(result, 0, result_len);
-	if (linphone_proxy_config_is_phone_number(tmpproxy, username)){
-		dial_plan_t dialplan = {0};
-		char *flatten=flatten_number(username);
-		ms_debug("Flattened number is '%s'",flatten);
-
-		/*username does not contain a dial prefix nor the tmpproxy, nothing else to do*/
-		if (tmpproxy->dial_prefix==NULL || tmpproxy->dial_prefix[0]=='\0'){
-			strncpy(result,flatten,result_len-1);
-		} else {
-			lookup_dial_plan_by_ccc(tmpproxy->dial_prefix,&dialplan);
-			ms_debug("Using dial plan '%s'",dialplan.country);
-			/* the number has international prefix or +, so nothing to do*/
-			if (flatten[0]=='+'){
-				ms_debug("Prefix already present.");
-				/*eventually replace the plus by the international calling prefix of the country*/
-				if (tmpproxy->dial_escape_plus) {
-					replace_plus_with_icp(flatten,result,result_len,dialplan.icp);
-				}else{
-					strncpy(result, flatten, result_len-1);
-				}
-			}else if (strstr(flatten,dialplan.icp)==flatten){
-				if (tmpproxy->dial_escape_plus){
-					strncpy(result, flatten, result_len-1);
-				}else{
-					replace_icp_with_plus(flatten, result, result_len, dialplan.icp);
-				}
-			}else{
-				int numlen;
-				int i=0;
-				int skip;
-				numlen=strlen(flatten);
-				/*keep at most national number significant digits */
-				skip=numlen-dialplan.nnl;
-				if (skip<0) skip=0;
-				/*first prepend international calling prefix or +*/
-				if (tmpproxy->dial_escape_plus){
-					strncpy(result,dialplan.icp,result_len);
-					i+=strlen(dialplan.icp);
-				}else{
-					strncpy(result,"+",result_len);
-					i+=1;
-				}
-				/*add prefix*/
-				if (result_len-i>strlen(dialplan.ccc)){
-					strcpy(result+i,dialplan.ccc);
-					i+=strlen(dialplan.ccc);
-				}
-				/*add user digits */
-				strncpy(result+i,flatten+skip,result_len-i-1);
-			}
-		}
-		ms_free(flatten);
-		ret = TRUE;
-	} else {
-		strncpy(result,username,result_len-1);
-		ret = FALSE;
-	}
-	if (proxy==NULL) ms_free(tmpproxy);
-	return ret;
+	memcpy(result, output, MIN(strlen(output) + 1, result_len));
+	ms_free(normalized_phone);
+	return output != username;
 }
 
 char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, const char *username) {
 	LinphoneProxyConfig *tmpproxy = proxy ? proxy : linphone_proxy_config_new();
 	char* result = NULL;
 	if (linphone_proxy_config_is_phone_number(tmpproxy, username)){
-		dial_plan_t dialplan = {0};
+		LinphoneDialPlan dialplan = *linphone_dial_plan_by_ccc(tmpproxy->dial_prefix); //copy dial plan;
 		char * flatten=flatten_number(username);
-		ms_debug("Flattened number is '%s'",flatten);
+		ms_debug("Flattened number is '%s' for '%s'",flatten, username);
 
+		if (tmpproxy->dial_prefix){
+			if (strcmp(tmpproxy->dial_prefix,dialplan.ccc) != 0){
+				//probably generic dialplan, preserving proxy dial prefix
+				strncpy(dialplan.ccc,tmpproxy->dial_prefix,sizeof(dialplan.ccc));
+			}
+		}
 		/*if proxy has a dial prefix, modify phonenumber accordingly*/
 		if (tmpproxy->dial_prefix!=NULL && tmpproxy->dial_prefix[0]!='\0'){
-			lookup_dial_plan_by_ccc(tmpproxy->dial_prefix,&dialplan);
 			ms_debug("Using dial plan '%s'",dialplan.country);
 			/* the number already starts with + or international prefix*/
 			if (flatten[0]=='+'||strstr(flatten,dialplan.icp)==flatten){
 				ms_debug("Prefix already present.");
 				if (tmpproxy->dial_escape_plus) {
-					result = replace_plus_with_icp_new(flatten,dialplan.icp);
+					result = replace_plus_with_icp(flatten,dialplan.icp);
 				} else {
-					result = replace_icp_with_plus_new(flatten,dialplan.icp);
+					result = replace_icp_with_plus(flatten,dialplan.icp);
 				}
 			}else{
 				/*0. keep at most national number significant digits */
-				char* flatten_start = flatten + MAX(0, strlen(flatten) - dialplan.nnl);
+				char* flatten_start = flatten + MAX(0, (int)strlen(flatten) - (int)dialplan.nnl);
+				ms_debug("Prefix not present. Keeping at most %d digits: %s", dialplan.nnl, flatten_start);
+
 				/*1. First prepend international calling prefix or +*/
 				/*2. Second add prefix*/
 				/*3. Finally add user digits */
-
 				result = ms_strdup_printf("%s%s%s"
 											, tmpproxy->dial_escape_plus ? dialplan.icp : "+"
 											, dialplan.ccc
 											, flatten_start);
+				ms_debug("Prepended prefix resulted in %s", result);
 			}
+		}else if (tmpproxy->dial_escape_plus){
+			/* user did not provide dial prefix, so we'll take the most generic one */
+			result = replace_plus_with_icp(flatten,dialplan.icp);
 		}
 		if (result==NULL) {
 			result = flatten;
@@ -984,7 +680,7 @@ char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, c
 			ms_free(flatten);
 		}
 	}
-	if (proxy==NULL) ms_free(tmpproxy);
+	if (proxy==NULL) linphone_proxy_config_destroy(tmpproxy);
 	return result;
 }
 
@@ -1042,11 +738,8 @@ LinphoneAddress* linphone_proxy_config_normalize_sip_uri(LinphoneProxyConfig *pr
 			if (uri==NULL){
 				return NULL;
 			} else {
-				char normalized_username[128];
 				linphone_address_set_display_name(uri,NULL);
-				linphone_proxy_config_normalize_number(proxy,username,normalized_username,
-										sizeof(normalized_username));
-				linphone_address_set_username(uri,normalized_username);
+				linphone_address_set_username(uri,username);
 				return _linphone_core_destroy_addr_if_not_sip(uri);
 			}
 		} else {
@@ -1071,7 +764,7 @@ int linphone_proxy_config_done(LinphoneProxyConfig *cfg)
 	if (!linphone_proxy_config_check(cfg->lc,cfg))
 		return -1;
 
-	/*check if server address as changed*/
+	/*check if server address has changed*/
 	res = linphone_proxy_config_is_server_config_changed(cfg);
 	if (res != LinphoneProxyConfigAddressEqual) {
 		/* server config has changed, need to unregister from previous first*/
@@ -1083,8 +776,41 @@ int linphone_proxy_config_done(LinphoneProxyConfig *cfg)
 			sal_op_unref(cfg->op); /*but we keep refresher to handle authentication if needed*/
 			cfg->op=NULL;
 		}
+		if (cfg->long_term_event) {
+			if (res == LinphoneProxyConfigAddressDifferent) {
+				_linphone_proxy_config_unpublish(cfg);
+			}
+		}
+		cfg->commit = TRUE;
 	}
-	cfg->commit=TRUE;
+	if (cfg->register_changed){
+		cfg->commit = TRUE;
+		cfg->register_changed = FALSE;
+	}
+	if (cfg->commit){
+		linphone_proxy_config_pause_register(cfg);
+	}
+	
+	if (linphone_proxy_config_compute_publish_params_hash(cfg)) {
+		ms_message("Publish params have changed on proxy config [%p]",cfg);
+		if (cfg->long_term_event) {
+			if (cfg->publish) {
+				const char * sip_etag = linphone_event_get_custom_header(cfg->long_term_event, "SIP-ETag");
+				if (sip_etag) {
+					if (cfg->sip_etag) ms_free(cfg->sip_etag);
+					cfg->sip_etag = ms_strdup(sip_etag);
+				}
+			}
+			/*publish is terminated*/
+			linphone_event_terminate(cfg->long_term_event);
+			linphone_event_unref(cfg->long_term_event);
+			cfg->long_term_event = NULL;
+		}
+		if (cfg->publish) cfg->send_publish=TRUE;
+	} else {
+		ms_message("Publish params have not changed on proxy config [%p]",cfg);
+	}
+	
 	linphone_proxy_config_write_all_to_config_file(cfg->lc);
 	return 0;
 }
@@ -1105,26 +831,55 @@ int linphone_proxy_config_send_publish(LinphoneProxyConfig *proxy, LinphonePrese
 	int err=0;
 
 	if (proxy->state==LinphoneRegistrationOk || proxy->state==LinphoneRegistrationCleared){
-		if (proxy->publish_op==NULL){
-			const LinphoneAddress *to=linphone_proxy_config_get_identity_address(proxy);
-			proxy->publish_op=sal_op_new(proxy->lc->sal);
-
-			linphone_configure_op(proxy->lc, proxy->publish_op,
-				to, NULL, FALSE);
-
-			if (lp_config_get_int(proxy->lc->config,"sip","publish_msg_with_contact",0)){
-				sal_op_set_contact_address(proxy->publish_op,linphone_proxy_config_get_identity_address(proxy));
-			}
+		LinphoneContent *content;
+		char *presence_body;
+		if (proxy->long_term_event==NULL){
+			proxy->long_term_event = linphone_core_create_publish(proxy->lc
+										 , linphone_proxy_config_get_identity_address(proxy)
+										 , "presence"
+										 , linphone_proxy_config_get_publish_expires(proxy));
+			linphone_event_ref(proxy->long_term_event);
 		}
-		err=sal_publish_presence(proxy->publish_op
-									,NULL
-									,NULL
-									,linphone_proxy_config_get_publish_expires(proxy)
-									,(SalPresenceModel *)presence);
+		proxy->long_term_event->internal = TRUE;
+
+		if (linphone_presence_model_get_presentity(presence) == NULL) {
+			ms_message("No presentity set for model [%p], using identity from proxy config [%p]", presence, proxy);
+			linphone_presence_model_set_presentity(presence,linphone_proxy_config_get_identity_address(proxy));
+		}
+
+		if (!(presence_body = linphone_presence_model_to_xml(presence))) {
+			ms_error("Cannot publish presence model [%p] for proxy config [%p] because of xml serilization error",presence,proxy);
+			return -1;
+		}
+
+		content = linphone_content_new();
+		linphone_content_set_buffer(content,presence_body,strlen(presence_body));
+		linphone_content_set_type(content, "application");
+		linphone_content_set_subtype(content,"pidf+xml");
+		if (proxy->sip_etag) {
+			linphone_event_add_custom_header(proxy->long_term_event, "SIP-If-Match", proxy->sip_etag);
+			ms_free(proxy->sip_etag);
+			proxy->sip_etag=NULL;
+		}
+		err = linphone_event_send_publish(proxy->long_term_event, content);
+		linphone_content_unref(content);
+		ms_free(presence_body);
 	}else proxy->send_publish=TRUE; /*otherwise do not send publish if registration is in progress, this will be done later*/
 	return err;
 }
 
+void _linphone_proxy_config_unpublish(LinphoneProxyConfig *obj) {
+	if (obj->long_term_event
+		&& (linphone_event_get_publish_state(obj->long_term_event) == LinphonePublishOk ||
+					(linphone_event_get_publish_state(obj->long_term_event)  == LinphonePublishProgress && obj->publish_expires != 0))) {
+		linphone_event_unpublish(obj->long_term_event);
+	}
+	if (obj->sip_etag) {
+		ms_free(obj->sip_etag);
+		obj->sip_etag=NULL;
+	}
+}
+
 const char *linphone_proxy_config_get_route(const LinphoneProxyConfig *cfg){
 	return cfg->reg_route;
 }
@@ -1164,6 +919,7 @@ void linphone_proxy_config_set_contact_parameters(LinphoneProxyConfig *cfg, cons
 	if (contact_params){
 		cfg->contact_params=ms_strdup(contact_params);
 	}
+	cfg->register_changed = TRUE;
 }
 
 void linphone_proxy_config_set_contact_uri_parameters(LinphoneProxyConfig *cfg, const char *contact_uri_params){
@@ -1174,6 +930,7 @@ void linphone_proxy_config_set_contact_uri_parameters(LinphoneProxyConfig *cfg,
 	if (contact_uri_params){
 		cfg->contact_uri_params=ms_strdup(contact_uri_params);
 	}
+	cfg->register_changed = TRUE;
 }
 
 const char *linphone_proxy_config_get_contact_parameters(const LinphoneProxyConfig *cfg){
@@ -1197,30 +954,31 @@ const char *linphone_proxy_config_get_custom_header(LinphoneProxyConfig *cfg, co
 
 void linphone_proxy_config_set_custom_header(LinphoneProxyConfig *cfg, const char *header_name, const char *header_value){
 	cfg->sent_headers=sal_custom_header_append(cfg->sent_headers, header_name, header_value);
+	cfg->register_changed = TRUE;
 }
 
 int linphone_core_add_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *cfg){
 	if (!linphone_proxy_config_check(lc,cfg)) {
 		return -1;
 	}
-	if (ms_list_find(lc->sip_conf.proxies,cfg)!=NULL){
+	if (bctbx_list_find(lc->sip_conf.proxies,cfg)!=NULL){
 		ms_warning("ProxyConfig already entered, ignored.");
 		return 0;
 	}
-	lc->sip_conf.proxies=ms_list_append(lc->sip_conf.proxies,(void *)linphone_proxy_config_ref(cfg));
+	lc->sip_conf.proxies=bctbx_list_append(lc->sip_conf.proxies,(void *)linphone_proxy_config_ref(cfg));
 	linphone_proxy_config_apply(cfg,lc);
 	return 0;
 }
 
 void linphone_core_remove_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *cfg){
 	/* check this proxy config is in the list before doing more*/
-	if (ms_list_find(lc->sip_conf.proxies,cfg)==NULL){
+	if (bctbx_list_find(lc->sip_conf.proxies,cfg)==NULL){
 		ms_error("linphone_core_remove_proxy_config: LinphoneProxyConfig [%p] is not known by LinphoneCore (programming error?)",cfg);
 		return;
 	}
-	lc->sip_conf.proxies=ms_list_remove(lc->sip_conf.proxies,cfg);
+	lc->sip_conf.proxies=bctbx_list_remove(lc->sip_conf.proxies,cfg);
 	/* add to the list of destroyed proxies, so that the possible unREGISTER request can succeed authentication */
-	lc->sip_conf.deleted_proxies=ms_list_append(lc->sip_conf.deleted_proxies,cfg);
+	lc->sip_conf.deleted_proxies=bctbx_list_append(lc->sip_conf.deleted_proxies,cfg);
 
 	if (lc->default_proxy==cfg){
 		lc->default_proxy=NULL;
@@ -1233,24 +991,26 @@ void linphone_core_remove_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *cf
 		linphone_proxy_config_enable_register(cfg,FALSE);
 		linphone_proxy_config_done(cfg);
 		linphone_proxy_config_update(cfg);
+	} else if (cfg->state != LinphoneRegistrationNone) {
+		linphone_proxy_config_set_state(cfg, LinphoneRegistrationNone,"Registration disabled");
 	}
 	linphone_proxy_config_write_all_to_config_file(lc);
 }
 
 void linphone_core_clear_proxy_config(LinphoneCore *lc){
-	MSList* list=ms_list_copy(linphone_core_get_proxy_config_list((const LinphoneCore*)lc));
-	MSList* copy=list;
+	bctbx_list_t* list=bctbx_list_copy(linphone_core_get_proxy_config_list((const LinphoneCore*)lc));
+	bctbx_list_t* copy=list;
 	for(;list!=NULL;list=list->next){
 		linphone_core_remove_proxy_config(lc,(LinphoneProxyConfig *)list->data);
 	}
-	ms_list_free(copy);
+	bctbx_list_free(copy);
 	linphone_proxy_config_write_all_to_config_file(lc);
 }
 
-static int linphone_core_get_default_proxy_config_index(LinphoneCore *lc) {
+int linphone_core_get_default_proxy_config_index(LinphoneCore *lc) {
 	int pos = -1;
 	if (lc->default_proxy != NULL) {
-		pos = ms_list_position(lc->sip_conf.proxies, ms_list_find(lc->sip_conf.proxies, (void *)lc->default_proxy));
+		pos = bctbx_list_position(lc->sip_conf.proxies, bctbx_list_find(lc->sip_conf.proxies, (void *)lc->default_proxy));
 	}
 	return pos;
 }
@@ -1258,7 +1018,7 @@ static int linphone_core_get_default_proxy_config_index(LinphoneCore *lc) {
 void linphone_core_set_default_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *config){
 	/* check if this proxy is in our list */
 	if (config!=NULL){
-		if (ms_list_find(lc->sip_conf.proxies,config)==NULL){
+		if (bctbx_list_find(lc->sip_conf.proxies,config)==NULL){
 			ms_warning("Bad proxy address: it is not in the list !");
 			lc->default_proxy=NULL;
 			return ;
@@ -1271,7 +1031,7 @@ void linphone_core_set_default_proxy_config(LinphoneCore *lc, LinphoneProxyConfi
 
 void linphone_core_set_default_proxy_index(LinphoneCore *lc, int index){
 	if (index<0) linphone_core_set_default_proxy(lc,NULL);
-	else linphone_core_set_default_proxy(lc,ms_list_nth_data(lc->sip_conf.proxies,index));
+	else linphone_core_set_default_proxy(lc,bctbx_list_nth_data(lc->sip_conf.proxies,index));
 }
 
 int linphone_core_get_default_proxy(LinphoneCore *lc, LinphoneProxyConfig **config){
@@ -1283,7 +1043,7 @@ LinphoneProxyConfig * linphone_core_get_default_proxy_config(LinphoneCore *lc) {
 	return lc->default_proxy;
 }
 
-const MSList *linphone_core_get_proxy_config_list(const LinphoneCore *lc){
+const bctbx_list_t *linphone_core_get_proxy_config_list(const LinphoneCore *lc){
 	return lc->sip_conf.proxies;
 }
 
@@ -1330,6 +1090,13 @@ void linphone_proxy_config_write_to_config_file(LpConfig *config, LinphoneProxyC
 	lp_config_set_int(config,key,"dial_escape_plus",cfg->dial_escape_plus);
 	lp_config_set_string(config,key,"dial_prefix",cfg->dial_prefix);
 	lp_config_set_int(config,key,"privacy",cfg->privacy);
+	if (cfg->refkey) lp_config_set_string(config,key,"refkey",cfg->refkey);
+	lp_config_set_int(config, key, "publish_expires", cfg->publish_expires);
+
+	if (cfg->nat_policy != NULL) {
+		lp_config_set_string(config, key, "nat_policy_ref", cfg->nat_policy->ref);
+		linphone_nat_policy_save_to_config(cfg->nat_policy);
+	}
 }
 
 
@@ -1352,6 +1119,7 @@ LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LinphoneCore* lc
 	LinphoneProxyConfig *cfg;
 	char key[50];
 	LpConfig *config=lc->config;
+	const char *nat_policy_ref;
 
 	sprintf(key,"proxy_%i",index);
 
@@ -1386,6 +1154,15 @@ LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LinphoneCore* lc
 	if (tmp!=NULL && strlen(tmp)>0)
 		linphone_proxy_config_set_sip_setup(cfg,tmp);
 	CONFIGURE_INT_VALUE(cfg,config,key,privacy,"privacy")
+
+	CONFIGURE_STRING_VALUE(cfg,config,key,ref_key,"refkey")
+	CONFIGURE_INT_VALUE(cfg,config,key,publish_expires,"publish_expires")
+
+	nat_policy_ref = lp_config_get_string(config, key, "nat_policy_ref", NULL);
+	if (nat_policy_ref != NULL) {
+		cfg->nat_policy = linphone_core_create_nat_policy_from_config(lc, nat_policy_ref);
+	}
+
 	return cfg;
 }
 
@@ -1442,7 +1219,7 @@ static bool_t can_register(LinphoneProxyConfig *cfg){
 	}
 #endif //BUILD_UPNP
 	if (lc->sip_conf.register_only_when_network_is_up){
-		return lc->network_reachable;
+		return lc->sip_network_reachable;
 	}
 	return TRUE;
 }
@@ -1456,7 +1233,6 @@ void linphone_proxy_config_update(LinphoneProxyConfig *cfg){
 		if (can_register(cfg)){
 			linphone_proxy_config_register(cfg);
 			cfg->commit=FALSE;
-			if (cfg->publish) cfg->send_publish=TRUE;
 		}
 	}
 	if (cfg->send_publish && (cfg->state==LinphoneRegistrationOk || cfg->state==LinphoneRegistrationCleared)){
@@ -1489,7 +1265,6 @@ void * linphone_proxy_config_get_user_data(const LinphoneProxyConfig *cfg) {
 
 void linphone_proxy_config_set_state(LinphoneProxyConfig *cfg, LinphoneRegistrationState state, const char *message){
 	LinphoneCore *lc=cfg->lc;
-	bool_t update_friends=FALSE;
 
 	if (state==LinphoneRegistrationProgress) {
 		char *msg=ortp_strdup_printf(_("Refreshing on %s..."), linphone_proxy_config_get_identity(cfg));
@@ -1499,21 +1274,26 @@ void linphone_proxy_config_set_state(LinphoneProxyConfig *cfg, LinphoneRegistrat
 	}
 
 	if (cfg->state!=state || state==LinphoneRegistrationOk) { /*allow multiple notification of LinphoneRegistrationOk for refreshing*/
-		ms_message("Proxy config [%p] for identity [%s] moving from state [%s] to [%s]"	, cfg,
-								linphone_proxy_config_get_identity(cfg),
-								linphone_registration_state_to_string(cfg->state),
-								linphone_registration_state_to_string(state));
-		if (linphone_core_should_subscribe_friends_only_when_registered(lc)){
-			update_friends=(state==LinphoneRegistrationOk && cfg->state!=LinphoneRegistrationOk)
-				|| (state!=LinphoneRegistrationOk && cfg->state==LinphoneRegistrationOk);
+		ms_message("Proxy config [%p] for identity [%s] moving from state [%s] to [%s] on core [%p]"	,
+					cfg,
+					linphone_proxy_config_get_identity(cfg),
+					linphone_registration_state_to_string(cfg->state),
+					linphone_registration_state_to_string(state),
+					cfg->lc);
+		if (linphone_core_should_subscribe_friends_only_when_registered(lc) && cfg->state!=state && state == LinphoneRegistrationOk){
+			ms_message("Updating friends for identity [%s] on core [%p]",linphone_proxy_config_get_identity(cfg),cfg->lc);
+			/* state must be updated before calling linphone_core_update_friends_subscriptions*/
+			cfg->state=state;
+			linphone_core_update_friends_subscriptions(lc);
+		} else {
+			/*at this point state must be updated*/
+			cfg->state=state;
 		}
-		cfg->state=state;
 
-		if (update_friends){
-			linphone_core_update_friends_subscriptions(lc,cfg,TRUE);
-		}
-		if (lc)
+		if (lc){
 			linphone_core_notify_registration_state_changed(lc,cfg,state,message);
+			linphone_core_repair_calls(lc);
+		}
 	} else {
 		/*state already reported*/
 	}
@@ -1570,9 +1350,11 @@ const char* linphone_proxy_config_get_transport(const LinphoneProxyConfig *cfg)
 		return NULL;
 	}
 
-	if ((route_addr || (route_addr=sal_address_new(addr))) && sal_address_get_transport(route_addr)) {
+	if (route_addr || (route_addr=sal_address_new(addr))) {
 		ret=sal_transport_to_string(sal_address_get_transport(route_addr));
-		if (!linphone_proxy_config_get_service_route(cfg)) sal_address_destroy(route_addr); /*destroy except for service route*/
+		if (!linphone_proxy_config_get_service_route(cfg)) {
+			sal_address_destroy(route_addr);
+		}
 	}
 
 	return ret;
@@ -1625,3 +1407,31 @@ uint8_t linphone_proxy_config_get_avpf_rr_interval(const LinphoneProxyConfig *cf
 const LinphoneAddress* linphone_proxy_config_get_contact(const LinphoneProxyConfig *cfg) {
 	return sal_op_get_contact_address(cfg->op);
 }
+
+const struct _LinphoneAuthInfo* linphone_proxy_config_find_auth_info(const LinphoneProxyConfig *cfg) {
+	const char* username = cfg->identity_address ? linphone_address_get_username(cfg->identity_address) : NULL;
+	const char* domain =  cfg->identity_address ? linphone_address_get_domain(cfg->identity_address) : NULL;
+	return _linphone_core_find_auth_info(cfg->lc, cfg->realm, username, domain, TRUE);
+}
+
+const char * linphone_proxy_config_get_ref_key(const LinphoneProxyConfig *cfg) {
+	return cfg->refkey;
+}
+
+void linphone_proxy_config_set_ref_key(LinphoneProxyConfig *cfg, const char *refkey) {
+	if (cfg->refkey!=NULL){
+		ms_free(cfg->refkey);
+		cfg->refkey=NULL;
+	}
+	if (refkey) cfg->refkey=ms_strdup(refkey);
+}
+
+LinphoneNatPolicy * linphone_proxy_config_get_nat_policy(const LinphoneProxyConfig *cfg) {
+	return cfg->nat_policy;
+}
+
+void linphone_proxy_config_set_nat_policy(LinphoneProxyConfig *cfg, LinphoneNatPolicy *policy) {
+	if (policy != NULL) policy = linphone_nat_policy_ref(policy); /* Prevent object destruction if the same policy is used */
+	if (cfg->nat_policy != NULL) linphone_nat_policy_unref(cfg->nat_policy);
+	cfg->nat_policy = policy;
+}
diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index 88269a0d9..ecf301ca7 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -44,7 +44,7 @@ static char * float_to_one_decimal_string(float f) {
 	float rounded_f = floorf(f * 10 + .5f) / 10;
 
 	int floor_part = (int) rounded_f;
-	int one_decimal_part = floorf (10 * (rounded_f - floor_part) + .5f);
+	int one_decimal_part = (int)floorf(10 * (rounded_f - floor_part) + .5f);
 
 	return ms_strdup_printf("%d.%d", floor_part, one_decimal_part);
 }
@@ -65,7 +65,7 @@ static void append_to_buffer_valist(char **buff, size_t *buff_size, size_t *offs
 	/*if we are out of memory, we add some size to buffer*/
 	if (ret == BELLE_SIP_BUFFER_OVERFLOW) {
 		/*some compilers complain that size_t cannot be formatted as unsigned long, hence forcing cast*/
-		ms_warning("QualityReporting: Buffer was too small to contain the whole report - increasing its size from %lu to %lu",
+		ms_debug("QualityReporting: Buffer was too small to contain the whole report - increasing its size from %lu to %lu",
 			(unsigned long)*buff_size, (unsigned long)*buff_size + 2048);
 		*buff_size += 2048;
 		*buff = (char *) ms_realloc(*buff, *buff_size);
@@ -160,6 +160,9 @@ static bool_t media_report_enabled(LinphoneCall * call, int stats_type){
 	if (stats_type == LINPHONE_CALL_STATS_VIDEO && !linphone_call_params_video_enabled(linphone_call_get_current_params(call)))
 		return FALSE;
 
+	if (stats_type == LINPHONE_CALL_STATS_TEXT && !linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(call)))
+		return FALSE;
+
 	return (call->log->reporting.reports[stats_type] != NULL);
 }
 
@@ -260,20 +263,18 @@ static void append_metrics_to_buffer(char ** buffer, size_t * size, size_t * off
 }
 
 static int send_report(LinphoneCall* call, reporting_session_report_t * report, const char * report_event) {
-	LinphoneContent *content = linphone_content_new();
-	int expires = -1;
+	LinphoneContent *content;
 	size_t offset = 0;
 	size_t size = 2048;
 	char * buffer;
 	int ret = 0;
 	LinphoneEvent *lev;
 	LinphoneAddress *request_uri;
-	char * domain;
-	const char* route;
+	const char* collector_uri;
 
 	/*if we are on a low bandwidth network, do not send reports to not overload it*/
 	if (linphone_call_params_low_bandwidth_enabled(linphone_call_get_current_params(call))){
-		ms_warning("QualityReporting[%p]: Avoid sending reports on low bandwidth network", call);
+		ms_message("QualityReporting[%p]: Avoid sending reports on low bandwidth network", call);
 		ret = 1;
 		goto end;
 	}
@@ -282,7 +283,7 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 	in that case, we abort the report since it's not useful data*/
 	if (report->info.local_addr.ip == NULL || strlen(report->info.local_addr.ip) == 0
 		|| report->info.remote_addr.ip == NULL || strlen(report->info.remote_addr.ip) == 0) {
-		ms_warning("QualityReporting[%p]: Trying to submit a %s too early (call duration: %d sec) but %s IP could "
+		ms_message("QualityReporting[%p]: Trying to submit a %s too early (call duration: %d sec) but %s IP could "
 			"not be retrieved so dropping this report"
 			, call
 			, report_event
@@ -293,6 +294,7 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 	}
 
 	buffer = (char *) belle_sip_malloc(size);
+	content = linphone_content_new();
 	linphone_content_set_type(content, "application");
 	linphone_content_set_subtype(content, "vq-rtcpxr");
 
@@ -343,26 +345,30 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 	linphone_content_set_buffer(content, buffer, strlen(buffer));
 	ms_free(buffer);
 
-	if (call->log->reporting.on_report_sent != NULL){
-		call->log->reporting.on_report_sent(
-			call,
-			(report==call->log->reporting.reports[0])?LINPHONE_CALL_STATS_AUDIO:LINPHONE_CALL_STATS_VIDEO,
-			content);
+	if (call->log->reporting.on_report_sent != NULL) {
+		SalStreamType type = report == call->log->reporting.reports[0] ? LINPHONE_CALL_STATS_AUDIO : report == call->log->reporting.reports[1] ? LINPHONE_CALL_STATS_VIDEO : LINPHONE_CALL_STATS_TEXT;
+		call->log->reporting.on_report_sent(call, type, content);
 	}
 
 
-	route = linphone_proxy_config_get_quality_reporting_collector(call->dest_proxy);
-	domain = ms_strdup_printf("sip:%s", linphone_proxy_config_get_domain(call->dest_proxy));
-	request_uri = linphone_address_new(route ? route : domain);
-	ms_free(domain);
-	lev=linphone_core_create_publish(call->core, request_uri, "vq-rtcpxr", expires);
-	if (route) {
-		ms_message("Publishing report with custom route %s", route);
-		sal_op_set_route(lev->op, route);
+	collector_uri = linphone_proxy_config_get_quality_reporting_collector(call->dest_proxy);
+	if (!collector_uri){
+		collector_uri = ms_strdup_printf("sip:%s", linphone_proxy_config_get_domain(call->dest_proxy));
+	}
+	request_uri = linphone_address_new(collector_uri);
+	lev = linphone_core_create_one_shot_publish(call->core, request_uri, "vq-rtcpxr");
+	/* Special exception for quality report PUBLISH: if the collector_uri has any transport related parameters
+	 * (port, transport, maddr), then it is sent directly.
+	 * Otherwise it is routed as any LinphoneEvent publish, following proxy config policy.
+	 **/
+	if (sal_address_has_uri_param((SalAddress*)request_uri, "transport") || 
+		sal_address_has_uri_param((SalAddress*)request_uri, "maddr") ||
+		linphone_address_get_port(request_uri) != 0) {
+		ms_message("Publishing report with custom route %s", collector_uri);
+		sal_op_set_route(lev->op, collector_uri);
 	}
 
 	if (linphone_event_send_publish(lev, content) != 0){
-		linphone_event_unref(lev);
 		lev=NULL;
 		ret=4;
 	} else {
@@ -390,8 +396,8 @@ static int send_report(LinphoneCall* call, reporting_session_report_t * report,
 static const SalStreamDescription * get_media_stream_for_desc(const SalMediaDescription * smd, SalStreamType sal_stream_type) {
 	int count;
 	if (smd != NULL) {
-		for (count = 0; count < smd->nb_streams; ++count) {
-			if (smd->streams[count].type == sal_stream_type) {
+		for (count = 0; count < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++count) {
+			if (sal_stream_description_active(&smd->streams[count]) && smd->streams[count].type == sal_stream_type) {
 				return &smd->streams[count];
 			}
 		}
@@ -400,7 +406,7 @@ static const SalStreamDescription * get_media_stream_for_desc(const SalMediaDesc
 }
 
 static void update_ip(LinphoneCall * call, int stats_type) {
-	SalStreamType sal_stream_type = (stats_type == LINPHONE_CALL_STATS_AUDIO) ? SalAudio : SalVideo;
+	SalStreamType sal_stream_type = stats_type == LINPHONE_CALL_STATS_AUDIO ? SalAudio : stats_type == LINPHONE_CALL_STATS_VIDEO ? SalVideo : SalText;
 	const SalStreamDescription * local_desc = get_media_stream_for_desc(call->localdesc, sal_stream_type);
 	const SalStreamDescription * remote_desc = get_media_stream_for_desc(sal_call_get_remote_media_description(call->op), sal_stream_type);
 
@@ -432,20 +438,20 @@ static void qos_analyzer_on_action_suggested(void *user_data, int datac, const c
 	char * appendbuf;
 	int i;
 	int ptime = -1;
-	int bitrate[2] = {-1, -1};
-	int up_bw[2] = {-1, -1};
-	int down_bw[2] = {-1, -1};
-	MediaStream *streams[2] = {(MediaStream*) call->audiostream, (MediaStream *) call->videostream};
-	for (i=0;i<2;i++){
-		if (streams[i]!=NULL){
-			if (streams[i]->encoder!=NULL){
+	int bitrate[3] = {-1, -1, -1};
+	int up_bw[3] = {-1, -1, -1};
+	int down_bw[3] = {-1, -1, -1};
+	MediaStream *streams[3] = { (MediaStream*) call->audiostream, (MediaStream *) call->videostream, (MediaStream *) call->textstream };
+	for (i = 0; i < 3; i++){
+		if (streams[i] != NULL){
+			if (streams[i]->encoder != NULL){
 				if (ms_filter_has_method(streams[i]->encoder,MS_FILTER_GET_BITRATE)){
 					ms_filter_call_method(streams[i]->encoder,MS_FILTER_GET_BITRATE,&bitrate[i]);
-					bitrate[i] /= 1000.f;
+					bitrate[i] /= 1000;
 				}
 			}
-			up_bw[i] = media_stream_get_up_bw(streams[i])/1000.f;
-			down_bw[i] = media_stream_get_down_bw(streams[i])/1000.f;
+			up_bw[i] = (int)(media_stream_get_up_bw(streams[i])/1000.f);
+			down_bw[i] = (int)(media_stream_get_down_bw(streams[i])/1000.f);
 		}
 	}
 	if (call->audiostream!=NULL){
@@ -459,9 +465,9 @@ static void qos_analyzer_on_action_suggested(void *user_data, int datac, const c
 	appendbuf=ms_strdup_printf("%s%d;", report->qos_analyzer.timestamp?report->qos_analyzer.timestamp:"", ms_time(0));
 	STR_REASSIGN(report->qos_analyzer.timestamp,appendbuf);
 
-	STR_REASSIGN(report->qos_analyzer.input_leg, ms_strdup_printf("%s aenc_ptime aenc_br a_dbw a_ubw venc_br v_dbw v_ubw", datav[0]));
-	appendbuf=ms_strdup_printf("%s%s %d %d %d %d %d %d %d;", report->qos_analyzer.input?report->qos_analyzer.input:"", datav[1],
-		ptime, bitrate[0], down_bw[0], up_bw[0], bitrate[1], down_bw[1], up_bw[1] );
+	STR_REASSIGN(report->qos_analyzer.input_leg, ms_strdup_printf("%s aenc_ptime aenc_br a_dbw a_ubw venc_br v_dbw v_ubw tenc_br t_dbw t_ubw", datav[0]));
+	appendbuf=ms_strdup_printf("%s%s %d %d %d %d %d %d %d %d %d %d;", report->qos_analyzer.input?report->qos_analyzer.input:"", datav[1],
+		ptime, bitrate[0], down_bw[0], up_bw[0], bitrate[1], down_bw[1], up_bw[1], bitrate[2], down_bw[2], up_bw[2]);
 	STR_REASSIGN(report->qos_analyzer.input,appendbuf);
 	STR_REASSIGN(report->qos_analyzer.output_leg, ms_strdup(datav[2]));
 	appendbuf=ms_strdup_printf("%s%s;", report->qos_analyzer.output?report->qos_analyzer.output:"", datav[3]);
@@ -471,6 +477,7 @@ static void qos_analyzer_on_action_suggested(void *user_data, int datac, const c
 void linphone_reporting_update_ip(LinphoneCall * call) {
 	update_ip(call, LINPHONE_CALL_STATS_AUDIO);
 	update_ip(call, LINPHONE_CALL_STATS_VIDEO);
+	update_ip(call, LINPHONE_CALL_STATS_TEXT);
 }
 
 void linphone_reporting_update_media_info(LinphoneCall * call, int stats_type) {
@@ -495,15 +502,15 @@ void linphone_reporting_update_media_info(LinphoneCall * call, int stats_type) {
 	// RFC states: "LocalGroupID provides the identification for the purposes
 	// of aggregation for the local endpoint.".
 	STR_REASSIGN(report->info.local_addr.group, ms_strdup_printf("%s-%s-%s"
-		, dialog_id
+		, dialog_id ? dialog_id : ""
 		, "local"
-		, report->local_metrics.user_agent
+		, report->local_metrics.user_agent ? report->local_metrics.user_agent : ""
 		)
 	);
 	STR_REASSIGN(report->info.remote_addr.group, ms_strdup_printf("%s-%s-%s"
-		, dialog_id
+		, dialog_id ? dialog_id : ""
 		, "remote"
-		, report->remote_metrics.user_agent
+		, report->remote_metrics.user_agent ? report->remote_metrics.user_agent : ""
 		)
 	);
 
@@ -536,6 +543,10 @@ void linphone_reporting_update_media_info(LinphoneCall * call, int stats_type) {
 		stream = &call->videostream->ms;
 		local_payload = linphone_call_params_get_used_video_codec(current_params);
 		remote_payload = local_payload;
+	} else if (stats_type == LINPHONE_CALL_STATS_TEXT && call->textstream != NULL) {
+		stream = &call->textstream->ms;
+		local_payload = linphone_call_params_get_used_text_codec(current_params);
+		remote_payload = local_payload;
 	}
 
 	if (stream != NULL) {
@@ -552,7 +563,7 @@ void linphone_reporting_update_media_info(LinphoneCall * call, int stats_type) {
 		}
 	}
 
-	STR_REASSIGN(report->dialog_id, ms_strdup_printf("%s;%u", dialog_id, report->info.local_addr.ssrc));
+	STR_REASSIGN(report->dialog_id, ms_strdup_printf("%s;%u", dialog_id ? dialog_id : "", report->info.local_addr.ssrc));
 
 	if (local_payload != NULL) {
 		report->local_metrics.session_description.payload_type = local_payload->type;
@@ -627,14 +638,14 @@ void linphone_reporting_on_rtcp_update(LinphoneCall *call, SalStreamType stats_t
 
 			if (rtt > 1e-6){
 				metrics->rtcp_sr_count++;
-				metrics->delay.round_trip_delay += 1000*rtt;
+				metrics->delay.round_trip_delay += (int)(1000*rtt);
 			}
 		}
 	}while(rtcp_next_packet(block));
 
 	/* check if we should send an interval report - use a random sending time to
 	dispatch reports and avoid sending them too close from each other */
-	if (report_interval>0 && ms_time(NULL)-report->last_report_date>reporting_rand(report_interval)){
+	if ((report_interval > 0) && ((float)(ms_time(NULL) - report->last_report_date) > reporting_rand((float)report_interval))) {
 		linphone_reporting_update_media_info(call, stats_type);
 		send_report(call, report, "VQIntervalReport");
 	}
@@ -643,11 +654,12 @@ void linphone_reporting_on_rtcp_update(LinphoneCall *call, SalStreamType stats_t
 static int publish_report(LinphoneCall *call, const char *event_type){
 	int ret = 0;
 	int i;
-	for (i = 0; i < 2; i++){
-		if (media_report_enabled(call, i)){
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++){
+		int stream_index = i == call->main_audio_stream_index ? LINPHONE_CALL_STATS_AUDIO : call->main_video_stream_index ? LINPHONE_CALL_STATS_VIDEO : LINPHONE_CALL_STATS_TEXT;
+		if (media_report_enabled(call, stream_index)) {
 			int sndret;
-			linphone_reporting_update_media_info(call, i);
-			sndret=send_report(call, call->log->reporting.reports[i], event_type);
+			linphone_reporting_update_media_info(call, stream_index);
+			sndret=send_report(call, call->log->reporting.reports[stream_index], event_type);
 			if (sndret>0){
 				ret += 10+(i+1)*sndret;
 			}
@@ -688,12 +700,13 @@ void linphone_reporting_call_state_updated(LinphoneCall *call){
 	switch (state){
 		case LinphoneCallStreamsRunning:{
 			int i = 0;
-			MediaStream *streams[2] = {(MediaStream*) call->audiostream, (MediaStream *) call->videostream};
-			for (i=0;i<2;i++) {
-				bool_t enabled=media_report_enabled(call, i);
-				if (enabled && set_on_action_suggested_cb(streams[i], qos_analyzer_on_action_suggested, call->log->reporting.reports[i])) {
-					call->log->reporting.reports[i]->call=call;
-					STR_REASSIGN(call->log->reporting.reports[i]->qos_analyzer.name, ms_strdup(ms_qos_analyzer_get_name(ms_bitrate_controller_get_qos_analyzer(streams[i]->rc))));
+			MediaStream *streams[3] = { (MediaStream*) call->audiostream, (MediaStream *) call->videostream, (MediaStream *) call->textstream };
+			for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+				int stream_index = i == call->main_audio_stream_index ? LINPHONE_CALL_STATS_AUDIO : call->main_video_stream_index ? LINPHONE_CALL_STATS_VIDEO : LINPHONE_CALL_STATS_TEXT;
+				bool_t enabled = media_report_enabled(call, stream_index);
+				if (enabled && set_on_action_suggested_cb(streams[stream_index], qos_analyzer_on_action_suggested, call->log->reporting.reports[stream_index])) {
+					call->log->reporting.reports[stream_index]->call=call;
+					STR_REASSIGN(call->log->reporting.reports[stream_index]->qos_analyzer.name, ms_strdup(ms_qos_analyzer_get_name(ms_bitrate_controller_get_qos_analyzer(streams[stream_index]->rc))));
 				}
 			}
 			linphone_reporting_update_ip(call);
diff --git a/coreapi/quality_reporting.h b/coreapi/quality_reporting.h
index 921840cb8..a707a298b 100644
--- a/coreapi/quality_reporting.h
+++ b/coreapi/quality_reporting.h
@@ -144,7 +144,7 @@ typedef struct reporting_session_report {
 
 typedef void (*LinphoneQualityReportingReportSendCb)(const LinphoneCall *call, SalStreamType stream_type, const LinphoneContent *content);
 
-reporting_session_report_t * linphone_reporting_new();
+reporting_session_report_t * linphone_reporting_new(void);
 void linphone_reporting_destroy(reporting_session_report_t * report);
 
 /**
diff --git a/coreapi/remote_provisioning.c b/coreapi/remote_provisioning.c
index 4a3045ee0..717f8743c 100644
--- a/coreapi/remote_provisioning.c
+++ b/coreapi/remote_provisioning.c
@@ -108,11 +108,12 @@ int linphone_remote_provisioning_download_and_apply(LinphoneCore *lc, const char
 	if( scheme && (strcmp(scheme,"file") == 0) ){
 		// We allow for 'local remote-provisioning' in case the file is to be opened from the hard drive.
 		const char* file_path = remote_provisioning_uri + strlen("file://"); // skip scheme
+		if (uri) {
+			belle_sip_object_unref(uri);
+		}
 		return linphone_remote_provisioning_load_file(lc, file_path);
-
 	} else if( scheme && strncmp(scheme, "http", 4) == 0 && host && strlen(host) > 0) {
 		belle_http_request_listener_callbacks_t belle_request_listener={0};
-		belle_http_request_listener_t *listener;
 		belle_http_request_t *request;
 
 		belle_request_listener.process_response=belle_request_process_response_event;
@@ -120,18 +121,32 @@ int linphone_remote_provisioning_download_and_apply(LinphoneCore *lc, const char
 		belle_request_listener.process_io_error=belle_request_process_io_error;
 		belle_request_listener.process_timeout=belle_request_process_timeout;
 
-		listener = belle_http_request_listener_create_from_callbacks(&belle_request_listener, lc);
+		lc->provisioning_http_listener = belle_http_request_listener_create_from_callbacks(&belle_request_listener, lc);
 
 		request=belle_http_request_create("GET",uri, NULL);
-		return belle_http_provider_send_request(lc->http_provider, request, listener);
+
+		return belle_http_provider_send_request(lc->http_provider, request, lc->provisioning_http_listener);
 	} else {
 		ms_error("Invalid provisioning URI [%s] (missing scheme or host ?)",remote_provisioning_uri);
+		if (uri) {
+			belle_sip_object_unref(uri);
+		}
 		return -1;
 	}
 }
 
-void linphone_core_set_provisioning_uri(LinphoneCore *lc, const char *uri) {
-	lp_config_set_string(lc->config,"misc","config-uri",uri);
+int linphone_core_set_provisioning_uri(LinphoneCore *lc, const char *remote_provisioning_uri) {
+	belle_generic_uri_t *uri=remote_provisioning_uri?belle_generic_uri_parse(remote_provisioning_uri):NULL;
+	if (!remote_provisioning_uri||uri) {
+		lp_config_set_string(lc->config,"misc","config-uri",remote_provisioning_uri);
+		if (uri) {
+			belle_sip_object_unref(uri);
+		}
+		return 0;
+	}
+	ms_error("Invalid provisioning URI [%s] (could not be parsed)",remote_provisioning_uri);
+	return -1;
+
 }
 
 const char*linphone_core_get_provisioning_uri(const LinphoneCore *lc){
diff --git a/coreapi/ringtoneplayer.c b/coreapi/ringtoneplayer.c
new file mode 100644
index 000000000..c6921c6f1
--- /dev/null
+++ b/coreapi/ringtoneplayer.c
@@ -0,0 +1,113 @@
+/*
+linphone
+Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
+Copyright (C) 2010  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "private.h"
+#include <mediastreamer2/msfactory.h>
+
+int linphone_ringtoneplayer_start(MSFactory *factory, LinphoneRingtonePlayer* rp, MSSndCard* card, const char* ringtone, int loop_pause_ms) {
+	return linphone_ringtoneplayer_start_with_cb(factory, rp, card, ringtone, loop_pause_ms, NULL, NULL);
+}
+
+#ifdef __ios
+
+#include "ringtoneplayer_ios.h"
+
+LinphoneRingtonePlayer* linphone_ringtoneplayer_new() {
+	return linphone_ringtoneplayer_ios_new();
+}
+
+void linphone_ringtoneplayer_destroy(LinphoneRingtonePlayer* rp) {
+	linphone_ringtoneplayer_ios_destroy(rp);
+}
+
+int linphone_ringtoneplayer_start_with_cb(MSFactory* f, LinphoneRingtonePlayer* rp, MSSndCard* card, const char* ringtone, int loop_pause_ms, LinphoneRingtonePlayerFunc end_of_ringtone, void * user_data) {
+	if (linphone_ringtoneplayer_is_started(rp)) {
+		ms_message("the local ringtone is already started");
+		return 2;
+	}
+	if (ringtone){
+		return linphone_ringtoneplayer_ios_start_with_cb(rp, ringtone, loop_pause_ms, end_of_ringtone, user_data);
+	}
+	return 3;
+}
+
+bool_t linphone_ringtoneplayer_is_started(LinphoneRingtonePlayer* rp) {
+	return linphone_ringtoneplayer_ios_is_started(rp);
+}
+
+int linphone_ringtoneplayer_stop(LinphoneRingtonePlayer* rp) {
+	return linphone_ringtoneplayer_ios_stop(rp);
+}
+
+
+#else
+
+struct _LinphoneRingtonePlayer {
+	RingStream *ringstream;
+	LinphoneRingtonePlayerFunc end_of_ringtone;
+	void* end_of_ringtone_ud;
+};
+
+LinphoneRingtonePlayer* linphone_ringtoneplayer_new() {
+	LinphoneRingtonePlayer* rp = ms_new0(LinphoneRingtonePlayer, 1);
+	return rp;
+}
+
+void linphone_ringtoneplayer_destroy(LinphoneRingtonePlayer* rp) {
+	if (rp->ringstream) {
+		linphone_ringtoneplayer_stop(rp);
+	}
+	ms_free(rp);
+}
+
+static void notify_end_of_ringtone(void *ud, MSFilter *f, unsigned int event, void *arg){
+	LinphoneRingtonePlayer *rp=(LinphoneRingtonePlayer*)ud;
+	if (event==MS_PLAYER_EOF && rp->end_of_ringtone){
+		rp->end_of_ringtone(rp, rp->end_of_ringtone_ud, 0);
+	}
+}
+
+int linphone_ringtoneplayer_start_with_cb(MSFactory *factory, LinphoneRingtonePlayer* rp, MSSndCard* card, const char* ringtone, int loop_pause_ms, LinphoneRingtonePlayerFunc end_of_ringtone, void * user_data) {
+	if (linphone_ringtoneplayer_is_started(rp)) {
+		ms_message("the local ringtone is already started");
+		return 2;
+	}
+	if (card!=NULL && ringtone){
+		ms_message("Starting local ringtone...");
+		rp->end_of_ringtone = end_of_ringtone;
+		rp->end_of_ringtone_ud = user_data;
+		rp->ringstream=ring_start_with_cb(factory, ringtone,loop_pause_ms,card,notify_end_of_ringtone,rp);
+		return rp->ringstream != NULL ? 0 : 1;
+	}
+	return 3;
+}
+
+bool_t linphone_ringtoneplayer_is_started(LinphoneRingtonePlayer* rp) {
+	return (rp->ringstream!=NULL);
+}
+
+int linphone_ringtoneplayer_stop(LinphoneRingtonePlayer* rp) {
+	if (rp->ringstream) {
+		ring_stop(rp->ringstream);
+		rp->ringstream = NULL;
+	}
+	return 0;
+}
+#endif
diff --git a/coreapi/ringtoneplayer.h b/coreapi/ringtoneplayer.h
new file mode 100644
index 000000000..984a86427
--- /dev/null
+++ b/coreapi/ringtoneplayer.h
@@ -0,0 +1,44 @@
+/*
+linphone
+Copyright (C) 2000 - 2010 Simon MORLAT (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+#ifndef RINGPLAYER_H
+#define RINGPLAYER_H
+
+typedef void (*LinphoneRingtonePlayerFunc)(LinphoneRingtonePlayer* rp, void* user_data, int status);
+
+LINPHONE_PUBLIC LinphoneRingtonePlayer* linphone_ringtoneplayer_new(void);
+LINPHONE_PUBLIC void linphone_ringtoneplayer_destroy(LinphoneRingtonePlayer* rp);
+
+LINPHONE_PUBLIC int linphone_ringtoneplayer_start(MSFactory *factory, LinphoneRingtonePlayer* rp, MSSndCard* card, const char* ringtone, int loop_pause_ms);
+/**
+ * Start a ringtone player
+ * @param factory A MSFactory object
+ * @param rp LinphoneRingtonePlayer object
+ * @param card unused argument
+ * @param ringtone path to the ringtone to play
+ * @param loop_pause_ms pause interval in milliseconds to be observed between end of play and resuming at start. A value of -1 disables loop mode
+ * @param end_of_ringtone A callback function called when the ringtone ends
+ * @param user_data A user data passed to the callback function called when the ringtone ends
+ * @return 0 if the player successfully started, positive error code otherwise
+ */
+LINPHONE_PUBLIC int linphone_ringtoneplayer_start_with_cb(MSFactory *factory, LinphoneRingtonePlayer* rp, MSSndCard* card,
+														  const char* ringtone, int loop_pause_ms, LinphoneRingtonePlayerFunc end_of_ringtone, void * user_data);
+LINPHONE_PUBLIC bool_t linphone_ringtoneplayer_is_started(LinphoneRingtonePlayer* rp);
+LINPHONE_PUBLIC int linphone_ringtoneplayer_stop(LinphoneRingtonePlayer* rp);
+
+#endif
diff --git a/coreapi/ringtoneplayer_ios.h b/coreapi/ringtoneplayer_ios.h
new file mode 100644
index 000000000..27730d0ba
--- /dev/null
+++ b/coreapi/ringtoneplayer_ios.h
@@ -0,0 +1,27 @@
+/*
+linphone
+Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
+Copyright (C) 2010  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "linphonecore.h"
+
+LinphoneRingtonePlayer* linphone_ringtoneplayer_ios_new();
+void linphone_ringtoneplayer_ios_destroy(LinphoneRingtonePlayer* rp);
+int linphone_ringtoneplayer_ios_start_with_cb(LinphoneRingtonePlayer* rp, const char* ringtone, int loop_pause_ms, LinphoneRingtonePlayerFunc end_of_ringtone, void * user_data);
+bool_t linphone_ringtoneplayer_ios_is_started(LinphoneRingtonePlayer* rp);
+int linphone_ringtoneplayer_ios_stop(LinphoneRingtonePlayer* rp);
diff --git a/coreapi/ringtoneplayer_ios.m b/coreapi/ringtoneplayer_ios.m
new file mode 100644
index 000000000..61e73703b
--- /dev/null
+++ b/coreapi/ringtoneplayer_ios.m
@@ -0,0 +1,88 @@
+/*
+linphone
+Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
+Copyright (C) 2010  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "ringtoneplayer_ios.h"
+
+#import <AVFoundation/AVFoundation.h>
+
+@interface AudioPlayerDelegate : NSObject <AVAudioPlayerDelegate>
+@property (assign) LinphoneRingtonePlayer* ringtonePlayer;
+@end
+
+struct _LinphoneRingtonePlayer {
+	AVAudioPlayer* player;
+	AudioPlayerDelegate* playerDelegate;
+	LinphoneRingtonePlayerFunc end_of_ringtone;
+	void* end_of_ringtone_ud;
+};
+
+@implementation AudioPlayerDelegate
+- (void)audioPlayerDidFinishPlaying:(AVAudioPlayer *)player successfully:(BOOL)flag {
+	if (_ringtonePlayer->end_of_ringtone) {
+		_ringtonePlayer->end_of_ringtone(_ringtonePlayer, _ringtonePlayer->end_of_ringtone_ud, !flag);
+	}
+}
+- (void)audioPlayerDecodeErrorDidOccur:(AVAudioPlayer *)player error:(NSError *)error {
+	if (_ringtonePlayer->end_of_ringtone) {
+		_ringtonePlayer->end_of_ringtone(_ringtonePlayer, _ringtonePlayer->end_of_ringtone_ud, 1);
+	}
+}
+@end
+
+
+
+LinphoneRingtonePlayer* linphone_ringtoneplayer_ios_new() {
+	LinphoneRingtonePlayer* rp = ms_new0(LinphoneRingtonePlayer, 1);
+	rp->playerDelegate = [[AudioPlayerDelegate alloc] init];
+	rp->playerDelegate.ringtonePlayer = rp;
+	return rp;
+}
+
+void linphone_ringtoneplayer_ios_destroy(LinphoneRingtonePlayer* rp) {
+	linphone_ringtoneplayer_ios_stop(rp);
+	ms_free(rp);
+}
+
+int linphone_ringtoneplayer_ios_start_with_cb(LinphoneRingtonePlayer* rp, const char* ringtone, int loop_pause_ms, LinphoneRingtonePlayerFunc end_of_ringtone, void * user_data) {
+	NSURL* url = [NSURL URLWithString:[NSString stringWithUTF8String:ringtone]];
+	ms_message("%s: using ringtone %s", __FUNCTION__, ringtone);
+	if (rp->player) {
+		ms_warning("%s: a player is already instantiated, stopping it first.", __FUNCTION__);
+		linphone_ringtoneplayer_ios_stop(rp);
+	}
+	rp->player = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:nil];
+	[rp->player prepareToPlay];
+	rp->player.numberOfLoops = (loop_pause_ms >= 0) ? -1 : 0;
+	rp->player.delegate = rp->playerDelegate;
+	rp->end_of_ringtone = end_of_ringtone;
+	rp->end_of_ringtone_ud = user_data;
+	return [rp->player play] ? 0 : 1;
+}
+
+bool_t linphone_ringtoneplayer_ios_is_started(LinphoneRingtonePlayer* rp) {
+	return [rp->player isPlaying];
+}
+
+int linphone_ringtoneplayer_ios_stop(LinphoneRingtonePlayer* rp) {
+	[rp->player stop];
+	[rp->player release];
+	rp->player = nil;
+	return 0;
+}
diff --git a/coreapi/sal.c b/coreapi/sal.c
index 942f6d62a..133241be1 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -18,18 +18,31 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 /**
- This header files defines the Signaling Abstraction Layer.
- The purpose of this layer is too allow experiment different call signaling
- protocols and implementations under linphone, for example SIP, JINGLE...
+This file contains SAL API functions that do not depend on the underlying implementation (like belle-sip).
 **/
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include "sal/sal.h"
-#include "bellesip_sal/sal_impl.h"
+
 
 #include <ctype.h>
 
+
+const char *sal_multicast_role_to_string(SalMulticastRole role){
+	switch(role){
+		case SalMulticastInactive:
+			return "inactive";
+		case SalMulticastReceiver:
+			return "receiver";
+		case SalMulticastSender:
+			return "sender";
+		case SalMulticastSenderReceiver:
+			return "sender-receiver";
+	}
+	return "INVALID";
+}
+
 const char* sal_transport_to_string(SalTransport transport) {
 	switch (transport) {
 		case SalTransportUDP:return "udp";
@@ -55,18 +68,27 @@ SalTransport sal_transport_parse(const char* param) {
 
 SalMediaDescription *sal_media_description_new(){
 	SalMediaDescription *md=ms_new0(SalMediaDescription,1);
+	int i;
 	md->refcount=1;
+	for(i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+		md->streams[i].dir=SalStreamInactive;
+		md->streams[i].rtp_port = 0;
+		md->streams[i].rtcp_port = 0;
+		md->streams[i].haveZrtpHash = 0;
+	}
 	return md;
 }
 
 static void sal_media_description_destroy(SalMediaDescription *md){
 	int i;
 	for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;i++){
-		ms_list_free_with_data(md->streams[i].payloads,(void (*)(void *))payload_type_destroy);
-		ms_list_free_with_data(md->streams[i].already_assigned_payloads,(void (*)(void *))payload_type_destroy);
+		bctbx_list_free_with_data(md->streams[i].payloads,(void (*)(void *))payload_type_destroy);
+		bctbx_list_free_with_data(md->streams[i].already_assigned_payloads,(void (*)(void *))payload_type_destroy);
 		md->streams[i].payloads=NULL;
 		md->streams[i].already_assigned_payloads=NULL;
+		sal_custom_sdp_attribute_free(md->streams[i].custom_sdp_attributes);
 	}
+	sal_custom_sdp_attribute_free(md->custom_sdp_attributes);
 	ms_free(md);
 }
 
@@ -82,10 +104,9 @@ void sal_media_description_unref(SalMediaDescription *md){
 	}
 }
 
-SalStreamDescription *sal_media_description_find_stream(SalMediaDescription *md,
-	SalMediaProto proto, SalStreamType type){
+SalStreamDescription *sal_media_description_find_stream(SalMediaDescription *md, SalMediaProto proto, SalStreamType type){
 	int i;
-	for(i=0;i<md->nb_streams;++i){
+	for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
 		SalStreamDescription *ss=&md->streams[i];
 		if (!sal_stream_description_active(ss)) continue;
 		if (ss->proto==proto && ss->type==type) return ss;
@@ -96,7 +117,7 @@ SalStreamDescription *sal_media_description_find_stream(SalMediaDescription *md,
 unsigned int sal_media_description_nb_active_streams_of_type(SalMediaDescription *md, SalStreamType type) {
 	unsigned int i;
 	unsigned int nb = 0;
-	for (i = 0; i < md->nb_streams; ++i) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++i) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		if (md->streams[i].type == type) nb++;
 	}
@@ -105,7 +126,7 @@ unsigned int sal_media_description_nb_active_streams_of_type(SalMediaDescription
 
 SalStreamDescription * sal_media_description_get_active_stream_of_type(SalMediaDescription *md, SalStreamType type, unsigned int idx) {
 	unsigned int i;
-	for (i = 0; i < md->nb_streams; ++i) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++i) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		if (md->streams[i].type == type) {
 			if (idx-- == 0) return &md->streams[i];
@@ -137,7 +158,7 @@ bool_t sal_media_description_empty(const SalMediaDescription *md){
 
 void sal_media_description_set_dir(SalMediaDescription *md, SalStreamDir stream_dir){
 	int i;
-	for(i=0;i<md->nb_streams;++i){
+	for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
 		SalStreamDescription *ss=&md->streams[i];
 		if (!sal_stream_description_active(ss)) continue;
 		ss->dir=stream_dir;
@@ -147,7 +168,7 @@ void sal_media_description_set_dir(SalMediaDescription *md, SalStreamDir stream_
 int sal_media_description_get_nb_active_streams(const SalMediaDescription *md) {
 	int i;
 	int nb = 0;
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (sal_stream_description_active(&md->streams[i])) nb++;
 	}
 	return nb;
@@ -160,9 +181,9 @@ static bool_t is_null_address(const char *addr){
 /*check for the presence of at least one stream with requested direction */
 static bool_t has_dir(const SalMediaDescription *md, SalStreamDir stream_dir){
 	int i;
-	
+
 	/* we are looking for at least one stream with requested direction, inactive streams are ignored*/
-	for(i=0;i<md->nb_streams;++i){
+	for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
 		const SalStreamDescription *ss=&md->streams[i];
 		if (!sal_stream_description_active(ss)) continue;
 		if (ss->dir==stream_dir) {
@@ -196,32 +217,89 @@ bool_t sal_stream_description_active(const SalStreamDescription *sd) {
 	return (sd->rtp_port > 0);
 }
 
+/*these are switch case, so that when a new proto is added we can't forget to modify this function*/
 bool_t sal_stream_description_has_avpf(const SalStreamDescription *sd) {
-	return ((sd->proto == SalProtoRtpAvpf) || (sd->proto == SalProtoRtpSavpf) || (sd->proto == SalProtoUdpTlsRtpSavpf));
+	switch (sd->proto){
+		case SalProtoRtpAvpf:
+		case SalProtoRtpSavpf:
+		case SalProtoUdpTlsRtpSavpf:
+			return TRUE;
+		case SalProtoRtpAvp:
+		case SalProtoRtpSavp:
+		case SalProtoUdpTlsRtpSavp:
+		case SalProtoOther:
+			return FALSE;
+	}
+	return FALSE;
 }
 
+bool_t sal_stream_description_has_ipv6(const SalStreamDescription *sd){
+	return strchr(sd->rtp_addr,':') != NULL;
+}
+
+bool_t sal_stream_description_has_implicit_avpf(const SalStreamDescription *sd){
+	return sd->implicit_rtcp_fb;
+}
+/*these are switch case, so that when a new proto is added we can't forget to modify this function*/
 bool_t sal_stream_description_has_srtp(const SalStreamDescription *sd) {
-	return ((sd->proto == SalProtoRtpSavp) || (sd->proto == SalProtoRtpSavpf));
+	switch (sd->proto){
+		case SalProtoRtpSavp:
+		case SalProtoRtpSavpf:
+			return TRUE;
+		case SalProtoRtpAvp:
+		case SalProtoRtpAvpf:
+		case SalProtoUdpTlsRtpSavpf:
+		case SalProtoUdpTlsRtpSavp:
+		case SalProtoOther:
+			return FALSE;
+	}
+	return FALSE;
 }
 
 bool_t sal_stream_description_has_dtls(const SalStreamDescription *sd) {
-	return ((sd->proto == SalProtoUdpTlsRtpSavp) || (sd->proto == SalProtoUdpTlsRtpSavpf));
+	switch (sd->proto){
+		case SalProtoUdpTlsRtpSavpf:
+		case SalProtoUdpTlsRtpSavp:
+			return TRUE;
+		case SalProtoRtpSavp:
+		case SalProtoRtpSavpf:
+		case SalProtoRtpAvp:
+		case SalProtoRtpAvpf:
+		case SalProtoOther:
+			return FALSE;
+	}
+	return FALSE;
+}
+
+bool_t sal_stream_description_has_zrtp(const SalStreamDescription *sd) {
+	if (sd->haveZrtpHash==1) return TRUE;
+	return FALSE;
 }
 
 bool_t sal_media_description_has_avpf(const SalMediaDescription *md) {
 	int i;
 	if (md->nb_streams == 0) return FALSE;
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		if (sal_stream_description_has_avpf(&md->streams[i]) != TRUE) return FALSE;
 	}
 	return TRUE;
 }
 
+bool_t sal_media_description_has_implicit_avpf(const SalMediaDescription *md) {
+    int i;
+    if (md->nb_streams == 0) return FALSE;
+    for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+        if (!sal_stream_description_active(&md->streams[i])) continue;
+        if (sal_stream_description_has_implicit_avpf(&md->streams[i]) != TRUE) return FALSE;
+    }
+    return TRUE;
+}
+
 bool_t sal_media_description_has_srtp(const SalMediaDescription *md) {
 	int i;
 	if (md->nb_streams == 0) return FALSE;
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		if (sal_stream_description_has_srtp(&md->streams[i]) != TRUE) return FALSE;
 	}
@@ -231,13 +309,37 @@ bool_t sal_media_description_has_srtp(const SalMediaDescription *md) {
 bool_t sal_media_description_has_dtls(const SalMediaDescription *md) {
 	int i;
 	if (md->nb_streams == 0) return FALSE;
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		if (!sal_stream_description_active(&md->streams[i])) continue;
 		if (sal_stream_description_has_dtls(&md->streams[i]) != TRUE) return FALSE;
 	}
 	return TRUE;
 }
 
+bool_t sal_media_description_has_zrtp(const SalMediaDescription *md) {
+	int i;
+	if (md->nb_streams == 0) return FALSE;
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+		if (!sal_stream_description_active(&md->streams[i])) continue;
+		if (sal_stream_description_has_zrtp(&md->streams[i]) != TRUE) return FALSE;
+	}
+	return TRUE;
+}
+
+bool_t sal_media_description_has_ipv6(const SalMediaDescription *md){
+	int i;
+	if (md->nb_streams == 0) return FALSE;
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
+		if (!sal_stream_description_active(&md->streams[i])) continue;
+		if (md->streams[i].rtp_addr[0] != '\0'){
+			if (!sal_stream_description_has_ipv6(&md->streams[i])) return FALSE;
+		}else{
+			if (strchr(md->addr,':') == NULL) return FALSE;
+		}
+	}
+	return TRUE;
+}
+
 /*
 static bool_t fmtp_equals(const char *p1, const char *p2){
 	if (p1 && p2 && strcmp(p1,p2)==0) return TRUE;
@@ -267,8 +369,8 @@ static bool_t is_recv_only(PayloadType *p){
 	return (p->flags & PAYLOAD_TYPE_FLAG_CAN_RECV) && ! (p->flags & PAYLOAD_TYPE_FLAG_CAN_SEND);
 }
 
-static bool_t payload_list_equals(const MSList *l1, const MSList *l2){
-	const MSList *e1,*e2;
+static bool_t payload_list_equals(const bctbx_list_t *l1, const bctbx_list_t *l2){
+	const bctbx_list_t *e1,*e2;
 	for(e1=l1,e2=l2;e1!=NULL && e2!=NULL; e1=e1->next,e2=e2->next){
 		PayloadType *p1=(PayloadType*)e1->data;
 		PayloadType *p2=(PayloadType*)e2->data;
@@ -320,6 +422,10 @@ int sal_stream_description_equals(const SalStreamDescription *sd1, const SalStre
 	if (sd1->ptime != sd2->ptime) result |= SAL_MEDIA_DESCRIPTION_CODEC_CHANGED;
 	if (sd1->dir != sd2->dir) result |= SAL_MEDIA_DESCRIPTION_CODEC_CHANGED;
 
+	/* ICE */
+	if (strcmp(sd1->ice_ufrag, sd2->ice_ufrag) != 0) result |= SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED;
+	if (strcmp(sd1->ice_pwd, sd2->ice_pwd) != 0) result |= SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED;
+
 	/*DTLS*/
 	if (sd1->dtls_role != sd2->dtls_role) result |= SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED;
 	if (strcmp(sd1->dtls_fingerprint, sd2->dtls_fingerprint) != 0) result |= SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED;
@@ -327,6 +433,47 @@ int sal_stream_description_equals(const SalStreamDescription *sd1, const SalStre
 	return result;
 }
 
+char * sal_media_description_print_differences(int result){
+	char *out = NULL;
+	if (result & SAL_MEDIA_DESCRIPTION_CODEC_CHANGED){
+		out = ms_strcat_printf(out, "%s ", "CODEC_CHANGED");
+		result &= ~SAL_MEDIA_DESCRIPTION_CODEC_CHANGED;
+	}
+	if (result & SAL_MEDIA_DESCRIPTION_NETWORK_CHANGED){
+		out = ms_strcat_printf(out, "%s ", "NETWORK_CHANGED");
+		result &= ~SAL_MEDIA_DESCRIPTION_NETWORK_CHANGED;
+	}
+	if (result & SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED){
+		out = ms_strcat_printf(out, "%s ", "ICE_RESTART_DETECTED");
+		result &= ~SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED;
+	}
+	if (result & SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED){
+		out = ms_strcat_printf(out, "%s ", "CRYPTO_KEYS_CHANGED");
+		result &= ~SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED;
+	}
+	if (result & SAL_MEDIA_DESCRIPTION_NETWORK_XXXCAST_CHANGED){
+		out = ms_strcat_printf(out, "%s ", "NETWORK_XXXCAST_CHANGED");
+		result &= ~SAL_MEDIA_DESCRIPTION_NETWORK_XXXCAST_CHANGED;
+	}
+	if (result & SAL_MEDIA_DESCRIPTION_STREAMS_CHANGED){
+		out = ms_strcat_printf(out, "%s ", "STREAMS_CHANGED");
+		result &= ~SAL_MEDIA_DESCRIPTION_STREAMS_CHANGED;
+	}
+	if (result & SAL_MEDIA_DESCRIPTION_CRYPTO_POLICY_CHANGED){
+		out = ms_strcat_printf(out, "%s ", "CRYPTO_POLICY_CHANGED");
+		result &= ~SAL_MEDIA_DESCRIPTION_CRYPTO_POLICY_CHANGED;
+	}
+	if (result & SAL_MEDIA_DESCRIPTION_FORCE_STREAM_RECONSTRUCTION){
+		out = ms_strcat_printf(out, "%s ", "FORCE_STREAM_RECONSTRUCTION");
+		result &= ~SAL_MEDIA_DESCRIPTION_FORCE_STREAM_RECONSTRUCTION;
+	}
+	if (result){
+		ms_fatal("There are unhandled result bitmasks in sal_media_description_print_differences(), fix it");
+	}
+	if (!out) out = ms_strdup("NONE");
+	return out;
+}
+
 int sal_media_description_equals(const SalMediaDescription *md1, const SalMediaDescription *md2) {
 	int result = SAL_MEDIA_DESCRIPTION_UNCHANGED;
 	int i;
@@ -336,11 +483,18 @@ int sal_media_description_equals(const SalMediaDescription *md1, const SalMediaD
 		result |= SAL_MEDIA_DESCRIPTION_NETWORK_XXXCAST_CHANGED;
 	if (md1->nb_streams != md2->nb_streams) result |= SAL_MEDIA_DESCRIPTION_STREAMS_CHANGED;
 	if (md1->bandwidth != md2->bandwidth) result |= SAL_MEDIA_DESCRIPTION_CODEC_CHANGED;
-	for(i = 0; i < md1->nb_streams; ++i){
+
+	/* ICE */
+	if (strcmp(md1->ice_ufrag, md2->ice_ufrag) != 0) result |= SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED;
+	if (strcmp(md1->ice_pwd, md2->ice_pwd) != 0) result |= SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED;
+
+	for(i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; ++i){
+		if (!sal_stream_description_active(&md1->streams[i]) && !sal_stream_description_active(&md2->streams[i])) continue;
 		result |= sal_stream_description_equals(&md1->streams[i], &md2->streams[i]);
 	}
 	return result;
 }
+
 static void assign_address(SalAddress** address, const char *value){
 	if (*address){
 		sal_address_destroy(*address);
@@ -386,18 +540,18 @@ void sal_op_set_route(SalOp *op, const char *route){
 	char* route_string=(void *)0;
 	SalOpBase* op_base = (SalOpBase*)op;
 	if (op_base->route_addresses) {
-		ms_list_for_each(op_base->route_addresses,(void (*)(void *))sal_address_destroy);
-		op_base->route_addresses=ms_list_free(op_base->route_addresses);
+		bctbx_list_for_each(op_base->route_addresses,(void (*)(void *))sal_address_destroy);
+		op_base->route_addresses=bctbx_list_free(op_base->route_addresses);
 	}
 	if (route) {
-		op_base->route_addresses=ms_list_append(NULL,NULL);
+		op_base->route_addresses=bctbx_list_append(NULL,NULL);
 		assign_address((SalAddress**)&(op_base->route_addresses->data),route);
 		route_string=sal_address_as_string((SalAddress*)op_base->route_addresses->data); \
 	}
 	assign_string(&op_base->route,route_string); \
 	if(route_string) ms_free(route_string);
 }
-const MSList* sal_op_get_route_addresses(const SalOp *op) {
+const bctbx_list_t* sal_op_get_route_addresses(const SalOp *op) {
 	return ((SalOpBase*)op)->route_addresses;
 }
 void sal_op_set_route_address(SalOp *op, const SalAddress *address){
@@ -408,7 +562,7 @@ void sal_op_set_route_address(SalOp *op, const SalAddress *address){
 void sal_op_add_route_address(SalOp *op, const SalAddress *address){
 	SalOpBase* op_base = (SalOpBase*)op;
 	if (op_base->route_addresses) {
-		op_base->route_addresses=ms_list_append(op_base->route_addresses,(void*)sal_address_clone(address));
+		op_base->route_addresses=bctbx_list_append(op_base->route_addresses,(void*)sal_address_clone(address));
 	} else {
 		sal_op_set_route_address(op,address);
 	}
@@ -436,7 +590,10 @@ void sal_op_set_to_address(SalOp *op, const SalAddress *to){
 	sal_op_set_to(op,address_string);
 	ms_free(address_string);
 }
-
+void sal_op_set_diversion_address(SalOp *op, const SalAddress *diversion){
+	if (((SalOpBase*)op)->diversion_address) sal_address_destroy(((SalOpBase*)op)->diversion_address);
+	((SalOpBase*)op)->diversion_address=diversion?sal_address_clone(diversion):NULL;
+}
 void sal_op_set_user_pointer(SalOp *op, void *up){
 	((SalOpBase*)op)->user_pointer=up;
 }
@@ -460,11 +617,8 @@ const SalAddress *sal_op_get_to_address(const SalOp *op){
 	return ((SalOpBase*)op)->to_address;
 }
 
-const char *sal_op_get_route(const SalOp *op){
-#ifdef BELLE_SIP
-ms_fatal("sal_op_get_route not supported, use sal_op_get_route_addresses instead");
-#endif
-	return ((SalOpBase*)op)->route;
+const SalAddress *sal_op_get_diversion_address(const SalOp *op){
+	return ((SalOpBase*)op)->diversion_address;
 }
 
 const char *sal_op_get_remote_ua(const SalOp *op){
@@ -485,14 +639,7 @@ const char *sal_op_get_network_origin(const SalOp *op){
 const char* sal_op_get_call_id(const SalOp *op) {
 	return  ((SalOpBase*)op)->call_id;
 }
-char* sal_op_get_dialog_id(const SalOp *op) {
-	if (op->dialog != NULL) {
-		return ms_strdup_printf("%s;to-tag=%s;from-tag=%s", ((SalOpBase*)op)->call_id,
-			belle_sip_dialog_get_remote_tag(op->dialog), belle_sip_dialog_get_local_tag(op->dialog));
-	}
-	return NULL;
 
-}
 void __sal_op_init(SalOp *b, Sal *sal){
 	memset(b,0,sizeof(SalOpBase));
 	((SalOpBase*)b)->root=sal;
@@ -503,7 +650,9 @@ void __sal_op_set_network_origin(SalOp *op, const char *origin){
 }
 
 void __sal_op_set_remote_contact(SalOp *op, const char* remote_contact){
-	SET_PARAM(op,remote_contact);
+	assign_address(&((SalOpBase*)op)->remote_contact_address,remote_contact);\
+	/*to preserve header params*/
+	assign_string(&((SalOpBase*)op)->remote_contact,remote_contact); \
 }
 
 void __sal_op_set_network_origin_address(SalOp *op, SalAddress *origin){
@@ -577,13 +726,18 @@ void __sal_op_free(SalOp *op){
 		sal_address_destroy(b->service_route);
 	}
 	if (b->route_addresses){
-		ms_list_for_each(b->route_addresses,(void (*)(void*)) sal_address_destroy);
-		b->route_addresses=ms_list_free(b->route_addresses);
+		bctbx_list_for_each(b->route_addresses,(void (*)(void*)) sal_address_destroy);
+		b->route_addresses=bctbx_list_free(b->route_addresses);
 	}
 	if (b->recv_custom_headers)
 		sal_custom_header_free(b->recv_custom_headers);
 	if (b->sent_custom_headers)
 		sal_custom_header_free(b->sent_custom_headers);
+	
+	if (b->entity_tag != NULL){
+		ms_free(b->entity_tag);
+		b->entity_tag = NULL;
+	}
 	ms_free(op);
 }
 
@@ -617,8 +771,9 @@ void sal_auth_info_delete(SalAuthInfo* auth_info) {
 
 const char* sal_stream_type_to_string(SalStreamType type) {
 	switch (type) {
-	case SalAudio:return "audio";
-	case SalVideo:return "video";
+	case SalAudio: return "audio";
+	case SalVideo: return "video";
+	case SalText: return "text";
 	default: return "other";
 	}
 }
@@ -711,15 +866,16 @@ const char* sal_privacy_to_string(SalPrivacy privacy) {
 	}
 }
 
-static void remove_trailing_spaces(char *line){
-	int i;
-	for(i=strlen(line)-1;i>=0;--i){
-		if (isspace(line[i])) line[i]='\0';
-		else break;
+static void remove_trailing_spaces(char *line) {
+	size_t size = size = strlen(line);
+	char *end = line + size - 1;
+	while (end >= line && isspace(*end)) {
+		end--;
 	}
+    *(end + 1) = '\0';
 }
 
-static int line_get_value(const char *input, const char *key, char *value, size_t value_size, int *read){
+static int line_get_value(const char *input, const char *key, char *value, size_t value_size, size_t *read){
 	const char *end=strchr(input,'\n');
 	char line[256]={0};
 	char key_candidate[256];
@@ -744,7 +900,7 @@ static int line_get_value(const char *input, const char *key, char *value, size_
 }
 
 int sal_lines_get_value(const char *data, const char *key, char *value, size_t value_size){
-	int read=0;
+	size_t read=0;
 
 	do{
 		if (line_get_value(data,key,value,value_size,&read))
@@ -754,19 +910,23 @@ int sal_lines_get_value(const char *data, const char *key, char *value, size_t v
 	return FALSE;
 }
 
-int sal_body_has_type(const SalBody *body, const char *type, const char *subtype){
-	return body->type && body->subtype
-		&& strcmp(body->type,type)==0
-		&& strcmp(body->subtype,subtype)==0;
+const char *sal_op_get_entity_tag(const SalOp* op) {
+	SalOpBase* op_base = (SalOpBase*)op;
+	return op_base->entity_tag;
 }
 
-belle_sip_stack_t *sal_get_belle_sip_stack(Sal *sal) {
-	return sal->stack;
-}
 
-char* sal_op_get_public_uri(SalOp *op) {
-	if (op && op->refresher) {
-		return belle_sip_refresher_get_public_uri(op->refresher);
+void sal_op_set_entity_tag(SalOp *op, const char* entity_tag) {
+	SalOpBase* op_base = (SalOpBase*)op;
+	if (op_base->entity_tag != NULL){
+		ms_free(op_base->entity_tag);
 	}
-	return NULL;
+	if (entity_tag)
+		op_base->entity_tag = ms_strdup(entity_tag);
+	else
+		op_base->entity_tag = NULL;
 }
+
+#ifdef BELLE_SIP_H
+#error "You included belle-sip header other than just belle-sip/object.h in sal.c. This breaks design rules !"
+#endif
diff --git a/coreapi/sipsetup.c b/coreapi/sipsetup.c
index 5319ca887..c36ae3713 100644
--- a/coreapi/sipsetup.c
+++ b/coreapi/sipsetup.c
@@ -29,27 +29,28 @@ static SipSetup *all_sip_setups[]={
 	NULL
 };
 
-static MSList *registered_sip_setups=NULL;
+static bctbx_list_t *registered_sip_setups=NULL;
 
 void sip_setup_register(SipSetup *ss){
-	registered_sip_setups=ms_list_append(registered_sip_setups,ss);
+	registered_sip_setups=bctbx_list_append(registered_sip_setups,ss);
 }
 
-void sip_setup_register_all(void){
+void sip_setup_register_all(MSFactory *factory){
 	SipSetup **p=all_sip_setups;
-	ms_load_plugins(LINPHONE_PLUGINS_DIR);
+	ms_factory_load_plugins(factory, LINPHONE_PLUGINS_DIR);
+	//ms_load_plugins(LINPHONE_PLUGINS_DIR);
 	while(*p!=NULL){
 		sip_setup_register(*p);
 		p++;
 	}
 }
 
-const MSList * linphone_core_get_sip_setups(LinphoneCore *lc){
+const bctbx_list_t * linphone_core_get_sip_setups(LinphoneCore *lc){
 	return registered_sip_setups;
 }
 
 SipSetup *sip_setup_lookup(const char *type_name){
-	MSList *elem;
+	bctbx_list_t *elem;
 	for(elem=registered_sip_setups;elem!=NULL;elem=elem->next){
 		SipSetup *ss=(SipSetup*)elem->data;
 		if ( strcasecmp(ss->name,type_name)==0){
@@ -68,7 +69,7 @@ SipSetup *sip_setup_lookup(const char *type_name){
 }
 
 void sip_setup_unregister_all(void){
-	MSList *elem;
+	bctbx_list_t *elem;
 	for(elem=registered_sip_setups;elem!=NULL;elem=elem->next){
 		SipSetup *ss=(SipSetup*)elem->data;
 		if (ss->initialized){
@@ -76,6 +77,7 @@ void sip_setup_unregister_all(void){
 			ss->initialized=FALSE;
 		}
 	}
+	registered_sip_setups = bctbx_list_free(registered_sip_setups);
 }
 
 void buddy_lookup_request_set_key(BuddyLookupRequest *req, const char *key){
@@ -93,8 +95,8 @@ void buddy_lookup_request_set_max_results(BuddyLookupRequest *req, int ncount){
 void buddy_lookup_request_free(BuddyLookupRequest *req){
 	if (req->key) ms_free(req->key);
 	if (req->results){
-		ms_list_for_each(req->results,(void (*)(void*))buddy_info_free);
-		ms_list_free(req->results);
+		bctbx_list_for_each(req->results,(void (*)(void*))buddy_info_free);
+		bctbx_list_free(req->results);
 	}
 	ms_free(req);
 }
diff --git a/coreapi/sipsetup.h b/coreapi/sipsetup.h
index 40e6369a1..63dc3f01e 100644
--- a/coreapi/sipsetup.h
+++ b/coreapi/sipsetup.h
@@ -132,7 +132,7 @@ void buddy_lookup_request_set_max_results(BuddyLookupRequest *req, int ncount);
 
 
 void sip_setup_register(SipSetup *ss);
-void sip_setup_register_all(void);
+void sip_setup_register_all(MSFactory* factory);
 SipSetup *sip_setup_lookup(const char *type_name);
 void sip_setup_unregister_all(void);
 LINPHONE_PUBLIC unsigned int sip_setup_get_capabilities(SipSetup *s);
diff --git a/coreapi/sqlite3_bctbx_vfs.c b/coreapi/sqlite3_bctbx_vfs.c
new file mode 100755
index 000000000..0926f0ddc
--- /dev/null
+++ b/coreapi/sqlite3_bctbx_vfs.c
@@ -0,0 +1,454 @@
+/*
+sqlite3_bctbx_vfs.c
+Copyright (C) 2016 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifdef SQLITE_STORAGE_ENABLED
+#include "private.h"
+
+#include "sqlite3_bctbx_vfs.h"
+#include <sqlite3.h>
+
+#ifndef _WIN32_WCE
+#include <errno.h>
+#endif /*_WIN32_WCE*/
+
+
+#ifndef _WIN32
+#if !defined(__QNXNTO__)
+#	include <langinfo.h>
+#	include <locale.h>
+#	include <iconv.h>
+#	include <string.h>
+#endif
+
+#endif
+
+
+/**
+ * Closes the file whose file descriptor is stored in the file handle p.
+ * @param  p 	sqlite3_file file handle pointer.
+ * @return      SQLITE_OK if successful,  SQLITE_IOERR_CLOSE otherwise.
+ */
+static int sqlite3bctbx_Close(sqlite3_file *p){
+
+	int ret;
+	sqlite3_bctbx_file_t *pFile = (sqlite3_bctbx_file_t*) p;
+
+	ret = bctbx_file_close(pFile->pbctbx_file);
+	if (!ret){
+		return SQLITE_OK;
+	}
+	else{
+		free(pFile);
+		return SQLITE_IOERR_CLOSE ;
+	}
+}
+
+
+/**
+ * Read count bytes from the open file given by p, starting at offset and puts them in
+ * the buffer pointed by buf.
+ * Calls bctbx_file_read.
+ *
+ * @param  p  		sqlite3_file file handle pointer.
+ * @param  buf    	buffer to write the read bytes to.
+ * @param  count  	number of bytes to read
+ * @param  offset 	file offset where to start reading
+ * @return 			SQLITE_OK if read bytes equals count,
+ *                  SQLITE_IOERR_SHORT_READ if the number of bytes read is inferior to count
+ *                  SQLITE_IOERR_READ if an error occurred.
+ */
+static int sqlite3bctbx_Read(sqlite3_file *p, void *buf, int count, sqlite_int64 offset){
+	int ret;
+	sqlite3_bctbx_file_t *pFile = (sqlite3_bctbx_file_t*) p;
+	if (pFile){
+		ret = bctbx_file_read(pFile->pbctbx_file, buf, count, (off_t)offset);
+		if( ret==count ){
+			return SQLITE_OK;
+		}
+		else if( ret >= 0 ){
+			/*fill in unread portion of buffer, as requested by sqlite3 documentation*/
+			memset(((uint8_t*)buf) + ret, 0, count-ret);
+			return SQLITE_IOERR_SHORT_READ;
+		}else {
+
+			return SQLITE_IOERR_READ;
+		}
+	}
+	return SQLITE_IOERR_READ;
+}
+
+/**
+ * Writes directly to the open file given through the p argument.
+ * Calls bctbx_file_write .
+ * @param  p       sqlite3_file file handle pointer.
+ * @param  buf     Buffer containing data to write
+ * @param  count   Size of data to write in bytes
+ * @param  offset  File offset where to write to
+ * @return         SQLITE_OK on success, SQLITE_IOERR_WRITE if an error occurred.
+ */
+static int sqlite3bctbx_Write(sqlite3_file *p, const void *buf, int count, sqlite_int64 offset){
+	sqlite3_bctbx_file_t *pFile = (sqlite3_bctbx_file_t*) p;
+	int ret;
+	if (pFile ){
+		ret = bctbx_file_write(pFile->pbctbx_file, buf, count, (off_t)offset);
+		if(ret > 0 ) return SQLITE_OK;
+		else {
+			return SQLITE_IOERR_WRITE;
+		}
+	}
+	return SQLITE_IOERR_WRITE;
+}
+
+
+/**
+ * Saves the file size associated with the file handle p into the argument pSize.
+ * @param  p 	sqlite3_file file handle pointer.
+ * @return 		SQLITE_OK if read bytes equals count,
+ *              SQLITE_IOERR_FSTAT if the file size returned is negative
+ *              SQLITE_ERROR if an error occurred.
+ */
+static int sqlite3bctbx_FileSize(sqlite3_file *p, sqlite_int64 *pSize){
+
+	int64_t rc;                         /* Return code from fstat() call */
+	sqlite3_bctbx_file_t *pFile = (sqlite3_bctbx_file_t*) p;
+	if (pFile->pbctbx_file){
+		rc = bctbx_file_size(pFile->pbctbx_file);
+		if( rc < 0 ) {
+			return SQLITE_IOERR_FSTAT;
+		}
+		if (pSize){
+			*pSize = rc;
+			return SQLITE_OK;
+		}
+	}
+	return SQLITE_ERROR;
+
+
+}
+
+
+/************************ PLACE HOLDER FUNCTIONS ***********************/
+/** These functions were implemented to please the SQLite VFS
+implementation. Some of them are just stubs, some do a very limited job. */
+
+
+/**
+ * Returns the device characteristics for the file. Stub function
+ * to fill the SQLite VFS function pointer structure .
+ * @param  p 	sqlite3_file file handle pointer.
+ * @return		value 4096.
+ */
+static int sqlite3bctbx_DeviceCharacteristics(sqlite3_file *p){
+	int rc = 0x00001000;
+	return rc;
+}
+
+/**
+ * Stub function for information and control over the open file.
+ * @param  p    sqlite3_file file handle pointer.
+ * @param  op   operation
+ * @param  pArg unused
+ * @return      SQLITE_OK on success, SALITE_NOTFOUND otherwise.
+ */
+static int sqlite3bctbx_FileControl(sqlite3_file *p, int op, void *pArg){
+#ifdef SQLITE_FCNTL_MMAP_SIZE
+	if (op == SQLITE_FCNTL_MMAP_SIZE) return SQLITE_OK;
+#endif
+	return SQLITE_NOTFOUND;
+
+}
+
+/**
+ * The lock file mechanism is not used with this VFS : checking
+ * the reserved lock is always OK.
+ * @param  pUnused sqlite3_file file handle pointer.
+ * @param  pResOut set to 0 since there is no lock mechanism.
+ * @return         SQLITE_OK
+ */
+static int sqlite3bctbx_nolockCheckReservedLock(sqlite3_file *pUnused, int *pResOut){
+	*pResOut = 0;
+	return SQLITE_OK;
+}
+
+/**
+ * The lock file mechanism is not used with this VFS : locking the file
+ * is always OK.
+ * @param  pUnused sqlite3_file file handle pointer.
+ * @param  unused  unused
+ * @return         SQLITE_OK
+ */
+static int sqlite3bctbx_nolockLock(sqlite3_file *pUnused, int unused){
+	return SQLITE_OK;
+}
+
+/**
+ * The lock file mechanism is not used with this VFS : unlocking the file
+  * is always OK.
+ * @param  pUnused sqlite3_file file handle pointer.
+ * @param  unused  unused
+ * @return         SQLITE_OK
+ */
+static int sqlite3bctbx_nolockUnlock(sqlite3_file *pUnused, int unused){
+	return SQLITE_OK;
+}
+
+
+/**
+ * Simply sync the file contents given through the file handle p
+ * to the persistent media.
+ * @param  p 	 sqlite3_file file handle pointer.
+ * @param  flags unused
+ * @return       SQLITE_OK on success, SLITE_IOERR_FSYNC if an error occurred.
+ */
+static int sqlite3bctbx_Sync(sqlite3_file *p, int flags){
+	sqlite3_bctbx_file_t *pFile = (sqlite3_bctbx_file_t*)p;
+#if _WIN32
+	int ret;
+	ret = FlushFileBuffers((HANDLE)_get_osfhandle(pFile->pbctbx_file->fd));
+	return (ret!=0 ? SQLITE_OK : SQLITE_IOERR_FSYNC);
+#else
+	int rc = fsync(pFile->pbctbx_file->fd);
+	return (rc==0 ? SQLITE_OK : SQLITE_IOERR_FSYNC);
+#endif
+}
+
+/************************ END OF PLACE HOLDER FUNCTIONS ***********************/
+
+
+
+static char* ConvertFromUtf8Filename(const char* fName){
+#if _WIN32
+	char* convertedFilename;
+	int nChar, nb_byte;
+	LPWSTR wideFilename;
+	
+	nChar = MultiByteToWideChar(CP_UTF8, 0, fName, -1, NULL, 0);
+	if (nChar == 0) return NULL;
+	wideFilename = bctbx_malloc(nChar*sizeof(wideFilename[0]));
+	if (wideFilename == NULL) return NULL;
+	nChar = MultiByteToWideChar(CP_UTF8, 0, fName, -1, wideFilename, nChar);
+	if (nChar == 0) {
+		bctbx_free(wideFilename);
+		wideFilename = 0;
+	}
+	
+	nb_byte = WideCharToMultiByte(CP_ACP, 0, wideFilename, -1, 0, 0, 0, 0);
+	if (nb_byte == 0) return NULL;
+	convertedFilename = bctbx_malloc(nb_byte);
+	if (convertedFilename == NULL) return NULL;
+	nb_byte = WideCharToMultiByte(CP_ACP, 0, wideFilename, -1, convertedFilename, nb_byte, 0, 0);
+	if (nb_byte == 0) {
+		bctbx_free(convertedFilename);
+		convertedFilename = 0;
+	}
+	bctbx_free(wideFilename);
+	return convertedFilename;
+#elif defined(__QNXNTO__)
+	return bctbx_strdup(fName);
+#else
+	#define MAX_PATH_SIZE 1024
+	char db_file_utf8[MAX_PATH_SIZE] = {'\0'};
+	char db_file_locale[MAX_PATH_SIZE] = "";
+	char *outbuf=db_file_locale, *inbuf=db_file_utf8;
+	size_t inbyteleft = MAX_PATH_SIZE, outbyteleft = MAX_PATH_SIZE;
+	iconv_t cb;
+	
+	if (strcasecmp("UTF-8", nl_langinfo(CODESET)) == 0) {
+		strncpy(db_file_locale, fName, MAX_PATH_SIZE - 1);
+	} else {
+		strncpy(db_file_utf8, fName, MAX_PATH_SIZE-1);
+		cb = iconv_open(nl_langinfo(CODESET), "UTF-8");
+		if (cb != (iconv_t)-1) {
+			int ret;
+			ret = iconv(cb, &inbuf, &inbyteleft, &outbuf, &outbyteleft);
+			if(ret == -1) db_file_locale[0] = '\0';
+			iconv_close(cb);
+		}
+	}
+	return bctbx_strdup(db_file_locale);
+#endif
+}
+#endif 
+/**
+ * Opens the file fName and populates the structure pointed by p
+ * with the necessary io_methods
+ * Methods not implemented for version 1 : xTruncate, xSectorSize.
+ * Initializes some fields in the p structure, some of which where already
+ * initialized by SQLite.
+ * @param  pVfs      sqlite3_vfs VFS pointer.
+ * @param  fName     filename
+ * @param  p         file handle pointer
+ * @param  flags     db file access flags
+ * @param  pOutFlags flags used by SQLite
+ * @return           SQLITE_CANTOPEN on error, SQLITE_OK on success.
+ */
+static  int sqlite3bctbx_Open(sqlite3_vfs *pVfs, const char *fName, sqlite3_file *p, int flags, int *pOutFlags ){
+	static const sqlite3_io_methods sqlite3_bctbx_io = {
+		1,										/* iVersion         Structure version number */
+		sqlite3bctbx_Close,                 	/* xClose */
+		sqlite3bctbx_Read,                  	/* xRead */
+		sqlite3bctbx_Write,                 	/* xWrite */
+		NULL,									/* xTruncate */
+		sqlite3bctbx_Sync,
+		sqlite3bctbx_FileSize,
+		sqlite3bctbx_nolockLock,
+		sqlite3bctbx_nolockUnlock,
+		sqlite3bctbx_nolockCheckReservedLock,
+		sqlite3bctbx_FileControl,
+		NULL,									/* xSectorSize */
+		sqlite3bctbx_DeviceCharacteristics
+		/*other function points follows, all NULL but not present in all sqlite3 versions.*/
+	};
+
+	sqlite3_bctbx_file_t * pFile = (sqlite3_bctbx_file_t*)p; /*File handle sqlite3_bctbx_file_t*/
+	int openFlags = 0;
+	char* wFname;
+
+	/*returns error if filename is empty or file handle not initialized*/
+	if (pFile == NULL || fName == NULL){
+		return SQLITE_IOERR;
+	}
+	
+	/* Set flags  to open the file with */
+	if( flags&SQLITE_OPEN_EXCLUSIVE ) openFlags  |= O_EXCL;
+	if( flags&SQLITE_OPEN_CREATE )    openFlags |= O_CREAT;
+	if( flags&SQLITE_OPEN_READONLY )  openFlags |= O_RDONLY;
+	if( flags&SQLITE_OPEN_READWRITE ) openFlags |= O_RDWR;
+
+#if defined(_WIN32)
+	openFlags |= O_BINARY;
+#endif
+	wFname = ConvertFromUtf8Filename(fName);
+	if (wFname != NULL) {
+		pFile->pbctbx_file = bctbx_file_open2(bctbx_vfs_get_default(), wFname, openFlags);
+		bctbx_free(wFname);
+	} else {
+		pFile->pbctbx_file = NULL;
+	}
+	
+	if( pFile->pbctbx_file == NULL){
+		return SQLITE_CANTOPEN;
+	}
+
+	if( pOutFlags ){
+    	*pOutFlags = flags;
+  	}
+	pFile->base.pMethods = &sqlite3_bctbx_io;
+
+	return SQLITE_OK;
+}
+
+
+
+sqlite3_vfs *sqlite3_bctbx_vfs_create(void){
+  static sqlite3_vfs bctbx_vfs = {
+    1,								/* iVersion */
+    sizeof(sqlite3_bctbx_file_t),	/* szOsFile */
+    MAXPATHNAME,					/* mxPathname */
+    NULL,							/* pNext */
+    LINPHONE_SQLITE3_VFS,			/* zName */
+    NULL,							/* pAppData */
+    sqlite3bctbx_Open,				/* xOpen */
+    NULL,							/* xDelete */
+    NULL,							/* xAccess */
+    NULL							/* xFullPathname */
+  };
+  return &bctbx_vfs;
+}
+
+/*static int sqlite3bctbx_winFullPathname(
+										sqlite3_vfs *pVfs,            // Pointer to vfs object
+										const char *zRelative,        // Possibly relative input path
+										int nFull,                    // Size of output buffer in bytes
+										char *zFull){
+	//LPWSTR zTemp;
+	//DWORD nByte;
+	// If this path name begins with "/X:", where "X" is any alphabetic
+	// character, discard the initial "/" from the pathname.
+	//
+	//if (zRelative[0] == '/' && sqlite3Isalpha(zRelative[1]) && zRelative[2] == ':'){
+	//	zRelative++;
+	//}
+
+	 nByte = GetFullPathNameW((LPCWSTR)zRelative, 0, 0, 0);
+	 if (nByte == 0){
+		return SQLITE_CANTOPEN_FULLPATH;
+	 }
+	 nByte += 3;
+	 zTemp = bctbx_malloc(nByte*sizeof(zTemp[0]));
+	 memset(zTemp, 0, nByte*sizeof(zTemp[0]));
+	 if (zTemp == 0){
+		return SQLITE_IOERR_NOMEM;
+	 }
+	 nByte = GetFullPathNameW((LPCWSTR)zRelative, nByte, zTemp, 0);
+	 if (nByte == 0){
+		bctbx_free(zTemp);
+		return SQLITE_CANTOPEN_FULLPATH;
+	 }
+	 if (zTemp){
+		sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zTemp);
+		bctbx_free(zTemp);
+		return SQLITE_OK;
+	 }
+	 else{
+		return SQLITE_IOERR_NOMEM;
+	 }
+	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zRelative);
+	return SQLITE_OK;
+}*/
+
+
+
+void sqlite3_bctbx_vfs_register( int makeDefault){
+	sqlite3_vfs* pVfsToUse = sqlite3_bctbx_vfs_create();
+	#if _WIN32
+	sqlite3_vfs* pDefault = sqlite3_vfs_find("win32");
+	#else
+	sqlite3_vfs* pDefault = sqlite3_vfs_find("unix-none");
+	#endif
+	pVfsToUse->xCurrentTime = pDefault->xCurrentTime;
+	
+	pVfsToUse->xAccess =  pDefault->xAccess;
+	pVfsToUse->xFullPathname = pDefault->xFullPathname;
+
+	pVfsToUse->xDelete = pDefault->xDelete;
+	pVfsToUse->xSleep = pDefault->xSleep;
+	pVfsToUse->xRandomness = pDefault->xRandomness;
+	pVfsToUse->xGetLastError = pDefault->xGetLastError; /* Not implemented by sqlite3 :place holder */
+	/*Functions below should not be a problem sincve we are declaring ourselves
+	 in version 1 */
+
+	/* used in version 2
+	xCurrentTimeInt64;*/
+	/* used in version 3
+	xGetSystemCall
+	xSetSystemCall
+	xNextSystemCall*/
+
+	sqlite3_vfs_register(pVfsToUse, makeDefault);
+
+}
+
+
+void sqlite3_bctbx_vfs_unregister(void)
+{
+	sqlite3_vfs* pVfs = sqlite3_vfs_find(LINPHONE_SQLITE3_VFS);
+	sqlite3_vfs_unregister(pVfs);
+}
+
diff --git a/coreapi/sqlite3_bctbx_vfs.h b/coreapi/sqlite3_bctbx_vfs.h
new file mode 100644
index 000000000..aa2e17331
--- /dev/null
+++ b/coreapi/sqlite3_bctbx_vfs.h
@@ -0,0 +1,105 @@
+/*
+sqlite3_bctbx_vfs_t.h
+Copyright (C) 2016 Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef sqlite3_bctx_vfs_h
+#define sqlite3_bctx_vfs_h
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <bctoolbox/vfs.h>
+
+#include "sqlite3.h"
+
+
+/*
+** The maximum pathname length supported by this VFS.
+*/
+#define MAXPATHNAME 512
+
+
+/**
+ * sqlite3_bctbx_file_t VFS file structure.
+ */
+typedef struct sqlite3_bctbx_file_t sqlite3_bctbx_file_t;
+struct sqlite3_bctbx_file_t {
+	sqlite3_file base;              /* Base class. Must be first. */
+	bctbx_vfs_file_t* pbctbx_file;
+};
+
+
+
+/**
+ * Very simple VFS structure based on sqlite3_vfs. 
+ * Only the Open function is implemented, 
+ */
+typedef struct sqlite3_bctbx_vfs_t sqlite3_bctbx_vfs_t;
+struct sqlite3_bctbx_vfs_t {
+	sqlite3_bctbx_vfs_t *pNext;      /* Next registered VFS */
+	const char *vfsName;       /* Virtual file system name */
+	int (*xOpen)(sqlite3_vfs* pVfs, const char *fName, sqlite3_file *pFile,int flags, int *pOutFlags);
+	
+};
+
+
+/****************************************************
+VFS API to register this VFS to sqlite3 VFS
+*****************************************************/
+
+/**
+ * Returns a sqlite3_vfs pointer to the VFS named sqlite3bctbx_vfs 
+ * implemented in this file.
+ * Methods not implemented:
+ *			xDelete 
+ *			xAccess 
+ *			xFullPathname 
+ *			xDlOpen 
+ *			xDlError 
+ *			xDlSym 
+ *			xDlClose 
+ *			xRandomness 
+ *			xSleep 
+ *			xCurrentTime , xCurrentTimeInt64,
+ *			xGetLastError
+ *			xGetSystemCall
+ *			xSetSystemCall
+ *			xNextSystemCall
+ *			To make the VFS available to SQLite
+ * @return  Pointer to bctbx_vfs.
+ */
+sqlite3_vfs *sqlite3_bctbx_vfs_create(void);
+
+/**
+ * Registers sqlite3bctbx_vfs to SQLite VFS. If makeDefault is 1,
+ * the VFS will be used by default.
+ * Methods not implemented by sqlite3_bctbx_vfs_t are initialized to the one 
+ * used by the unix-none VFS where all locking file operations are no-ops. 
+ * @param  makeDefault  set to 1 to make the newly registered VFS be the default one, set to 0 instead.
+ */
+void sqlite3_bctbx_vfs_register(int makeDefault);
+
+
+/**
+ * Unregisters sqlite3bctbx_vfs from SQLite.
+ */
+void sqlite3_bctbx_vfs_unregister(void);
+
+#endif
diff --git a/coreapi/test_lsd.c b/coreapi/test_lsd.c
deleted file mode 100644
index 373b31b48..000000000
--- a/coreapi/test_lsd.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-linphone
-Copyright (C) 2010 Simon MORLAT (simon.morlat@linphone.org)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-/* Linphone Sound Daemon: is a lightweight utility to play sounds to speaker during a conversation.
- This is useful for embedded platforms, where sound apis are not performant enough to allow
- simultaneous sound access.
-
- This file is a test program that plays several sound files and places a call simultatenously.
-*/
-
-#include "linphonecore_utils.h"
-
-
-static void play_finished(LsdPlayer *p){
-	const char *filename=(const char *)lsd_player_get_user_pointer (p);
-	ms_message("Playing of %s is finished.",filename);
-	if (!lsd_player_loop_enabled (p)){
-		linphone_sound_daemon_release_player (lsd_player_get_daemon(p),p);
-	}
-}
-
-static void wait_a_bit(LinphoneCore *lc, int seconds){
-	time_t orig=ms_time(NULL);
-	while(ms_time(NULL)-orig<seconds){
-		/* we need to call iterate to receive notifications */
-		linphone_core_iterate(lc);
-		ms_usleep (50000);
-	}
-}
-
-int main(int argc, char *argv[]){
-	LinphoneCore *lc;
-	LinphoneCoreVTable vtable={0};
-	LinphoneSoundDaemon *lsd;
-	LsdPlayer *p;
-
-	linphone_core_enable_logs(stdout);
-	lc=linphone_core_new(&vtable,NULL,NULL,NULL);
-	lsd=linphone_sound_daemon_new (NULL,44100,1);
-
-	linphone_core_use_sound_daemon(lc,lsd);
-
-	/* start a play */
-	p=linphone_sound_daemon_get_player(lsd);
-	lsd_player_set_callback (p,play_finished);
-	lsd_player_set_user_pointer (p,"share/hello8000.wav");
-	lsd_player_play (p,"share/hello8000.wav");
-	wait_a_bit (lc,2);
-
-	/*start another one */
-	p=linphone_sound_daemon_get_player(lsd);
-	lsd_player_set_callback (p,play_finished);
-	lsd_player_set_user_pointer (p,"share/hello16000.wav");
-	lsd_player_enable_loop (p,TRUE);
-	lsd_player_play (p,"share/hello16000.wav");
-
-	/* after a few seconds decrease the volume */
-	wait_a_bit (lc,3);
-	lsd_player_set_gain (p,0.3);
-	wait_a_bit(lc,5);
-
-	/*now play some stereo music*/
-	p=linphone_sound_daemon_get_player(lsd);
-	lsd_player_set_callback (p,play_finished);
-	lsd_player_set_user_pointer (p,"share/rings/rock.wav");
-	lsd_player_play(p,"share/rings/rock.wav");
-	wait_a_bit(lc,2);
-
-	/*now play some stereo music at 22khz in order to test
-	 stereo resampling */
-	p=linphone_sound_daemon_get_player(lsd);
-	lsd_player_set_callback (p,play_finished);
-	lsd_player_set_user_pointer (p,"share/rings/bigben.wav");
-	lsd_player_play(p,"share/rings/bigben.wav");
-	wait_a_bit(lc,6);
-
-	/* now place an outgoing call if sip address argument is given */
-	if (argc>1){
-		linphone_core_invite(lc,argv[1]);
-		wait_a_bit(lc,10);
-		linphone_core_terminate_call(lc,NULL);
-	}
-	linphone_core_use_sound_daemon(lc,NULL);
-	linphone_sound_daemon_destroy(lsd);
-	linphone_core_destroy(lc);
-	
-	return 0;
-}
diff --git a/coreapi/test_numbers.c b/coreapi/test_numbers.c
deleted file mode 100644
index 0124d8c57..000000000
--- a/coreapi/test_numbers.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-linphone
-Copyright (C) 2012 Belledonne Communications SARL
-Author: Simon MORLAT (simon.morlat@linphone.org)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-#include "linphonecore.h"
-#include "linphonecore_utils.h"
-
-int main(int argc , char *argv[]){
-	LinphoneProxyConfig *cfg;
-	char normalized_number[32];
-	if (argc<2){
-		fprintf(stderr,"Usage:\n%s <phone number> [<country code>] [--escape-plus]\nReturns normalized number.", argv[0]);
-		return -1;
-	}
-	linphone_core_enable_logs(stderr);
-	cfg=linphone_proxy_config_new();
-	if (argc>2)
-		linphone_proxy_config_set_dial_prefix(cfg,argv[2]);
-	if (argc>3 && strcmp(argv[3],"--escape-plus")==0)
-		linphone_proxy_config_set_dial_escape_plus(cfg,TRUE);
-	linphone_proxy_config_normalize_number(cfg,argv[1],normalized_number,sizeof(normalized_number));
-
-	printf("Normalized number is %s\n",normalized_number);
-	/*check extracted ccc*/
-	if (linphone_dial_plan_lookup_ccc_from_e164(normalized_number) != atoi(linphone_proxy_config_get_dial_prefix(cfg))) {
-		printf("Error ccc [%i] not correctly parsed\n",linphone_dial_plan_lookup_ccc_from_e164(normalized_number));
-	} else {
-		printf("Extracted ccc is [%i] \n",linphone_dial_plan_lookup_ccc_from_e164(normalized_number));
-	}
-	return 0;
-}
diff --git a/coreapi/upnp.c b/coreapi/upnp.c
index e1e4db3e2..3f476eae2 100644
--- a/coreapi/upnp.c
+++ b/coreapi/upnp.c
@@ -73,9 +73,9 @@ struct _UpnpContext {
 	UpnpPortBinding *sip_tls;
 	UpnpPortBinding *sip_udp;
 	LinphoneUpnpState state;
-	MSList *removing_configs;
-	MSList *adding_configs;
-	MSList *pending_bindings;
+	bctbx_list_t *removing_configs;
+	bctbx_list_t *adding_configs;
+	bctbx_list_t *pending_bindings;
 
 	ms_mutex_t mutex;
 	ms_cond_t empty_cond;
@@ -89,13 +89,13 @@ bool_t linphone_core_upnp_hook(void *data);
 void linphone_upnp_update(UpnpContext *ctx);
 bool_t linphone_upnp_is_blacklisted(UpnpContext *ctx);
 
-UpnpPortBinding *linphone_upnp_port_binding_new();
+UpnpPortBinding *linphone_upnp_port_binding_new(void);
 UpnpPortBinding *linphone_upnp_port_binding_new_with_parameters(upnp_igd_ip_protocol protocol, int local_port, int external_port);
-UpnpPortBinding *linphone_upnp_port_binding_new_or_collect(MSList *list, upnp_igd_ip_protocol protocol, int local_port, int external_port);
+UpnpPortBinding *linphone_upnp_port_binding_new_or_collect(bctbx_list_t *list, upnp_igd_ip_protocol protocol, int local_port, int external_port);
 UpnpPortBinding *linphone_upnp_port_binding_copy(const UpnpPortBinding *port);
 void linphone_upnp_port_binding_set_device_id(UpnpPortBinding *port, const char * device_id);
 bool_t linphone_upnp_port_binding_equal(const UpnpPortBinding *port1, const UpnpPortBinding *port2);
-UpnpPortBinding *linphone_upnp_port_binding_equivalent_in_list(MSList *list, const UpnpPortBinding *port);
+UpnpPortBinding *linphone_upnp_port_binding_equivalent_in_list(bctbx_list_t *list, const UpnpPortBinding *port);
 UpnpPortBinding *linphone_upnp_port_binding_retain(UpnpPortBinding *port);
 void linphone_upnp_update_port_binding(UpnpContext *lupnp, UpnpPortBinding **port_mapping, upnp_igd_ip_protocol protocol, int port, int retry_delay);
 void linphone_upnp_port_binding_log(int level, const char *msg, const UpnpPortBinding *port);
@@ -104,7 +104,7 @@ void linphone_upnp_update_config(UpnpContext *lupnp);
 void linphone_upnp_update_proxy(UpnpContext *lupnp, bool_t force);
 
 // Configuration
-MSList *linphone_upnp_config_list_port_bindings(struct _LpConfig *lpc, const char *device_id);
+bctbx_list_t *linphone_upnp_config_list_port_bindings(struct _LpConfig *lpc, const char *device_id);
 void linphone_upnp_config_add_port_binding(UpnpContext *lupnp, const UpnpPortBinding *port);
 void linphone_upnp_config_remove_port_binding(UpnpContext *lupnp, const UpnpPortBinding *port);
 
@@ -189,7 +189,7 @@ void linphone_upnp_igd_print(void *cookie, upnp_igd_print_level level, const cha
 	default:
 		break;
 	}
-	ortp_logv(ortp_level, fmt, list);
+	ortp_logv(ORTP_LOG_DOMAIN, ortp_level, fmt, list);
 }
 
 void linphone_upnp_igd_callback(void *cookie, upnp_igd_event event, void *arg) {
@@ -302,7 +302,7 @@ void linphone_upnp_igd_callback(void *cookie, upnp_igd_event event, void *arg) {
 			}
 		}
 
-		lupnp->pending_bindings = ms_list_remove(lupnp->pending_bindings, port_mapping);
+		lupnp->pending_bindings = bctbx_list_remove(lupnp->pending_bindings, port_mapping);
 		linphone_upnp_port_binding_release(port_mapping);
 	}
 
@@ -367,7 +367,7 @@ void linphone_upnp_context_destroy(UpnpContext *lupnp) {
 
 	ms_mutex_lock(&lupnp->mutex);
 
-	if(lupnp->lc->network_reachable) {
+	if(lupnp->lc->sip_network_reachable) {
 		/* Send port binding removes */
 		if(lupnp->sip_udp != NULL) {
 			linphone_upnp_context_send_remove_port_binding(lupnp, lupnp->sip_udp, TRUE);
@@ -413,12 +413,12 @@ void linphone_upnp_context_destroy(UpnpContext *lupnp) {
 	}
 
 	/* Release lists */
-	ms_list_for_each(lupnp->adding_configs,(void (*)(void*))linphone_upnp_port_binding_release);
-	lupnp->adding_configs = ms_list_free(lupnp->adding_configs);
-	ms_list_for_each(lupnp->removing_configs,(void (*)(void*))linphone_upnp_port_binding_release);
-	lupnp->removing_configs = ms_list_free(lupnp->removing_configs);
-	ms_list_for_each(lupnp->pending_bindings,(void (*)(void*))linphone_upnp_port_binding_release);
-	lupnp->pending_bindings = ms_list_free(lupnp->pending_bindings);
+	bctbx_list_for_each(lupnp->adding_configs,(void (*)(void*))linphone_upnp_port_binding_release);
+	lupnp->adding_configs = bctbx_list_free(lupnp->adding_configs);
+	bctbx_list_for_each(lupnp->removing_configs,(void (*)(void*))linphone_upnp_port_binding_release);
+	lupnp->removing_configs = bctbx_list_free(lupnp->removing_configs);
+	bctbx_list_for_each(lupnp->pending_bindings,(void (*)(void*))linphone_upnp_port_binding_release);
+	lupnp->pending_bindings = bctbx_list_free(lupnp->pending_bindings);
 
 	ms_mutex_destroy(&lupnp->mutex);
 	ms_cond_destroy(&lupnp->empty_cond);
@@ -598,7 +598,7 @@ int linphone_upnp_context_send_add_port_binding(UpnpContext *lupnp, UpnpPortBind
 	} else {
 		linphone_upnp_port_binding_set_device_id(port, upnp_igd_get_device_id(lupnp->upnp_igd_ctxt));
 		mapping.cookie = linphone_upnp_port_binding_retain(port);
-		lupnp->pending_bindings = ms_list_append(lupnp->pending_bindings, mapping.cookie);
+		lupnp->pending_bindings = bctbx_list_append(lupnp->pending_bindings, mapping.cookie);
 
 		mapping.local_port = port->local_port;
 		mapping.local_host = port->local_addr;
@@ -660,7 +660,7 @@ int linphone_upnp_context_send_remove_port_binding(UpnpContext *lupnp, UpnpPortB
 	} else {
 		linphone_upnp_port_binding_set_device_id(port, upnp_igd_get_device_id(lupnp->upnp_igd_ctxt));
 		mapping.cookie = linphone_upnp_port_binding_retain(port);
-		lupnp->pending_bindings = ms_list_append(lupnp->pending_bindings, mapping.cookie);
+		lupnp->pending_bindings = bctbx_list_append(lupnp->pending_bindings, mapping.cookie);
 
 		mapping.remote_port = port->external_port;
 		mapping.remote_host = "";
@@ -698,19 +698,19 @@ int linphone_core_update_upnp_audio_video(LinphoneCall *call, bool_t audio, bool
 		 * Audio part
 		 */
 		linphone_upnp_update_port_binding(lupnp, &call->upnp_session->audio->rtp,
-			UPNP_IGD_IP_PROTOCOL_UDP, (audio)? call->media_ports[0].rtp_port:0, UPNP_CALL_RETRY_DELAY);
+			UPNP_IGD_IP_PROTOCOL_UDP, (audio)? call->media_ports[call->main_audio_stream_index].rtp_port:0, UPNP_CALL_RETRY_DELAY);
 
 		linphone_upnp_update_port_binding(lupnp, &call->upnp_session->audio->rtcp,
-			UPNP_IGD_IP_PROTOCOL_UDP, (audio)? call->media_ports[0].rtcp_port:0, UPNP_CALL_RETRY_DELAY);
+			UPNP_IGD_IP_PROTOCOL_UDP, (audio)? call->media_ports[call->main_audio_stream_index].rtcp_port:0, UPNP_CALL_RETRY_DELAY);
 
 		/*
 		 * Video part
 		 */
 		linphone_upnp_update_port_binding(lupnp, &call->upnp_session->video->rtp,
-			UPNP_IGD_IP_PROTOCOL_UDP, (video)? call->media_ports[1].rtp_port:0, UPNP_CALL_RETRY_DELAY);
+			UPNP_IGD_IP_PROTOCOL_UDP, (video)? call->media_ports[call->main_video_stream_index].rtp_port:0, UPNP_CALL_RETRY_DELAY);
 
 		linphone_upnp_update_port_binding(lupnp, &call->upnp_session->video->rtcp,
-			UPNP_IGD_IP_PROTOCOL_UDP, (video)? call->media_ports[1].rtcp_port:0, UPNP_CALL_RETRY_DELAY);
+			UPNP_IGD_IP_PROTOCOL_UDP, (video)? call->media_ports[call->main_video_stream_index].rtcp_port:0, UPNP_CALL_RETRY_DELAY);
 	}
 
 	ms_mutex_unlock(&lupnp->mutex);
@@ -731,8 +731,9 @@ int linphone_core_update_upnp_from_remote_media_description(LinphoneCall *call,
 	int i;
 	const SalStreamDescription *stream;
 
-	for (i = 0; i < md->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		stream = &md->streams[i];
+		if (!sal_stream_description_active(stream)) continue;
 		if(stream->type == SalAudio) {
 			audio = TRUE;
 		} else if(stream->type == SalVideo) {
@@ -860,9 +861,9 @@ static const char *linphone_core_upnp_get_charptr_null(const char *str) {
 }
 
 void linphone_upnp_update(UpnpContext *lupnp) {
-	MSList *global_list = NULL;
-	MSList *list = NULL;
-	MSList *item;
+	bctbx_list_t *global_list = NULL;
+	bctbx_list_t *list = NULL;
+	bctbx_list_t *item;
 	LinphoneCall *call;
 	UpnpPortBinding *port_mapping, *port_mapping2;
 
@@ -873,13 +874,13 @@ void linphone_upnp_update(UpnpContext *lupnp) {
 	ms_message("uPnP IGD: Refresh mappings");
 
 	if(lupnp->sip_udp != NULL) {
-		global_list = ms_list_append(global_list, lupnp->sip_udp);
+		global_list = bctbx_list_append(global_list, lupnp->sip_udp);
 	}
 	if(lupnp->sip_tcp != NULL) {
-		global_list = ms_list_append(global_list, lupnp->sip_tcp);
+		global_list = bctbx_list_append(global_list, lupnp->sip_tcp);
 	}
 	if(lupnp->sip_tls != NULL) {
-		global_list = ms_list_append(global_list, lupnp->sip_tls);
+		global_list = bctbx_list_append(global_list, lupnp->sip_tls);
 	}
 
 	list = lupnp->lc->calls;
@@ -887,16 +888,16 @@ void linphone_upnp_update(UpnpContext *lupnp) {
 		call = (LinphoneCall *)list->data;
 		if(call->upnp_session != NULL) {
 			if(call->upnp_session->audio->rtp != NULL) {
-				global_list = ms_list_append(global_list, call->upnp_session->audio->rtp);
+				global_list = bctbx_list_append(global_list, call->upnp_session->audio->rtp);
 			}
 			if(call->upnp_session->audio->rtcp != NULL) {
-				global_list = ms_list_append(global_list, call->upnp_session->audio->rtcp);
+				global_list = bctbx_list_append(global_list, call->upnp_session->audio->rtcp);
 			}
 			if(call->upnp_session->video->rtp != NULL) {
-				global_list = ms_list_append(global_list, call->upnp_session->video->rtp);
+				global_list = bctbx_list_append(global_list, call->upnp_session->video->rtp);
 			}
 			if(call->upnp_session->video->rtcp != NULL) {
-				global_list = ms_list_append(global_list, call->upnp_session->video->rtcp);
+				global_list = bctbx_list_append(global_list, call->upnp_session->video->rtcp);
 			}
 		}
 		list = list->next;
@@ -913,8 +914,8 @@ void linphone_upnp_update(UpnpContext *lupnp) {
 				port_mapping2->state = LinphoneUpnpStateOk;
 			}
 	}
-	ms_list_for_each(list, (void (*)(void*))linphone_upnp_port_binding_release);
-	list = ms_list_free(list);
+	bctbx_list_for_each(list, (void (*)(void*))linphone_upnp_port_binding_release);
+	list = bctbx_list_free(list);
 
 
 	// (Re)Add removed port bindings
@@ -925,7 +926,7 @@ void linphone_upnp_update(UpnpContext *lupnp) {
 		linphone_upnp_context_send_add_port_binding(lupnp, port_mapping, TRUE);
 		list = list->next;
 	}
-	global_list = ms_list_free(global_list);
+	global_list = bctbx_list_free(global_list);
 }
 
 void linphone_upnp_update_port_binding(UpnpContext *lupnp, UpnpPortBinding **port_mapping, upnp_igd_ip_protocol protocol, int port, int retry_delay) {
@@ -972,7 +973,7 @@ void linphone_upnp_update_port_binding(UpnpContext *lupnp, UpnpPortBinding **por
 
 void linphone_upnp_update_config(UpnpContext* lupnp) {
 	char key[64];
-	const MSList *item;
+	const bctbx_list_t *item;
 	UpnpPortBinding *port_mapping;
 
 	/* Add configs */
@@ -986,8 +987,8 @@ void linphone_upnp_update_config(UpnpContext* lupnp) {
 		lp_config_set_string(lupnp->lc->config, UPNP_SECTION_NAME, key, "uPnP");
 		linphone_upnp_port_binding_log(ORTP_DEBUG, "Configuration: Added port binding", port_mapping);
 	}
-	ms_list_for_each(lupnp->adding_configs,(void (*)(void*))linphone_upnp_port_binding_release);
-	lupnp->adding_configs = ms_list_free(lupnp->adding_configs);
+	bctbx_list_for_each(lupnp->adding_configs,(void (*)(void*))linphone_upnp_port_binding_release);
+	lupnp->adding_configs = bctbx_list_free(lupnp->adding_configs);
 
 	/* Remove configs */
 	for(item = lupnp->removing_configs;item!=NULL;item=item->next) {
@@ -1000,13 +1001,13 @@ void linphone_upnp_update_config(UpnpContext* lupnp) {
 		lp_config_set_string(lupnp->lc->config, UPNP_SECTION_NAME, key, NULL);
 		linphone_upnp_port_binding_log(ORTP_DEBUG, "Configuration: Removed port binding", port_mapping);
 	}
-	ms_list_for_each(lupnp->removing_configs,(void (*)(void*))linphone_upnp_port_binding_release);
-	lupnp->removing_configs = ms_list_free(lupnp->removing_configs);
+	bctbx_list_for_each(lupnp->removing_configs,(void (*)(void*))linphone_upnp_port_binding_release);
+	lupnp->removing_configs = bctbx_list_free(lupnp->removing_configs);
 }
 
 void linphone_upnp_update_proxy(UpnpContext* lupnp, bool_t force) {
 	LinphoneUpnpState ready_state;
-	const MSList *item;
+	const bctbx_list_t *item;
 	time_t now = (force)? (lupnp->last_ready_check + UPNP_CORE_READY_CHECK) : time(NULL);
 
 	/* Refresh registers if we are ready */
@@ -1060,7 +1061,7 @@ int linphone_core_update_local_media_description_from_upnp(SalMediaDescription *
 	SalStreamDescription *stream;
 	UpnpStream *upnpStream;
 
-	for (i = 0; i < desc->nb_streams; i++) {
+	for (i = 0; i < SAL_MEDIA_DESCRIPTION_MAX_STREAMS; i++) {
 		stream = &desc->streams[i];
 		if (!sal_stream_description_active(stream)) continue;
 		upnpStream = NULL;
@@ -1088,7 +1089,7 @@ int linphone_core_update_local_media_description_from_upnp(SalMediaDescription *
  * uPnP Port Binding
  */
 
-UpnpPortBinding *linphone_upnp_port_binding_new() {
+UpnpPortBinding *linphone_upnp_port_binding_new(void) {
 	UpnpPortBinding *port = NULL;
 	port = ms_new0(UpnpPortBinding,1);
 	ms_mutex_init(&port->mutex, NULL);
@@ -1114,7 +1115,7 @@ UpnpPortBinding *linphone_upnp_port_binding_new_with_parameters(upnp_igd_ip_prot
 	return port_binding;
 }
 
-UpnpPortBinding *linphone_upnp_port_binding_new_or_collect(MSList *list, upnp_igd_ip_protocol protocol, int local_port, int external_port) {
+UpnpPortBinding *linphone_upnp_port_binding_new_or_collect(bctbx_list_t *list, upnp_igd_ip_protocol protocol, int local_port, int external_port) {
 	UpnpPortBinding *tmp_binding;
 	UpnpPortBinding *end_binding;
 
@@ -1181,7 +1182,7 @@ bool_t linphone_upnp_port_binding_equal(const UpnpPortBinding *port1, const Upnp
 		   (port1->external_port == -1 || port2->external_port == -1 || port1->external_port == port2->external_port);
 }
 
-UpnpPortBinding *linphone_upnp_port_binding_equivalent_in_list(MSList *list, const UpnpPortBinding *port) {
+UpnpPortBinding *linphone_upnp_port_binding_equivalent_in_list(bctbx_list_t *list, const UpnpPortBinding *port) {
 	UpnpPortBinding *port_mapping;
 	while(list != NULL) {
 		port_mapping = (UpnpPortBinding *)list->data;
@@ -1220,7 +1221,7 @@ void linphone_upnp_port_binding_release(UpnpPortBinding *port) {
  * uPnP Stream
  */
 
-UpnpStream* linphone_upnp_stream_new() {
+UpnpStream* linphone_upnp_stream_new(void) {
 	UpnpStream *stream = ms_new0(UpnpStream,1);
 	stream->state = LinphoneUpnpStateIdle;
 	stream->rtp = NULL;
@@ -1292,7 +1293,7 @@ LinphoneUpnpState linphone_upnp_session_get_state(UpnpSession *session) {
 
 struct linphone_upnp_config_list_port_bindings_struct {
 	struct _LpConfig *lpc;
-	MSList *retList;
+	bctbx_list_t *retList;
 	const char *device_id;
 };
 
@@ -1326,7 +1327,7 @@ static void linphone_upnp_config_list_port_bindings_cb(const char *entry, struct
 			port->protocol = protocol;
 			port->external_port = external_port;
 			port->local_port = local_port;
-			cookie->retList = ms_list_append(cookie->retList, port);
+			cookie->retList = bctbx_list_append(cookie->retList, port);
 		}
 	} else {
 		valid = FALSE;
@@ -1336,7 +1337,7 @@ static void linphone_upnp_config_list_port_bindings_cb(const char *entry, struct
 	}
 }
 
-MSList *linphone_upnp_config_list_port_bindings(struct _LpConfig *lpc, const char *device_id) {
+bctbx_list_t *linphone_upnp_config_list_port_bindings(struct _LpConfig *lpc, const char *device_id) {
 	char *formated_device_id = linphone_upnp_format_device_id(device_id);
 	struct linphone_upnp_config_list_port_bindings_struct cookie = {lpc, NULL, formated_device_id};
 	lp_config_for_each_entry(lpc, UPNP_SECTION_NAME, (void(*)(const char *, void*))linphone_upnp_config_list_port_bindings_cb, &cookie);
@@ -1345,7 +1346,7 @@ MSList *linphone_upnp_config_list_port_bindings(struct _LpConfig *lpc, const cha
 }
 
 void linphone_upnp_config_add_port_binding(UpnpContext *lupnp, const UpnpPortBinding *port) {
-	MSList *list;
+	bctbx_list_t *list;
 	UpnpPortBinding *list_port;
 
 	if(port->device_id == NULL) {
@@ -1357,11 +1358,11 @@ void linphone_upnp_config_add_port_binding(UpnpContext *lupnp, const UpnpPortBin
 	while(list != NULL) {
 		list_port = (UpnpPortBinding *)list->data;
 		if(linphone_upnp_port_binding_equal(list_port, port) == TRUE) {
-			lupnp->removing_configs = ms_list_remove(lupnp->removing_configs, list_port);
+			lupnp->removing_configs = bctbx_list_remove(lupnp->removing_configs, list_port);
 			linphone_upnp_port_binding_release(list_port);
 			return;
 		}
-		list = ms_list_next(list);
+		list = bctbx_list_next(list);
 	}
 
 	list = lupnp->adding_configs;
@@ -1370,15 +1371,15 @@ void linphone_upnp_config_add_port_binding(UpnpContext *lupnp, const UpnpPortBin
 		if(linphone_upnp_port_binding_equal(list_port, port) == TRUE) {
 			return;
 		}
-		list = ms_list_next(list);
+		list = bctbx_list_next(list);
 	}
 
 	list_port = linphone_upnp_port_binding_copy(port);
-	lupnp->adding_configs = ms_list_append(lupnp->adding_configs, list_port);
+	lupnp->adding_configs = bctbx_list_append(lupnp->adding_configs, list_port);
 }
 
 void linphone_upnp_config_remove_port_binding(UpnpContext *lupnp, const UpnpPortBinding *port) {
-	MSList *list;
+	bctbx_list_t *list;
 	UpnpPortBinding *list_port;
 
 	if(port->device_id == NULL) {
@@ -1390,11 +1391,11 @@ void linphone_upnp_config_remove_port_binding(UpnpContext *lupnp, const UpnpPort
 	while(list != NULL) {
 		list_port = (UpnpPortBinding *)list->data;
 		if(linphone_upnp_port_binding_equal(list_port, port) == TRUE) {
-			lupnp->adding_configs = ms_list_remove(lupnp->adding_configs, list_port);
+			lupnp->adding_configs = bctbx_list_remove(lupnp->adding_configs, list_port);
 			linphone_upnp_port_binding_release(list_port);
 			return;
 		}
-		list = ms_list_next(list);
+		list = bctbx_list_next(list);
 	}
 
 	list = lupnp->removing_configs;
@@ -1403,9 +1404,9 @@ void linphone_upnp_config_remove_port_binding(UpnpContext *lupnp, const UpnpPort
 		if(linphone_upnp_port_binding_equal(list_port, port) == TRUE) {
 			return;
 		}
-		list = ms_list_next(list);
+		list = bctbx_list_next(list);
 	}
 
 	list_port = linphone_upnp_port_binding_copy(port);
-	lupnp->removing_configs = ms_list_append(lupnp->removing_configs, list_port);
+	lupnp->removing_configs = bctbx_list_append(lupnp->removing_configs, list_port);
 }
diff --git a/coreapi/vcard.cc b/coreapi/vcard.cc
new file mode 100644
index 000000000..9d99efa78
--- /dev/null
+++ b/coreapi/vcard.cc
@@ -0,0 +1,402 @@
+/*
+vcard.cc
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "vcard.h"
+#include "belcard/belcard.hpp"
+#include "belcard/belcard_parser.hpp"
+#include "sal/sal.h"
+#include <bctoolbox/crypto.h>
+#include "linphonecore.h"
+
+#define VCARD_MD5_HASH_SIZE 16
+
+
+struct _LinphoneVcardContext {
+	belcard::BelCardParser *parser;
+	void *user_data;
+};
+
+struct _LinphoneVcard {
+	shared_ptr<belcard::BelCard> belCard;
+	char *etag;
+	char *url;
+	unsigned char md5[VCARD_MD5_HASH_SIZE];
+	bctbx_list_t *sip_addresses_cache;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LinphoneVcardContext* linphone_vcard_context_new(void) {
+	LinphoneVcardContext* context = ms_new0(LinphoneVcardContext, 1);
+	context->parser = new belcard::BelCardParser();
+	context->user_data = NULL;
+	return context;
+}
+
+void linphone_vcard_context_destroy(LinphoneVcardContext *context) {
+	if (context) {
+		if (context->parser) delete context->parser;
+		ms_free(context);
+	}
+}
+
+void* linphone_vcard_context_get_user_data(const LinphoneVcardContext *context) {
+	return context ? context->user_data : NULL;
+}
+
+
+void linphone_vcard_context_set_user_data(LinphoneVcardContext *context, void *data) {
+	if (context) context->user_data = data;
+}
+
+LinphoneVcard* linphone_vcard_new(void) {
+	LinphoneVcard* vCard = (LinphoneVcard*) ms_new0(LinphoneVcard, 1);
+	vCard->belCard = belcard::BelCardGeneric::create<belcard::BelCard>();
+	return vCard;
+}
+
+static LinphoneVcard* linphone_vcard_new_from_belcard(shared_ptr<belcard::BelCard> belcard) {
+	LinphoneVcard* vCard = (LinphoneVcard*) ms_new0(LinphoneVcard, 1);
+	vCard->belCard = belcard;
+	return vCard;
+}
+
+void linphone_vcard_free(LinphoneVcard *vCard) {
+	if (!vCard) return;
+	if (vCard->etag) ms_free(vCard->etag);
+	if (vCard->url) ms_free(vCard->url);
+	linphone_vcard_clean_cache(vCard);
+	vCard->belCard.reset();
+	ms_free(vCard);
+}
+
+bctbx_list_t* linphone_vcard_context_get_vcard_list_from_file(LinphoneVcardContext *context, const char *filename) {
+	bctbx_list_t *result = NULL;
+	if (context && filename) {
+		if (!context->parser) {
+			context->parser = new belcard::BelCardParser();
+		}
+		shared_ptr<belcard::BelCardList> belCards = context->parser->parseFile(filename);
+		if (belCards) {
+			for (auto it = belCards->getCards().begin(); it != belCards->getCards().end(); ++it) {
+				shared_ptr<belcard::BelCard> belCard = (*it);
+				LinphoneVcard *vCard = linphone_vcard_new_from_belcard(belCard);
+				result = bctbx_list_append(result, vCard);
+			}
+		}
+	}
+	return result;
+}
+
+bctbx_list_t* linphone_vcard_context_get_vcard_list_from_buffer(LinphoneVcardContext *context, const char *buffer) {
+	bctbx_list_t *result = NULL;
+	if (context && buffer) {
+		if (!context->parser) {
+			context->parser = new belcard::BelCardParser();
+		}
+		shared_ptr<belcard::BelCardList> belCards = context->parser->parse(buffer);
+		if (belCards) {
+			for (auto it = belCards->getCards().begin(); it != belCards->getCards().end(); ++it) {
+				shared_ptr<belcard::BelCard> belCard = (*it);
+				LinphoneVcard *vCard = linphone_vcard_new_from_belcard(belCard);
+				result = bctbx_list_append(result, vCard);
+			}
+		}
+	}
+	return result;
+}
+
+LinphoneVcard* linphone_vcard_context_get_vcard_from_buffer(LinphoneVcardContext *context, const char *buffer) {
+	LinphoneVcard *vCard = NULL;
+	if (context && buffer) {
+		if (!context->parser) {
+			context->parser = new belcard::BelCardParser();
+		}
+		shared_ptr<belcard::BelCard> belCard = context->parser->parseOne(buffer);
+		if (belCard) {
+			vCard = linphone_vcard_new_from_belcard(belCard);
+		} else {
+			ms_error("Couldn't parse buffer %s", buffer);
+		}
+	}
+	return vCard;
+}
+
+const char * linphone_vcard_as_vcard4_string(LinphoneVcard *vCard) {
+	if (!vCard) return NULL;
+
+	return vCard->belCard->toFoldedString().c_str();
+}
+
+void linphone_vcard_set_full_name(LinphoneVcard *vCard, const char *name) {
+	if (!vCard || !name) return;
+
+	if (vCard->belCard->getFullName()) {
+		vCard->belCard->getFullName()->setValue(name);
+	} else {
+		shared_ptr<belcard::BelCardFullName> fn = belcard::BelCardGeneric::create<belcard::BelCardFullName>();
+		fn->setValue(name);
+		vCard->belCard->setFullName(fn);
+	}
+}
+
+const char* linphone_vcard_get_full_name(const LinphoneVcard *vCard) {
+	if (!vCard) return NULL;
+
+	const char *result = vCard->belCard->getFullName() ? vCard->belCard->getFullName()->getValue().c_str() : NULL;
+	return result;
+}
+
+void linphone_vcard_set_family_name(LinphoneVcard *vCard, const char *name) {
+	if (!vCard || !name) return;
+
+	if (vCard->belCard->getName()) {
+		vCard->belCard->getName()->setFamilyName(name);
+	} else {
+		shared_ptr<belcard::BelCardName> n = belcard::BelCardGeneric::create<belcard::BelCardName>();
+		n->setFamilyName(name);
+		vCard->belCard->setName(n);
+	}
+}
+
+const char* linphone_vcard_get_family_name(const LinphoneVcard *vCard) {
+	if (!vCard) return NULL;
+
+	const char *result = vCard->belCard->getName() ? vCard->belCard->getName()->getFamilyName().c_str() : NULL;
+	return result;
+}
+
+void linphone_vcard_set_given_name(LinphoneVcard *vCard, const char *name) {
+	if (!vCard || !name) return;
+
+	if (vCard->belCard->getName()) {
+		vCard->belCard->getName()->setGivenName(name);
+	} else {
+		shared_ptr<belcard::BelCardName> n = belcard::BelCardGeneric::create<belcard::BelCardName>();
+		n->setGivenName(name);
+		vCard->belCard->setName(n);
+	}
+}
+
+const char* linphone_vcard_get_given_name(const LinphoneVcard *vCard) {
+	if (!vCard) return NULL;
+
+	const char *result = vCard->belCard->getName() ? vCard->belCard->getName()->getGivenName().c_str() : NULL;
+	return result;
+}
+
+void linphone_vcard_add_sip_address(LinphoneVcard *vCard, const char *sip_address) {
+	if (!vCard || !sip_address) return;
+
+	shared_ptr<belcard::BelCardImpp> impp = belcard::BelCardGeneric::create<belcard::BelCardImpp>();
+	impp->setValue(sip_address);
+	vCard->belCard->addImpp(impp);
+}
+
+void linphone_vcard_remove_sip_address(LinphoneVcard *vCard, const char *sip_address) {
+	if (!vCard) return;
+
+	shared_ptr<belcard::BelCardImpp> impp;
+	for (auto it = vCard->belCard->getImpp().begin(); it != vCard->belCard->getImpp().end(); ++it) {
+		const char *value = (*it)->getValue().c_str();
+		if (strcmp(value, sip_address) == 0) {
+			impp = *it;
+			break;
+		}
+	}
+	if (impp) {
+		vCard->belCard->removeImpp(impp);
+	}
+}
+
+void linphone_vcard_edit_main_sip_address(LinphoneVcard *vCard, const char *sip_address) {
+	if (!vCard || !sip_address) return;
+
+	if (vCard->belCard->getImpp().size() > 0) {
+		const shared_ptr<belcard::BelCardImpp> impp = vCard->belCard->getImpp().front();
+		impp->setValue(sip_address);
+	} else {
+		shared_ptr<belcard::BelCardImpp> impp = belcard::BelCardGeneric::create<belcard::BelCardImpp>();
+		impp->setValue(sip_address);
+		vCard->belCard->addImpp(impp);
+	}
+}
+
+const bctbx_list_t* linphone_vcard_get_sip_addresses(LinphoneVcard *vCard) {
+	if (!vCard) return NULL;
+	if (!vCard->sip_addresses_cache) {
+		for (auto it = vCard->belCard->getImpp().begin(); it != vCard->belCard->getImpp().end(); ++it) {
+			LinphoneAddress* addr = linphone_address_new((*it)->getValue().c_str());
+			if (addr) {
+				vCard->sip_addresses_cache = bctbx_list_append(vCard->sip_addresses_cache, addr);
+			}
+		}
+	}
+	return vCard->sip_addresses_cache;
+}
+
+void linphone_vcard_add_phone_number(LinphoneVcard *vCard, const char *phone) {
+	if (!vCard || !phone) return;
+
+	shared_ptr<belcard::BelCardPhoneNumber> phone_number = belcard::BelCardGeneric::create<belcard::BelCardPhoneNumber>();
+	phone_number->setValue(phone);
+	vCard->belCard->addPhoneNumber(phone_number);
+}
+
+void linphone_vcard_remove_phone_number(LinphoneVcard *vCard, const char *phone) {
+	if (!vCard) return;
+
+	shared_ptr<belcard::BelCardPhoneNumber> tel;
+	for (auto it = vCard->belCard->getPhoneNumbers().begin(); it != vCard->belCard->getPhoneNumbers().end(); ++it) {
+		const char *value = (*it)->getValue().c_str();
+		if (strcmp(value, phone) == 0) {
+			tel = *it;
+			break;
+		}
+	}
+	if (tel) {
+		vCard->belCard->removePhoneNumber(tel);
+	}
+}
+
+bctbx_list_t* linphone_vcard_get_phone_numbers(const LinphoneVcard *vCard) {
+	bctbx_list_t *result = NULL;
+	if (!vCard) return NULL;
+
+	for (auto it = vCard->belCard->getPhoneNumbers().begin(); it != vCard->belCard->getPhoneNumbers().end(); ++it) {
+		const char *value = (*it)->getValue().c_str();
+		result = bctbx_list_append(result, (char *)value);
+	}
+	return result;
+}
+
+void linphone_vcard_set_organization(LinphoneVcard *vCard, const char *organization) {
+	if (!vCard) return;
+
+	if (vCard->belCard->getOrganizations().size() > 0) {
+		const shared_ptr<belcard::BelCardOrganization> org = vCard->belCard->getOrganizations().front();
+		org->setValue(organization);
+	} else {
+		shared_ptr<belcard::BelCardOrganization> org = belcard::BelCardGeneric::create<belcard::BelCardOrganization>();
+		org->setValue(organization);
+		vCard->belCard->addOrganization(org);
+	}
+}
+
+const char* linphone_vcard_get_organization(const LinphoneVcard *vCard) {
+	if (vCard && vCard->belCard->getOrganizations().size() > 0) {
+		const shared_ptr<belcard::BelCardOrganization> org = vCard->belCard->getOrganizations().front();
+		return org->getValue().c_str();
+	}
+
+	return NULL;
+}
+
+bool_t linphone_vcard_generate_unique_id(LinphoneVcard *vCard) {
+	char uuid[64];
+
+	if (vCard) {
+		if (linphone_vcard_get_uid(vCard)) {
+			return FALSE;
+		}
+		if (sal_generate_uuid(uuid, sizeof(uuid)) == 0) {
+			char vcard_uuid[sizeof(uuid)+4];
+			snprintf(vcard_uuid, sizeof(vcard_uuid), "urn:%s", uuid);
+			linphone_vcard_set_uid(vCard, vcard_uuid);
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+void linphone_vcard_set_uid(LinphoneVcard *vCard, const char *uid) {
+	if (!vCard || !uid) return;
+
+	shared_ptr<belcard::BelCardUniqueId> uniqueId = belcard::BelCardGeneric::create<belcard::BelCardUniqueId>();
+	uniqueId->setValue(uid);
+	vCard->belCard->setUniqueId(uniqueId);
+}
+
+const char* linphone_vcard_get_uid(const LinphoneVcard *vCard) {
+	if (vCard && vCard->belCard->getUniqueId()) {
+		return vCard->belCard->getUniqueId()->getValue().c_str();
+	}
+	return NULL;
+}
+
+void linphone_vcard_set_etag(LinphoneVcard *vCard, const char * etag) {
+	if (!vCard) {
+		return;
+	}
+	if (vCard->etag) {
+		ms_free(vCard->etag);
+		vCard->etag = NULL;
+	}
+	vCard->etag = ms_strdup(etag);
+}
+
+const char* linphone_vcard_get_etag(const LinphoneVcard *vCard) {
+	if (!vCard) return NULL;
+	return vCard->etag;
+}
+
+void linphone_vcard_set_url(LinphoneVcard *vCard, const char * url) {
+	if (!vCard) {
+		return;
+	}
+	if (vCard->url) {
+		ms_free(vCard->url);
+		vCard->url = NULL;
+	}
+	vCard->url = ms_strdup(url);
+}
+
+const char* linphone_vcard_get_url(const LinphoneVcard *vCard) {
+	if (!vCard) return NULL;
+	return vCard->url;
+}
+
+void linphone_vcard_compute_md5_hash(LinphoneVcard *vCard) {
+	const char *text = NULL;
+	if (!vCard) return;
+	text = linphone_vcard_as_vcard4_string(vCard);
+	bctbx_md5((unsigned char *)text, strlen(text), vCard->md5);
+}
+
+bool_t linphone_vcard_compare_md5_hash(LinphoneVcard *vCard) {
+	unsigned char previous_md5[VCARD_MD5_HASH_SIZE];
+	memcpy(previous_md5, vCard->md5, VCARD_MD5_HASH_SIZE);
+	linphone_vcard_compute_md5_hash(vCard);
+	return memcmp(vCard->md5, previous_md5, VCARD_MD5_HASH_SIZE);
+}
+
+bool_t linphone_core_vcard_supported(void) {
+	return TRUE;
+}
+
+void linphone_vcard_clean_cache(LinphoneVcard *vCard) {
+	if (vCard->sip_addresses_cache) bctbx_list_free_with_data(vCard->sip_addresses_cache, (void (*)(void*))linphone_address_unref);
+	vCard->sip_addresses_cache = NULL;
+}
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/coreapi/vcard.h b/coreapi/vcard.h
new file mode 100644
index 000000000..7e72b5347
--- /dev/null
+++ b/coreapi/vcard.h
@@ -0,0 +1,296 @@
+/*
+vcard.h
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef LINPHONE_VCARD_H
+#define LINPHONE_VCARD_H
+
+#include <mediastreamer2/mscommon.h>
+
+#ifndef LINPHONE_PUBLIC
+#define LINPHONE_PUBLIC MS2_PUBLIC
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/**
+ * @addtogroup carddav_vcard
+ * @{
+ */
+
+/**
+ * The LinphoneVcardContext object.
+ */
+typedef struct _LinphoneVcardContext LinphoneVcardContext;
+
+/**
+ * Creates a vCard context to reuse the same BelCardParser object
+ * @return a new LinphoneVcardContext object
+ */
+LINPHONE_PUBLIC LinphoneVcardContext* linphone_vcard_context_new(void);
+
+/**
+ * Destroys the vCard context
+ * @param[in] context a LinphoneVcardContext object
+ */
+LINPHONE_PUBLIC void linphone_vcard_context_destroy(LinphoneVcardContext *context);
+
+/**
+ * Gets the user data set in the LinphoneVcardContext
+ * @param[in] context a LinphoneVcardContext object
+ * @return the user data pointer
+ */
+LINPHONE_PUBLIC void* linphone_vcard_context_get_user_data(const LinphoneVcardContext *context);
+
+/**
+ * Sets the user data in the LinphoneVcardContext
+ * @param[in] context a LinphoneVcardContext object
+ * @param[in] data the user data pointer
+ */
+LINPHONE_PUBLIC void linphone_vcard_context_set_user_data(LinphoneVcardContext *context, void *data);
+
+/**
+ * The LinphoneVcard object.
+ */
+typedef struct _LinphoneVcard LinphoneVcard;
+
+/**
+ * Creates a LinphoneVcard object that has a pointer to an empty vCard
+ * @return a new LinphoneVcard object
+ */
+LINPHONE_PUBLIC LinphoneVcard* linphone_vcard_new(void);
+
+/**
+ * Deletes a LinphoneVcard object properly
+ * @param[in] vCard the LinphoneVcard to destroy
+ */
+LINPHONE_PUBLIC void linphone_vcard_free(LinphoneVcard *vCard);
+
+/**
+ * Uses belcard to parse the content of a file and returns all the vcards it contains as LinphoneVcards, or NULL if it contains none.
+ * @param[in] context the vCard context to use (speed up the process by not creating a Belcard parser each time)
+ * @param[in] file the path to the file to parse
+ * @return \mslist{LinphoneVcard}
+ */
+LINPHONE_PUBLIC bctbx_list_t* linphone_vcard_context_get_vcard_list_from_file(LinphoneVcardContext *context, const char *file);
+
+/**
+ * Uses belcard to parse the content of a buffer and returns all the vcards it contains as LinphoneVcards, or NULL if it contains none.
+ * @param[in] context the vCard context to use (speed up the process by not creating a Belcard parser each time)
+ * @param[in] buffer the buffer to parse
+ * @return \mslist{LinphoneVcard}
+ */
+LINPHONE_PUBLIC bctbx_list_t* linphone_vcard_context_get_vcard_list_from_buffer(LinphoneVcardContext *context, const char *buffer);
+
+/**
+ * Uses belcard to parse the content of a buffer and returns one vCard if possible, or NULL otherwise.
+ * @param[in] context the vCard context to use (speed up the process by not creating a Belcard parser each time)
+ * @param[in] buffer the buffer to parse
+ * @return a LinphoneVcard if one could be parsed, or NULL otherwise
+ */
+LINPHONE_PUBLIC LinphoneVcard* linphone_vcard_context_get_vcard_from_buffer(LinphoneVcardContext *context, const char *buffer);
+
+/**
+ * Returns the vCard4 representation of the LinphoneVcard.
+ * @param[in] vCard the LinphoneVcard
+ * @return a const char * that represents the vCard
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_as_vcard4_string(LinphoneVcard *vCard);
+
+/**
+ * Sets the FN attribute of the vCard (which is mandatory).
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] name the display name to set for the vCard
+ */
+LINPHONE_PUBLIC void linphone_vcard_set_full_name(LinphoneVcard *vCard, const char *name);
+
+/**
+ * Returns the FN attribute of the vCard, or NULL if it isn't set yet.
+ * @param[in] vCard the LinphoneVcard
+ * @return the display name of the vCard, or NULL
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_get_full_name(const LinphoneVcard *vCard);
+
+/**
+ * Sets the family name in the N attribute of the vCard.
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] name the family name to set for the vCard
+ */
+LINPHONE_PUBLIC void linphone_vcard_set_family_name(LinphoneVcard *vCard, const char *name);
+
+/**
+ * Returns the family name in the N attribute of the vCard, or NULL if it isn't set yet.
+ * @param[in] vCard the LinphoneVcard
+ * @return the family name of the vCard, or NULL
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_get_family_name(const LinphoneVcard *vCard);
+
+/**
+ * Sets the given name in the N attribute of the vCard.
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] name the given name to set for the vCard
+ */
+LINPHONE_PUBLIC void linphone_vcard_set_given_name(LinphoneVcard *vCard, const char *name);
+
+/**
+ * Returns the given name in the N attribute of the vCard, or NULL if it isn't set yet.
+ * @param[in] vCard the LinphoneVcard
+ * @return the given name of the vCard, or NULL
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_get_given_name(const LinphoneVcard *vCard);
+
+/**
+ * Adds a SIP address in the vCard, using the IMPP property
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] sip_address the SIP address to add
+ */
+void linphone_vcard_add_sip_address(LinphoneVcard *vCard, const char *sip_address);
+
+/**
+ * Removes a SIP address in the vCard (if it exists), using the IMPP property
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] sip_address the SIP address to remove
+ */
+void linphone_vcard_remove_sip_address(LinphoneVcard *vCard, const char *sip_address);
+
+/**
+ * Edits the preferred SIP address in the vCard (or the first one), using the IMPP property
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] sip_address the new SIP address
+ */
+void linphone_vcard_edit_main_sip_address(LinphoneVcard *vCard, const char *sip_address);
+
+/**
+ * Returns the list of SIP addresses (as LinphoneAddress) in the vCard (all the IMPP attributes that has an URI value starting by "sip:") or NULL
+ * @param[in] vCard the LinphoneVcard
+ * @return const \mslist{LinphoneAddress *}
+ */
+LINPHONE_PUBLIC const bctbx_list_t* linphone_vcard_get_sip_addresses(LinphoneVcard *vCard);
+
+/**
+ * Adds a phone number in the vCard, using the TEL property
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] phone the phone number to add
+ */
+void linphone_vcard_add_phone_number(LinphoneVcard *vCard, const char *phone);
+
+/**
+ * Removes a phone number in the vCard (if it exists), using the TEL property
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] phone the phone number to remove
+ */
+void linphone_vcard_remove_phone_number(LinphoneVcard *vCard, const char *phone);
+
+/**
+ * Returns the list of phone numbers (as string) in the vCard (all the TEL attributes) or NULL
+ * @param[in] vCard the LinphoneVcard
+ * @return \mslist{const char *}
+ */
+LINPHONE_PUBLIC bctbx_list_t* linphone_vcard_get_phone_numbers(const LinphoneVcard *vCard);
+
+/**
+ * Fills the Organization field of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] organization the Organization
+ */
+LINPHONE_PUBLIC void linphone_vcard_set_organization(LinphoneVcard *vCard, const char *organization);
+
+/**
+ * Gets the Organization of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @return the Organization of the vCard or NULL
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_get_organization(const LinphoneVcard *vCard);
+
+/**
+ * Generates a random unique id for the vCard.
+ * If is required to be able to synchronize the vCard with a CardDAV server
+ * @param[in] vCard the LinphoneVcard
+ * @return TRUE if operation is successful, otherwise FALSE (for example if it already has an unique ID)
+ */
+bool_t linphone_vcard_generate_unique_id(LinphoneVcard *vCard);
+
+/**
+ * Sets the unique ID of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] uid the unique id
+ */
+void linphone_vcard_set_uid(LinphoneVcard *vCard, const char *uid);
+
+/**
+ * Gets the UID of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @return the UID of the vCard, otherwise NULL
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_get_uid(const LinphoneVcard *vCard);
+
+/**
+ * Sets the eTAG of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] etag the eTAG
+ */
+LINPHONE_PUBLIC void linphone_vcard_set_etag(LinphoneVcard *vCard, const char * etag);
+
+/**
+ * Gets the eTag of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @return the eTag of the vCard in the CardDAV server, otherwise NULL
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_get_etag(const LinphoneVcard *vCard);
+
+/**
+ * Sets the URL of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @param[in] url the URL
+ */
+LINPHONE_PUBLIC void linphone_vcard_set_url(LinphoneVcard *vCard, const char *url);
+
+/**
+ * Gets the URL of the vCard
+ * @param[in] vCard the LinphoneVcard
+ * @return the URL of the vCard in the CardDAV server, otherwise NULL
+ */
+LINPHONE_PUBLIC const char* linphone_vcard_get_url(const LinphoneVcard *vCard);
+
+/**
+ * Computes the md5 hash for the vCard
+ * @param[in] vCard the LinphoneVcard
+ */
+void linphone_vcard_compute_md5_hash(LinphoneVcard *vCard);
+
+/**
+ * Compares the previously computed md5 hash (using linphone_vcard_compute_md5_hash) with the current one
+ * @param[in] vCard the LinphoneVcard
+ * @return 0 if the md5 hasn't changed, 1 otherwise
+ */
+bool_t linphone_vcard_compare_md5_hash(LinphoneVcard *vCard);
+
+void linphone_vcard_clean_cache(LinphoneVcard *vCard);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/coreapi/vcard_stubs.c b/coreapi/vcard_stubs.c
new file mode 100644
index 000000000..70920e5ae
--- /dev/null
+++ b/coreapi/vcard_stubs.c
@@ -0,0 +1,163 @@
+/*
+vcard_stubs.c
+Copyright (C) 2015  Belledonne Communications SARL
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "vcard.h"
+#include "linphonecore.h"
+
+struct _LinphoneVcardContext {
+	void *user_data;
+};
+
+LinphoneVcardContext* linphone_vcard_context_new(void) {
+	LinphoneVcardContext* context = ms_new0(LinphoneVcardContext, 1);
+	context->user_data = NULL;
+	return context;
+}
+
+void linphone_vcard_context_destroy(LinphoneVcardContext *context) {
+	if (context) {
+		ms_free(context);
+	}
+}
+
+
+void* linphone_vcard_context_get_user_data(const LinphoneVcardContext *context) {
+	return context ? context->user_data : NULL;
+}
+
+void linphone_vcard_context_set_user_data(LinphoneVcardContext *context, void *data) {
+	if (context) context->user_data = data;
+}
+
+struct _LinphoneVcard {
+	void *dummy;
+};
+
+LinphoneVcard* linphone_vcard_new(void) {
+	return NULL;
+}
+
+void linphone_vcard_free(LinphoneVcard *vCard) {
+}
+
+bctbx_list_t* linphone_vcard_context_get_vcard_list_from_file(LinphoneVcardContext *context, const char *filename) {
+	return NULL;
+}
+
+bctbx_list_t* linphone_vcard_context_get_vcard_list_from_buffer(LinphoneVcardContext *context, const char *buffer) {
+	return NULL;
+}
+
+LinphoneVcard* linphone_vcard_context_get_vcard_from_buffer(LinphoneVcardContext *context, const char *buffer) {
+	return NULL;
+}
+
+const char * linphone_vcard_as_vcard4_string(LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_set_full_name(LinphoneVcard *vCard, const char *name) {
+}
+
+const char* linphone_vcard_get_full_name(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_set_family_name(LinphoneVcard *vCard, const char *name) {
+}
+
+const char* linphone_vcard_get_family_name(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_set_given_name(LinphoneVcard *vCard, const char *name) {
+}
+
+const char* linphone_vcard_get_given_name(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_add_sip_address(LinphoneVcard *vCard, const char *sip_address) {
+}
+
+void linphone_vcard_remove_sip_address(LinphoneVcard *vCard, const char *sip_address) {
+}
+
+void linphone_vcard_edit_main_sip_address(LinphoneVcard *vCard, const char *sip_address) {
+}
+
+const bctbx_list_t* linphone_vcard_get_sip_addresses(LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_add_phone_number(LinphoneVcard *vCard, const char *phone) {
+}
+
+void linphone_vcard_remove_phone_number(LinphoneVcard *vCard, const char *phone) {
+}
+
+bctbx_list_t* linphone_vcard_get_phone_numbers(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_set_organization(LinphoneVcard *vCard, const char *organization) {
+}
+
+const char* linphone_vcard_get_organization(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+bool_t linphone_vcard_generate_unique_id(LinphoneVcard *vCard) {
+	return FALSE;
+}
+
+void linphone_vcard_set_uid(LinphoneVcard *vCard, const char *uid) {
+}
+
+const char* linphone_vcard_get_uid(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_set_etag(LinphoneVcard *vCard, const char * etag) {
+}
+
+const char* linphone_vcard_get_etag(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_set_url(LinphoneVcard *vCard, const char * url) {
+}
+
+const char* linphone_vcard_get_url(const LinphoneVcard *vCard) {
+	return NULL;
+}
+
+void linphone_vcard_compute_md5_hash(LinphoneVcard *vCard) {
+}
+
+bool_t linphone_vcard_compare_md5_hash(LinphoneVcard *vCard) {
+	return FALSE;
+}
+
+bool_t linphone_core_vcard_supported(void) {
+	return FALSE;
+}
+
+void linphone_vcard_clean_cache(LinphoneVcard *vCard) {
+}
diff --git a/coreapi/vtables.c b/coreapi/vtables.c
index 9d44160c1..12ca9fc30 100644
--- a/coreapi/vtables.c
+++ b/coreapi/vtables.c
@@ -29,7 +29,7 @@ void linphone_core_v_table_set_user_data(LinphoneCoreVTable *table, void *data)
 	table->user_data = data;
 }
 
-void* linphone_core_v_table_get_user_data(LinphoneCoreVTable *table) {
+void* linphone_core_v_table_get_user_data(const LinphoneCoreVTable *table) {
 	return table->user_data;
 }
 
@@ -42,129 +42,188 @@ LinphoneCoreVTable *linphone_core_get_current_vtable(LinphoneCore *lc) {
 }
 
 static void cleanup_dead_vtable_refs(LinphoneCore *lc){
-	MSList *it,*next_it;
+	bctbx_list_t *it,*next_it;
+	
+	if (lc->vtable_notify_recursion > 0) return; /*don't cleanup vtable if we are iterating through a listener list.*/
 	for(it=lc->vtable_refs; it!=NULL; ){
 		VTableReference *ref=(VTableReference*)it->data;
 		next_it=it->next;
 		if (ref->valid==0){
 			ref->valid=0;
-			lc->vtable_refs=ms_list_remove_link(lc->vtable_refs, it);
+			lc->vtable_refs=bctbx_list_erase_link(lc->vtable_refs, it);
 			ms_free(ref);
 		}
 		it=next_it;
 	}
 }
 
-#define NOTIFY_IF_EXIST(function_name) \
-	MSList* iterator; \
+#define NOTIFY_IF_EXIST(function_name, ...) \
+	bctbx_list_t* iterator; \
 	VTableReference *ref; \
-	ms_message("Linphone core [%p] notifying [%s]",lc,#function_name);\
-	for (iterator=lc->vtable_refs; iterator!=NULL; iterator=iterator->next) \
-		if ((ref=(VTableReference*)iterator->data)->valid && (lc->current_vtable=ref->vtable)->function_name)\
-			lc->current_vtable->function_name
+	bool_t has_cb = FALSE; \
+	lc->vtable_notify_recursion++;\
+	for (iterator=lc->vtable_refs; iterator!=NULL; iterator=iterator->next){\
+		if ((ref=(VTableReference*)iterator->data)->valid && (lc->current_vtable=ref->vtable)->function_name) {\
+			lc->current_vtable->function_name(__VA_ARGS__);\
+			has_cb = TRUE;\
+		}\
+	}\
+	lc->vtable_notify_recursion--;\
+	if (has_cb) ms_message("Linphone core [%p] notified [%s]",lc,#function_name)
+
+#define NOTIFY_IF_EXIST_INTERNAL(function_name, internal_val, ...) \
+	bctbx_list_t* iterator; \
+	VTableReference *ref; \
+	lc->vtable_notify_recursion++;\
+	for (iterator=lc->vtable_refs; iterator!=NULL; iterator=iterator->next){\
+		if ((ref=(VTableReference*)iterator->data)->valid && (lc->current_vtable=ref->vtable)->function_name && (ref->internal == internal_val)) {\
+			lc->current_vtable->function_name(__VA_ARGS__);\
+		}\
+	}\
+	lc->vtable_notify_recursion--;
 
 void linphone_core_notify_global_state_changed(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message) {
-	NOTIFY_IF_EXIST(global_state_changed)(lc,gstate,message);
+	NOTIFY_IF_EXIST(global_state_changed,lc,gstate,message);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *message){
-	NOTIFY_IF_EXIST(call_state_changed)(lc,call,cstate,message);
+	NOTIFY_IF_EXIST(call_state_changed, lc,call,cstate,message);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_call_encryption_changed(LinphoneCore *lc, LinphoneCall *call, bool_t on, const char *authentication_token) {
-	NOTIFY_IF_EXIST(call_encryption_changed)(lc,call,on,authentication_token);
+	NOTIFY_IF_EXIST(call_encryption_changed, lc,call,on,authentication_token);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_registration_state_changed(LinphoneCore *lc, LinphoneProxyConfig *cfg, LinphoneRegistrationState cstate, const char *message){
-	NOTIFY_IF_EXIST(registration_state_changed)(lc,cfg,cstate,message);
+	NOTIFY_IF_EXIST(registration_state_changed, lc,cfg,cstate,message);
 	cleanup_dead_vtable_refs(lc);
 }
-
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 void linphone_core_notify_show_interface(LinphoneCore *lc){
-	NOTIFY_IF_EXIST(show)(lc);
+	NOTIFY_IF_EXIST(show, lc);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_display_status(LinphoneCore *lc, const char *message) {
-	NOTIFY_IF_EXIST(display_status)(lc,message);
+	NOTIFY_IF_EXIST(display_status, lc,message);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_display_message(LinphoneCore *lc, const char *message){
-	NOTIFY_IF_EXIST(display_message)(lc,message);
+	NOTIFY_IF_EXIST(display_message, lc,message);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_display_warning(LinphoneCore *lc, const char *message){
-	NOTIFY_IF_EXIST(display_warning)(lc,message);
+	NOTIFY_IF_EXIST(display_warning, lc,message);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_display_url(LinphoneCore *lc, const char *message, const char *url){
-	NOTIFY_IF_EXIST(display_url)(lc,message,url);
+	NOTIFY_IF_EXIST(display_url, lc,message,url);
+	cleanup_dead_vtable_refs(lc);
+}
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+void linphone_core_notify_notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf) {
+	NOTIFY_IF_EXIST(notify_presence_received, lc, lf);
 	cleanup_dead_vtable_refs(lc);
 }
 
-void linphone_core_notify_notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf){
-	NOTIFY_IF_EXIST(notify_presence_received)(lc,lf);
+void linphone_core_notify_notify_presence_received_for_uri_or_tel(LinphoneCore *lc, LinphoneFriend *lf, const char *uri_or_tel, const LinphonePresenceModel *presence_model) {
+	NOTIFY_IF_EXIST(notify_presence_received_for_uri_or_tel, lc, lf, uri_or_tel, presence_model);
 	cleanup_dead_vtable_refs(lc);
 }
 
-void linphone_core_notify_new_subscription_requested(LinphoneCore *lc, LinphoneFriend *lf, const char *url){
-	NOTIFY_IF_EXIST(new_subscription_requested)(lc,lf,url);
+void linphone_core_notify_new_subscription_requested(LinphoneCore *lc, LinphoneFriend *lf, const char *url) {
+	NOTIFY_IF_EXIST(new_subscription_requested, lc, lf, url);
 	cleanup_dead_vtable_refs(lc);
 }
 
-void linphone_core_notify_auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain){
-	NOTIFY_IF_EXIST(auth_info_requested)(lc,realm,username,domain);
+
+void linphone_core_notify_authentication_requested(LinphoneCore *lc, LinphoneAuthInfo *ai, LinphoneAuthMethod method) {
+	NOTIFY_IF_EXIST(authentication_requested, lc, ai, method);
 	cleanup_dead_vtable_refs(lc);
 }
 
-void linphone_core_notify_call_log_updated(LinphoneCore *lc, LinphoneCallLog *newcl){
-	NOTIFY_IF_EXIST(call_log_updated)(lc,newcl);
+void linphone_core_notify_call_log_updated(LinphoneCore *lc, LinphoneCallLog *newcl) {
+	NOTIFY_IF_EXIST(call_log_updated, lc, newcl);
+	cleanup_dead_vtable_refs(lc);
+}
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+void linphone_core_notify_auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain) {
+	NOTIFY_IF_EXIST(auth_info_requested, lc, realm, username, domain);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from, const char *message){
-	NOTIFY_IF_EXIST(text_received)(lc,room,from,message);
+	NOTIFY_IF_EXIST(text_received, lc,room,from,message);
 	cleanup_dead_vtable_refs(lc);
 }
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
 
 void linphone_core_notify_message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *message){
-	NOTIFY_IF_EXIST(message_received)(lc,room,message);
+	NOTIFY_IF_EXIST(message_received, lc,room,message);
 	cleanup_dead_vtable_refs(lc);
 }
-
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 void linphone_core_notify_file_transfer_recv(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, const char* buff, size_t size) {
-	NOTIFY_IF_EXIST(file_transfer_recv)(lc,message,content,buff,size);
+	NOTIFY_IF_EXIST(file_transfer_recv, lc,message,content,buff,size);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_file_transfer_send(LinphoneCore *lc, LinphoneChatMessage *message,  const LinphoneContent* content, char* buff, size_t* size) {
-	NOTIFY_IF_EXIST(file_transfer_send)(lc,message,content,buff,size);
+	NOTIFY_IF_EXIST(file_transfer_send, lc,message,content,buff,size);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_file_transfer_progress_indication(LinphoneCore *lc, LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total) {
-	NOTIFY_IF_EXIST(file_transfer_progress_indication)(lc,message,content,offset,total);
+	NOTIFY_IF_EXIST(file_transfer_progress_indication, lc,message,content,offset,total);
 	cleanup_dead_vtable_refs(lc);
 }
-
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
 void linphone_core_notify_is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
-	NOTIFY_IF_EXIST(is_composing_received)(lc,room);
+	NOTIFY_IF_EXIST(is_composing_received, lc,room);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_dtmf_received(LinphoneCore* lc, LinphoneCall *call, int dtmf) {
-	NOTIFY_IF_EXIST(dtmf_received)(lc,call,dtmf);
+	NOTIFY_IF_EXIST(dtmf_received, lc,call,dtmf);
 	cleanup_dead_vtable_refs(lc);
 }
 
 bool_t linphone_core_dtmf_received_has_listener(const LinphoneCore* lc) {
-	MSList* iterator;
+	bctbx_list_t* iterator;
 	for (iterator=lc->vtable_refs; iterator!=NULL; iterator=iterator->next){
 		VTableReference *ref=(VTableReference*)iterator->data;
 		if (ref->valid && ref->vtable->dtmf_received)
@@ -174,69 +233,80 @@ bool_t linphone_core_dtmf_received_has_listener(const LinphoneCore* lc) {
 }
 
 void linphone_core_notify_refer_received(LinphoneCore *lc, const char *refer_to) {
-	NOTIFY_IF_EXIST(refer_received)(lc,refer_to);
+	NOTIFY_IF_EXIST(refer_received, lc,refer_to);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_buddy_info_updated(LinphoneCore *lc, LinphoneFriend *lf) {
-	NOTIFY_IF_EXIST(buddy_info_updated)(lc,lf);
+	NOTIFY_IF_EXIST(buddy_info_updated, lc,lf);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered, LinphoneCallState new_call_state) {
-	NOTIFY_IF_EXIST(transfer_state_changed)(lc,transfered,new_call_state);
+	NOTIFY_IF_EXIST(transfer_state_changed, lc,transfered,new_call_state);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_call_stats_updated(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallStats *stats) {
-	NOTIFY_IF_EXIST(call_stats_updated)(lc,call,stats);
+	NOTIFY_IF_EXIST(call_stats_updated, lc,call,stats);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_info_received(LinphoneCore *lc, LinphoneCall *call, const LinphoneInfoMessage *msg) {
-	NOTIFY_IF_EXIST(info_received)(lc,call,msg);
+	NOTIFY_IF_EXIST(info_received, lc,call,msg);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_configuring_status(LinphoneCore *lc, LinphoneConfiguringState status, const char *message) {
-	NOTIFY_IF_EXIST(configuring_status)(lc,status,message);
+	NOTIFY_IF_EXIST(configuring_status, lc,status,message);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_network_reachable(LinphoneCore *lc, bool_t reachable) {
-	NOTIFY_IF_EXIST(network_reachable)(lc,reachable);
+	NOTIFY_IF_EXIST(network_reachable, lc,reachable);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *notified_event, const LinphoneContent *body) {
-	NOTIFY_IF_EXIST(notify_received)(lc,lev,notified_event,body);
+	NOTIFY_IF_EXIST_INTERNAL(notify_received, linphone_event_is_internal(lev), lc, lev, notified_event, body);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_subscription_state_changed(LinphoneCore *lc, LinphoneEvent *lev, LinphoneSubscriptionState state) {
-	NOTIFY_IF_EXIST(subscription_state_changed)(lc,lev,state);
+	NOTIFY_IF_EXIST_INTERNAL(subscription_state_changed,linphone_event_is_internal(lev), lc,lev,state);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_publish_state_changed(LinphoneCore *lc, LinphoneEvent *lev, LinphonePublishState state) {
-	NOTIFY_IF_EXIST(publish_state_changed)(lc,lev,state);
+	NOTIFY_IF_EXIST_INTERNAL(publish_state_changed, linphone_event_is_internal(lev), lc, lev, state);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_log_collection_upload_state_changed(LinphoneCore *lc, LinphoneCoreLogCollectionUploadState state, const char *info) {
-	NOTIFY_IF_EXIST(log_collection_upload_state_changed)(lc, state, info);
+	NOTIFY_IF_EXIST(log_collection_upload_state_changed, lc, state, info);
 	cleanup_dead_vtable_refs(lc);
 }
 
 void linphone_core_notify_log_collection_upload_progress_indication(LinphoneCore *lc, size_t offset, size_t total) {
-	NOTIFY_IF_EXIST(log_collection_upload_progress_indication)(lc, offset, total);
+	NOTIFY_IF_EXIST(log_collection_upload_progress_indication, lc, offset, total);
 	cleanup_dead_vtable_refs(lc);
 }
 
-static VTableReference * v_table_reference_new(LinphoneCoreVTable *vtable, bool_t autorelease){
+void linphone_core_notify_friend_list_created(LinphoneCore *lc, LinphoneFriendList *list) {
+	NOTIFY_IF_EXIST(friend_list_created, lc, list);
+	cleanup_dead_vtable_refs(lc);
+}
+
+void linphone_core_notify_friend_list_removed(LinphoneCore *lc, LinphoneFriendList *list) {
+	NOTIFY_IF_EXIST(friend_list_removed, lc, list);
+	cleanup_dead_vtable_refs(lc);
+}
+
+static VTableReference * v_table_reference_new(LinphoneCoreVTable *vtable, bool_t autorelease, bool_t internal){
 	VTableReference *ref=ms_new0(VTableReference,1);
 	ref->valid=1;
 	ref->autorelease=autorelease;
+	ref->internal = internal;
 	ref->vtable=vtable;
 	return ref;
 }
@@ -246,17 +316,17 @@ void v_table_reference_destroy(VTableReference *ref){
 	ms_free(ref);
 }
 
-void _linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable, bool_t autorelease) {
-	ms_message("Vtable [%p] registered on core [%p]",lc,vtable);
-	lc->vtable_refs=ms_list_append(lc->vtable_refs,v_table_reference_new(vtable, autorelease));
+void _linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable, bool_t autorelease, bool_t internal) {
+	ms_message("Vtable [%p] registered on core [%p]",vtable, lc);
+	lc->vtable_refs=bctbx_list_append(lc->vtable_refs,v_table_reference_new(vtable, autorelease, internal));
 }
 
 void linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable){
-	_linphone_core_add_listener(lc, vtable, FALSE);
+	_linphone_core_add_listener(lc, vtable, FALSE, FALSE);
 }
 
 void linphone_core_remove_listener(LinphoneCore *lc, const LinphoneCoreVTable *vtable) {
-	MSList *it;
+	bctbx_list_t *it;
 	ms_message("Vtable [%p] unregistered on core [%p]",lc,vtable);
 	for(it=lc->vtable_refs; it!=NULL; it=it->next){
 		VTableReference *ref=(VTableReference*)it->data;
diff --git a/coreapi/xml.c b/coreapi/xml.c
index db002f5d5..db45239b9 100644
--- a/coreapi/xml.c
+++ b/coreapi/xml.c
@@ -51,7 +51,7 @@ void linphone_xmlparsing_context_destroy(xmlparsing_context_t *ctx) {
 
 void linphone_xmlparsing_genericxml_error(void *ctx, const char *fmt, ...) {
 	xmlparsing_context_t *xmlCtx = (xmlparsing_context_t *)ctx;
-	int sl = strlen(xmlCtx->errorBuffer);
+	size_t sl = strlen(xmlCtx->errorBuffer);
 	va_list args;
 	va_start(args, fmt);
 	vsnprintf(xmlCtx->errorBuffer + sl, XMLPARSING_BUFFER_LEN - sl, fmt, args);
@@ -89,6 +89,33 @@ char * linphone_get_xml_text_content(xmlparsing_context_t *xml_ctx, const char *
 	return (char *)text;
 }
 
+const char * linphone_get_xml_attribute_text_content(xmlparsing_context_t *xml_ctx, const char *xpath_expression, const char *attribute_name) {
+	xmlXPathObjectPtr xpath_obj;
+	xmlChar *text = NULL;
+
+	xpath_obj = xmlXPathEvalExpression((const xmlChar *)xpath_expression, xml_ctx->xpath_ctx);
+	if (xpath_obj != NULL) {
+		if (xpath_obj->nodesetval != NULL) {
+			xmlNodeSetPtr nodes = xpath_obj->nodesetval;
+			if ((nodes != NULL) && (nodes->nodeNr >= 1)) {
+				xmlNodePtr node = nodes->nodeTab[0];
+				xmlAttr *attr = node->properties;
+				while (attr) {
+					if (strcmp((char *)attr->name, attribute_name) == 0) {
+						text = xmlStrcat(text, attr->children->content);
+						attr = NULL;
+					} else {
+						attr = attr->next;
+					}
+				}
+			}
+		}
+		xmlXPathFreeObject(xpath_obj);
+	}
+
+	return (const char *)text;
+}
+
 void linphone_free_xml_text_content(const char *text) {
 	xmlFree((xmlChar *)text);
 }
@@ -96,3 +123,11 @@ void linphone_free_xml_text_content(const char *text) {
 xmlXPathObjectPtr linphone_get_xml_xpath_object_for_node_list(xmlparsing_context_t *xml_ctx, const char *xpath_expression) {
 	return xmlXPathEvalExpression((const xmlChar *)xpath_expression, xml_ctx->xpath_ctx);
 }
+
+void linphone_xml_xpath_context_init_carddav_ns(xmlparsing_context_t *xml_ctx) {
+	if (xml_ctx && xml_ctx->xpath_ctx) {
+		xmlXPathRegisterNs(xml_ctx->xpath_ctx, (const xmlChar*)"d", (const xmlChar*)"DAV:");
+		xmlXPathRegisterNs(xml_ctx->xpath_ctx, (const xmlChar*)"card", (const xmlChar*)"urn:ietf:params:xml:ns:carddav");
+		xmlXPathRegisterNs(xml_ctx->xpath_ctx, (const xmlChar*)"x1", (const xmlChar*)"http://calendarserver.org/ns/");
+	}
+}
\ No newline at end of file
diff --git a/coreapi/xml2lpc.c b/coreapi/xml2lpc.c
index 845ce496b..da61e991b 100644
--- a/coreapi/xml2lpc.c
+++ b/coreapi/xml2lpc.c
@@ -80,7 +80,7 @@ static void xml2lpc_log(xml2lpc_context *xmlCtx, int level, const char *fmt, ...
 
 static void xml2lpc_genericxml_error(void *ctx, const char *fmt, ...) {
 	xml2lpc_context *xmlCtx = (xml2lpc_context *)ctx;
-	int sl = strlen(xmlCtx->errorBuffer);
+	size_t sl = strlen(xmlCtx->errorBuffer);
 	va_list args;
 	va_start(args, fmt);
 	vsnprintf(xmlCtx->errorBuffer + sl, XML2LPC_BZ-sl, fmt, args);
@@ -89,7 +89,7 @@ static void xml2lpc_genericxml_error(void *ctx, const char *fmt, ...) {
 
 static void xml2lpc_genericxml_warning(void *ctx, const char *fmt, ...) {
 	xml2lpc_context *xmlCtx = (xml2lpc_context *)ctx;
-	int sl = strlen(xmlCtx->warningBuffer);
+	size_t sl = strlen(xmlCtx->warningBuffer);
 	va_list args;
 	va_start(args, fmt);
 	vsnprintf(xmlCtx->warningBuffer + sl, XML2LPC_BZ-sl, fmt, args);
diff --git a/coreapi/xmlrpc.c b/coreapi/xmlrpc.c
index 2a55cccaa..bd74447ad 100644
--- a/coreapi/xmlrpc.c
+++ b/coreapi/xmlrpc.c
@@ -88,6 +88,9 @@ static void format_request(LinphoneXmlRpcRequest *request) {
 		return;
 	}
 
+	/* autoindent so that logs are human-readable, as SIP sip on-purpose */
+	xmlTextWriterSetIndent(writer, 1);
+
 	err = xmlTextWriterStartDocument(writer, "1.0", "UTF-8", NULL);
 	if (err >= 0) {
 		err = xmlTextWriterStartElement(writer, (const xmlChar *)"methodCall");
@@ -115,7 +118,7 @@ static void format_request(LinphoneXmlRpcRequest *request) {
 				err = xmlTextWriterWriteElement(writer, (const xmlChar *)"int", (const xmlChar *)si);
 				break;
 			case LinphoneXmlRpcArgString:
-				err = xmlTextWriterWriteElement(writer, (const xmlChar *)"string", (const xmlChar *)arg->data.s);
+				err = xmlTextWriterWriteElement(writer, (const xmlChar *)"string", arg->data.s ? (const xmlChar *)arg->data.s : (const xmlChar *)"");
 				break;
 		}
 		if (err >= 0) {
@@ -154,12 +157,23 @@ static void free_arg(LinphoneXmlRpcArg *arg) {
 	belle_sip_free(arg);
 }
 
+static bool_t linphone_xml_rpc_request_aborted(LinphoneXmlRpcRequest *req){
+	LinphoneXmlRpcSession *session = (LinphoneXmlRpcSession*) belle_sip_object_data_get(BELLE_SIP_OBJECT(req), "session");
+	if (!session){
+		ms_error("linphone_xml_rpc_request_aborted(): no session, this should not happen.");
+		return FALSE;
+	}
+	return session->released;
+}
+
 static void process_io_error_from_post_xml_rpc_request(void *data, const belle_sip_io_error_event_t *event) {
 	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)data;
 	ms_error("I/O Error during XML-RPC request sending");
-	request->status = LinphoneXmlRpcStatusFailed;
-	if (request->callbacks->response != NULL) {
-		request->callbacks->response(request);
+	if (!linphone_xml_rpc_request_aborted(request)){
+		request->status = LinphoneXmlRpcStatusFailed;
+			if (request->callbacks->response != NULL) {
+			request->callbacks->response(request);
+		}
 	}
 	linphone_xml_rpc_request_unref(request);
 }
@@ -167,9 +181,11 @@ static void process_io_error_from_post_xml_rpc_request(void *data, const belle_s
 static void process_auth_requested_from_post_xml_rpc_request(void *data, belle_sip_auth_event_t *event) {
 	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)data;
 	ms_error("Authentication error during XML-RPC request sending");
-	request->status = LinphoneXmlRpcStatusFailed;
-	if (request->callbacks->response != NULL) {
-		request->callbacks->response(request);
+	if (!linphone_xml_rpc_request_aborted(request)){
+		request->status = LinphoneXmlRpcStatusFailed;
+		if (request->callbacks->response != NULL) {
+			request->callbacks->response(request);
+		}
 	}
 	linphone_xml_rpc_request_unref(request);
 }
@@ -212,7 +228,7 @@ end:
 }
 
 static void notify_xml_rpc_error(LinphoneXmlRpcRequest *request) {
-	request->status = LinphoneXmlRpcStatusOk;
+	request->status = LinphoneXmlRpcStatusFailed;
 	if (request->callbacks->response != NULL) {
 		request->callbacks->response(request);
 	}
@@ -222,11 +238,12 @@ static void process_response_from_post_xml_rpc_request(void *data, const belle_h
 	LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)data;
 
 	/* Check the answer code */
-	if (event->response) {
+	if (!linphone_xml_rpc_request_aborted(request) && event->response) {
 		int code = belle_http_response_get_status_code(event->response);
 		if (code == 200) { /* Valid response from the server. */
 			parse_valid_xml_rpc_response(request, belle_sip_message_get_body((belle_sip_message_t *)event->response));
 		} else {
+			ms_error("process_response_from_post_xml_rpc_request(): error code = %i", code);
 			notify_xml_rpc_error(request);
 		}
 	}
@@ -399,15 +416,20 @@ void linphone_xml_rpc_session_send_request(LinphoneXmlRpcSession *session, Linph
 	belle_http_request_t *req;
 	belle_sip_memory_body_handler_t *bh;
 	const char *data;
-	LinphoneContent *content;
-
 	linphone_xml_rpc_request_ref(request);
-	content = linphone_content_new();
-	linphone_content_set_type(content, "text");
-	linphone_content_set_subtype(content, "xml");
-	linphone_content_set_string_buffer(content, linphone_xml_rpc_request_get_content(request));
+
 	uri = belle_generic_uri_parse(session->url);
+	if (!uri) {
+		ms_error("Could not send request, URL %s is invalid", session->url);
+		process_io_error_from_post_xml_rpc_request(request, NULL);
+		return;
+	}
 	req = belle_http_request_create("POST", uri, belle_sip_header_content_type_create("text", "xml"), NULL);
+	if (!req) {
+		belle_sip_object_unref(uri);
+		process_io_error_from_post_xml_rpc_request(request, NULL);
+		return;
+	}
 	data = linphone_xml_rpc_request_get_content(request);
 	bh = belle_sip_memory_body_handler_new_copy_from_buffer(data, strlen(data), NULL, NULL);
 	belle_sip_message_set_body_handler(BELLE_SIP_MESSAGE(req), BELLE_SIP_BODY_HANDLER(bh));
@@ -416,5 +438,14 @@ void linphone_xml_rpc_session_send_request(LinphoneXmlRpcSession *session, Linph
 	cbs.process_auth_requested = process_auth_requested_from_post_xml_rpc_request;
 	l = belle_http_request_listener_create_from_callbacks(&cbs, request);
 	belle_http_provider_send_request(session->core->http_provider, req, l);
-	linphone_content_unref(content);
+	/*ensure that the listener object will be destroyed with the request*/
+	belle_sip_object_data_set(BELLE_SIP_OBJECT(request), "listener", l, belle_sip_object_unref);
+	/*prevent destruction of the session while there are still pending http requests*/
+	belle_sip_object_data_set(BELLE_SIP_OBJECT(request), "session", belle_sip_object_ref(session), belle_sip_object_unref);
 }
+
+void linphone_xml_rpc_session_release(LinphoneXmlRpcSession *session){
+	session->released = TRUE;
+	belle_sip_object_unref(session);
+}
+
diff --git a/coreapi/xmlrpc.h b/coreapi/xmlrpc.h
index cfa9bff8d..c5e28e221 100644
--- a/coreapi/xmlrpc.h
+++ b/coreapi/xmlrpc.h
@@ -182,6 +182,7 @@ LINPHONE_PUBLIC LinphoneXmlRpcSession * linphone_xml_rpc_session_ref(LinphoneXml
 /**
  * Release reference to the XML-RPC session.
  * @param[in] session LinphoneXmlRpcSession object.
+ * @warning This will not stop pending xml-rpc requests. Use linphone_xml_rpc_session_release() instead if this is intended.
 **/
 LINPHONE_PUBLIC void linphone_xml_rpc_session_unref(LinphoneXmlRpcSession *session);
 
@@ -207,6 +208,13 @@ LINPHONE_PUBLIC void linphone_xml_rpc_session_set_user_data(LinphoneXmlRpcSessio
 LINPHONE_PUBLIC void linphone_xml_rpc_session_send_request(LinphoneXmlRpcSession *session, LinphoneXmlRpcRequest *request);
 
 
+/**
+ * Stop and unref an XML rpc session. Pending requests will be aborted.
+ * @param[in] session LinphoneXmlRpcSession object.
+**/
+LINPHONE_PUBLIC void linphone_xml_rpc_session_release(LinphoneXmlRpcSession *session);
+
+
 /**
  * Acquire a reference to a LinphoneXmlRpcRequestCbs object.
  * @param[in] cbs LinphoneXmlRpcRequestCbs object.
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
new file mode 100644
index 000000000..2137c230f
--- /dev/null
+++ b/daemon/CMakeLists.txt
@@ -0,0 +1,131 @@
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2016  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
+
+set(DAEMON_SOURCE_FILES
+	commands/adaptive-jitter-compensation.cc
+	commands/adaptive-jitter-compensation.h
+	commands/answer.cc
+	commands/answer.h
+	commands/audio-codec-get.cc
+	commands/audio-codec-get.h
+	commands/audio-codec-move.cc
+	commands/audio-codec-move.h
+	commands/audio-codec-set.cc
+	commands/audio-codec-set.h
+	commands/audio-codec-toggle.cc
+	commands/audio-codec-toggle.h
+	commands/audio-stream-start.cc
+	commands/audio-stream-start.h
+	commands/audio-stream-stats.cc
+	commands/audio-stream-stats.h
+	commands/audio-stream-stop.cc
+	commands/audio-stream-stop.h
+	commands/auth-infos-clear.cc
+	commands/auth-infos-clear.h
+	commands/call.cc
+	commands/call.h
+	commands/call-mute.cc
+	commands/call-mute.h
+	commands/call-pause.cc
+	commands/call-pause.h
+	commands/call-resume.cc
+	commands/call-resume.h
+	commands/call-stats.cc
+	commands/call-stats.h
+	commands/call-status.cc
+	commands/call-status.h
+	commands/call-transfer.cc
+	commands/call-transfer.h
+	commands/cn.cc
+	commands/cn.h
+	commands/conference.cc
+	commands/conference.h
+	commands/config.cc
+	commands/configcommand.h
+	commands/contact.cc
+	commands/contact.h
+	commands/dtmf.cc
+	commands/dtmf.h
+	commands/firewall-policy.cc
+	commands/firewall-policy.h
+	commands/help.cc
+	commands/help.h
+	commands/ipv6.cc
+	commands/ipv6.h
+	commands/jitterbuffer.cc
+	commands/jitterbuffer.h
+	commands/media-encryption.cc
+	commands/media-encryption.h
+	commands/msfilter-add-fmtp.cc
+	commands/msfilter-add-fmtp.h
+	commands/netsim.cc
+	commands/netsim.h
+	commands/play-wav.cc
+	commands/play-wav.h
+	commands/pop-event.cc
+	commands/pop-event.h
+	commands/port.cc
+	commands/port.h
+	commands/ptime.cc
+	commands/ptime.h
+	commands/quit.cc
+	commands/quit.h
+	commands/register.cc
+	commands/register.h
+	commands/register-status.cc
+	commands/register-status.h
+	commands/terminate.cc
+	commands/terminate.h
+	commands/unregister.cc
+	commands/unregister.h
+	commands/version.cc
+	commands/version.h
+	commands/video.cc
+	commands/video.h
+	daemon.cc
+	daemon.h
+)
+
+set(DAEMON_PIPETEST_SOURCE_FILES
+	daemon-pipetest.c
+)
+
+apply_compile_flags(DAEMON_SOURCE_FILES "CPP" "CXX")
+apply_compile_flags(DAEMON_PIPETEST_SOURCE_FILES "CPP" "C")
+
+add_executable(linphone-daemon ${DAEMON_SOURCE_FILES})
+target_include_directories(linphone-daemon PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(linphone-daemon ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES})
+set_target_properties(linphone-daemon PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+
+add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES})
+target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES})
+set_target_properties(linphone-daemon-pipetest PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+
+set(INSTALL_TARGETS linphone-daemon linphone-daemon-pipetest)
+
+install(TARGETS ${INSTALL_TARGETS}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
new file mode 100644
index 000000000..6672779ed
--- /dev/null
+++ b/daemon/Makefile.am
@@ -0,0 +1,108 @@
+
+
+bin_PROGRAMS=linphone-daemon linphone-daemon-pipetest
+
+linphone_daemon_SOURCES=daemon.cc \
+			commands/adaptive-jitter-compensation.cc \
+			commands/answer.cc \
+			commands/audio-codec-get.cc \
+			commands/audio-codec-move.cc \
+			commands/audio-codec-set.cc \
+			commands/audio-codec-toggle.cc \
+			commands/audio-stream-start.cc \
+			commands/audio-stream-stop.cc \
+			commands/audio-stream-stats.cc \
+			commands/auth-infos-clear.cc \
+			commands/call.cc \
+			commands/call-stats.cc \
+			commands/call-status.cc \
+			commands/call-pause.cc \
+			commands/call-resume.cc \
+			commands/call-mute.cc \
+			commands/video.cc \
+			commands/call-transfer.cc \
+			commands/conference.cc \
+			commands/dtmf.cc \
+			commands/firewall-policy.cc \
+			commands/help.cc \
+			commands/ipv6.cc \
+			commands/jitterbuffer.cc \
+			commands/media-encryption.cc \
+			commands/msfilter-add-fmtp.cc \
+			commands/play-wav.cc \
+			commands/pop-event.cc \
+			commands/port.cc \
+			commands/ptime.cc \
+			commands/register.cc \
+			commands/register-status.cc \
+			commands/terminate.cc \
+			commands/unregister.cc \
+			commands/quit.cc \
+			commands/version.cc \
+			commands/contact.cc \
+			commands/config.cc commands/configcommand.h \
+			daemon.h \
+			commands/adaptive-jitter-compensation.h \
+			commands/answer.h \
+			commands/audio-codec-get.h \
+			commands/audio-codec-move.h \
+			commands/audio-codec-set.h \
+			commands/audio-codec-toggle.h \
+			commands/audio-stream-start.h \
+			commands/audio-stream-stop.h \
+			commands/audio-stream-stats.h \
+			commands/auth-infos-clear.h \
+			commands/call.h \
+			commands/call-stats.h \
+			commands/call-status.h \
+			commands/call-pause.h \
+			commands/call-resume.h \
+			commands/call-mute.h \
+			commands/video.h \
+			commands/call-transfer.h \
+			commands/conference.h \
+			commands/dtmf.h \
+			commands/firewall-policy.h \
+			commands/help.h \
+			commands/ipv6.h \
+			commands/jitterbuffer.h \
+			commands/media-encryption.h \
+			commands/msfilter-add-fmtp.h \
+			commands/play-wav.h \
+			commands/pop-event.h \
+			commands/port.h \
+			commands/ptime.h \
+			commands/register.h \
+			commands/register-status.h \
+			commands/terminate.h \
+			commands/unregister.h \
+			commands/quit.h \
+			commands/contact.h \
+			commands/netsim.cc commands/netsim.h\
+			commands/cn.cc commands/cn.h \
+			commands/version.h
+
+linphone_daemon_pipetest_SOURCES=daemon-pipetest.c
+
+linphone_daemon_pipetest_LDADD=$(ORTP_LIBS)
+
+linphone_daemon_LDADD=$(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
+		$(MEDIASTREAMER_LIBS) \
+		$(ORTP_LIBS) \
+		$(SPEEX_LIBS) \
+		$(LIBXML2_LIBS) \
+		$(BCTOOLBOX_LIBS)
+
+AM_CFLAGS=$(READLINE_CFLAGS) -DIN_LINPHONE $(STRICT_OPTIONS)
+AM_CXXFLAGS=$(READLINE_CXXFLAGS) -DIN_LINPHONE $(STRICT_OPTIONS)
+
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/coreapi \
+	-I$(top_srcdir)/include \
+	$(ORTP_CFLAGS) \
+	$(MEDIASTREAMER_CFLAGS) \
+	$(BELLESIP_CFLAGS) \
+	$(LIBXML2_CFLAGS) \
+	$(BCTOOLBOX_CFLAGS)
+
diff --git a/daemon/commands/adaptive-jitter-compensation.cc b/daemon/commands/adaptive-jitter-compensation.cc
new file mode 100644
index 000000000..8985a782e
--- /dev/null
+++ b/daemon/commands/adaptive-jitter-compensation.cc
@@ -0,0 +1,133 @@
+/*
+adaptive-jitter-compensation.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "adaptive-jitter-compensation.h"
+
+using namespace std;
+
+class AdaptiveBufferCompensationResponse : public Response {
+public:
+	enum StreamType {
+		AudioStream,
+		VideoStream,
+		AllStreams
+	};
+
+	AdaptiveBufferCompensationResponse(LinphoneCore *core, StreamType type);
+
+private:
+	void outputAdaptiveBufferCompensation(LinphoneCore *core, ostringstream &ost, const char *header, bool_t value);
+};
+
+AdaptiveBufferCompensationResponse::AdaptiveBufferCompensationResponse(LinphoneCore *core, StreamType type) : Response() {
+	bool enabled = false;
+	ostringstream ost;
+	switch (type) {
+		case AudioStream:
+			enabled = linphone_core_audio_adaptive_jittcomp_enabled(core);
+			outputAdaptiveBufferCompensation(core, ost, "Audio", enabled);
+			break;
+		case VideoStream:
+			enabled = linphone_core_video_adaptive_jittcomp_enabled(core);
+			outputAdaptiveBufferCompensation(core, ost, "Video", enabled);
+			break;
+		case AllStreams:
+			enabled = linphone_core_audio_adaptive_jittcomp_enabled(core);
+			outputAdaptiveBufferCompensation(core, ost, "Audio", enabled);
+			enabled = linphone_core_video_adaptive_jittcomp_enabled(core);
+			outputAdaptiveBufferCompensation(core, ost, "Video", enabled);
+			break;
+	}
+	setBody(ost.str().c_str());
+}
+
+void AdaptiveBufferCompensationResponse::outputAdaptiveBufferCompensation(LinphoneCore *core, ostringstream &ost, const char *header, bool_t value) {
+	ost << header << ": ";
+	if (value) {
+		ost << "enabled\n";
+	} else {
+		ost << "disabled\n";
+	}
+}
+
+AdaptiveBufferCompensationCommand::AdaptiveBufferCompensationCommand() :
+		DaemonCommand("adaptive-jitter-compensation", "adaptive-jitter-compensation [<stream>] [enable|disable]",
+				"Enable or disable adaptive buffer compensation respectively with the 'enable' and 'disable' parameters for the specified stream, "
+				"return the status of the use of adaptive buffer compensation without parameter.\n"
+				"<stream> must be one of these values: audio, video.") {
+	addExample(new DaemonCommandExample("adaptive-jitter-compensation audio",
+						"Status: Ok\n\n"
+						"Audio: enabled"));
+	addExample(new DaemonCommandExample("adaptive-jitter-compensation video",
+						"Status: Ok\n\n"
+						"Video: disabled"));
+	addExample(new DaemonCommandExample("adaptive-jitter-compensation",
+						"Status: Ok\n\n"
+						"Audio: enabled\n"
+						"Video: disabled"));
+	addExample(new DaemonCommandExample("adaptive-jitter-compensation video enable",
+						"Status: Ok\n\n"
+						"Video: enabled"));
+}
+
+void AdaptiveBufferCompensationCommand::exec(Daemon *app, const char *args) {
+	string stream;
+	string state;
+	istringstream ist(args);
+	ist >> stream;
+	if (ist.fail()) {
+		app->sendResponse(AdaptiveBufferCompensationResponse(app->getCore(), AdaptiveBufferCompensationResponse::AllStreams));
+	} else {
+		ist >> state;
+		if (ist.fail()) {
+			if (stream.compare("audio") == 0) {
+				app->sendResponse(AdaptiveBufferCompensationResponse(app->getCore(), AdaptiveBufferCompensationResponse::AudioStream));
+			} else if (stream.compare("video") == 0) {
+				app->sendResponse(AdaptiveBufferCompensationResponse(app->getCore(), AdaptiveBufferCompensationResponse::VideoStream));
+			} else {
+				app->sendResponse(Response("Incorrect stream parameter.", Response::Error));
+			}
+		} else {
+			AdaptiveBufferCompensationResponse::StreamType type;
+			bool enabled;
+			if (stream.compare("audio") == 0) {
+				type = AdaptiveBufferCompensationResponse::AudioStream;
+			} else if (stream.compare("video") == 0) {
+				type = AdaptiveBufferCompensationResponse::VideoStream;
+			} else {
+				app->sendResponse(Response("Incorrect stream parameter.", Response::Error));
+				return;
+			}
+			if (state.compare("enable") == 0) {
+				enabled = TRUE;
+			} else if (state.compare("disable") == 0) {
+				enabled = FALSE;
+			} else {
+				app->sendResponse(Response("Incorrect parameter.", Response::Error));
+				return;
+			}
+			if (type == AdaptiveBufferCompensationResponse::AudioStream) {
+				linphone_core_enable_audio_adaptive_jittcomp(app->getCore(), enabled);
+			} else if (type == AdaptiveBufferCompensationResponse::VideoStream) {
+				linphone_core_enable_video_adaptive_jittcomp(app->getCore(), enabled);
+			}
+			app->sendResponse(AdaptiveBufferCompensationResponse(app->getCore(), AdaptiveBufferCompensationResponse::AllStreams));
+		}
+	}
+}
diff --git a/daemon/commands/adaptive-jitter-compensation.h b/daemon/commands/adaptive-jitter-compensation.h
new file mode 100644
index 000000000..cfbe070dd
--- /dev/null
+++ b/daemon/commands/adaptive-jitter-compensation.h
@@ -0,0 +1,31 @@
+/*
+adaptive-jitter-compensation.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_ADAPTIVE_BUFFER_COMPENSATION_H_
+#define COMMAND_ADAPTIVE_BUFFER_COMPENSATION_H_
+
+#include "../daemon.h"
+
+class AdaptiveBufferCompensationCommand: public DaemonCommand {
+public:
+	AdaptiveBufferCompensationCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_ADAPTIVE_BUFFER_COMPENSATION_H_
diff --git a/daemon/commands/answer.cc b/daemon/commands/answer.cc
new file mode 100644
index 000000000..9c5da9f74
--- /dev/null
+++ b/daemon/commands/answer.cc
@@ -0,0 +1,74 @@
+/*
+answer.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "answer.h"
+
+using namespace std;
+
+AnswerCommand::AnswerCommand() :
+		DaemonCommand("answer", "answer <call id>", "Answer an incoming call.") {
+	addExample(new DaemonCommandExample("answer 3",
+						"Status: Error\n"
+						"Reason: No call with such id."));
+	addExample(new DaemonCommandExample("answer 2",
+						"Status: Error\n"
+						"Reason: Can't accept this call."));
+	addExample(new DaemonCommandExample("answer 1",
+						"Status: Ok"));
+	addExample(new DaemonCommandExample("answer",
+						"Status: Ok"));
+	addExample(new DaemonCommandExample("answer",
+						"Status: Error\n"
+						"Reason: No call to accept."));
+}
+
+void AnswerCommand::exec(Daemon *app, const char *args) {
+	LinphoneCore *lc = app->getCore();
+	int cid;
+	LinphoneCall *call;
+	if (sscanf(args, "%i", &cid) == 1) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		} else {
+			LinphoneCallState cstate = linphone_call_get_state(call);
+			if (cstate == LinphoneCallIncomingReceived || cstate == LinphoneCallIncomingEarlyMedia) {
+				if (linphone_core_accept_call(lc, call) == 0) {
+					app->sendResponse(Response());
+					return;
+				}
+			}
+			app->sendResponse(Response("Can't accept this call."));
+			return;
+		}
+	} else {
+		for (const MSList* elem = linphone_core_get_calls(lc); elem != NULL; elem = elem->next) {
+			call = (LinphoneCall*) elem->data;
+			LinphoneCallState cstate = linphone_call_get_state(call);
+			if (cstate == LinphoneCallIncomingReceived || cstate == LinphoneCallIncomingEarlyMedia) {
+				if (linphone_core_accept_call(lc, call) == 0) {
+					app->sendResponse(Response());
+					return;
+				}
+			}
+		}
+	}
+	app->sendResponse(Response("No call to accept."));
+}
diff --git a/daemon/commands/answer.h b/daemon/commands/answer.h
new file mode 100644
index 000000000..a65c1bac7
--- /dev/null
+++ b/daemon/commands/answer.h
@@ -0,0 +1,31 @@
+/*
+answer.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_ANSWER_H_
+#define COMMAND_ANSWER_H_
+
+#include "../daemon.h"
+
+class AnswerCommand: public DaemonCommand {
+public:
+	AnswerCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_ANSWER_H_
diff --git a/daemon/commands/audio-codec-get.cc b/daemon/commands/audio-codec-get.cc
new file mode 100644
index 000000000..01372da2c
--- /dev/null
+++ b/daemon/commands/audio-codec-get.cc
@@ -0,0 +1,93 @@
+/*
+audio-codec-get.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "audio-codec-get.h"
+
+using namespace std;
+
+AudioCodecGetCommand::AudioCodecGetCommand() :
+		DaemonCommand("audio-codec-get", "audio-codec-get <payload_type_number|mime_type>",
+				"Get an audio codec if a parameter is given, otherwise return the audio codec list.\n"
+				"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1") {
+	addExample(new DaemonCommandExample("audio-codec-get 9",
+						"Status: Ok\n\n"
+						"Index: 9\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+	addExample(new DaemonCommandExample("audio-codec-get G722/8000/1",
+						"Status: Ok\n\n"
+						"Index: 9\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+	addExample(new DaemonCommandExample("audio-codec-get 2",
+						"Status: Error\n"
+						"Reason: Audio codec not found."));
+}
+
+void AudioCodecGetCommand::exec(Daemon *app, const char *args) {
+	bool list = false;
+	bool found = false;
+	istringstream ist(args);
+	ostringstream ost;
+	PayloadType *pt=NULL;
+
+	if (ist.peek() == EOF) {
+		found = list = true;
+	} else {
+		string mime_type;
+		ist >> mime_type;
+		PayloadTypeParser parser(app->getCore(), mime_type);
+		if (!parser.successful()) {
+			app->sendResponse(Response("Incorrect mime type format.", Response::Error));
+			return;
+		}
+		pt = parser.getPayloadType();
+	}
+
+	int index = 0;
+	for (const bctbx_list_t *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = bctbx_list_next(node)) {
+		PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
+		if (list) {
+			ost << PayloadTypeResponse(app->getCore(), payload, index).getBody() << "\n";
+		} else if (pt == payload) {
+			ost << PayloadTypeResponse(app->getCore(), payload, index).getBody();
+			found = true;
+			break;
+		}
+		++index;
+	}
+
+	if (!found) {
+		app->sendResponse(Response("Audio codec not found.", Response::Error));
+	} else {
+		app->sendResponse(Response(ost.str().c_str(), Response::Ok));
+	}
+}
diff --git a/daemon/commands/audio-codec-get.h b/daemon/commands/audio-codec-get.h
new file mode 100644
index 000000000..d298e6cf5
--- /dev/null
+++ b/daemon/commands/audio-codec-get.h
@@ -0,0 +1,31 @@
+/*
+audio-codec-get.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUDIO_CODEC_GET_H_
+#define COMMAND_AUDIO_CODEC_GET_H_
+
+#include "../daemon.h"
+
+class AudioCodecGetCommand: public DaemonCommand {
+public:
+	AudioCodecGetCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_AUDIO_CODEC_GET_H_
diff --git a/daemon/commands/audio-codec-move.cc b/daemon/commands/audio-codec-move.cc
new file mode 100644
index 000000000..23f28b4ad
--- /dev/null
+++ b/daemon/commands/audio-codec-move.cc
@@ -0,0 +1,106 @@
+/*
+audio-codec-move.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "audio-codec-move.h"
+
+using namespace std;
+
+AudioCodecMoveCommand::AudioCodecMoveCommand() :
+		DaemonCommand("audio-codec-move", "audio-codec-move <payload_type_number|mime_type> <index>",
+				"Move a codec to the specified index.\n"
+				"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1") {
+	addExample(new DaemonCommandExample("audio-codec-move 9 1",
+						"Status: Ok\n\n"
+						"Index: 1\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+	addExample(new DaemonCommandExample("audio-codec-move G722/8000/1 9",
+						"Status: Ok\n\n"
+						"Index: 9\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+}
+
+void AudioCodecMoveCommand::exec(Daemon *app, const char *args) {
+	istringstream ist(args);
+
+	if (ist.peek() == EOF) {
+		app->sendResponse(Response("Missing parameters.", Response::Error));
+		return;
+	}
+
+	string mime_type;
+	ist >> mime_type;
+	if (ist.peek() == EOF) {
+		app->sendResponse(Response("Missing index parameter.", Response::Error));
+		return;
+	}
+	PayloadTypeParser parser(app->getCore(), mime_type);
+	if (!parser.successful()) {
+		app->sendResponse(Response("Incorrect mime type format.", Response::Error));
+		return;
+	}
+	PayloadType *selected_payload = NULL;
+	selected_payload = parser.getPayloadType();
+	
+	if (selected_payload == NULL) {
+		app->sendResponse(Response("Audio codec not found.", Response::Error));
+		return;
+	}
+	
+	int index;
+	ist >> index;
+	if (ist.fail() || (index < 0)) {
+		app->sendResponse(Response("Incorrect index parameter.", Response::Error));
+		return;
+	}
+
+	int i = 0;
+	bctbx_list_t *mslist = NULL;
+	for (const bctbx_list_t *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = bctbx_list_next(node)) {
+		PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
+		if (i == index) {
+			mslist = bctbx_list_append(mslist, selected_payload);
+			++i;
+		}
+		if (selected_payload != payload) {
+			mslist = bctbx_list_append(mslist, payload);
+			++i;
+		}
+	}
+	if (i <= index) {
+		index = i;
+		mslist = bctbx_list_append(mslist, selected_payload);
+	}
+	linphone_core_set_audio_codecs(app->getCore(), mslist);
+
+	app->sendResponse(PayloadTypeResponse(app->getCore(), selected_payload, index));
+}
diff --git a/daemon/commands/audio-codec-move.h b/daemon/commands/audio-codec-move.h
new file mode 100644
index 000000000..eab54d677
--- /dev/null
+++ b/daemon/commands/audio-codec-move.h
@@ -0,0 +1,31 @@
+/*
+audio-codec-move.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUDIO_CODEC_MOVE_H_
+#define COMMAND_AUDIO_CODEC_MOVE_H_
+
+#include "../daemon.h"
+
+class AudioCodecMoveCommand: public DaemonCommand {
+public:
+	AudioCodecMoveCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_AUDIO_CODEC_MOVE_H_
diff --git a/daemon/commands/audio-codec-set.cc b/daemon/commands/audio-codec-set.cc
new file mode 100644
index 000000000..3b893d4ef
--- /dev/null
+++ b/daemon/commands/audio-codec-set.cc
@@ -0,0 +1,147 @@
+/*
+audio-codec-set.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "audio-codec-set.h"
+
+#include "private.h"
+
+/*hack, until this function comes to linphonecore*/
+#define _payload_type_get_number(pt)	((long)(pt)->user_data)
+#define _payload_type_set_number(pt,n)	(pt)->user_data=(void*)(long)(n)
+
+using namespace std;
+
+AudioCodecSetCommand::AudioCodecSetCommand() :
+		DaemonCommand("audio-codec-set", "audio-codec-set <payload_type_number|mime_type> <property> <value>",
+				"Set a property (number, clock_rate, recv_fmtp, send_fmtp, bitrate (in kbps/s)) of a codec. Numbering of payload type is automatically performed at startup, any change will be lost after restart.\n"
+				"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1") {
+	addExample(new DaemonCommandExample("audio-codec-set 9 number 18",
+						"Status: Ok\n\n"
+						"Index: 10\n"
+						"Payload-type-number: 18\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+	addExample(new DaemonCommandExample("audio-codec-set G722/8000/1 number 9",
+						"Status: Ok\n\n"
+						"Index: 10\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+	addExample(new DaemonCommandExample("audio-codec-set 9 clock_rate 16000",
+						"Status: Ok\n\n"
+						"Index: 10\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 16000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+}
+
+static PayloadType *findPayload(LinphoneCore *lc, int payload_type, int *index){
+	if (index) *index=0;
+	for (const bctbx_list_t *node = linphone_core_get_audio_codecs(lc); node != NULL; node = bctbx_list_next(node)) {
+		PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
+		if (index) (*index)++;
+		if (payload_type == linphone_core_get_payload_type_number(lc, payload)) {
+			return payload;
+		}
+	}
+	return NULL;
+}
+
+void AudioCodecSetCommand::exec(Daemon *app, const char *args) {
+	istringstream ist(args);
+
+	if (ist.peek() == EOF) {
+		app->sendResponse(Response("Missing parameters.", Response::Error));
+		return;
+	}
+
+	string mime_type;
+	ist >> mime_type;
+	PayloadTypeParser parser(app->getCore(), mime_type);
+	if (!parser.successful()) {
+		app->sendResponse(Response("Incorrect mime type format.", Response::Error));
+		return;
+	}
+	string param;
+	string value;
+	ist >> param;
+	if (ist.fail()) {
+		app->sendResponse(Response("Missing/Incorrect parameter(s).", Response::Error));
+		return;
+	}
+	ist >> value;
+	if (value.length() > 255) value.resize(255);
+
+	PayloadType *payload=parser.getPayloadType();
+	if (payload) {
+		bool handled = false;
+		if (param.compare("clock_rate") == 0) {
+			if (value.length() > 0) {
+				payload->clock_rate = atoi(value.c_str());
+				handled = true;
+			}
+		} else if (param.compare("recv_fmtp") == 0) {
+			payload_type_set_recv_fmtp(payload, value.c_str());
+			handled = true;
+		} else if (param.compare("send_fmtp") == 0) {
+			payload_type_set_send_fmtp(payload, value.c_str());
+			handled = true;
+		} else if (param.compare("number") == 0) {
+			if (value.length() > 0) {
+				int idx=atoi(value.c_str());
+				PayloadType *conflict=NULL;
+				if (idx!=-1){
+					conflict=findPayload(app->getCore(), atoi(value.c_str()), NULL);
+				}
+				if (conflict) {
+					app->sendResponse(Response("New payload type number is already used.", Response::Error));
+				} else {
+					linphone_core_set_payload_type_number(app->getCore(),payload, idx);
+					app->sendResponse(PayloadTypeResponse(app->getCore(), payload, parser.getPosition()));
+				}
+				return;
+			}
+		} else if (param.compare("bitrate") == 0) {
+			linphone_core_set_payload_type_bitrate(app->getCore(), payload, atoi(value.c_str()));
+			handled=true;
+		}
+		if (handled) {
+			app->sendResponse(PayloadTypeResponse(app->getCore(), payload, parser.getPosition()));
+		} else {
+			app->sendResponse(Response("Invalid codec parameter.", Response::Error));
+		}
+		return;
+	}
+	app->sendResponse(Response("Audio codec not found.", Response::Error));
+}
diff --git a/daemon/commands/audio-codec-set.h b/daemon/commands/audio-codec-set.h
new file mode 100644
index 000000000..54025fb18
--- /dev/null
+++ b/daemon/commands/audio-codec-set.h
@@ -0,0 +1,31 @@
+/*
+audio-codec-set.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUDIO_CODEC_SET_H_
+#define COMMAND_AUDIO_CODEC_SET_H_
+
+#include "../daemon.h"
+
+class AudioCodecSetCommand: public DaemonCommand {
+public:
+	AudioCodecSetCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_AUDIO_CODEC_SET_H_
diff --git a/daemon/commands/audio-codec-toggle.cc b/daemon/commands/audio-codec-toggle.cc
new file mode 100644
index 000000000..ed5949b00
--- /dev/null
+++ b/daemon/commands/audio-codec-toggle.cc
@@ -0,0 +1,122 @@
+/*
+audio-codec-toggle.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "audio-codec-toggle.h"
+#include "audio-codec-get.h"
+
+using namespace std;
+
+AudioCodecToggleCommand::AudioCodecToggleCommand(const char *name, const char *proto, const char *help, bool enable) :
+		DaemonCommand(name, proto, help), mEnable(enable) {
+}
+
+void AudioCodecToggleCommand::exec(Daemon *app, const char *args) {
+	istringstream ist(args);
+
+	if (ist.peek() == EOF) {
+		app->sendResponse(Response("Missing parameter.", Response::Error));
+	} else {
+		string mime_type;
+		PayloadType *pt = NULL;
+		ist >> mime_type;
+		PayloadTypeParser parser(app->getCore(), mime_type, true);
+		if (!parser.successful()) {
+			app->sendResponse(Response("Incorrect mime type format.", Response::Error));
+			return;
+		}
+		if (!parser.all()) pt = parser.getPayloadType();
+
+		int index = 0;
+		for (const bctbx_list_t *node = linphone_core_get_audio_codecs(app->getCore()); node != NULL; node = bctbx_list_next(node)) {
+			PayloadType *payload = reinterpret_cast<PayloadType*>(node->data);
+			if (parser.all()) {
+				linphone_core_enable_payload_type(app->getCore(), payload, mEnable);
+			} else {
+				if (pt == payload) {
+					linphone_core_enable_payload_type(app->getCore(), payload, mEnable);
+					app->sendResponse(PayloadTypeResponse(app->getCore(), payload, index));
+					return;
+				}
+			}
+			++index;
+		}
+		if (parser.all()) {
+			AudioCodecGetCommand getCommand;
+			getCommand.exec(app, "");
+		} else {
+			app->sendResponse(Response("Audio codec not found.", Response::Error));
+		}
+	}
+}
+
+AudioCodecEnableCommand::AudioCodecEnableCommand() :
+		AudioCodecToggleCommand("audio-codec-enable", "audio-codec-enable <payload_type_number|mime_type|ALL>",
+					"Enable an audio codec.\n"
+					"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1", true) {
+	addExample(new DaemonCommandExample("audio-codec-enable G722/8000/1",
+						"Status: Ok\n\n"
+						"Index: 9\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: true"));
+	addExample(new DaemonCommandExample("audio-codec-enable 9",
+						"Status: Ok\n\n"
+						"Index: 9\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: true"));
+}
+
+AudioCodecDisableCommand::AudioCodecDisableCommand() :
+		AudioCodecToggleCommand("audio-codec-disable", "audio-codec-disable <payload_type_number|mime_type|ALL>",
+					"Disable an audio codec.\n"
+					"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1", false) {
+	addExample(new DaemonCommandExample("audio-codec-disable G722/8000/1",
+						"Status: Ok\n\n"
+						"Index: 9\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+	addExample(new DaemonCommandExample("audio-codec-disable 9",
+						"Status: Ok\n\n"
+						"Index: 9\n"
+						"Payload-type-number: 9\n"
+						"Clock-rate: 8000\n"
+						"Bitrate: 64000\n"
+						"Mime: G722\n"
+						"Channels: 1\n"
+						"Recv-fmtp: \n"
+						"Send-fmtp: \n"
+						"Enabled: false"));
+}
\ No newline at end of file
diff --git a/daemon/commands/audio-codec-toggle.h b/daemon/commands/audio-codec-toggle.h
new file mode 100644
index 000000000..47c196e41
--- /dev/null
+++ b/daemon/commands/audio-codec-toggle.h
@@ -0,0 +1,43 @@
+/*
+audio-codec-toggle.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUDIO_CODEC_TOGGLE_H_
+#define COMMAND_AUDIO_CODEC_TOGGLE_H_
+
+#include "../daemon.h"
+
+class AudioCodecToggleCommand: public DaemonCommand {
+public:
+	AudioCodecToggleCommand(const char *name, const char *proto, const char *help, bool enable);
+	virtual void exec(Daemon *app, const char *args);
+protected:
+	bool mEnable;
+};
+
+class AudioCodecEnableCommand: public AudioCodecToggleCommand {
+public:
+	AudioCodecEnableCommand();
+};
+
+class AudioCodecDisableCommand: public AudioCodecToggleCommand {
+public:
+	AudioCodecDisableCommand();
+};
+
+#endif //COMMAND_AUDIO_CODEC_TOGGLE_H_
diff --git a/daemon/commands/audio-stream-start.cc b/daemon/commands/audio-stream-start.cc
new file mode 100644
index 000000000..a961d742e
--- /dev/null
+++ b/daemon/commands/audio-stream-start.cc
@@ -0,0 +1,95 @@
+/*
+audio-stream-start.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "audio-stream-start.h"
+#include "private.h"
+
+using namespace std;
+
+AudioStreamStartCommand::AudioStreamStartCommand() :
+		DaemonCommand("audio-stream-start", "audio-stream-start <remote ip> <remote port> <payload type number>", "Start an audio stream.") {
+	addExample(new DaemonCommandExample("audio-stream-start 192.168.1.28 7078 9",
+						"Status: Ok\n\n"
+						"Id: 1"));
+}
+
+static PayloadType *getPayloadType(LinphoneCore *lc, const MSList *codecs, int number){
+	const MSList *elem;
+	for (elem=codecs;elem!=NULL;elem=elem->next){
+		PayloadType *pt=(PayloadType*)elem->data;
+		if (linphone_core_get_payload_type_number(lc, pt)==number)
+			return pt;
+	}
+	return NULL;
+}
+
+void AudioStreamStartCommand::exec(Daemon *app, const char *args) {
+	char addr[256];
+	int port;
+	int payload_type;
+	MSFactory* factory ;
+	
+	factory = (app->getCore())->factory; 
+
+	if (sscanf(args, "%255s %d %d", addr, &port, &payload_type) == 3) {
+		int local_port = linphone_core_get_audio_port(app->getCore());
+		int jitt = linphone_core_get_audio_jittcomp(app->getCore());
+		bool_t echo_canceller = linphone_core_echo_cancellation_enabled(app->getCore());
+		int ptime=linphone_core_get_upload_ptime(app->getCore());
+		MSSndCardManager *manager = ms_factory_get_snd_card_manager(factory);
+		MSSndCard *capture_card = ms_snd_card_manager_get_card(manager, linphone_core_get_capture_device(app->getCore()));
+		MSSndCard *play_card = ms_snd_card_manager_get_card(manager, linphone_core_get_playback_device(app->getCore()));
+		RtpProfile *prof=rtp_profile_new("stream");
+		PayloadType *pt=getPayloadType(app->getCore(), linphone_core_get_audio_codecs(app->getCore()), payload_type);
+		
+		if (!pt){
+			app->sendResponse(Response("No payload type were assigned to this number."));
+			return;
+		}
+		AudioStream *stream = audio_stream_new(factory, local_port, local_port + 1, linphone_core_ipv6_enabled(app->getCore()));
+		audio_stream_set_features(stream,linphone_core_get_audio_features(app->getCore()));
+		
+		pt=payload_type_clone(pt);
+		if (ptime!=0){
+			char fmtp[32];
+			snprintf(fmtp,sizeof(fmtp)-1,"ptime=%i",ptime);
+			payload_type_append_send_fmtp(pt,fmtp);
+		}
+		rtp_profile_set_payload(prof,payload_type,pt);
+		if (linphone_core_generic_confort_noise_enabled(app->getCore())){
+			rtp_profile_set_payload(prof,13,payload_type_clone(&payload_type_cn));
+		}
+
+		
+		audio_stream_enable_adaptive_jittcomp(stream, linphone_core_audio_adaptive_jittcomp_enabled(app->getCore()));
+		rtp_session_set_symmetric_rtp(stream->ms.sessions.rtp_session, linphone_core_symmetric_rtp_enabled(app->getCore()));
+
+		int err=audio_stream_start_now(stream, prof, addr, port, port + 1, payload_type, jitt, play_card, capture_card, echo_canceller);
+
+		if (err != 0) {
+			app->sendResponse(Response("Error during audio stream creation."));
+			return;
+		}
+		ostringstream ostr;
+		ostr << "Id: " << app->updateAudioStreamId(stream) << "\n";
+		app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+	} else {
+		app->sendResponse(Response("Missing/Incorrect parameter(s)."));
+	}
+}
diff --git a/daemon/commands/audio-stream-start.h b/daemon/commands/audio-stream-start.h
new file mode 100644
index 000000000..29372681d
--- /dev/null
+++ b/daemon/commands/audio-stream-start.h
@@ -0,0 +1,31 @@
+/*
+audio-stream-start.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUDIO_STREAM_START_H_
+#define COMMAND_AUDIO_STREAM_START_H_
+
+#include "../daemon.h"
+
+class AudioStreamStartCommand: public DaemonCommand {
+public:
+	AudioStreamStartCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_AUDIO_STREAM_START_H_
diff --git a/daemon/commands/audio-stream-stats.cc b/daemon/commands/audio-stream-stats.cc
new file mode 100644
index 000000000..93e51c36e
--- /dev/null
+++ b/daemon/commands/audio-stream-stats.cc
@@ -0,0 +1,65 @@
+/*
+audio-stream-stats.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "audio-stream-stats.h"
+
+using namespace std;
+
+AudioStreamStatsCommand::AudioStreamStatsCommand() :
+		DaemonCommand("audio-stream-stats", "audio-stream-stats <stream id>", "Return stats of a given audio stream.") {
+	addExample(new DaemonCommandExample("audio-stream-stats 1",
+						"Status: Ok\n\n"
+						"Audio-ICE state: Not activated\n"
+						"Audio-RoundTripDelay: 0.0859833\n"
+						"Audio-Jitter: 296\n"
+						"Audio-JitterBufferSizeMs: 47.7778\n"
+						"Audio-Received-InterarrivalJitter: 154\n"
+						"Audio-Received-FractionLost: 0\n"
+						"Audio-Sent-InterarrivalJitter: 296\n"
+						"Audio-Sent-FractionLost: 0\n"
+						"Audio-Payload-type-number: 111\n"
+						"Audio-Clock-rate: 16000\n"
+						"Audio-Bitrate: 44000\n"
+						"Audio-Mime: speex\n"
+						"Audio-Channels: 1\n"
+						"Audio-Recv-fmtp: vbr=on\n"
+						"Audio-Send-fmtp: vbr=on"));
+	addExample(new DaemonCommandExample("audio-stream-stats 2",
+						"Status: Error\n"
+						"Reason: No audio stream with such id."));
+}
+
+void AudioStreamStatsCommand::exec(Daemon *app, const char *args) {
+	int sid;
+	AudioStreamAndOther *stream = NULL;
+	if (sscanf(args, "%i", &sid) == 1) {
+		stream = app->findAudioStreamAndOther(sid);
+		if (!stream) {
+			app->sendResponse(Response("No audio stream with such id."));
+			return;
+		}
+	} else {
+		app->sendResponse(Response("No stream specified."));
+		return;
+	}
+
+	ostringstream ostr;
+	ostr << AudioStreamStatsResponse(app, stream->stream, &stream->stats, false).getBody();
+	app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+}
diff --git a/daemon/commands/audio-stream-stats.h b/daemon/commands/audio-stream-stats.h
new file mode 100644
index 000000000..6e27e8d52
--- /dev/null
+++ b/daemon/commands/audio-stream-stats.h
@@ -0,0 +1,31 @@
+/*
+audio-stream-stats.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUDIO_STREAM_STATS_H_
+#define COMMAND_AUDIO_STREAM_STATS_H_
+
+#include "../daemon.h"
+
+class AudioStreamStatsCommand: public DaemonCommand {
+public:
+	AudioStreamStatsCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_AUDIO_STREAM_STATS_H_
diff --git a/daemon/commands/audio-stream-stop.cc b/daemon/commands/audio-stream-stop.cc
new file mode 100644
index 000000000..a1290a852
--- /dev/null
+++ b/daemon/commands/audio-stream-stop.cc
@@ -0,0 +1,49 @@
+/*
+audio-stream-stop.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "audio-stream-stop.h"
+
+using namespace std;
+
+AudioStreamStopCommand::AudioStreamStopCommand() :
+		DaemonCommand("audio-stream-stop", "audio-stream-stop <audio stream id>", "Stop an audio stream.") {
+	addExample(new DaemonCommandExample("audio-stream-stop 1",
+						"Status: Ok"));
+	addExample(new DaemonCommandExample("audio-stream-stop 2",
+						"Status: Error\n"
+						"Reason: No Audio Stream with such id."));
+}
+
+void AudioStreamStopCommand::exec(Daemon *app, const char *args) {
+	int id;
+	if (sscanf(args, "%d", &id) == 1) {
+		AudioStream *stream = app->findAudioStream(id);
+		if (stream == NULL) {
+			app->sendResponse(Response("No Audio Stream with such id."));
+			return;
+		}
+		app->removeAudioStream(id);
+		RtpProfile *prof=rtp_session_get_profile(stream->ms.sessions.rtp_session);
+		audio_stream_stop(stream);
+		rtp_profile_destroy(prof);
+		app->sendResponse(Response());
+	} else {
+		app->sendResponse(Response("Missing/Incorrect parameter(s)."));
+	}
+}
diff --git a/daemon/commands/audio-stream-stop.h b/daemon/commands/audio-stream-stop.h
new file mode 100644
index 000000000..b885b0ff4
--- /dev/null
+++ b/daemon/commands/audio-stream-stop.h
@@ -0,0 +1,31 @@
+/*
+audio-stream-stop.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUDIO_STREAM_STOP_H_
+#define COMMAND_AUDIO_STREAM_STOP_H_
+
+#include "../daemon.h"
+
+class AudioStreamStopCommand: public DaemonCommand {
+public:
+	AudioStreamStopCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_AUDIO_STREAM_STOP_H_
diff --git a/daemon/commands/auth-infos-clear.cc b/daemon/commands/auth-infos-clear.cc
new file mode 100644
index 000000000..ec247daee
--- /dev/null
+++ b/daemon/commands/auth-infos-clear.cc
@@ -0,0 +1,71 @@
+/*
+auth-infos-clear.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "auth-infos-clear.h"
+
+using namespace std;
+
+AuthInfosClearCommand::AuthInfosClearCommand() :
+		DaemonCommand("auth-infos-clear", "auth-infos-clear <auth_infos_id|ALL> ", "Remove auth infos context for the given id, or all.") {
+	addExample(new DaemonCommandExample("auth-infos-clear 1",
+						"Status: Ok\n"
+						"Reason: Successfully cleared auth info 1."));
+	addExample(new DaemonCommandExample("auth-infos-clear ALL",
+						"Status: Ok\n"
+						"Reason: Successfully cleared 5 auth infos."));
+	addExample(new DaemonCommandExample("auth-infos-clear 3",
+						"Status: Error\n"
+						"Reason: No auth info with such id."));
+}
+
+void AuthInfosClearCommand::exec(Daemon *app, const char *args) {
+	string param;
+	int pid;
+	ostringstream ostr;
+
+	istringstream ist(args);
+	ist >> param;
+	if (ist.fail()) {
+		app->sendResponse(Response("Missing parameter.", Response::Error));
+		return;
+	}
+	if (param.compare("ALL") == 0) {
+		int previous_size = app->maxAuthInfoId();
+		linphone_core_clear_all_auth_info(app->getCore());
+		ostr << "Successfully cleared " << previous_size - app->maxAuthInfoId() << " auth infos." << endl;
+		app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+	} else {
+		LinphoneAuthInfo *auth_info = NULL;
+		ist.clear();
+		ist.str(param);
+		ist >> pid;
+		if (ist.fail()) {
+			app->sendResponse(Response("Incorrect parameter.", Response::Error));
+			return;
+		}
+		auth_info = app->findAuthInfo(pid);
+		if (auth_info == NULL) {
+			app->sendResponse(Response("No auth info with such id.", Response::Error));
+			return;
+		}
+		linphone_core_remove_auth_info(app->getCore(), auth_info);
+		ostr << "Successfully cleared auth info " << pid << "." << endl;
+		app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+	}
+}
diff --git a/daemon/commands/auth-infos-clear.h b/daemon/commands/auth-infos-clear.h
new file mode 100644
index 000000000..20a27afcd
--- /dev/null
+++ b/daemon/commands/auth-infos-clear.h
@@ -0,0 +1,31 @@
+/*
+auth-infos-clear.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_AUTH_INFOS_CLEAR_H_
+#define COMMAND_AUTH_INFOS_CLEAR_H_
+
+#include "../daemon.h"
+
+class AuthInfosClearCommand: public DaemonCommand {
+public:
+	AuthInfosClearCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_AUTH_INFOS_CLEAR_H_
diff --git a/daemon/commands/call-mute.cc b/daemon/commands/call-mute.cc
new file mode 100644
index 000000000..a244b4cf4
--- /dev/null
+++ b/daemon/commands/call-mute.cc
@@ -0,0 +1,59 @@
+/*
+call-mute.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "call-mute.h"
+
+CallMute::CallMute() :
+	DaemonCommand("call-mute", "call-mute 0|1", "mute/unmute the microphone (1 to mute, 0 to unmute). No argument means MUTE.")
+{
+	addExample(new DaemonCommandExample("call-mute 1",
+										"Status: Ok\n\n"
+										"Microphone Muted"));
+	addExample(new DaemonCommandExample("call-mute",
+										"Status: Ok\n\n"
+										"Microphone Muted"));
+	addExample(new DaemonCommandExample("call-mute 0",
+										"Status: Ok\n\n"
+										"Microphone Unmuted"));
+	addExample(new DaemonCommandExample("call-mute 1",
+										"Status: Error\n\n"
+										"Reason: No call in progress. Can't mute."));
+}
+
+void CallMute::exec(Daemon* app, const char* args)
+{
+	LinphoneCore *lc = app->getCore();
+	int muted = TRUE; // no arg means MUTE
+	LinphoneCall *call = linphone_core_get_current_call(lc);
+
+	if( call == NULL ){
+		app->sendResponse(Response("No call in progress. Can't mute."));
+		return;
+	}
+
+	if (sscanf(args, "%i", &muted) == 1) {
+		linphone_core_enable_mic(lc, !muted);
+	} else {
+		linphone_core_enable_mic(lc, !muted);
+	}
+
+	app->sendResponse(Response(muted?"Microphone Muted"
+									:"Microphone Unmuted",
+							   Response::Ok));
+}
diff --git a/daemon/commands/call-mute.h b/daemon/commands/call-mute.h
new file mode 100644
index 000000000..772c6cd0b
--- /dev/null
+++ b/daemon/commands/call-mute.h
@@ -0,0 +1,32 @@
+/*
+call-mute.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef CALLMUTE_H
+#define CALLMUTE_H
+
+#include "daemon.h"
+
+class CallMute : public DaemonCommand
+{
+public:
+	CallMute();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif // CALLMUTE_H
diff --git a/daemon/commands/call-pause.cc b/daemon/commands/call-pause.cc
new file mode 100644
index 000000000..9bceb0ffc
--- /dev/null
+++ b/daemon/commands/call-pause.cc
@@ -0,0 +1,67 @@
+/*
+call-pause.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "call-pause.h"
+
+CallPause::CallPause() :
+	DaemonCommand("call-pause",
+				  "call-pause <call id>",
+				  "Pause a call (pause current if no id is specified).")
+{
+	addExample(new DaemonCommandExample("call-pause 1",
+										"Status: Ok\n\n"
+										"Call was paused"));
+
+	addExample(new DaemonCommandExample("call-pause 2",
+										"Status: Error\n"
+										"Reason: No call with such id."));
+
+	addExample(new DaemonCommandExample("call-pause",
+										"Status: Error\n"
+										"Reason: No current call available."));
+}
+
+void CallPause::exec(Daemon* app, const char* args)
+{
+	LinphoneCore *lc = app->getCore();
+	int cid;
+	LinphoneCall *call = NULL;
+	bool current = false;
+	if (sscanf(args, "%i", &cid) == 1) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	} else {
+		call = linphone_core_get_current_call(lc);
+		current = true;
+		if (call == NULL) {
+			app->sendResponse(Response("No current call available."));
+			return;
+		}
+	}
+
+	if( linphone_core_pause_call(lc, call) == 0 ) {
+		app->sendResponse(Response(current?"Current call was paused":
+										   "Call was paused", Response::Ok));
+	} else {
+		app->sendResponse(Response("Error pausing call"));
+	}
+}
diff --git a/daemon/commands/call-pause.h b/daemon/commands/call-pause.h
new file mode 100644
index 000000000..0a52a0fb1
--- /dev/null
+++ b/daemon/commands/call-pause.h
@@ -0,0 +1,33 @@
+/*
+call-pause.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef CALLPAUSE_H
+#define CALLPAUSE_H
+
+#include "daemon.h"
+
+class CallPause : public DaemonCommand
+{
+public:
+	CallPause();
+
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif // CALLPAUSE_H
diff --git a/daemon/commands/call-resume.cc b/daemon/commands/call-resume.cc
new file mode 100644
index 000000000..43ceda8fd
--- /dev/null
+++ b/daemon/commands/call-resume.cc
@@ -0,0 +1,65 @@
+/*
+call-resume.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "call-resume.h"
+
+CallResume::CallResume():
+	DaemonCommand("call-resume", "call-resume <call id>", "Pause a call (pause current if no id is specified).")
+{
+	addExample(new DaemonCommandExample("call-resume 1",
+										"Status: Ok\n\n"
+										"Call was resumed"));
+
+	addExample(new DaemonCommandExample("call-resume 2",
+										"Status: Error\n"
+										"Reason: No call with such id."));
+
+	addExample(new DaemonCommandExample("call-resume",
+										"Status: Error\n"
+										"Reason: No current call available."));
+}
+
+void CallResume::exec(Daemon* app, const char* args)
+{
+	LinphoneCore *lc = app->getCore();
+	int cid;
+	LinphoneCall *call = NULL;
+	bool current = false;
+	if (sscanf(args, "%i", &cid) == 1) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	} else {
+		call = linphone_core_get_current_call(lc);
+		current = true;
+		if (call == NULL) {
+			app->sendResponse(Response("No current call available."));
+			return;
+		}
+	}
+
+	if( linphone_core_resume_call(lc, call) == 0 ) {
+		app->sendResponse(Response(current?"Current call was resumed":
+										   "Call was resumed", Response::Ok));
+	} else {
+		app->sendResponse(Response("Error pausing call"));
+	}
+}
diff --git a/daemon/commands/call-resume.h b/daemon/commands/call-resume.h
new file mode 100644
index 000000000..13824d584
--- /dev/null
+++ b/daemon/commands/call-resume.h
@@ -0,0 +1,32 @@
+/*
+call-resume.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef CALLRESUME_H
+#define CALLRESUME_H
+
+#include "daemon.h"
+
+class CallResume : public DaemonCommand
+{
+public:
+	CallResume();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif // CALLRESUME_H
diff --git a/daemon/commands/call-stats.cc b/daemon/commands/call-stats.cc
new file mode 100644
index 000000000..b239dfd75
--- /dev/null
+++ b/daemon/commands/call-stats.cc
@@ -0,0 +1,77 @@
+/*
+call-stats.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "call-stats.h"
+
+using namespace std;
+
+CallStatsCommand::CallStatsCommand() :
+		DaemonCommand("call-stats", "call-stats <call id>", "Return all stats of a call.") {
+	addExample(new DaemonCommandExample("call-stats 1",
+						"Status: Ok\n\n"
+						"Audio-ICE state: Not activated\n"
+						"Audio-RoundTripDelay: 0.0859833\n"
+						"Audio-Jitter: 296\n"
+						"Audio-JitterBufferSizeMs: 47.7778\n"
+						"Audio-Received-InterarrivalJitter: 154\n"
+						"Audio-Received-FractionLost: 0\n"
+						"Audio-Sent-InterarrivalJitter: 296\n"
+						"Audio-Sent-FractionLost: 0\n"
+						"Audio-Payload-type-number: 111\n"
+						"Audio-Clock-rate: 16000\n"
+						"Audio-Bitrate: 44000\n"
+						"Audio-Mime: speex\n"
+						"Audio-Channels: 1\n"
+						"Audio-Recv-fmtp: vbr=on\n"
+						"Audio-Send-fmtp: vbr=on\n\n"
+						"Video-ICE state: Not activated\n"
+						"Video-RoundTripDelay: 0\n"
+						"Video-Jitter: 0\n"
+						"Video-JitterBufferSizeMs: 0State: disabled"));
+	addExample(new DaemonCommandExample("call-stats 2",
+						"Status: Error\n"
+						"Reason: No call with such id."));
+	addExample(new DaemonCommandExample("call-stats",
+						"Status: Error\n"
+						"Reason: No current call available."));
+}
+
+void CallStatsCommand::exec(Daemon *app, const char *args) {
+	LinphoneCore *lc = app->getCore();
+	int cid;
+	LinphoneCall *call = NULL;
+	if (sscanf(args, "%i", &cid) == 1) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	} else {
+		call = linphone_core_get_current_call(lc);
+		if (call == NULL) {
+			app->sendResponse(Response("No current call available."));
+			return;
+		}
+	}
+
+	ostringstream ostr;
+	ostr << CallStatsResponse(app, call, linphone_call_get_audio_stats(call), false).getBody();
+	ostr << CallStatsResponse(app, call, linphone_call_get_video_stats(call), false).getBody();
+	app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+}
diff --git a/daemon/commands/call-stats.h b/daemon/commands/call-stats.h
new file mode 100644
index 000000000..13b4370a3
--- /dev/null
+++ b/daemon/commands/call-stats.h
@@ -0,0 +1,31 @@
+/*
+call-stats.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_CALL_STATS_H_
+#define COMMAND_CALL_STATS_H_
+
+#include "../daemon.h"
+
+class CallStatsCommand: public DaemonCommand {
+public:
+	CallStatsCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_CALL_STATS_H_
diff --git a/daemon/commands/call-status.cc b/daemon/commands/call-status.cc
new file mode 100644
index 000000000..675b160d8
--- /dev/null
+++ b/daemon/commands/call-status.cc
@@ -0,0 +1,86 @@
+/*
+call-status.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "call-status.h"
+
+using namespace std;
+
+CallStatusCommand::CallStatusCommand() :
+		DaemonCommand("call-status", "call-status <call id>", "Return status of a call.") {
+	addExample(new DaemonCommandExample("call-status 1",
+						"Status: Ok\n\n"
+						"State: LinphoneCallStreamsRunning\n"
+						"From: <sip:daemon-test@sip.linphone.org>\n"
+						"Direction: out\n"
+						"Duration: 6"));
+	addExample(new DaemonCommandExample("call-status 2",
+						"Status: Error\n"
+						"Reason: No call with such id."));
+	addExample(new DaemonCommandExample("call-status",
+						"Status: Error\n"
+						"Reason: No current call available."));
+}
+void CallStatusCommand::exec(Daemon *app, const char *args) {
+	LinphoneCore *lc = app->getCore();
+	int cid;
+	LinphoneCall *call = NULL;
+	if (sscanf(args, "%i", &cid) == 1) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	} else {
+		call = linphone_core_get_current_call(lc);
+		if (call == NULL) {
+			app->sendResponse(Response("No current call available."));
+			return;
+		}
+	}
+
+	LinphoneCallState call_state = LinphoneCallIdle;
+	call_state = linphone_call_get_state(call);
+	const LinphoneAddress *remoteAddress = linphone_call_get_remote_address(call);
+	ostringstream ostr;
+	ostr << "State: " << linphone_call_state_to_string(call_state) << "\n";
+
+	switch (call_state) {
+	case LinphoneCallOutgoingInit:
+	case LinphoneCallOutgoingProgress:
+	case LinphoneCallOutgoingRinging:
+	case LinphoneCallPaused:
+	case LinphoneCallStreamsRunning:
+	case LinphoneCallConnected:
+	case LinphoneCallIncomingReceived:
+		ostr << "From: " << linphone_address_as_string(remoteAddress) << "\n";
+		break;
+	default:
+		break;
+	}
+	switch (call_state) {
+	case LinphoneCallStreamsRunning:
+	case LinphoneCallConnected:
+		ostr << "Direction: " << ((linphone_call_get_dir(call) == LinphoneCallOutgoing) ? "out" : "in") << "\n";
+		ostr << "Duration: " << linphone_call_get_duration(call) << "\n";
+		break;
+	default:
+		break;
+	}
+	app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+}
diff --git a/daemon/commands/call-status.h b/daemon/commands/call-status.h
new file mode 100644
index 000000000..b97551a93
--- /dev/null
+++ b/daemon/commands/call-status.h
@@ -0,0 +1,31 @@
+/*
+call-status.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_CALL_STATUS_H_
+#define COMMAND_CALL_STATUS_H_
+
+#include "../daemon.h"
+
+class CallStatusCommand: public DaemonCommand {
+public:
+	CallStatusCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_CALL_STATUS_H_
diff --git a/daemon/commands/call-transfer.cc b/daemon/commands/call-transfer.cc
new file mode 100644
index 000000000..17558f00d
--- /dev/null
+++ b/daemon/commands/call-transfer.cc
@@ -0,0 +1,64 @@
+/*
+call-transfer.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "call-transfer.h"
+
+CallTransfer::CallTransfer() :
+	DaemonCommand("call-transfer",
+				  "call-transfer <call id> <sip url>",
+				  "Transfer a call that you aswered to another party")
+{
+	addExample(new DaemonCommandExample("call-transfer 1 sip:john",
+										"Status: Ok\n\n"
+										"Call ID: 1\n"
+										"Transfer to: sip:john"));
+
+	addExample(new DaemonCommandExample("call-transfer 2 sip:john",
+										"Status: Error\n"
+										"Reason: No call with such id."));
+}
+
+void CallTransfer::exec(Daemon* app, const char* args)
+{
+	LinphoneCore *lc = app->getCore();
+	int cid;
+	LinphoneCall *call = NULL;
+	char sipurl[512];
+	memset(sipurl, 0x00, 512);
+
+	if (sscanf(args, "%i %511s", &cid, sipurl) == 2) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	} else {
+		app->sendResponse(Response("Invalid command format."));
+		return;
+	}
+
+	if( linphone_core_transfer_call(lc, call, sipurl) == 0 ) {
+		std::ostringstream ostr;
+		ostr << "Call ID: "     << cid    << "\n";
+		ostr << "Transfer to: " << sipurl << "\n";
+		app->sendResponse(Response(ostr.str(), Response::Ok));
+	} else {
+		app->sendResponse(Response("Error pausing call"));
+	}
+}
diff --git a/daemon/commands/call-transfer.h b/daemon/commands/call-transfer.h
new file mode 100644
index 000000000..1ff37952c
--- /dev/null
+++ b/daemon/commands/call-transfer.h
@@ -0,0 +1,32 @@
+/*
+call-transfer.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef CALLTRANSFER_H
+#define CALLTRANSFER_H
+
+#include "daemon.h"
+
+class CallTransfer : public DaemonCommand
+{
+public:
+	CallTransfer();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif // CALLTRANSFER_H
diff --git a/daemon/commands/call.cc b/daemon/commands/call.cc
new file mode 100644
index 000000000..f908b7f0b
--- /dev/null
+++ b/daemon/commands/call.cc
@@ -0,0 +1,64 @@
+/*
+call.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "call.h"
+
+using namespace std;
+
+CallCommand::CallCommand() :
+		DaemonCommand("call", "call <sip address>", "Place a call.") {
+	addExample(new DaemonCommandExample("call daemon-test@sip.linphone.org",
+						"Status: Ok\n\n"
+						"Id: 1"));
+	addExample(new DaemonCommandExample("call daemon-test@sip.linphone.org --early-media",
+						"Status: Ok\n\n"
+						"Early media: Ok\n"
+						"Id: 1"));
+	addExample(new DaemonCommandExample("call daemon-test@sip.linphone.org",
+						"Status: Error\n"
+						"Reason: Call creation failed."));
+}
+
+void CallCommand::exec(Daemon *app, const char *args) {
+	LinphoneCall *call;
+	Response resp;
+	ostringstream ostr;
+	char address[256] = { 0 }, early_media[256] = { 0 };
+	if (sscanf(args, "%s %s", address, early_media) == 2) {
+		char *opt;
+		LinphoneCallParams *cp;
+		opt = strstr(early_media,"--early-media");
+		cp = linphone_core_create_call_params(app->getCore(), NULL);
+		if (opt) {
+			linphone_call_params_enable_early_media_sending(cp, TRUE);
+			ostr << "Early media: Ok\n";
+		}
+		call = linphone_core_invite_with_params(app->getCore(), address, cp);
+	} else {
+		call = linphone_core_invite(app->getCore(), args);
+	}
+	
+	if (call == NULL) {
+		app->sendResponse(Response("Call creation failed."));
+	} else {
+		ostr << "Id: " << app->updateCallId(call) << "\n";
+		resp.setBody(ostr.str().c_str());
+		app->sendResponse(resp);
+	}
+}
diff --git a/daemon/commands/call.h b/daemon/commands/call.h
new file mode 100644
index 000000000..5f0ea6b49
--- /dev/null
+++ b/daemon/commands/call.h
@@ -0,0 +1,31 @@
+/*
+call.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_CALL_H_
+#define COMMAND_CALL_H_
+
+#include "../daemon.h"
+
+class CallCommand: public DaemonCommand {
+public:
+	CallCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_CALL_H_
diff --git a/daemon/commands/cn.cc b/daemon/commands/cn.cc
new file mode 100644
index 000000000..d2eabad30
--- /dev/null
+++ b/daemon/commands/cn.cc
@@ -0,0 +1,73 @@
+/*
+cn.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "cn.h"
+
+using namespace std;
+
+class CNResponse : public Response {
+public:
+	CNResponse(LinphoneCore *core);
+};
+
+CNResponse::CNResponse(LinphoneCore *core) : Response() {
+	ostringstream ost;
+	bool cn_enabled = linphone_core_generic_confort_noise_enabled(core) == TRUE ? true : false;
+	ost << "State: ";
+	if (cn_enabled) {
+		ost << "enabled\n";
+	} else {
+		ost << "disabled\n";
+	}
+	setBody(ost.str().c_str());
+}
+
+
+CNCommand::CNCommand() :
+		DaemonCommand("cn", "cn [enable|disable]",
+				"Enable or disable generic confort noice (CN payload type) with the 'enable' and 'disable' parameters, return the status of the use of confort noise without parameter.") {
+	addExample(new DaemonCommandExample("cn enable",
+						"Status: Ok\n\n"
+						"State: enabled"));
+	addExample(new DaemonCommandExample("cn disable",
+						"Status: Ok\n\n"
+						"State: disabled"));
+	addExample(new DaemonCommandExample("cn",
+						"Status: Ok\n\n"
+						"State: disabled"));
+}
+
+void CNCommand::exec(Daemon *app, const char *args) {
+	string status;
+	istringstream ist(args);
+	ist >> status;
+	if (ist.fail()) {
+		app->sendResponse(CNResponse(app->getCore()));
+	} else {
+		if (status.compare("enable") == 0) {
+			linphone_core_enable_generic_confort_noise(app->getCore(), TRUE);
+		} else if (status.compare("disable") == 0) {
+			linphone_core_enable_generic_confort_noise(app->getCore(), FALSE);
+		} else {
+			app->sendResponse(Response("Incorrect parameter.", Response::Error));
+			return;
+		}
+		app->sendResponse(CNResponse(app->getCore()));
+	}
+}
diff --git a/daemon/commands/cn.h b/daemon/commands/cn.h
new file mode 100644
index 000000000..b8ca19b88
--- /dev/null
+++ b/daemon/commands/cn.h
@@ -0,0 +1,31 @@
+/*
+cn.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_CN_H_
+#define COMMAND_CN_H_
+
+#include "../daemon.h"
+
+class CNCommand: public DaemonCommand {
+public:
+	CNCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_IPV6_H_
diff --git a/daemon/commands/conference.cc b/daemon/commands/conference.cc
new file mode 100644
index 000000000..c39c8515a
--- /dev/null
+++ b/daemon/commands/conference.cc
@@ -0,0 +1,88 @@
+/*
+conference.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "conference.h"
+
+Conference::Conference() :
+	DaemonCommand("conference", "conference <subcommand> <call id>",
+				  "Create and manage an audio conference.\n"
+				  "Subcommands:\n"
+				  "- add   : join the call with id 'call id' into the audio conference. Creates new one if none exists.\n"
+				  "- rm    : remove the call with id 'call id' from the audio conference\n"
+				  "- leave : temporarily leave the current conference.\n"
+				  "- enter : re-join the conference after leaving it")
+{
+	addExample(new DaemonCommandExample("conference add 1",
+										"Status: Ok\n\n"
+										"Call Id: 1\n"
+										"Conference: add OK"));
+	addExample(new DaemonCommandExample("conference leave 1",
+										"Status: Ok\n\n"
+										"Call Id: 1\n"
+										"Conference: leave OK"));
+	addExample(new DaemonCommandExample("conference azerty 1",
+										"Status: Error\n\n"
+										"Reason: Invalid command format"));
+	addExample(new DaemonCommandExample("conference leave 2",
+										"Status: Error\n\n"
+										"Reason: No call with such id."));
+}
+
+void Conference::exec(Daemon* app, const char* args)
+{
+	LinphoneCore* lc = app->getCore();
+	long id;
+	char subcommand[32]={0};
+	int n;
+	n=sscanf(args, "%31s %li", subcommand,&id);
+	if (n == 2){
+		LinphoneCall *call=app->findCall(id);
+		if (call==NULL){
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+
+		if (strcmp(subcommand,"add")==0){
+			n = linphone_core_add_to_conference(lc,call);
+
+		}else if (strcmp(subcommand,"rm")==0){
+			n = linphone_core_remove_from_conference(lc,call);
+
+		}else if (strcmp(subcommand,"enter")==0){
+			n = linphone_core_enter_conference(lc);
+
+		}else if (strcmp(subcommand,"leave")==0){
+			n = linphone_core_leave_conference(lc);
+		} else {
+			app->sendResponse("Invalid command format.");
+		}
+
+		if ( n == 0 ){
+			std::ostringstream ostr;
+			ostr << "Call ID: " << id << "\n";
+			ostr << "Conference: " << subcommand << " OK" << "\n";
+			app->sendResponse(Response(ostr.str(), Response::Ok));
+		} else {
+			app->sendResponse("Conference: command failed");
+		}
+
+	} else {
+		app->sendResponse("Invalid command format.");
+	}
+}
diff --git a/daemon/commands/conference.h b/daemon/commands/conference.h
new file mode 100644
index 000000000..e904e8792
--- /dev/null
+++ b/daemon/commands/conference.h
@@ -0,0 +1,32 @@
+/*
+conference.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMANDS_CONFERENCE_H
+#define COMMANDS_CONFERENCE_H
+
+#include "daemon.h"
+
+class Conference : public DaemonCommand
+{
+public:
+	Conference();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif // CONFERENCE_H
diff --git a/daemon/commands/config.cc b/daemon/commands/config.cc
new file mode 100644
index 000000000..385823256
--- /dev/null
+++ b/daemon/commands/config.cc
@@ -0,0 +1,79 @@
+/*
+config.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "configcommand.h"
+
+using namespace std;
+
+class ConfigResponse : public Response {
+public:
+	ConfigResponse(const char *value);
+};
+
+ConfigResponse::ConfigResponse(const char *value) : Response() {
+	ostringstream ost;
+	ost << "Value: "<<(value ? value : "<unset>");
+	setBody(ost.str().c_str());
+}
+
+ConfigGetCommand::ConfigGetCommand() :
+		DaemonCommand("config-get", "config section key",
+				"Reads a configuration value from linphone's configuration database.") {
+	addExample(new DaemonCommandExample("config rtp symmetric",
+						"Status: Ok\n\n"
+						"Value: <unset>"));
+}
+
+void ConfigGetCommand::exec(Daemon *app, const char *args) {
+	string section,key;
+	istringstream ist(args);
+	ist >> section >> key;
+	if (ist.fail()) {
+		app->sendResponse(Response("Missing section and/or key names."));
+	} else {
+		const char *read_value=lp_config_get_string(linphone_core_get_config(app->getCore()),section.c_str(),key.c_str(),NULL);
+		app->sendResponse(ConfigResponse(read_value));
+	}
+}
+
+
+ConfigSetCommand::ConfigSetCommand() :
+		DaemonCommand("config-set", "config section key value",
+				"Sets a configuration value into linphone's configuration database.") {
+	addExample(new DaemonCommandExample("config-set rtp symmetric 1",
+						"Status: Ok\n\n"
+						"Value: 2"));
+	addExample(new DaemonCommandExample("config-set rtp symmetric",
+						"Status: Ok\n\n"
+						"Value: <unset>"));
+}
+
+void ConfigSetCommand::exec(Daemon *app, const char *args) {
+	string section,key,value;
+	istringstream ist(args);
+	ist >> section >> key;
+	if (ist.fail()) {
+		app->sendResponse(Response("Missing section and/or key names."));
+	} else {
+		ist>>value;
+		lp_config_set_string(linphone_core_get_config(app->getCore()), section.c_str(), key.c_str(), value.size()>0 ? value.c_str() : NULL);
+		app->sendResponse(ConfigResponse(value.c_str()));
+	}
+}
+
diff --git a/daemon/commands/configcommand.h b/daemon/commands/configcommand.h
new file mode 100644
index 000000000..5813f6735
--- /dev/null
+++ b/daemon/commands/configcommand.h
@@ -0,0 +1,37 @@
+/*
+configcommand.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_CONFIG_H_
+#define COMMAND_CONFIG_H_
+
+#include "../daemon.h"
+
+class ConfigGetCommand: public DaemonCommand {
+public:
+	ConfigGetCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+class ConfigSetCommand: public DaemonCommand {
+public:
+	ConfigSetCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_IPV6_H_
diff --git a/daemon/commands/contact.cc b/daemon/commands/contact.cc
new file mode 100644
index 000000000..b0b97f162
--- /dev/null
+++ b/daemon/commands/contact.cc
@@ -0,0 +1,48 @@
+/*
+contact.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "contact.h"
+
+using namespace std;
+
+ContactCommand::ContactCommand() :
+		DaemonCommand("contact", "contact sip:<username>@<hostname> or contact username hostname", "Set a contact name.") {
+	addExample(new DaemonCommandExample("contact sip:root@unknown-host",
+						"Status: Ok\n\n"));
+}
+void ContactCommand::exec(Daemon *app, const char *args) {
+	LinphoneCore *lc = app->getCore();
+	int result;
+	char *contact;
+	char username[256] = { 0 };
+	char hostname[256] = { 0 };
+	result = sscanf(args, "%255s %255s", username, hostname);
+	if (result == 1) {
+		linphone_core_set_primary_contact(lc,username);
+		app->sendResponse(Response("", Response::Ok));
+	}
+	else if (result > 1) {
+		contact=ortp_strdup_printf("sip:%s@%s",username,hostname);
+		linphone_core_set_primary_contact(lc,contact);
+		ms_free(contact);
+		app->sendResponse(Response("", Response::Ok));
+	} else {
+		app->sendResponse(Response("Missing/Incorrect parameter(s)."));
+	}
+}
diff --git a/daemon/commands/contact.h b/daemon/commands/contact.h
new file mode 100644
index 000000000..79a609bc8
--- /dev/null
+++ b/daemon/commands/contact.h
@@ -0,0 +1,31 @@
+/*
+contact.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_CONTACT_H_
+#define COMMAND_CONTACT_H_
+
+#include "../daemon.h"
+
+class ContactCommand: public DaemonCommand {
+public:
+	ContactCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_CONTACT_H_
diff --git a/daemon/commands/dtmf.cc b/daemon/commands/dtmf.cc
new file mode 100644
index 000000000..7d464f4de
--- /dev/null
+++ b/daemon/commands/dtmf.cc
@@ -0,0 +1,54 @@
+/*
+dtmf.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "dtmf.h"
+
+using namespace std;
+
+DtmfCommand::DtmfCommand() :
+		DaemonCommand("dtmf", "dtmf <digit>", "Generate a DTMF (one of: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, *, #.") {
+	addExample(new DaemonCommandExample("dtmf 4",
+						"Status: Ok"));
+	addExample(new DaemonCommandExample("dtmf B",
+						"Status: Ok"));
+	addExample(new DaemonCommandExample("dtmf #",
+						"Status: Ok"));
+}
+
+void DtmfCommand::exec(Daemon *app, const char *args) {
+	string digit_str;
+	char digit;
+	istringstream ist(args);
+	ist >> digit_str;
+	if (ist.fail()) {
+		app->sendResponse(Response("Missing digit parameter.", Response::Error));
+	} else {
+	digit = digit_str.at(0);
+		if (isdigit(digit) || (digit == 'A') || (digit == 'B') || (digit == 'C') || (digit == 'D') || (digit == '*') || (digit == '#')) {
+			LinphoneCall *call = linphone_core_get_current_call(app->getCore());
+			linphone_core_play_dtmf(app->getCore(), digit, 100);
+			if (call == NULL) {
+				linphone_call_send_dtmf(call, digit);
+			}
+			app->sendResponse(Response());
+		} else {
+			app->sendResponse(Response("Incorrect digit parameter.", Response::Error));
+		}
+	}
+}
diff --git a/daemon/commands/dtmf.h b/daemon/commands/dtmf.h
new file mode 100644
index 000000000..1af629457
--- /dev/null
+++ b/daemon/commands/dtmf.h
@@ -0,0 +1,31 @@
+/*
+dtmf.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_DTMF_H_
+#define COMMAND_DTMF_H_
+
+#include "../daemon.h"
+
+class DtmfCommand: public DaemonCommand {
+public:
+	DtmfCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_DTMF_H_
diff --git a/daemon/commands/firewall-policy.cc b/daemon/commands/firewall-policy.cc
new file mode 100644
index 000000000..ae3a912b3
--- /dev/null
+++ b/daemon/commands/firewall-policy.cc
@@ -0,0 +1,120 @@
+/*
+firewall-policy.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "firewall-policy.h"
+
+using namespace std;
+
+class FirewallPolicyResponse : public Response {
+public:
+	FirewallPolicyResponse(LinphoneCore *core);
+};
+
+FirewallPolicyResponse::FirewallPolicyResponse(LinphoneCore *core) : Response() {
+	ostringstream ost;
+	LinphoneFirewallPolicy policy = linphone_core_get_firewall_policy(core);
+	ost << "Type: ";
+	switch (policy) {
+		case LinphonePolicyNoFirewall:
+			ost << "none\n";
+			break;
+		case LinphonePolicyUseNatAddress:
+			ost << "nat\n";
+			ost << "Address: " << linphone_core_get_nat_address(core) << "\n";
+			break;
+		case LinphonePolicyUseStun:
+			ost << "stun\n";
+			ost << "Address: " << linphone_core_get_stun_server(core) << "\n";
+			break;
+		case LinphonePolicyUseIce:
+			ost << "ice\n";
+			ost << "Address: " << linphone_core_get_stun_server(core) << "\n";
+			break;
+		case LinphonePolicyUseUpnp:
+			ost << "upnp\n";
+			break;
+	}
+	setBody(ost.str().c_str());
+}
+
+FirewallPolicyCommand::FirewallPolicyCommand() :
+		DaemonCommand("firewall-policy", "firewall-policy <type> [<address>]",
+				"Set the firewall policy if type is set, otherwise return the used firewall policy.\n"
+				"<type> must be one of these values: none, nat, stun, ice, upnp.\n"
+				"<address> must be specified for the 'nat' and 'stun' types. "
+				"It represents the public address of the gateway for the 'nat' type and the STUN server address for the 'stun' and 'ice' types.") {
+	addExample(new DaemonCommandExample("firewall-policy stun stun.linphone.org",
+						"Status: Ok\n\n"
+						"Type: stun\n"
+						"Address: stun.linphone.org"));
+	addExample(new DaemonCommandExample("firewall-policy none",
+						"Status: Ok\n\n"
+						"Type: none"));
+	addExample(new DaemonCommandExample("firewall-policy",
+						"Status: Ok\n\n"
+						"Type: none"));
+}
+
+void FirewallPolicyCommand::exec(Daemon *app, const char *args) {
+	string type;
+	string address;
+	istringstream ist(args);
+	ist >> type;
+	if (ist.eof() && (type.length() == 0)) {
+		app->sendResponse(FirewallPolicyResponse(app->getCore()));
+	} else if (ist.fail()) {
+		app->sendResponse(Response("Incorrect type parameter.", Response::Error));
+	} else {
+		bool get_address;
+		LinphoneFirewallPolicy policy;
+		if (type.compare("none") == 0) {
+			policy = LinphonePolicyNoFirewall;
+			get_address = false;
+		} else if (type.compare("nat") == 0) {
+			policy = LinphonePolicyUseNatAddress;
+			get_address = true;
+		} else if (type.compare("stun") == 0) {
+			policy = LinphonePolicyUseStun;
+			get_address = true;
+		} else if (type.compare("ice") == 0) {
+			policy = LinphonePolicyUseIce;
+			get_address = true;
+		} else if (type.compare("upnp") == 0) {
+			policy = LinphonePolicyUseUpnp;
+			get_address = false;
+		} else {
+			app->sendResponse(Response("Incorrect type parameter.", Response::Error));
+			return;
+		}
+		if (get_address) {
+			ist >> address;
+			if (ist.fail()) {
+				app->sendResponse(Response("Missing/Incorrect address parameter.", Response::Error));
+				return;
+			}
+		}
+		linphone_core_set_firewall_policy(app->getCore(), policy);
+		if (policy == LinphonePolicyUseNatAddress) {
+			linphone_core_set_nat_address(app->getCore(), address.c_str());
+		} else if ((policy == LinphonePolicyUseStun) || (policy == LinphonePolicyUseIce)) {
+			linphone_core_set_stun_server(app->getCore(), address.c_str());
+		}
+		app->sendResponse(FirewallPolicyResponse(app->getCore()));
+	}
+}
diff --git a/daemon/commands/firewall-policy.h b/daemon/commands/firewall-policy.h
new file mode 100644
index 000000000..d90c78ecf
--- /dev/null
+++ b/daemon/commands/firewall-policy.h
@@ -0,0 +1,31 @@
+/*
+firewall-policy.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_FIREWALL_POLICY_H_
+#define COMMAND_FIREWALL_POLICY_H_
+
+#include "../daemon.h"
+
+class FirewallPolicyCommand: public DaemonCommand {
+public:
+	FirewallPolicyCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_FIREWALL_POLICY_H_
diff --git a/daemon/commands/help.cc b/daemon/commands/help.cc
new file mode 100644
index 000000000..329a96359
--- /dev/null
+++ b/daemon/commands/help.cc
@@ -0,0 +1,50 @@
+/*
+help.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "help.h"
+
+using namespace std;
+
+HelpCommand::HelpCommand() :
+		DaemonCommand("help", "help <command>", "Show <command> help notice, if command is unspecified or inexistent show all commands.") {
+}
+
+void HelpCommand::exec(Daemon *app, const char *args) {
+	ostringstream ost;
+	list<DaemonCommand*>::const_iterator it;
+	const list<DaemonCommand*> &l = app->getCommandList();
+	if (args){
+		for (it = l.begin(); it != l.end(); ++it) {
+			if ((*it)->matches(args)){
+				ost << (*it)->getHelp();
+				break;
+			}
+		}
+		if (it==l.end()) args=NULL;
+	}
+	
+	if (args==NULL){
+		for (it = l.begin(); it != l.end(); ++it) {
+			ost << (*it)->getProto() << endl;
+		}
+	}
+	Response resp;
+	resp.setBody(ost.str().c_str());
+	app->sendResponse(resp);
+}
diff --git a/daemon/commands/help.h b/daemon/commands/help.h
new file mode 100644
index 000000000..b6e1f966d
--- /dev/null
+++ b/daemon/commands/help.h
@@ -0,0 +1,31 @@
+/*
+help.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_HELP_H_
+#define COMMAND_HELP_H_
+
+#include "../daemon.h"
+
+class HelpCommand: public DaemonCommand {
+public:
+	HelpCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_HELP_H_
diff --git a/daemon/commands/ipv6.cc b/daemon/commands/ipv6.cc
new file mode 100644
index 000000000..fc57cb531
--- /dev/null
+++ b/daemon/commands/ipv6.cc
@@ -0,0 +1,72 @@
+/*
+ipv6.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "ipv6.h"
+
+using namespace std;
+
+class IPv6Response : public Response {
+public:
+	IPv6Response(LinphoneCore *core);
+};
+
+IPv6Response::IPv6Response(LinphoneCore *core) : Response() {
+	ostringstream ost;
+	bool ipv6_enabled = linphone_core_ipv6_enabled(core) == TRUE ? true : false;
+	ost << "State: ";
+	if (ipv6_enabled) {
+		ost << "enabled\n";
+	} else {
+		ost << "disabled\n";
+	}
+	setBody(ost.str().c_str());
+}
+
+IPv6Command::IPv6Command() :
+		DaemonCommand("ipv6", "ipv6 [enable|disable]",
+				"Enable or disable IPv6 respectively with the 'enable' and 'disable' parameters, return the status of the use of IPv6 without parameter.") {
+	addExample(new DaemonCommandExample("ipv6 enable",
+						"Status: Ok\n\n"
+						"State: enabled"));
+	addExample(new DaemonCommandExample("ipv6 disable",
+						"Status: Ok\n\n"
+						"State: disabled"));
+	addExample(new DaemonCommandExample("ipv6",
+						"Status: Ok\n\n"
+						"State: disabled"));
+}
+
+void IPv6Command::exec(Daemon *app, const char *args) {
+	string status;
+	istringstream ist(args);
+	ist >> status;
+	if (ist.fail()) {
+		app->sendResponse(IPv6Response(app->getCore()));
+	} else {
+		if (status.compare("enable") == 0) {
+			linphone_core_enable_ipv6(app->getCore(), TRUE);
+		} else if (status.compare("disable") == 0) {
+			linphone_core_enable_ipv6(app->getCore(), FALSE);
+		} else {
+			app->sendResponse(Response("Incorrect parameter.", Response::Error));
+			return;
+		}
+		app->sendResponse(IPv6Response(app->getCore()));
+	}
+}
diff --git a/daemon/commands/ipv6.h b/daemon/commands/ipv6.h
new file mode 100644
index 000000000..61247cfc3
--- /dev/null
+++ b/daemon/commands/ipv6.h
@@ -0,0 +1,31 @@
+/*
+ipv6.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_IPV6_H_
+#define COMMAND_IPV6_H_
+
+#include "../daemon.h"
+
+class IPv6Command: public DaemonCommand {
+public:
+	IPv6Command();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_IPV6_H_
diff --git a/daemon/commands/jitterbuffer.cc b/daemon/commands/jitterbuffer.cc
new file mode 100644
index 000000000..be627a053
--- /dev/null
+++ b/daemon/commands/jitterbuffer.cc
@@ -0,0 +1,148 @@
+/*
+jitterbuffer.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "jitterbuffer.h"
+#include <iostream>
+
+#include <mediastreamer2/msrtp.h>
+#include <private.h>
+using namespace::std;
+
+
+class JitterBufferResponse : public Response{
+public:
+	JitterBufferResponse(LinphoneCore *lc,bool audio, bool video){
+		ostringstream ostr;
+		if (audio)
+			ostr<<"audio-jitter-buffer-size: "<<linphone_core_get_audio_jittcomp(lc)<<endl;
+		if (video)
+			ostr<<"video-jitter-buffer-size: "<<linphone_core_get_video_jittcomp(lc)<<endl;
+		setBody(ostr.str().c_str());
+	}
+};
+
+JitterBufferCommand::JitterBufferCommand() : DaemonCommand("jitter-buffer",
+	"jitter-buffer <stream-type> [size <milliseconds>]" ,
+	"Control jitter buffer parameters.\n"
+	"jitter-buffer <stream-type> size <milliseconds> : sets the nominal jitter buffer size in milliseconds. Has no effect in a running call.\n"
+	"jitter-buffer <stream-type> : gets the nominal jitter buffer size."
+	){
+	addExample(new DaemonCommandExample("jitter-buffer","Status: Ok\n\n"
+				"audio-jitter-buffer-size: 60\nvideo-jitter-buffer-size: 60\n"));
+	addExample(new DaemonCommandExample("jitter-buffer audio","Status: Ok\n\n"
+				"audio-jitter-buffer-size: 60\n"));
+	addExample(new DaemonCommandExample("jitter-buffer audio size 80","Status: Ok\n\n"
+				"audio-jitter-buffer-size: 80\n"));
+}
+
+
+void JitterBufferCommand::exec(Daemon *app, const char *args){
+	istringstream istr(args);
+	string arg1;
+	istr>>arg1;
+	if (istr.fail()){
+		app->sendResponse(JitterBufferResponse(app->getCore(),true,true));
+	}else{
+		if (arg1!="audio" && arg1!="video"){
+			app->sendResponse("Invalid argument.");
+			return;
+		}
+		string arg2;
+		istr>>arg2;
+		if (istr.fail()){
+			app->sendResponse(JitterBufferResponse(app->getCore(),arg1=="audio",arg1=="video"));
+		}else{
+			if (arg2=="size"){
+				int arg3;
+				istr>>arg3;
+				if (!istr.fail()){
+					if (arg1=="audio")
+						linphone_core_set_audio_jittcomp(app->getCore(),arg3);
+					else if (arg1=="video")
+						linphone_core_set_video_jittcomp(app->getCore(),arg3);
+				}
+				app->sendResponse(JitterBufferResponse(app->getCore(),arg1=="audio",arg1=="video"));
+			}else{
+				app->sendResponse(Response("Bad command argument."));
+			}
+		}
+	}
+}
+
+JitterBufferResetCommand::JitterBufferResetCommand() : DaemonCommand("jitter-buffer-reset",
+	"jitter-buffer-reset [call|stream] id [audio|video]" ,
+	"Reset the RTP jitter buffer for a given call or stream id and stream type."
+	){
+	addExample(new DaemonCommandExample("jitter-buffer-reset call 3 audio",
+		"Status: Ok\n"));
+	addExample(new DaemonCommandExample("jitter-buffer-reset stream 12",
+		"Status: Ok\n"));
+}
+
+
+void JitterBufferResetCommand::exec(Daemon *app, const char *args){
+	istringstream istr(args);
+	string arg1;
+	istr>>arg1;
+	if (istr.fail()){
+		app->sendResponse(Response("Missing arguments"));
+	}else{
+		if (arg1!="call" && arg1!="stream"){
+			app->sendResponse(Response("Invalid command syntax."));
+			return;
+		}
+		int arg2;
+		istr>>arg2;
+		if (istr.fail()){
+			app->sendResponse(Response("Missing call or stream id."));
+			return;
+		}else{
+			MSFilter *rtprecv=NULL;
+			if (arg1=="call"){
+				LinphoneCall *call=app->findCall(arg2);
+				string streamtype;
+				if (call==NULL){
+					app->sendResponse(Response("No such call id"));
+					return;
+				}
+				istr>>streamtype;
+				if (streamtype=="video"){
+					rtprecv=call->videostream ? call->videostream->ms.rtprecv : NULL;
+				}else{
+					rtprecv=call->audiostream ? call->audiostream->ms.rtprecv : NULL;
+				}
+			}else{
+				AudioStream *stream=app->findAudioStream(arg2);
+				if (stream==NULL){
+					app->sendResponse(Response("No such stream id"));
+					return;
+				}
+				rtprecv=stream->ms.rtprecv;
+			}
+			if (rtprecv==NULL){
+				app->sendResponse(Response("No such active stream"));
+				return;
+			}
+			ms_filter_call_method_noarg(rtprecv,MS_RTP_RECV_RESET_JITTER_BUFFER);
+			app->sendResponse(Response());
+		}
+	}
+}
+
+
diff --git a/daemon/commands/jitterbuffer.h b/daemon/commands/jitterbuffer.h
new file mode 100644
index 000000000..f63484b87
--- /dev/null
+++ b/daemon/commands/jitterbuffer.h
@@ -0,0 +1,39 @@
+/*
+jitterbuffer.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_JITTER_SIZE_H_
+#define COMMAND_JITTER_SIZE_H_
+
+#include "../daemon.h"
+
+
+class JitterBufferCommand : public DaemonCommand{
+public:
+    JitterBufferCommand();
+    virtual void exec(Daemon *app, const char *args);
+};
+
+
+class JitterBufferResetCommand : public DaemonCommand{
+public:
+    JitterBufferResetCommand();
+    virtual void exec(Daemon *app, const char *args);
+};
+
+#endif
diff --git a/daemon/commands/media-encryption.cc b/daemon/commands/media-encryption.cc
new file mode 100644
index 000000000..f055053ce
--- /dev/null
+++ b/daemon/commands/media-encryption.cc
@@ -0,0 +1,90 @@
+/*
+media-encryption.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "media-encryption.h"
+
+using namespace std;
+
+class MediaEncryptionResponse : public Response {
+public:
+	MediaEncryptionResponse(LinphoneCore *core);
+};
+
+MediaEncryptionResponse::MediaEncryptionResponse(LinphoneCore *core) : Response() {
+	LinphoneMediaEncryption encryption = linphone_core_get_media_encryption(core);
+	ostringstream ost;
+	ost << "Encryption: ";
+	switch (encryption) {
+		case LinphoneMediaEncryptionNone:
+			ost << "none\n";
+			break;
+		case LinphoneMediaEncryptionSRTP:
+			ost << "srtp\n";
+			break;
+		case LinphoneMediaEncryptionZRTP:
+			ost << "zrtp\n";
+			break;
+		case LinphoneMediaEncryptionDTLS:
+			ost << "DTLS\n";
+			break;
+	}
+	setBody(ost.str().c_str());
+}
+
+MediaEncryptionCommand::MediaEncryptionCommand() :
+		DaemonCommand("media-encryption", "media-encryption [none|srtp|zrtp]",
+				"Set the media encryption policy if a parameter is given, otherwise return the media encrytion in use.") {
+	addExample(new DaemonCommandExample("media-encryption none",
+						"Status: Ok\n\n"
+						"Encryption: none"));
+	addExample(new DaemonCommandExample("media-encryption srtp",
+						"Status: Ok\n\n"
+						"Encryption: srtp"));
+	addExample(new DaemonCommandExample("media-encryption",
+						"Status: Ok\n\n"
+						"Encryption: srtp"));
+}
+
+void MediaEncryptionCommand::exec(Daemon *app, const char *args) {
+	string encryption_str;
+	istringstream ist(args);
+	ist >> encryption_str;
+	if (ist.eof() && (encryption_str.length() == 0)) {
+		app->sendResponse(MediaEncryptionResponse(app->getCore()));
+	} else if (ist.fail()) {
+		app->sendResponse(Response("Incorrect parameter.", Response::Error));
+	} else {
+		LinphoneMediaEncryption encryption;
+		if (encryption_str.compare("none") == 0) {
+			encryption = LinphoneMediaEncryptionNone;
+		} else if (encryption_str.compare("srtp") == 0) {
+			encryption = LinphoneMediaEncryptionSRTP;
+		} else if (encryption_str.compare("zrtp") == 0) {
+			encryption = LinphoneMediaEncryptionZRTP;
+		} else {
+			app->sendResponse(Response("Incorrect parameter.", Response::Error));
+			return;
+		}
+		if (linphone_core_set_media_encryption(app->getCore(), encryption)==0){
+			app->sendResponse(MediaEncryptionResponse(app->getCore()));
+		}else{
+			app->sendResponse(Response("Unsupported media encryption", Response::Error));
+		}
+	}
+}
diff --git a/daemon/commands/media-encryption.h b/daemon/commands/media-encryption.h
new file mode 100644
index 000000000..a15163829
--- /dev/null
+++ b/daemon/commands/media-encryption.h
@@ -0,0 +1,31 @@
+/*
+media-encryption.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_MEDIA_ENCRYPTION_H_
+#define COMMAND_MEDIA_ENCRYPTION_H_
+
+#include "../daemon.h"
+
+class MediaEncryptionCommand: public DaemonCommand {
+public:
+	MediaEncryptionCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_MEDIA_ENCRYPTION_H_
diff --git a/daemon/commands/msfilter-add-fmtp.cc b/daemon/commands/msfilter-add-fmtp.cc
new file mode 100644
index 000000000..961aee825
--- /dev/null
+++ b/daemon/commands/msfilter-add-fmtp.cc
@@ -0,0 +1,68 @@
+/*
+msfilter-add-fmtp.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "msfilter-add-fmtp.h"
+#include <mediastreamer2/msfilter.h>
+#include <private.h>
+
+using namespace std;
+
+MSFilterAddFmtpCommand::MSFilterAddFmtpCommand() :
+	DaemonCommand("msfilter-add-fmtp", "msfilter-add-fmtp <call/stream> <id> <fmtp>", "Add fmtp to the encoder of a call or a stream") {
+	addExample(new DaemonCommandExample("msfilter-add-fmtp call 1 vbr=on",
+						"Status: Ok"));
+	addExample(new DaemonCommandExample("msfilter-add-fmtp call 2 vbr=on",
+						"Status: Error\n"
+						"Reason: No Call with such id."));
+	addExample(new DaemonCommandExample("msfilter-add-fmtp stream 7 vbr=on",
+						"Status: Error\n"
+						"Reason: No Audio Stream with such id."));
+}
+
+void MSFilterAddFmtpCommand::exec(Daemon *app, const char *args) {
+	char type[16]={0}, fmtp[512]={0};
+	int id;
+
+	if (sscanf(args, "%15s %d %511s", type, &id, fmtp) == 3) {
+		if(strcmp(type, "call") == 0) {
+			LinphoneCall *call = app->findCall(id);
+			if (call == NULL) {
+				app->sendResponse(Response("No Call with such id."));
+				return;
+			}
+			if (call->audiostream==NULL || call->audiostream->ms.encoder==NULL){
+				app->sendResponse(Response("This call doesn't have an active audio stream."));
+				return;
+			}
+			ms_filter_call_method(call->audiostream->ms.encoder, MS_FILTER_ADD_FMTP, fmtp);
+		} else if(strcmp(type, "stream") == 0) {
+			AudioStream *stream = app->findAudioStream(id);
+			if (stream == NULL) {
+				app->sendResponse(Response("No Audio Stream with such id."));
+				return;
+			}
+			ms_filter_call_method(stream->ms.encoder, MS_FILTER_ADD_FMTP, fmtp);
+		} else {
+			app->sendResponse(Response("Incorrect parameter(s)."));
+		}
+		app->sendResponse(Response());
+	} else {
+		app->sendResponse(Response("Missing/Incorrect parameter(s)."));
+	}
+}
diff --git a/daemon/commands/msfilter-add-fmtp.h b/daemon/commands/msfilter-add-fmtp.h
new file mode 100644
index 000000000..0e92f7e21
--- /dev/null
+++ b/daemon/commands/msfilter-add-fmtp.h
@@ -0,0 +1,31 @@
+/*
+msfilter-add-fmtp.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_MSFILTER_ADD_FMTP
+#define COMMAND_MSFILTER_ADD_FMTP
+
+#include "../daemon.h"
+
+class MSFilterAddFmtpCommand : public DaemonCommand {
+public:
+	MSFilterAddFmtpCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif /* COMMAND_MSFILTER_ADD_FMTP */
diff --git a/daemon/commands/netsim.cc b/daemon/commands/netsim.cc
new file mode 100644
index 000000000..204289ba4
--- /dev/null
+++ b/daemon/commands/netsim.cc
@@ -0,0 +1,125 @@
+/*
+netsim.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "netsim.h"
+
+using namespace std;
+
+class NetsimResponse : public Response {
+public:
+	NetsimResponse(LinphoneCore *core);
+};
+
+NetsimResponse::NetsimResponse(LinphoneCore *lc) : Response() {
+	ostringstream ost;
+	const OrtpNetworkSimulatorParams *params=linphone_core_get_network_simulator_params(lc);
+	ost << "State: ";
+	if (params->enabled) {
+		ost << "enabled\n";
+	} else {
+		ost << "disabled\n";
+	}
+	ost<<"max_bandwidth: "<<params->max_bandwidth<<endl;
+	ost<<"max_buffer_size: "<<params->max_buffer_size<<endl;
+	ost<<"loss_rate: "<<params->loss_rate<<endl;
+	ost<<"latency: "<<params->latency<<endl;
+	ost<<"consecutive_loss_probability: "<<params->consecutive_loss_probability<<endl;
+	ost<<"jitter_burst_density: "<<params->jitter_burst_density<<endl;
+	ost<<"jitter_strength: "<<params->jitter_strength<<endl;
+	ost<<"mode: "<<ortp_network_simulator_mode_to_string(params->mode)<<endl;
+	setBody(ost.str().c_str());
+}
+
+NetsimCommand::NetsimCommand(): DaemonCommand("netsim","netsim [enabled|disabled|parameters <parameters]",
+	"Configure the network simulator. Parameters are to be provided in the form param-name=param-value, separated with ';' only. Supported parameters are:\n"
+	"\tmax_bandwidth (kbit/s)\n"
+	"\tmax_buffer_size (bits)\n"
+	"\tloss_rate (percentage)\n"
+	"\tlatency (milliseconds)\n"
+	"\tconsecutive_loss_probability (0..1)\n"
+	"\tjitter_burst_density (frequency of bursts 0..1)\n"
+	"\tjitter_strength (percentage of max_bandwidth artifically consumed during bursts events)\n"
+	"\tmode (inbound, outbound, outbound-controlled)\n")
+{
+	addExample(new DaemonCommandExample("netsim",
+						"Status: Ok\n\n"
+						"State: disabled\nmax_bandwidth: 384000\nmax_buffer_size: 384000\nloss_rate: 2"));
+	addExample(new DaemonCommandExample("netsim enable",
+						"Status: Ok\n\n"
+						"State: enabled\nmax_bandwidth: 384000\nmax_buffer_size: 384000\nloss_rate: 2"));
+	addExample(new DaemonCommandExample("netsim parameters loss_rate=5;consecutive_loss_probability=0.5",
+						"Status: Ok\n\n"
+						"State: enabled\nmax_bandwidth: 384000\nmax_buffer_size: 384000\nloss_rate: 2"));
+}
+
+void NetsimCommand::exec(Daemon* app, const char* args){
+	LinphoneCore *lc=app->getCore();
+	OrtpNetworkSimulatorParams params=*linphone_core_get_network_simulator_params(lc);
+	string subcommand;
+	istringstream ist(args);
+	ist >> subcommand;
+	if (ist.fail()) {
+		app->sendResponse(NetsimResponse(app->getCore()));
+		return;
+	}
+	if (subcommand.compare("enable")==0){
+		params.enabled=TRUE;
+	}else if (subcommand.compare("disable")==0){
+		params.enabled=FALSE;
+	}else if (subcommand.compare("parameters")==0){
+		string parameters;
+		char value[128]={0};
+		ist >> parameters;
+		if (fmtp_get_value(parameters.c_str(),"max_bandwidth",value, sizeof(value))){
+			params.max_bandwidth=atoi(value);
+		}
+		if (fmtp_get_value(parameters.c_str(),"max_buffer_size",value, sizeof(value))){
+			params.max_buffer_size=atoi(value);
+		}
+		if (fmtp_get_value(parameters.c_str(),"loss_rate",value, sizeof(value))){
+			params.loss_rate=atoi(value);
+		}
+		if (fmtp_get_value(parameters.c_str(),"latency",value, sizeof(value))){
+			params.latency=atoi(value);
+		}
+		if (fmtp_get_value(parameters.c_str(),"consecutive_loss_probability",value, sizeof(value))){
+			params.consecutive_loss_probability=atof(value);
+		}
+		if (fmtp_get_value(parameters.c_str(),"jitter_burst_density",value, sizeof(value))){
+			params.jitter_burst_density=atof(value);
+		}
+		if (fmtp_get_value(parameters.c_str(),"jitter_strength",value, sizeof(value))){
+			params.jitter_strength=atof(value);
+		}
+		if (fmtp_get_value(parameters.c_str(),"mode",value, sizeof(value))){
+			OrtpNetworkSimulatorMode mode=ortp_network_simulator_mode_from_string(value);
+			if (mode==OrtpNetworkSimulatorInvalid){
+				app->sendResponse(Response("Invalid mode"));
+				return;
+			}
+			params.mode=mode;
+		}
+	}
+	linphone_core_set_network_simulator_params(lc,&params);
+	app->sendResponse(NetsimResponse(app->getCore()));
+	return;
+}
+
+
+
diff --git a/daemon/commands/netsim.h b/daemon/commands/netsim.h
new file mode 100644
index 000000000..b883b93dd
--- /dev/null
+++ b/daemon/commands/netsim.h
@@ -0,0 +1,31 @@
+/*
+netsim.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_NETSIM_H_
+#define COMMAND_NETSIM_H_
+
+#include "../daemon.h"
+
+class NetsimCommand: public DaemonCommand {
+public:
+	NetsimCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_NETSIM_H_
diff --git a/daemon/commands/play-wav.cc b/daemon/commands/play-wav.cc
new file mode 100644
index 000000000..18eae73e5
--- /dev/null
+++ b/daemon/commands/play-wav.cc
@@ -0,0 +1,56 @@
+/*
+play-wav.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "play-wav.h"
+
+using namespace std;
+
+PlayWavCommand::PlayWavCommand() :
+		DaemonCommand("play-wav", "play-wav <filename>",
+				"Play an WAV audio file (needs to have enabled the linphone sound daemon (LSD).\n"
+				"<filename> is the WAV file to be played.") {
+	addExample(new DaemonCommandExample("play-wav /usr/local/share/sounds/linphone/hello8000.wav",
+						"Status: Ok"));
+}
+
+void playWavFinished(LsdPlayer *p) {
+	linphone_sound_daemon_release_player(lsd_player_get_daemon(p), p);
+}
+
+void PlayWavCommand::exec(Daemon *app, const char *args) {
+	LinphoneSoundDaemon *lsd = app->getLSD();
+	if (!lsd) {
+		app->sendResponse(Response("The linphone sound daemon (LSD) is not enabled.", Response::Error));
+		return;
+	}
+
+	string filename;
+	istringstream ist(args);
+	ist >> filename;
+	if (ist.eof() && (filename.length() == 0)) {
+		app->sendResponse(Response("Missing filename parameter.", Response::Error));
+	} else if (ist.fail()) {
+		app->sendResponse(Response("Incorrect filename parameter.", Response::Error));
+	} else {
+		LsdPlayer *p = linphone_sound_daemon_get_player(lsd);
+		lsd_player_set_callback(p, playWavFinished);
+		lsd_player_play(p, filename.c_str());
+		app->sendResponse(Response());
+	}
+}
diff --git a/daemon/commands/play-wav.h b/daemon/commands/play-wav.h
new file mode 100644
index 000000000..30e947033
--- /dev/null
+++ b/daemon/commands/play-wav.h
@@ -0,0 +1,31 @@
+/*
+play-wav.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_PLAY_WAV_H_
+#define COMMAND_PLAY_WAV_H_
+
+#include "../daemon.h"
+
+class PlayWavCommand: public DaemonCommand {
+public:
+	PlayWavCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_PLAY_WAV_H_
diff --git a/daemon/commands/pop-event.cc b/daemon/commands/pop-event.cc
new file mode 100644
index 000000000..2d2075497
--- /dev/null
+++ b/daemon/commands/pop-event.cc
@@ -0,0 +1,32 @@
+/*
+pop-event.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "pop-event.h"
+
+using namespace std;
+
+PopEventCommand::PopEventCommand() :
+		DaemonCommand("pop-event", "pop-event", "Pop an event from event queue and display it.") {
+	addExample(new DaemonCommandExample("pop-event",
+						"Status: Ok\n\n"
+						"Size: 0"));
+}
+void PopEventCommand::exec(Daemon *app, const char *args) {
+	app->pullEvent();
+}
diff --git a/daemon/commands/pop-event.h b/daemon/commands/pop-event.h
new file mode 100644
index 000000000..1a5fd581d
--- /dev/null
+++ b/daemon/commands/pop-event.h
@@ -0,0 +1,31 @@
+/*
+pop-event.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_POP_EVENT_H_
+#define COMMAND_POP_EVENT_H_
+
+#include "../daemon.h"
+
+class PopEventCommand: public DaemonCommand {
+public:
+	PopEventCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_POP_EVENT_H_
diff --git a/daemon/commands/port.cc b/daemon/commands/port.cc
new file mode 100644
index 000000000..1452c6157
--- /dev/null
+++ b/daemon/commands/port.cc
@@ -0,0 +1,184 @@
+/*
+port.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "port.h"
+
+using namespace std;
+
+enum Protocol {
+	UDPProtocol,
+	TCPProtocol,
+	TLSProtocol
+};
+
+class PortResponse : public Response {
+public:
+	enum PortType {
+		SIPPort,
+		AudioRTPPort,
+		VideoRTPPort,
+		AllPorts
+	};
+
+	PortResponse(LinphoneCore *core, PortType type);
+
+private:
+	void outputSIPPort(LinphoneCore *core, ostringstream &ost);
+	void outputAudioRTPPort(LinphoneCore *core, ostringstream &ost);
+	void outputVideoRTPPort(LinphoneCore *core, ostringstream &ost);
+};
+
+PortResponse::PortResponse(LinphoneCore *core, PortResponse::PortType type) : Response() {
+	ostringstream ost;
+	switch (type) {
+		case SIPPort:
+			outputSIPPort(core, ost);
+			break;
+		case AudioRTPPort:
+			outputAudioRTPPort(core, ost);
+			break;
+		case VideoRTPPort:
+			outputVideoRTPPort(core, ost);
+			break;
+		case AllPorts:
+			outputSIPPort(core, ost);
+			outputAudioRTPPort(core, ost);
+			outputVideoRTPPort(core, ost);
+			break;
+	}
+	setBody(ost.str().c_str());
+}
+
+void PortResponse::outputSIPPort(LinphoneCore *core, ostringstream &ost) {
+	LCSipTransports transports;
+	linphone_core_get_sip_transports(core, &transports);
+	ost << "SIP: ";
+	if (transports.udp_port > 0) {
+		ost << transports.udp_port << " UDP\n";
+	} else if (transports.tcp_port > 0) {
+		ost << transports.tcp_port << " TCP\n";
+	} else {
+		ost << transports.tls_port << " TLS\n";
+	}
+}
+
+void PortResponse::outputAudioRTPPort(LinphoneCore *core, ostringstream &ost) {
+	ost << "Audio RTP: " << linphone_core_get_audio_port(core) << "\n";
+}
+
+void PortResponse::outputVideoRTPPort(LinphoneCore *core, ostringstream &ost) {
+	ost << "Video RTP: " << linphone_core_get_video_port(core) << "\n";
+}
+
+PortCommand::PortCommand() :
+		DaemonCommand("port", "port [<type>] [<port>] [<protocol>]",
+				"Set the port to use for type if port is set, otherwise return the port used for type if specified or all the used ports if no type is specified.\n"
+				"<type> must be one of these values: sip, audio, video.\n"
+				"<protocol> should be defined only for sip port and have one of these values: udp, tcp, tls.") {
+	addExample(new DaemonCommandExample("port sip 5060 tls",
+						"Status: Ok\n\n"
+						"SIP: 5060 TLS"));
+	addExample(new DaemonCommandExample("port sip 5060 udp",
+						"Status: Ok\n\n"
+						"SIP: 5060 UDP"));
+	addExample(new DaemonCommandExample("port audio 7078",
+						"Status: Ok\n\n"
+						"Audio RTP: 7078"));
+	addExample(new DaemonCommandExample("port video 9078",
+						"Status: Ok\n\n"
+						"Video RTP: 9078"));
+	addExample(new DaemonCommandExample("port sip",
+						"Status: Ok\n\n"
+						"SIP: 5060 UDP"));
+	addExample(new DaemonCommandExample("port audio",
+						"Status: Ok\n\n"
+						"Audio RTP: 7078"));
+	addExample(new DaemonCommandExample("port",
+						"Status: Ok\n\n"
+						"SIP: 5060 UDP\n"
+						"Audio RTP: 7078\n"
+						"Video RTP: 9078"));
+}
+
+void PortCommand::exec(Daemon *app, const char *args) {
+	string type;
+	int port;
+	istringstream ist(args);
+	ostringstream ost;
+	ist >> type;
+	if (ist.eof() && (type.length() == 0)) {
+		app->sendResponse(PortResponse(app->getCore(), PortResponse::AllPorts));
+	} else if (ist.fail()) {
+		app->sendResponse(Response("Incorrect type parameter.", Response::Error));
+	} else {
+		ist >> port;
+		if (ist.fail()) {
+			if (type.compare("sip") == 0) {
+				app->sendResponse(PortResponse(app->getCore(), PortResponse::SIPPort));
+			} else if (type.compare("audio") == 0) {
+				app->sendResponse(PortResponse(app->getCore(), PortResponse::AudioRTPPort));
+			} else if (type.compare("video") == 0) {
+				app->sendResponse(PortResponse(app->getCore(), PortResponse::VideoRTPPort));
+			} else {
+				app->sendResponse(Response("Incorrect type parameter.", Response::Error));
+			}
+		} else {
+			if (type.compare("sip") == 0) {
+				Protocol protocol = UDPProtocol;
+				string protocol_str;
+				ist >> protocol_str;
+				if (!ist.fail()) {
+					if (protocol_str.compare("udp") == 0) {
+						protocol = UDPProtocol;
+					} else if (protocol_str.compare("tcp") == 0) {
+						protocol = TCPProtocol;
+					} else if (protocol_str.compare("tls") == 0) {
+						protocol = TLSProtocol;
+					} else {
+						app->sendResponse(Response("Incorrect protocol parameter.", Response::Error));
+						return;
+					}
+				}
+				LCSipTransports transports;
+				memset(&transports, 0, sizeof(transports));
+				switch (protocol) {
+					case UDPProtocol:
+						transports.udp_port = port;
+						break;
+					case TCPProtocol:
+						transports.tcp_port = port;
+						break;
+					case TLSProtocol:
+						transports.tls_port = port;
+						break;
+				}
+				linphone_core_set_sip_transports(app->getCore(), &transports);
+				app->sendResponse(PortResponse(app->getCore(), PortResponse::SIPPort));
+			} else if (type.compare("audio") == 0) {
+				linphone_core_set_audio_port(app->getCore(), port);
+				app->sendResponse(PortResponse(app->getCore(), PortResponse::AudioRTPPort));
+			} else if (type.compare("video") == 0) {
+				linphone_core_set_video_port(app->getCore(), port);
+				app->sendResponse(PortResponse(app->getCore(), PortResponse::VideoRTPPort));
+			} else {
+				app->sendResponse(Response("Incorrect type parameter.", Response::Error));
+			}
+		}
+	}
+}
diff --git a/daemon/commands/port.h b/daemon/commands/port.h
new file mode 100644
index 000000000..3618971dd
--- /dev/null
+++ b/daemon/commands/port.h
@@ -0,0 +1,31 @@
+/*
+port.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_PORT_H_
+#define COMMAND_PORT_H_
+
+#include "../daemon.h"
+
+class PortCommand: public DaemonCommand {
+public:
+	PortCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_PORT_H_
diff --git a/daemon/commands/ptime.cc b/daemon/commands/ptime.cc
new file mode 100644
index 000000000..234bb8e46
--- /dev/null
+++ b/daemon/commands/ptime.cc
@@ -0,0 +1,98 @@
+/*
+ptime.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "ptime.h"
+
+using namespace std;
+
+class PtimeResponse : public Response {
+public:
+	enum Direction {
+		Upload,
+		Download,
+		BothDirections
+	};
+	PtimeResponse(LinphoneCore *core, Direction dir);
+};
+
+PtimeResponse::PtimeResponse(LinphoneCore *core, Direction dir) : Response() {
+	ostringstream ost;
+	switch (dir) {
+		case Upload:
+			ost << "Upload: " << linphone_core_get_upload_ptime(core) << "\n";
+			break;
+		case Download:
+			ost << "Download: " << linphone_core_get_download_ptime(core) << "\n";
+			break;
+		case BothDirections:
+			ost << "Upload: " << linphone_core_get_upload_ptime(core) << "\n";
+			ost << "Download: " << linphone_core_get_download_ptime(core) << "\n";
+			break;
+	}
+	setBody(ost.str().c_str());
+}
+
+PtimeCommand::PtimeCommand() :
+		DaemonCommand("ptime", "ptime [up|down] <ms>", "Set the upload or download ptime if ms is defined, otherwise return the current value of the ptime.") {
+	addExample(new DaemonCommandExample("ptime up 20",
+						"Status: Ok\n\n"
+						"Upload: 20"));
+	addExample(new DaemonCommandExample("ptime down 30",
+						"Status: Ok\n\n"
+						"Download: 30"));
+	addExample(new DaemonCommandExample("ptime up",
+						"Status: Ok\n\n"
+						"Upload: 20"));
+	addExample(new DaemonCommandExample("ptime",
+						"Status: Ok\n\n"
+						"Upload: 20\n"
+						"Download: 30"));
+}
+
+void PtimeCommand::exec(Daemon *app, const char *args) {
+	string direction;
+	int ms;
+	istringstream ist(args);
+	ist >> direction;
+	if (ist.fail()) {
+		app->sendResponse(PtimeResponse(app->getCore(), PtimeResponse::BothDirections));
+	} else {
+		if (direction.compare("up") == 0) {
+			if (!ist.eof()) {
+				ist >> ms;
+				if (ist.fail()) {
+					app->sendResponse(Response("Incorrect ms parameter.", Response::Error));
+				}
+				linphone_core_set_upload_ptime(app->getCore(), ms);
+			}
+			app->sendResponse(PtimeResponse(app->getCore(), PtimeResponse::Upload));
+		} else if (direction.compare("down") == 0) {
+			if (!ist.eof()) {
+				ist >> ms;
+				if (ist.fail()) {
+					app->sendResponse(Response("Incorrect ms parameter.", Response::Error));
+				}
+				linphone_core_set_download_ptime(app->getCore(), ms);
+			}
+			app->sendResponse(PtimeResponse(app->getCore(), PtimeResponse::Download));
+		} else {
+			app->sendResponse(Response("Missing/Incorrect parameter(s).", Response::Error));
+		}
+	}
+}
diff --git a/daemon/commands/ptime.h b/daemon/commands/ptime.h
new file mode 100644
index 000000000..18c59825b
--- /dev/null
+++ b/daemon/commands/ptime.h
@@ -0,0 +1,31 @@
+/*
+ptime.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_PTIME_H_
+#define COMMAND_PTIME_H_
+
+#include "../daemon.h"
+
+class PtimeCommand: public DaemonCommand {
+public:
+	PtimeCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_PTIME_H_
diff --git a/daemon/commands/quit.cc b/daemon/commands/quit.cc
new file mode 100644
index 000000000..8876e096d
--- /dev/null
+++ b/daemon/commands/quit.cc
@@ -0,0 +1,31 @@
+/*
+quit.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "quit.h"
+
+using namespace std;
+
+QuitCommand::QuitCommand() :
+		DaemonCommand("quit", "quit", "Quit the application.") {
+}
+
+void QuitCommand::exec(Daemon *app, const char *args) {
+	app->quit();
+	app->sendResponse(Response());
+}
diff --git a/daemon/commands/quit.h b/daemon/commands/quit.h
new file mode 100644
index 000000000..78e323e1f
--- /dev/null
+++ b/daemon/commands/quit.h
@@ -0,0 +1,31 @@
+/*
+quit.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_QUIT_H_
+#define COMMAND_QUIT_H_
+
+#include "../daemon.h"
+
+class QuitCommand: public DaemonCommand {
+public:
+	QuitCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_QUIT_H_
diff --git a/daemon/commands/register-status.cc b/daemon/commands/register-status.cc
new file mode 100644
index 000000000..c50e49acb
--- /dev/null
+++ b/daemon/commands/register-status.cc
@@ -0,0 +1,101 @@
+/*
+register-status.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "register-status.h"
+
+using namespace std;
+
+class RegisterStatusResponse : public Response {
+public:
+	RegisterStatusResponse();
+	RegisterStatusResponse(int id, const LinphoneProxyConfig *cfg);
+	void append(int id, const LinphoneProxyConfig *cfg);
+};
+
+RegisterStatusResponse::RegisterStatusResponse() {
+}
+
+RegisterStatusResponse::RegisterStatusResponse(int id, const LinphoneProxyConfig *cfg) {
+	append(id, cfg);
+}
+
+void RegisterStatusResponse::append(int id, const LinphoneProxyConfig* cfg) {
+	ostringstream ost;
+	ost << getBody();
+	if (ost.tellp() > 0) {
+		ost << "\n";
+	}
+	ost << "Id: " << id << "\n";
+	ost << "State: " << linphone_registration_state_to_string(linphone_proxy_config_get_state(cfg)) << "\n";
+	setBody(ost.str().c_str());
+}
+
+RegisterStatusCommand::RegisterStatusCommand() :
+		DaemonCommand("register-status", "register-status <register_id|ALL>", "Return status of a registration or of all registrations.") {
+	addExample(new DaemonCommandExample("register-status 1",
+						"Status: Ok\n\n"
+						"Id: 1\n"
+						"State: LinphoneRegistrationOk"));
+	addExample(new DaemonCommandExample("register-status ALL",
+						"Status: Ok\n\n"
+						"Id: 1\n"
+						"State: LinphoneRegistrationOk\n\n"
+						"Id: 2\n"
+						"State: LinphoneRegistrationFailed"));
+	addExample(new DaemonCommandExample("register-status 3",
+						"Status: Error\n"
+						"Reason: No register with such id."));
+}
+
+void RegisterStatusCommand::exec(Daemon *app, const char *args) {
+	LinphoneProxyConfig *cfg = NULL;
+	string param;
+	int pid;
+
+	istringstream ist(args);
+	ist >> param;
+	if (ist.fail()) {
+		app->sendResponse(Response("Missing parameter.", Response::Error));
+		return;
+	}
+	if (param.compare("ALL") == 0) {
+		RegisterStatusResponse response;
+		for (int i = 1; i <= app->maxProxyId(); i++) {
+			cfg = app->findProxy(i);
+			if (cfg != NULL) {
+				response.append(i, cfg);
+			}
+		}
+		app->sendResponse(response);
+	} else {
+		ist.clear();
+		ist.str(param);
+		ist >> pid;
+		if (ist.fail()) {
+			app->sendResponse(Response("Incorrect parameter.", Response::Error));
+			return;
+		}
+		cfg = app->findProxy(pid);
+		if (cfg == NULL) {
+			app->sendResponse(Response("No register with such id.", Response::Error));
+			return;
+		}
+		app->sendResponse(RegisterStatusResponse(pid, cfg));
+	}
+}
diff --git a/daemon/commands/register-status.h b/daemon/commands/register-status.h
new file mode 100644
index 000000000..9af479580
--- /dev/null
+++ b/daemon/commands/register-status.h
@@ -0,0 +1,31 @@
+/*
+register-status.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_REGISTER_STATUS_H_
+#define COMMAND_REGISTER_STATUS_H_
+
+#include "../daemon.h"
+
+class RegisterStatusCommand: public DaemonCommand {
+public:
+	RegisterStatusCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_REGISTER_STATUS_H_
diff --git a/daemon/commands/register.cc b/daemon/commands/register.cc
new file mode 100644
index 000000000..5ef151d73
--- /dev/null
+++ b/daemon/commands/register.cc
@@ -0,0 +1,75 @@
+/*
+register.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "register.h"
+#include "linphonecore.h"
+#include "private.h"
+#include "lpconfig.h"
+#include <string.h>
+
+
+using namespace std;
+
+RegisterCommand::RegisterCommand() :
+		DaemonCommand("register", "register <identity> <proxy-address> <password> <userid> <realm>", "Register the daemon to a SIP proxy. If one of the parameters <password>, <userid> and <realm> is not needed, send the string \"NULL\"") {
+	addExample(new DaemonCommandExample("register sip:daemon-test@sip.linphone.org sip.linphone.org password bob linphone.org",
+						"Status: Ok\n\n"
+						"Id: 1"));
+}
+void RegisterCommand::exec(Daemon *app, const char *args) {
+	LinphoneCore *lc = app->getCore();
+	ostringstream ostr;
+	char proxy[256] = { 0 }, identity[128] = { 0 }, password[64] = { 0 }, userid[128] = { 0 }, realm[128] = { 0 }, parameter[256] = { 0 };
+	if (sscanf(args, "%255s %127s %63s %127s %127s %255s", identity, proxy, password, userid, realm, parameter) >= 2) {
+		app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+		if (strcmp(password, "NULL") == 0) {
+			password[0] = 0;
+		}
+		if (strcmp(userid, "NULL") == 0) {
+			userid[0] = 0;
+		}
+		if (strcmp(realm, "NULL") == 0) {
+			realm[0] = 0;
+		}
+		if (strcmp(parameter, "NULL") == 0) {
+			parameter[0] = 0;
+		}
+		app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+		LinphoneProxyConfig *cfg = linphone_proxy_config_new();
+		if (password[0] != '\0') {
+			LinphoneAddress *from = linphone_address_new(identity);
+			if (from != NULL) {
+				LinphoneAuthInfo *info = linphone_auth_info_new(linphone_address_get_username(from),
+																userid, password, NULL, realm, NULL);
+				linphone_core_add_auth_info(lc, info); /*add authentication info to LinphoneCore*/
+				linphone_address_destroy(from);
+				linphone_auth_info_destroy(info);
+			}
+		}
+		linphone_proxy_config_set_identity(cfg, identity);
+		linphone_proxy_config_set_server_addr(cfg, proxy);
+		linphone_proxy_config_enable_register(cfg, TRUE);
+		linphone_proxy_config_set_contact_parameters(cfg, parameter);
+		ostr << "Id: " << app->updateProxyId(cfg) << "\n";
+		linphone_core_add_proxy_config(lc, cfg);
+		app->sendResponse(Response(ostr.str().c_str(), Response::Ok));
+	} else {
+		app->sendResponse(Response("Missing/Incorrect parameter(s)."));
+	}
+}
diff --git a/daemon/commands/register.h b/daemon/commands/register.h
new file mode 100644
index 000000000..73b990576
--- /dev/null
+++ b/daemon/commands/register.h
@@ -0,0 +1,31 @@
+/*
+register.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_REGISTER_H_
+#define COMMAND_REGISTER_H_
+
+#include "../daemon.h"
+
+class RegisterCommand: public DaemonCommand {
+public:
+	RegisterCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_REGISTER_H_
diff --git a/daemon/commands/terminate.cc b/daemon/commands/terminate.cc
new file mode 100644
index 000000000..20630ed56
--- /dev/null
+++ b/daemon/commands/terminate.cc
@@ -0,0 +1,59 @@
+/*
+terminate.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "terminate.h"
+
+using namespace std;
+
+TerminateCommand::TerminateCommand() :
+		DaemonCommand("terminate", "terminate <call id>", "Terminate a call.") {
+	addExample(new DaemonCommandExample("terminate 2",
+						"Status: Error\n"
+						"Reason: No call with such id."));
+	addExample(new DaemonCommandExample("terminate 1",
+						"Status: Ok\n"));
+	addExample(new DaemonCommandExample("terminate",
+						"Status: Ok\n"));
+	addExample(new DaemonCommandExample("terminate",
+						"Status: Error\n"
+						"Reason: No active call."));
+}
+void TerminateCommand::exec(Daemon *app, const char *args) {
+	LinphoneCall *call = NULL;
+	int cid;
+	const MSList *elem;
+	if (sscanf(args, "%i", &cid) == 1) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	} else {
+		elem = linphone_core_get_calls(app->getCore());
+		if (elem != NULL && elem->next == NULL) {
+			call = (LinphoneCall*) elem->data;
+		}
+	}
+	if (call == NULL) {
+		app->sendResponse(Response("No active call."));
+		return;
+	}
+	linphone_core_terminate_call(app->getCore(), call);
+	app->sendResponse(Response());
+}
diff --git a/daemon/commands/terminate.h b/daemon/commands/terminate.h
new file mode 100644
index 000000000..93096acd6
--- /dev/null
+++ b/daemon/commands/terminate.h
@@ -0,0 +1,31 @@
+/*
+terminate.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_TERMINATE_H_
+#define COMMAND_TERMINATE_H_
+
+#include "../daemon.h"
+
+class TerminateCommand: public DaemonCommand {
+public:
+	TerminateCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_TERMINATE_H_
diff --git a/daemon/commands/unregister.cc b/daemon/commands/unregister.cc
new file mode 100644
index 000000000..2b0852ece
--- /dev/null
+++ b/daemon/commands/unregister.cc
@@ -0,0 +1,69 @@
+/*
+unregister.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "unregister.h"
+
+using namespace std;
+
+UnregisterCommand::UnregisterCommand() :
+		DaemonCommand("unregister", "unregister <register_id|ALL>", "Unregister the daemon from the specified proxy or from all proxies.") {
+	addExample(new DaemonCommandExample("unregister 3",
+						"Status: Error\n"
+						"Reason: No register with such id."));
+	addExample(new DaemonCommandExample("unregister 2",
+						"Status: Ok"));
+	addExample(new DaemonCommandExample("unregister ALL",
+						"Status: Ok"));
+}
+
+void UnregisterCommand::exec(Daemon *app, const char *args) {
+	LinphoneProxyConfig *cfg = NULL;
+	string param;
+	int pid;
+
+	istringstream ist(args);
+	ist >> param;
+	if (ist.fail()) {
+		app->sendResponse(Response("Missing parameter.", Response::Error));
+		return;
+	}
+	if (param.compare("ALL") == 0) {
+		for (int i = 1; i <= app->maxProxyId(); i++) {
+			cfg = app->findProxy(i);
+			if (cfg != NULL) {
+				linphone_core_remove_proxy_config(app->getCore(), cfg);
+			}
+		}
+	} else {
+		ist.clear();
+		ist.str(param);
+		ist >> pid;
+		if (ist.fail()) {
+			app->sendResponse(Response("Incorrect parameter.", Response::Error));
+			return;
+		}
+		cfg = app->findProxy(pid);
+		if (cfg == NULL) {
+			app->sendResponse(Response("No register with such id.", Response::Error));
+			return;
+		}
+		linphone_core_remove_proxy_config(app->getCore(), cfg);
+	}
+	app->sendResponse(Response());
+}
diff --git a/daemon/commands/unregister.h b/daemon/commands/unregister.h
new file mode 100644
index 000000000..2c83c9137
--- /dev/null
+++ b/daemon/commands/unregister.h
@@ -0,0 +1,31 @@
+/*
+unregister.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_UNREGISTER_H_
+#define COMMAND_UNREGISTER_H_
+
+#include "../daemon.h"
+
+class UnregisterCommand: public DaemonCommand {
+public:
+	UnregisterCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_UNREGISTER_H_
diff --git a/daemon/commands/version.cc b/daemon/commands/version.cc
new file mode 100644
index 000000000..f080a7dbd
--- /dev/null
+++ b/daemon/commands/version.cc
@@ -0,0 +1,44 @@
+/*
+version.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "version.h"
+
+using namespace std;
+
+class VersionResponse : public Response {
+public:
+	VersionResponse(LinphoneCore *core);
+};
+
+VersionResponse::VersionResponse(LinphoneCore *core) : Response() {
+	ostringstream ost;
+	ost << "Version: " << linphone_core_get_version();
+	setBody(ost.str().c_str());
+}
+
+VersionCommand::VersionCommand() :
+		DaemonCommand("version", "version", "Get the version number.") {
+	addExample(new DaemonCommandExample("version",
+						"Status: Ok\n\n"
+						"Version: 3.5.99.0_6c2f4b9312fd4717b2f8ae0a7d7c97b752768c7c"));
+}
+
+void VersionCommand::exec(Daemon *app, const char *args) {
+	app->sendResponse(VersionResponse(app->getCore()));
+}
diff --git a/daemon/commands/version.h b/daemon/commands/version.h
new file mode 100644
index 000000000..f9cc7fee8
--- /dev/null
+++ b/daemon/commands/version.h
@@ -0,0 +1,31 @@
+/*
+version.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef COMMAND_VERSION_H_
+#define COMMAND_VERSION_H_
+
+#include "../daemon.h"
+
+class VersionCommand: public DaemonCommand {
+public:
+	VersionCommand();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif //COMMAND_VERSION_H_
diff --git a/daemon/commands/video.cc b/daemon/commands/video.cc
new file mode 100644
index 000000000..78d5d50fd
--- /dev/null
+++ b/daemon/commands/video.cc
@@ -0,0 +1,167 @@
+/*
+video.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include "commands/video.h"
+
+Video::Video() :
+	DaemonCommand("video",
+				  "video <call id>",
+				  "Toggles camera on current call."
+				  "If no call is specified, the current call is taken.")
+{
+	addExample(new DaemonCommandExample("video 1",
+										"Status: Ok\n\n"
+										"Camera activated."));
+
+	addExample(new DaemonCommandExample("video 1",
+										"Status: Ok\n\n"
+										"Camera deactivated."));
+
+	addExample(new DaemonCommandExample("video",
+										"Status: Error\n\n"
+										"Reason: No current call available."));
+
+	addExample(new DaemonCommandExample("video 2",
+										"Status: Error\n\n"
+										"Reason: No call with such id."));
+}
+
+void Video::exec(Daemon* app, const char* args)
+{
+	LinphoneCore *lc = app->getCore();
+	int cid;
+	LinphoneCall *call = NULL;
+	bool activate = false;
+	int argc = sscanf(args, "%i", &cid);
+
+	if ( argc == 1) { // should take current call
+		call = linphone_core_get_current_call(lc);
+		if (call == NULL) {
+			app->sendResponse(Response("No current call available."));
+			return;
+		}
+	} else {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	}
+
+	if (linphone_call_get_state(call)==LinphoneCallStreamsRunning){
+		LinphoneCallParams *new_params = linphone_call_params_copy(linphone_call_get_current_params(call));
+		activate = !linphone_call_params_video_enabled(new_params);
+
+		linphone_call_params_enable_video(new_params,activate);
+		linphone_core_update_call(lc,call,new_params);
+		linphone_call_params_destroy(new_params);
+
+	} else {
+		app->sendResponse(Response("No streams running: can't [de]activate video"));
+		return;
+	}
+
+	app->sendResponse(Response(activate?"Camera activated.":
+										"Camera deactivated", Response::Ok));
+}
+
+
+VideoSource::VideoSource():
+	DaemonCommand("videosource",
+				  "videosource <cam|dummy> <call-id>",
+				  "Toggles camera source for specified call."
+				  "If no call is specified, the current call is taken.")
+{
+	addExample(new DaemonCommandExample("videosource cam 1",
+										"Status: Ok\n\n"
+										"Webcam source selected."));
+
+	addExample(new DaemonCommandExample("videosource dummy 1",
+										"Status: Ok\n\n"
+										"Dummy source selected."));
+
+	addExample(new DaemonCommandExample("videosource cam",
+										"Status: Error\n\n"
+										"Reason: No current call available."));
+
+	addExample(new DaemonCommandExample("videosource cam 2",
+										"Status: Error\n\n"
+										"Reason: No call with such id."));
+}
+
+void VideoSource::exec(Daemon* app, const char* args)
+{
+	LinphoneCore *lc = app->getCore();
+	LinphoneCall *call = NULL;
+	int cid;
+	int argc = 0;
+	bool activate = false;
+	char command[6];
+
+	argc = sscanf(args, "%5s %i", command, &cid);
+	command[5] = 0;
+
+	if ( argc == 1) { // should take current call
+		call = linphone_core_get_current_call(lc);
+		if (call == NULL) {
+			app->sendResponse(Response("No current call available."));
+			return;
+		}
+	} else if( argc == 2 ) {
+		call = app->findCall(cid);
+		if (call == NULL) {
+			app->sendResponse(Response("No call with such id."));
+			return;
+		}
+	} else {
+		app->sendResponse(Response("Invalid command"));
+		return;
+	}
+
+	activate = (strcmp(command,"cam") == 0);
+
+	linphone_call_enable_camera(call,activate);
+
+	app->sendResponse(Response(activate?"Dummy source selected.":
+										"Webcam source selected.", Response::Ok));
+}
+
+
+AutoVideo::AutoVideo():
+	DaemonCommand("autovideo",
+				  "autovideo <on|off>",
+				  "Enables/disables automatic video setup when a call is issued")
+{
+	addExample(new DaemonCommandExample("autovideo on",
+										"Status: Ok\n\n"
+										"Auto video ON"));
+
+	addExample(new DaemonCommandExample("autovideo off",
+										"Status: Ok\n\n"
+										"Auto video OFF"));
+}
+
+void AutoVideo::exec(Daemon* app, const char* args)
+{
+	bool enable = (strcmp(args,"on") == 0);
+
+	app->setAutoVideo(enable);
+	app->sendResponse(Response(enable?"Auto video ON":
+										"Auto video OFF", Response::Ok));
+}
diff --git a/daemon/commands/video.h b/daemon/commands/video.h
new file mode 100644
index 000000000..3fe9b07e9
--- /dev/null
+++ b/daemon/commands/video.h
@@ -0,0 +1,47 @@
+/*
+video.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef CALLCAMERA_H
+#define CALLCAMERA_H
+
+#include "daemon.h"
+
+class Video : public DaemonCommand
+{
+public:
+	Video();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+
+class VideoSource : public DaemonCommand
+{
+public:
+	VideoSource();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+class AutoVideo : public DaemonCommand
+{
+public:
+	AutoVideo();
+	virtual void exec(Daemon *app, const char *args);
+};
+
+#endif // CALLCAMERA_H
diff --git a/daemon/daemon-pipetest.c b/daemon/daemon-pipetest.c
new file mode 100644
index 000000000..970413662
--- /dev/null
+++ b/daemon/daemon-pipetest.c
@@ -0,0 +1,86 @@
+/*
+daemon-pipetest.c
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#define _GNU_SOURCE
+#include <fcntl.h>
+
+#include <poll.h>
+
+
+
+#include "ortp/ortp.h"
+
+static int running=1;
+
+int main(int argc, char *argv[]){
+	struct pollfd pfds[2]={{0}};
+	char buf[4096];
+	int fd;
+
+	/* handle args */
+	if (argc < 2) {
+		ortp_error("Usage: %s pipename", argv[0]);
+		return 1;
+	}
+
+	fd=ortp_client_pipe_connect(argv[1]);
+
+	ortp_init();
+	ortp_set_log_level_mask(NULL,ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
+	if (fd==-1){
+		ortp_error("Could not connect to control pipe: %s",strerror(errno));
+		return -1;
+	}
+	pfds[0].fd=fd;
+	pfds[0].events=POLLIN;
+	pfds[1].fd=1;
+	pfds[1].events=POLLIN;
+	while (running){
+		int err;
+		int bytes;
+		err=poll(pfds,2,-1);
+		if (err>0){
+			/*splice to stdout*/
+			if (pfds[0].revents & POLLIN){
+				if ((bytes=read(pfds[0].fd,buf,sizeof(buf)))>0){
+					if (write(0,buf,bytes)==-1){
+						ortp_error("Fail to write to stdout?");
+						break;
+					}
+					fprintf(stdout,"\n");		
+				}else if (bytes==0){
+					break;
+				}
+			}
+			/*splice from stdin to pipe */
+			if (pfds[1].revents & POLLIN){
+				if ((bytes=read(pfds[1].fd,buf,sizeof(buf)))>0){
+					if (write(pfds[0].fd,buf,bytes)==-1){
+						ortp_error("Fail to write to unix socket");
+						break;
+					}		
+				}else if (bytes==0){
+					break;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
new file mode 100644
index 000000000..e7caff25a
--- /dev/null
+++ b/daemon/daemon.cc
@@ -0,0 +1,935 @@
+/*
+daemon.cc
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#include <cstdio>
+#include <sys/ioctl.h>
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <algorithm>
+
+#ifdef HAVE_READLINE
+#include <readline/readline.h>
+#include <readline/history.h>
+#endif
+
+#include <poll.h>
+
+#include "daemon.h"
+#include "commands/adaptive-jitter-compensation.h"
+#include "commands/jitterbuffer.h"
+#include "commands/answer.h"
+#include "commands/audio-codec-get.h"
+#include "commands/audio-codec-move.h"
+#include "commands/audio-codec-set.h"
+#include "commands/audio-codec-toggle.h"
+#include "commands/audio-stream-start.h"
+#include "commands/audio-stream-stop.h"
+#include "commands/audio-stream-stats.h"
+#include "commands/auth-infos-clear.h"
+#include "commands/call.h"
+#include "commands/call-stats.h"
+#include "commands/call-status.h"
+#include "commands/call-pause.h"
+#include "commands/call-mute.h"
+#include "commands/call-resume.h"
+#include "commands/video.h"
+#include "commands/call-transfer.h"
+#include "commands/conference.h"
+#include "commands/contact.h"
+#include "commands/dtmf.h"
+#include "commands/firewall-policy.h"
+#include "commands/help.h"
+#include "commands/ipv6.h"
+#include "commands/media-encryption.h"
+#include "commands/msfilter-add-fmtp.h"
+#include "commands/play-wav.h"
+#include "commands/pop-event.h"
+#include "commands/port.h"
+#include "commands/ptime.h"
+#include "commands/register.h"
+#include "commands/register-status.h"
+#include "commands/terminate.h"
+#include "commands/unregister.h"
+#include "commands/quit.h"
+#include "commands/configcommand.h"
+#include "commands/netsim.h"
+#include "commands/cn.h"
+#include "commands/version.h"
+
+#include "private.h"
+using namespace std;
+
+#ifndef WIN32
+#else
+#include <windows.h>
+void usleep(int waitTime) {
+	Sleep(waitTime/1000);
+}
+#endif
+
+#ifdef HAVE_READLINE
+#define LICENCE_GPL
+#else
+#define LICENCE_COMMERCIAL
+#endif
+
+const char * const ice_state_str[] = {
+	"Not activated",	/* LinphoneIceStateNotActivated */
+	"Failed",	/* LinphoneIceStateFailed */
+	"In progress",	/* LinphoneIceStateInProgress */
+	"Host connection",	/* LinphoneIceStateHostConnection */
+	"Reflexive connection",	/* LinphoneIceStateReflexiveConnection */
+	"Relayed connection"	/* LinphoneIceStateRelayConnection */
+};
+
+void *Daemon::iterateThread(void *arg) {
+	Daemon *daemon = (Daemon *) arg;
+	while (daemon->mRunning) {
+		ms_mutex_lock(&daemon->mMutex);
+		daemon->iterate();
+		ms_mutex_unlock(&daemon->mMutex);
+		usleep(20000);
+	}
+	return 0;
+}
+
+EventResponse::EventResponse(Daemon *daemon, LinphoneCall *call, LinphoneCallState state) {
+	ostringstream ostr;
+	char *remote = linphone_call_get_remote_address_as_string(call);
+	ostr << "Event-type: call-state-changed\nEvent: " << linphone_call_state_to_string(state) << "\n";
+	ostr << "From: " << remote << "\n";
+	ostr << "Id: " << daemon->updateCallId(call) << "\n";
+	setBody(ostr.str().c_str());
+	ms_free(remote);
+}
+
+DtmfResponse::DtmfResponse(Daemon *daemon, LinphoneCall *call, int dtmf) {
+	ostringstream ostr;
+	char *remote = linphone_call_get_remote_address_as_string(call);
+	ostr << "Event-type: receiving-tone\nTone: " << (char) dtmf << "\n";
+	ostr << "From: " << remote << "\n";
+	ostr << "Id: " << daemon->updateCallId(call) << "\n";
+	setBody(ostr.str().c_str());
+	ms_free(remote);
+}
+
+static ostream &printCallStatsHelper(ostream &ostr, const LinphoneCallStats *stats, const string &prefix) {
+	ostr << prefix << "ICE state: " << ice_state_str[stats->ice_state] << "\n";
+	ostr << prefix << "RoundTripDelay: " << stats->round_trip_delay << "\n";
+	ostr << prefix << "Jitter: " << stats->jitter_stats.jitter << "\n";
+//	ostr << prefix << "MaxJitter: " << stats->jitter_stats.max_jitter << "\n";
+//	ostr << prefix << "SumJitter: " << stats->jitter_stats.sum_jitter << "\n";
+//	ostr << prefix << "MaxJitterTs: " << stats->jitter_stats.max_jitter_ts << "\n";
+	ostr << prefix << "JitterBufferSizeMs: " << stats->jitter_stats.jitter_buffer_size_ms << "\n";
+
+	const report_block_t *rrb = NULL;
+	if (stats->received_rtcp != NULL) {
+		if (stats->received_rtcp->b_cont != NULL)
+			msgpullup(stats->received_rtcp, -1);
+		if (rtcp_is_SR(stats->received_rtcp)) {
+			rrb = rtcp_SR_get_report_block(stats->received_rtcp, 0);
+		} else if (rtcp_is_RR(stats->received_rtcp)) {
+			rrb = rtcp_RR_get_report_block(stats->received_rtcp, 0);
+		}
+	}
+	if (rrb) {
+		unsigned int ij;
+		float flost;
+		ij = report_block_get_interarrival_jitter(rrb);
+		flost = (float) (100.0 * report_block_get_fraction_lost(rrb) / 256.0);
+		ostr << prefix << "Received-InterarrivalJitter: " << ij << "\n";
+		ostr << prefix << "Received-FractionLost: " << flost << "\n";
+	}
+
+	const report_block_t *srb = NULL;
+	if (stats->sent_rtcp != NULL) {
+		if (stats->sent_rtcp->b_cont != NULL)
+			msgpullup(stats->sent_rtcp, -1);
+		if (rtcp_is_SR(stats->sent_rtcp)) {
+			srb = rtcp_SR_get_report_block(stats->sent_rtcp, 0);
+		} else if (rtcp_is_RR(stats->sent_rtcp)) {
+			srb = rtcp_RR_get_report_block(stats->sent_rtcp, 0);
+		}
+	}
+	if (srb) {
+		unsigned int ij;
+		float flost;
+		ij = report_block_get_interarrival_jitter(srb);
+		flost = (float) (100.0 * report_block_get_fraction_lost(srb) / 256.0);
+		ostr << prefix << "Sent-InterarrivalJitter: " << ij << "\n";
+		ostr << prefix << "Sent-FractionLost: " << flost << "\n";
+	}
+	return ostr;
+}
+
+CallStatsResponse::CallStatsResponse(Daemon *daemon, LinphoneCall *call, const LinphoneCallStats *stats, bool event) {
+	const LinphoneCallParams *callParams = linphone_call_get_current_params(call);
+	const char *prefix = "";
+
+	ostringstream ostr;
+	if (event) {
+		ostr << "Event-type: call-stats\n";
+		ostr << "Id: " << daemon->updateCallId(call) << "\n";
+		ostr << "Type: ";
+		if (stats->type == LINPHONE_CALL_STATS_AUDIO) {
+			ostr << "Audio";
+		} else {
+			ostr << "Video";
+		}
+		ostr << "\n";
+	} else {
+		prefix = ((stats->type == LINPHONE_CALL_STATS_AUDIO) ? "Audio-" : "Video-");
+	}
+
+	printCallStatsHelper(ostr, stats, prefix);
+
+	if (stats->type == LINPHONE_CALL_STATS_AUDIO) {
+		const PayloadType *audioCodec = linphone_call_params_get_used_audio_codec(callParams);
+		ostr << PayloadTypeResponse(linphone_call_get_core(call), audioCodec, -1, prefix, false).getBody() << "\n";
+	} else {
+		const PayloadType *videoCodec = linphone_call_params_get_used_video_codec(callParams);
+		ostr << PayloadTypeResponse(linphone_call_get_core(call), videoCodec, -1, prefix, false).getBody() << "\n";
+	}
+
+	setBody(ostr.str().c_str());
+}
+
+
+AudioStreamStatsResponse::AudioStreamStatsResponse(Daemon* daemon, AudioStream* stream,
+		const LinphoneCallStats *stats, bool event) {
+	const char *prefix = "";
+
+	ostringstream ostr;
+	if (event) {
+		ostr << "Event-type: audio-stream-stats\n";
+		ostr << "Id: " << daemon->updateAudioStreamId(stream) << "\n";
+		ostr << "Type: ";
+		if (stats->type == LINPHONE_CALL_STATS_AUDIO) {
+			ostr << "Audio";
+		} else {
+			ostr << "Video";
+		}
+		ostr << "\n";
+	} else {
+		prefix = ((stats->type == LINPHONE_CALL_STATS_AUDIO) ? "Audio-" : "Video-");
+	}
+
+	printCallStatsHelper(ostr, stats, prefix);
+
+	setBody(ostr.str().c_str());
+}
+
+PayloadTypeResponse::PayloadTypeResponse(LinphoneCore *core, const PayloadType *payloadType, int index, const string &prefix, bool enabled_status) {
+	ostringstream ostr;
+	if (payloadType != NULL) {
+		if (index >= 0)
+			ostr << prefix << "Index: " << index << "\n";
+		ostr << prefix << "Payload-type-number: " << linphone_core_get_payload_type_number(core, payloadType) << "\n";
+		ostr << prefix << "Clock-rate: " << payloadType->clock_rate << "\n";
+		ostr << prefix << "Bitrate: " << payloadType->normal_bitrate << "\n";
+		ostr << prefix << "Mime: " << payloadType->mime_type << "\n";
+		ostr << prefix << "Channels: " << payloadType->channels << "\n";
+		ostr << prefix << "Recv-fmtp: " << ((payloadType->recv_fmtp) ? payloadType->recv_fmtp : "") << "\n";
+		ostr << prefix << "Send-fmtp: " << ((payloadType->send_fmtp) ? payloadType->send_fmtp : "") << "\n";
+		if (enabled_status)
+			ostr << prefix << "Enabled: " << (linphone_core_payload_type_enabled(core, payloadType) == TRUE ? "true" : "false") << "\n";
+		setBody(ostr.str().c_str());
+	}
+}
+
+PayloadTypeParser::PayloadTypeParser(LinphoneCore *core, const string &mime_type, bool accept_all) : mAll(false), mSuccesful(true), mPayloadType(NULL),mPosition(-1){
+	int number=-1;
+	if (accept_all && (mime_type.compare("ALL") == 0)) {
+		mAll = true;
+		return;
+	}
+	istringstream ist(mime_type);
+	ist >> number;
+	if (ist.fail()) {
+		char type[64]={0};
+		int rate, channels;
+		if (sscanf(mime_type.c_str(), "%63[^/]/%u/%u", type, &rate, &channels) != 3) {
+			mSuccesful = false;
+			return;
+		}
+		mPayloadType = linphone_core_find_payload_type(core, type, rate, channels);
+		if (mPayloadType) mPosition=bctbx_list_index(linphone_core_get_audio_codecs(core), mPayloadType);
+	}else if (number!=-1){
+		const bctbx_list_t *elem;
+		for(elem=linphone_core_get_audio_codecs(core);elem!=NULL;elem=elem->next){
+			if (number==linphone_core_get_payload_type_number(core,(PayloadType*)elem->data)){
+				mPayloadType=(PayloadType*)elem->data;
+				break;
+			}
+		}
+	}
+}
+
+DaemonCommandExample::DaemonCommandExample(const char *command, const char *output)
+	: mCommand(command), mOutput(output) {}
+
+DaemonCommand::DaemonCommand(const char *name, const char *proto, const char *description) :
+		mName(name), mProto(proto), mDescription(description) {
+}
+
+void DaemonCommand::addExample(const DaemonCommandExample *example) {
+	mExamples.push_back(example);
+}
+
+const string DaemonCommand::getHelp() const {
+	ostringstream ost;
+	ost << getProto() << endl << endl;
+	ost << "Description:" << endl << getDescription() << endl << endl;
+	list<const DaemonCommandExample*> examples = getExamples();
+	int c = 1;
+	for (list<const DaemonCommandExample*>::iterator it = examples.begin(); it != examples.end(); ++it, ++c) {
+		ost << "Example " << c << ":" << endl;
+		ost << ">" << (*it)->getCommand() << endl;
+		ost << (*it)->getOutput() << endl;
+		ost << endl;
+	}
+	return ost.str();
+}
+
+bool DaemonCommand::matches(const char *name) const {
+	return strcmp(name, mName.c_str()) == 0;
+}
+
+Daemon::Daemon(const char *config_path, const char *factory_config_path, const char *log_file, const char *pipe_name, bool display_video, bool capture_video) :
+		mLSD(0), mLogFile(NULL), mAutoVideo(0), mCallIds(0), mProxyIds(0), mAudioStreamIds(0) {
+	ms_mutex_init(&mMutex, NULL);
+	mServerFd = -1;
+	mChildFd = -1;
+	if (pipe_name == NULL) {
+#ifdef HAVE_READLINE
+		const char *homedir = getenv("HOME");
+		rl_readline_name = (char*)"daemon";
+		if (homedir == NULL)
+			homedir = ".";
+		mHistfile = string(homedir) + string("/.linphone_history");
+		read_history(mHistfile.c_str());
+		setlinebuf(stdout);
+#endif
+	} else {
+		mServerFd = ortp_server_pipe_create(pipe_name);
+		listen(mServerFd, 2);
+		fprintf(stdout, "Server unix socket created, name=%s fd=%i\n", pipe_name, mServerFd);
+	}
+
+	if (log_file != NULL) {
+		mLogFile = fopen(log_file, "a+");
+		linphone_core_enable_logs(mLogFile);
+	} else {
+		linphone_core_disable_logs();
+	}
+
+	LinphoneCoreVTable vtable;
+	memset(&vtable, 0, sizeof(vtable));
+	vtable.call_state_changed = callStateChanged;
+	vtable.call_stats_updated = callStatsUpdated;
+	vtable.dtmf_received = dtmfReceived;
+	mLc = linphone_core_new(&vtable, config_path, factory_config_path, this);
+	linphone_core_set_user_data(mLc, this);
+	linphone_core_enable_video_capture(mLc,capture_video);
+	linphone_core_enable_video_display(mLc,display_video);
+	initCommands();
+	mUseStatsEvents=true;
+}
+
+const list<DaemonCommand*> &Daemon::getCommandList() const {
+	return mCommands;
+}
+
+LinphoneCore *Daemon::getCore() {
+	return mLc;
+}
+
+LinphoneSoundDaemon *Daemon::getLSD() {
+	return mLSD;
+}
+
+int Daemon::updateCallId(LinphoneCall *call) {
+	int val = (int) (long) linphone_call_get_user_pointer(call);
+	if (val == 0) {
+		linphone_call_set_user_pointer(call, (void*) (long) ++mCallIds);
+		return mCallIds;
+	}
+	return val;
+}
+
+LinphoneCall *Daemon::findCall(int id) {
+	const bctbx_list_t *elem = linphone_core_get_calls(mLc);
+	for (; elem != NULL; elem = elem->next) {
+		LinphoneCall *call = (LinphoneCall *) elem->data;
+		if (linphone_call_get_user_pointer(call) == (void*) (long) id)
+			return call;
+	}
+	return NULL;
+}
+
+int Daemon::updateProxyId(LinphoneProxyConfig *cfg) {
+	int val = (int) (long) linphone_proxy_config_get_user_data(cfg);
+	if (val == 0) {
+		linphone_proxy_config_set_user_data(cfg, (void*) (long) ++mProxyIds);
+		return mProxyIds;
+	}
+	return val;
+}
+
+LinphoneProxyConfig *Daemon::findProxy(int id) {
+	const bctbx_list_t *elem = linphone_core_get_proxy_config_list(mLc);
+	for (; elem != NULL; elem = elem->next) {
+		LinphoneProxyConfig *proxy = (LinphoneProxyConfig *) elem->data;
+		if (linphone_proxy_config_get_user_data(proxy) == (void*) (long) id)
+			return proxy;
+	}
+	return NULL;
+}
+
+LinphoneAuthInfo *Daemon::findAuthInfo(int id)  {
+	const bctbx_list_t *elem = linphone_core_get_auth_info_list(mLc);
+	if (elem == NULL || id < 1 || (unsigned int)id > bctbx_list_size(elem)) {
+		return NULL;
+	}
+	while (id > 1) {
+		elem = elem->next;
+		--id;
+	}
+	return (LinphoneAuthInfo *) elem->data;
+}
+
+int Daemon::updateAudioStreamId(AudioStream *audio_stream) {
+	for (std::map<int, AudioStreamAndOther*>::iterator it = mAudioStreams.begin(); it != mAudioStreams.end(); ++it) {
+		if (it->second->stream == audio_stream)
+			return it->first;
+	}
+
+	++mProxyIds;
+	mAudioStreams.insert(make_pair(mProxyIds, new AudioStreamAndOther(audio_stream)));
+	return mProxyIds;
+}
+
+AudioStreamAndOther *Daemon::findAudioStreamAndOther(int id) {
+	std::map<int, AudioStreamAndOther*>::iterator it = mAudioStreams.find(id);
+	if (it != mAudioStreams.end())
+		return it->second;
+	return NULL;
+}
+
+AudioStream *Daemon::findAudioStream(int id) {
+	std::map<int, AudioStreamAndOther*>::iterator it = mAudioStreams.find(id);
+	if (it != mAudioStreams.end())
+		return it->second->stream;
+	return NULL;
+}
+
+void Daemon::removeAudioStream(int id) {
+	std::map<int, AudioStreamAndOther*>::iterator it = mAudioStreams.find(id);
+	if (it != mAudioStreams.end()) {
+		mAudioStreams.erase(it);
+		delete(it->second);
+	}
+}
+
+void Daemon::initCommands() {
+	mCommands.push_back(new RegisterCommand());
+	mCommands.push_back(new ContactCommand());
+	mCommands.push_back(new RegisterStatusCommand());
+	mCommands.push_back(new UnregisterCommand());
+	mCommands.push_back(new AuthInfosClearCommand());
+	mCommands.push_back(new CallCommand());
+	mCommands.push_back(new TerminateCommand());
+	mCommands.push_back(new DtmfCommand());
+	mCommands.push_back(new PlayWavCommand());
+	mCommands.push_back(new PopEventCommand());
+	mCommands.push_back(new AnswerCommand());
+	mCommands.push_back(new CallStatusCommand());
+	mCommands.push_back(new CallStatsCommand());
+	mCommands.push_back(new CallPause());
+	mCommands.push_back(new CallMute());
+	mCommands.push_back(new CallResume());
+	mCommands.push_back(new CallTransfer());
+	mCommands.push_back(new Video());
+	mCommands.push_back(new VideoSource());
+	mCommands.push_back(new AutoVideo());
+	mCommands.push_back(new Conference());
+	mCommands.push_back(new AudioCodecGetCommand());
+	mCommands.push_back(new AudioCodecEnableCommand());
+	mCommands.push_back(new AudioCodecDisableCommand());
+	mCommands.push_back(new AudioCodecMoveCommand());
+	mCommands.push_back(new AudioCodecSetCommand());
+	mCommands.push_back(new AudioStreamStartCommand());
+	mCommands.push_back(new AudioStreamStopCommand());
+	mCommands.push_back(new AudioStreamStatsCommand());
+	mCommands.push_back(new MSFilterAddFmtpCommand());
+	mCommands.push_back(new PtimeCommand());
+	mCommands.push_back(new IPv6Command());
+	mCommands.push_back(new FirewallPolicyCommand());
+	mCommands.push_back(new MediaEncryptionCommand());
+	mCommands.push_back(new PortCommand());
+	mCommands.push_back(new AdaptiveBufferCompensationCommand());
+	mCommands.push_back(new JitterBufferCommand());
+	mCommands.push_back(new JitterBufferResetCommand());
+	mCommands.push_back(new VersionCommand());
+	mCommands.push_back(new QuitCommand());
+	mCommands.push_back(new HelpCommand());
+	mCommands.push_back(new ConfigGetCommand());
+	mCommands.push_back(new ConfigSetCommand());
+	mCommands.push_back(new NetsimCommand());
+	mCommands.push_back(new CNCommand());
+}
+
+void Daemon::uninitCommands() {
+	while (!mCommands.empty()) {
+		delete mCommands.front();
+		mCommands.pop_front();
+	}
+}
+
+bool Daemon::pullEvent() {
+	bool status = false;
+	ostringstream ostr;
+	if (!mEventQueue.empty()) {
+		Response *r = mEventQueue.front();
+		mEventQueue.pop();
+		ostr << r->getBody() << "\n";
+		delete r;
+		status = true;
+	}
+	ostr << "Size: " << mEventQueue.size() << "\n";
+	sendResponse(Response(ostr.str().c_str(), Response::Ok));
+	return status;
+}
+
+void Daemon::callStateChanged(LinphoneCall *call, LinphoneCallState state, const char *msg) {
+	switch (state) {
+	case LinphoneCallIncomingReceived:
+		linphone_call_enable_camera (call,mAutoVideo);
+	case LinphoneCallOutgoingProgress:
+	case LinphoneCallIncomingEarlyMedia:
+	case LinphoneCallConnected:
+	case LinphoneCallStreamsRunning:
+	case LinphoneCallError:
+	case LinphoneCallEnd:
+		mEventQueue.push(new EventResponse(this, call, state));
+		break;
+	default:
+		break;
+	}
+}
+
+void Daemon::callStatsUpdated(LinphoneCall *call, const LinphoneCallStats *stats) {
+	if (mUseStatsEvents) {
+		/* don't queue periodical updates (3 per seconds for just bandwidth updates) */
+		if (!(stats->updated & LINPHONE_CALL_STATS_PERIODICAL_UPDATE)){
+			mEventQueue.push(new CallStatsResponse(this, call, stats, true));
+		}
+	}
+}
+
+void Daemon::dtmfReceived(LinphoneCall *call, int dtmf) {
+	mEventQueue.push(new DtmfResponse(this, call, dtmf));
+}
+
+void Daemon::callStateChanged(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState state, const char *msg) {
+	Daemon *app = (Daemon*) linphone_core_get_user_data(lc);
+	app->callStateChanged(call, state, msg);
+}
+void Daemon::callStatsUpdated(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallStats *stats) {
+	Daemon *app = (Daemon*) linphone_core_get_user_data(lc);
+	app->callStatsUpdated(call, stats);
+}
+void Daemon::dtmfReceived(LinphoneCore *lc, LinphoneCall *call, int dtmf) {
+	Daemon *app = (Daemon*) linphone_core_get_user_data(lc);
+	app->dtmfReceived(call, dtmf);
+}
+
+void Daemon::iterateStreamStats() {
+	for (std::map<int, AudioStreamAndOther*>::iterator it = mAudioStreams.begin(); it != mAudioStreams.end(); ++it) {
+		OrtpEvent *ev;
+		while (it->second->queue && (NULL != (ev=ortp_ev_queue_get(it->second->queue)))){
+			OrtpEventType evt=ortp_event_get_type(ev);
+			if (evt == ORTP_EVENT_RTCP_PACKET_RECEIVED || evt == ORTP_EVENT_RTCP_PACKET_EMITTED) {
+				linphone_call_stats_fill(&it->second->stats, &it->second->stream->ms, ev);
+				if (mUseStatsEvents) mEventQueue.push(new AudioStreamStatsResponse(this,
+					it->second->stream, &it->second->stats, true));
+			}
+			ortp_event_destroy(ev);
+		}
+	}
+}
+
+void Daemon::iterate() {
+	linphone_core_iterate(mLc);
+	iterateStreamStats();
+	if (mChildFd == -1) {
+		if (!mEventQueue.empty()) {
+			Response *r = mEventQueue.front();
+			mEventQueue.pop();
+			fprintf(stdout, "%s\n", r->getBody().c_str());
+			fflush(stdout);
+			delete r;
+		}
+	}
+}
+
+void Daemon::execCommand(const char *cl) {
+	char args[sLineSize] = { 0 };
+	char name[sLineSize] = { 0 };
+	sscanf(cl, "%511s %511[^\n]", name, args); //Read the rest of line in args
+	list<DaemonCommand*>::iterator it = find_if(mCommands.begin(), mCommands.end(), bind2nd(mem_fun(&DaemonCommand::matches), name));
+	if (it != mCommands.end()) {
+		ms_mutex_lock(&mMutex);
+		(*it)->exec(this, args);
+		ms_mutex_unlock(&mMutex);
+	} else {
+		sendResponse(Response("Unknown command."));
+	}
+}
+
+void Daemon::sendResponse(const Response &resp) {
+	char buf[4096] = { 0 };
+	int size;
+	size = resp.toBuf(buf, sizeof(buf));
+	if (mChildFd != -1) {
+		if (write(mChildFd, buf, size) == -1) {
+			ms_error("Fail to write to pipe: %s", strerror(errno));
+		}
+	} else {
+		fprintf(stdout, "%s", buf);
+		fflush(stdout);
+	}
+}
+
+char *Daemon::readPipe(char *buffer, int buflen) {
+	struct pollfd pfd[2];
+	int nfds = 1;
+	memset(&pfd[0], 0, sizeof(pfd));
+	if (mServerFd != -1) {
+		pfd[0].events = POLLIN;
+		pfd[0].fd = mServerFd;
+	}
+	if (mChildFd != -1) {
+		pfd[1].events = POLLIN;
+		pfd[1].fd = mChildFd;
+		nfds++;
+	}
+	int err = poll(pfd, nfds, 50);
+	if (err > 0) {
+		if (mServerFd != -1 && (pfd[0].revents & POLLIN)) {
+			struct sockaddr_storage addr;
+			socklen_t addrlen = sizeof(addr);
+			int childfd = accept(mServerFd, (struct sockaddr*) &addr, &addrlen);
+			if (childfd != -1) {
+				if (mChildFd != -1) {
+					ms_error("Cannot accept two client at the same time");
+					close(childfd);
+				} else {
+					mChildFd = childfd;
+					return NULL;
+				}
+			}
+		}
+		if (mChildFd != -1 && (pfd[1].revents & POLLIN)) {
+			int ret;
+			if ((ret = read(mChildFd, buffer, buflen)) == -1) {
+				ms_error("Fail to read from pipe: %s", strerror(errno));
+			} else {
+				if (ret == 0) {
+					ms_message("Client disconnected");
+					close(mChildFd);
+					mChildFd = -1;
+					return NULL;
+				}
+				buffer[ret] = 0;
+				return buffer;
+			}
+		}
+	}
+	return NULL;
+}
+
+void Daemon::dumpCommandsHelp() {
+	int cols = 80;
+#ifdef TIOCGSIZE
+	struct ttysize ts;
+	ioctl(STDIN_FILENO, TIOCGSIZE, &ts);
+	cols = ts.ts_cols;
+#elif defined(TIOCGWINSZ)
+	struct winsize ts;
+	ioctl(STDIN_FILENO, TIOCGWINSZ, &ts);
+	cols = ts.ws_col;
+#endif
+
+	cout << endl;
+	for (list<DaemonCommand*>::iterator it = mCommands.begin(); it != mCommands.end(); ++it) {
+		cout << setfill('-') << setw(cols) << "-" << endl << endl;
+		cout << (*it)->getHelp();
+	}
+}
+
+static string htmlEscape(const string &orig){
+	string ret=orig;
+	size_t pos;
+
+	while(1){
+		pos=ret.find('<');
+		if (pos!=string::npos){
+			ret.erase(pos,1);
+			ret.insert(pos,"&lt");
+			continue;
+		}
+		pos=ret.find('>');
+		if (pos!=string::npos){
+			ret.erase(pos,1);
+			ret.insert(pos,"&gt");
+			continue;
+		}
+		break;
+	}
+	while(1){
+		pos=ret.find('\n');
+		if (pos!=string::npos){
+			ret.erase(pos,1);
+			ret.insert(pos,"<br>");
+			continue;
+		}
+		break;
+	}
+	return ret;
+}
+
+void Daemon::dumpCommandsHelpHtml(){
+	cout << endl;
+	cout << "<!DOCTYPE html><html><body>"<<endl;
+	cout << "<h1>List of linphone-daemon commands.</h1>"<<endl;
+	for (list<DaemonCommand*>::iterator it = mCommands.begin(); it != mCommands.end(); ++it) {
+		cout<<"<h2>"<<htmlEscape((*it)->getProto())<<"</h2>"<<endl;
+		cout<<"<h3>"<<"Description"<<"</h3>"<<endl;
+		cout<<"<p>"<<htmlEscape((*it)->getDescription())<<"</p>"<<endl;
+		cout<<"<h3>"<<"Examples"<<"</h3>"<<endl;
+		const std::list<const DaemonCommandExample*> &examples=(*it)->getExamples();
+		cout<<"<p><i>";
+		for(list<const DaemonCommandExample*>::const_iterator ex_it=examples.begin();ex_it!=examples.end();++ex_it){
+			cout<<"<b>"<<htmlEscape("Linphone-daemon>")<<htmlEscape((*ex_it)->getCommand())<<"</b><br>"<<endl;
+			cout<<htmlEscape((*ex_it)->getOutput())<<"<br>"<<endl;
+			cout<<"<br><br>";
+		}
+		cout<<"</i></p>"<<endl;
+	}
+
+	cout << "</body></html>"<<endl;
+}
+
+
+static void printHelp() {
+	fprintf(stdout, "daemon-linphone [<options>]\n"
+#if defined(LICENCE_GPL) || defined(LICENCE_COMMERCIAL)
+			"Licence: "
+#ifdef LICENCE_GPL
+			"GPL"
+#endif
+#ifdef LICENCE_COMMERCIAL
+			"Commercial"
+#endif
+			"\n"
+#endif
+
+			"where options are :\n"
+			"\t--help\t\t\tPrint this notice.\n"
+			"\t--dump-commands-help\tDump the help of every available commands.\n"
+			"\t--dump-commands-html-help\tDump the help of every available commands.\n"
+			"\t--pipe <pipename>\tCreate an unix server socket to receive commands.\n"
+			"\t--log <path>\t\tSupply a file where the log will be saved.\n"
+			"\t--factory-config <path>\tSupply a readonly linphonerc style config file to start with.\n"
+			"\t--config <path>\t\tSupply a linphonerc style config file to start with.\n"
+			"\t--disable-stats-events\t\tDo not automatically raise RTP statistics events.\n"
+			"\t--enable-lsd\t\tUse the linphone sound daemon.\n"
+			"\t-C\t\t\tenable video capture.\n"
+			"\t-D\t\t\tenable video display.\n");
+}
+
+void Daemon::startThread() {
+	ms_thread_create(&this->mThread, NULL, Daemon::iterateThread, this);
+}
+
+char *Daemon::readLine(const char *prompt, bool *eof) {
+	*eof=false;
+#ifdef HAVE_READLINE
+	return readline(prompt);
+#else
+	if (cin.eof()) {
+		*eof=true;
+		return NULL;
+	}
+	cout << prompt;
+	char *buff = (char *) malloc(sLineSize);
+	cin.getline(buff, sLineSize);
+	return buff;
+#endif
+}
+
+int Daemon::run() {
+	char line[sLineSize] = "daemon-linphone>";
+	char *ret;
+	mRunning = true;
+	startThread();
+	while (mRunning) {
+		bool eof=false;
+		if (mServerFd == -1) {
+			ret = readLine(line,&eof);
+			if (ret && ret[0] != '\0') {
+#ifdef HAVE_READLINE
+				add_history(ret);
+#endif
+			}
+		} else {
+			ret = readPipe(line, sLineSize);
+		}
+		if (ret && ret[0] != '\0') {
+			execCommand(ret);
+		}
+		if (mServerFd == -1 && ret != NULL) {
+			free(ret);
+		}
+		if (eof && mRunning) {
+			mRunning = false; // ctrl+d
+			cout << "Quitting..." << endl;
+		}
+	}
+	stopThread();
+	return 0;
+}
+
+void Daemon::stopThread() {
+	void *ret;
+	ms_thread_join(mThread, &ret);
+}
+
+void Daemon::quit() {
+	mRunning = false;
+}
+
+void Daemon::enableStatsEvents(bool enabled){
+	mUseStatsEvents=enabled;
+}
+
+void Daemon::enableLSD(bool enabled) {
+	if (mLSD) linphone_sound_daemon_destroy(mLSD);
+	linphone_core_use_sound_daemon(mLc, NULL);
+	if (enabled) {
+		mLSD = linphone_sound_daemon_new(mLc->factory,NULL, 44100, 1);
+		linphone_core_use_sound_daemon(mLc, mLSD);
+	}
+}
+
+Daemon::~Daemon() {
+	uninitCommands();
+
+	for (std::map<int, AudioStreamAndOther *>::iterator it = mAudioStreams.begin(); it != mAudioStreams.end(); ++it) {
+		audio_stream_stop(it->second->stream);
+	}
+
+	enableLSD(false);
+	linphone_core_destroy(mLc);
+	if (mChildFd != -1) {
+		close(mChildFd);
+	}
+	if (mServerFd != -1) {
+		ortp_server_pipe_close(mServerFd);
+	}
+	if (mLogFile != NULL) {
+		linphone_core_enable_logs(NULL);
+		fclose(mLogFile);
+	}
+
+	ms_mutex_destroy(&mMutex);
+
+#ifdef HAVE_READLINE
+	stifle_history(30);
+	write_history(mHistfile.c_str());
+#endif
+}
+
+int main(int argc, char *argv[]) {
+	const char *config_path = NULL;
+	const char *factory_config_path = NULL;
+	const char *pipe_name = NULL;
+	const char *log_file = NULL;
+	bool capture_video = false;
+	bool display_video = false;
+	bool stats_enabled = true;
+	bool lsd_enabled = false;
+	int i;
+
+	for (i = 1; i < argc; ++i) {
+		if (strcmp(argv[i], "--help") == 0) {
+			printHelp();
+			return 0;
+		} else if (strcmp(argv[i], "--dump-commands-help") == 0) {
+			Daemon app(NULL, NULL, NULL, NULL, false, false);
+			app.dumpCommandsHelp();
+			return 0;
+		}else if (strcmp(argv[i], "--dump-commands-html-help") == 0) {
+			Daemon app(NULL, NULL, NULL, NULL, false, false);
+			app.dumpCommandsHelpHtml();
+			return 0;
+		} else if (strcmp(argv[i], "--pipe") == 0) {
+			if (i + 1 >= argc) {
+				fprintf(stderr, "no pipe name specify after --pipe\n");
+				return -1;
+			}
+			pipe_name = argv[++i];
+		} else if (strcmp(argv[i], "--factory-config") == 0) {
+			if (i + 1 >= argc) {
+				fprintf(stderr, "no file specify after --factory-config\n");
+				return -1;
+			}
+			factory_config_path = argv[i + 1];
+			i++;
+		} else if (strcmp(argv[i], "--config") == 0) {
+			if (i + 1 >= argc) {
+				fprintf(stderr, "no file specify after --config\n");
+				return -1;
+			}
+			config_path = argv[i + 1];
+			i++;
+		} else if (strcmp(argv[i], "--log") == 0) {
+			if (i + 1 >= argc) {
+				fprintf(stderr, "no file specify after --log\n");
+				return -1;
+			}
+			log_file = argv[i + 1];
+			i++;
+		} else if (strcmp(argv[i], "-C") == 0) {
+			capture_video = true;
+		} else if (strcmp(argv[i], "-D") == 0) {
+			display_video = true;
+		}else if (strcmp(argv[i],"--disable-stats-events")==0){
+			stats_enabled = false;
+		} else if (strcmp(argv[i], "--enable-lsd") == 0) {
+			lsd_enabled = true;
+		}
+	}
+	Daemon app(config_path, factory_config_path, log_file, pipe_name, display_video, capture_video);
+	app.enableStatsEvents(stats_enabled);
+	app.enableLSD(lsd_enabled);
+	return app.run();
+}
diff --git a/daemon/daemon.h b/daemon/daemon.h
new file mode 100644
index 000000000..153c33c03
--- /dev/null
+++ b/daemon/daemon.h
@@ -0,0 +1,283 @@
+/*
+daemon.h
+Copyright (C) 2016 Belledonne Communications, Grenoble, France 
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+#ifndef DAEMON_H_
+#define DAEMON_H_
+
+#include <linphonecore.h>
+#include <linphonecore_utils.h>
+#include <mediastreamer2/mediastream.h>
+#include <mediastreamer2/mscommon.h>
+#include <bctoolbox/list.h>
+
+#include <string>
+#include <list>
+#include <queue>
+#include <map>
+#include <sstream>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_READLINE
+#ifdef HAVE_READLINE_H
+#include <readline.h>
+#else
+#ifdef HAVE_READLINE_READLINE_H
+#include <readline/readline.h>
+#endif
+#endif
+#endif
+#ifdef HAVE_HISTORY_H
+#include <history.h>
+#else
+#ifdef HAVE_READLINE_HISTORY_H
+#include <readline/history.h>
+#endif
+#endif
+
+
+class Daemon;
+
+class DaemonCommandExample {
+public:
+	DaemonCommandExample(const char *command, const char *output);
+	~DaemonCommandExample() {}
+	const std::string &getCommand() const {
+		return mCommand;
+	}
+	const std::string &getOutput() const {
+		return mOutput;
+	}
+private:
+	const std::string mCommand;
+	const std::string mOutput;
+};
+
+class DaemonCommand {
+public:
+	virtual ~DaemonCommand() {}
+	virtual void exec(Daemon *app, const char *args)=0;
+	bool matches(const char *name) const;
+	const std::string getHelp() const;
+	const std::string &getProto() const {
+		return mProto;
+	}
+	const std::string &getDescription() const {
+		return mDescription;
+	}
+	const std::list<const DaemonCommandExample*> &getExamples() const {
+		return mExamples;
+	}
+	void addExample(const DaemonCommandExample *example);
+protected:
+	DaemonCommand(const char *name, const char *proto, const char *description);
+	const std::string mName;
+	const std::string mProto;
+	const std::string mDescription;
+	std::list<const DaemonCommandExample*> mExamples;
+};
+
+class Response {
+public:
+	enum Status {
+		Ok, Error
+	};
+	virtual ~Response() {
+	}
+	Response() :
+			mStatus(Ok) {
+	}
+	Response(const char *msg, Status status = Error) :
+			mStatus(status) {
+		if (status == Ok) {
+			mBody = msg;
+		} else {
+			mReason = msg;
+		}
+	}
+	Response(const std::string& msg, Status status = Error):
+		mStatus(status) {
+		if( status == Ok) {
+			mBody = msg;
+		} else {
+			mReason = msg;
+		}
+	}
+
+	void setStatus(Status st) {
+		mStatus = st;
+	}
+	void setReason(const char *reason) {
+		mReason = reason;
+	}
+	void setBody(const char *body) {
+		mBody = body;
+	}
+	const std::string &getBody() const {
+		return mBody;
+	}
+	virtual int toBuf(char *dst, int dstlen) const {
+		int i = 0;
+		i += snprintf(dst + i, dstlen - i, "Status: %s\n", mStatus == Ok ? "Ok" : "Error");
+		if (mReason.size() > 0) {
+			i += snprintf(dst + i, dstlen - i, "Reason: %s\n", mReason.c_str());
+		}
+		if (mBody.size() > 0) {
+			i += snprintf(dst + i, dstlen - i, "\n%s\n", mBody.c_str());
+		}
+		return i;
+	}
+private:
+	Status mStatus;
+	std::string mReason;
+	std::string mBody;
+};
+
+class EventResponse: public Response {
+public:
+	EventResponse(Daemon *daemon, LinphoneCall *call, LinphoneCallState state);
+};
+
+class CallStatsResponse: public Response {
+public:
+	CallStatsResponse(Daemon *daemon, LinphoneCall *call, const LinphoneCallStats *stats, bool unique);
+};
+
+class AudioStreamStatsResponse: public Response {
+public:
+	AudioStreamStatsResponse(Daemon *daemon, AudioStream *stream,
+		const LinphoneCallStats *stats, bool event);
+};
+
+class DtmfResponse: public Response {
+public:
+	DtmfResponse(Daemon *daemon, LinphoneCall *call, int dtmf);
+};
+
+class PayloadTypeResponse: public Response {
+public:
+	PayloadTypeResponse(LinphoneCore *core, const PayloadType *payloadType, int index = -1, const std::string &prefix = std::string(), bool enabled_status = true);
+};
+
+class PayloadTypeParser {
+public:
+	PayloadTypeParser(LinphoneCore *core, const std::string &mime_type, bool accept_all = false);
+	inline bool all() { return mAll; }
+	inline bool successful() { return mSuccesful; }
+	inline PayloadType * getPayloadType()const{
+		return mPayloadType;
+	}
+	inline int getPosition()const{
+		return mPosition;
+	}
+private:
+	bool mAll;
+	bool mSuccesful;
+	PayloadType *mPayloadType;
+	int mPosition;
+};
+
+struct AudioStreamAndOther {
+	AudioStream *stream;
+	OrtpEvQueue *queue;
+	LinphoneCallStats stats;
+	AudioStreamAndOther(AudioStream *as) : stream(as) {
+		queue = ortp_ev_queue_new();
+		rtp_session_register_event_queue(as->ms.sessions.rtp_session, queue);
+		memset(&stats, 0, sizeof(stats));
+	}
+	~AudioStreamAndOther() {
+		rtp_session_unregister_event_queue(stream->ms.sessions.rtp_session, queue);
+		ortp_ev_queue_destroy(queue);
+	}
+};
+
+class Daemon {
+	friend class DaemonCommand;
+public:
+	typedef Response::Status Status;
+	Daemon(const char *config_path, const char *factory_config_path, const char *log_file, const char *pipe_name, bool display_video, bool capture_video);
+	~Daemon();
+	int run();
+	void quit();
+	void sendResponse(const Response &resp);
+	LinphoneCore *getCore();
+	LinphoneSoundDaemon *getLSD();
+	const std::list<DaemonCommand*> &getCommandList() const;
+	LinphoneCall *findCall(int id);
+	LinphoneProxyConfig *findProxy(int id);
+	LinphoneAuthInfo *findAuthInfo(int id);
+	AudioStream *findAudioStream(int id);
+	AudioStreamAndOther *findAudioStreamAndOther(int id);
+	void removeAudioStream(int id);
+	bool pullEvent();
+	int updateCallId(LinphoneCall *call);
+	int updateProxyId(LinphoneProxyConfig *proxy);
+	inline int maxProxyId() { return mProxyIds; }
+	inline int maxAuthInfoId()  { return bctbx_list_size(linphone_core_get_auth_info_list(mLc)); }
+	int updateAudioStreamId(AudioStream *audio_stream);
+	void dumpCommandsHelp();
+	void dumpCommandsHelpHtml();
+	void enableStatsEvents(bool enabled);
+	void enableLSD(bool enabled);
+
+	void setAutoVideo( bool enabled ){ mAutoVideo = enabled; }
+	inline bool autoVideo(){ return mAutoVideo; }
+
+private:
+	static void* iterateThread(void *arg);
+	static void callStateChanged(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState state, const char *msg);
+	static void callStatsUpdated(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallStats *stats);
+	static void dtmfReceived(LinphoneCore *lc, LinphoneCall *call, int dtmf);
+	void callStateChanged(LinphoneCall *call, LinphoneCallState state, const char *msg);
+	void callStatsUpdated(LinphoneCall *call, const LinphoneCallStats *stats);
+	void dtmfReceived(LinphoneCall *call, int dtmf);
+	void execCommand(const char *cl);
+	char *readLine(const char *, bool*);
+	char *readPipe(char *buffer, int buflen);
+	void iterate();
+	void iterateStreamStats();
+	void startThread();
+	void stopThread();
+	void initCommands();
+	void uninitCommands();
+	void iterateStreamStats(LinphoneCore *lc);
+	LinphoneCore *mLc;
+	LinphoneSoundDaemon *mLSD;
+	std::list<DaemonCommand*> mCommands;
+	std::queue<Response*> mEventQueue;
+	int mServerFd;
+	int mChildFd;
+	std::string mHistfile;
+	bool mRunning;
+	bool mUseStatsEvents;
+	FILE *mLogFile;
+	bool mAutoVideo;
+	int mCallIds;
+	int mProxyIds;
+	int mAudioStreamIds;
+	ms_thread_t mThread;
+	ms_mutex_t mMutex;
+	static const int sLineSize = 512;
+	std::map<int, AudioStreamAndOther*> mAudioStreams;
+};
+
+#endif //DAEMON_H_
diff --git a/gtk/.directory b/gtk/.directory
deleted file mode 100644
index 40f7ba528..000000000
--- a/gtk/.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2015,8,9,21,25,40
-Version=3
-ViewMode=2
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 98116bf5d..ae3e0d2d0 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -24,26 +24,27 @@ set(UI_FILES
 	about.ui
 	audio_assistant.ui
 	buddylookup.ui
+	callee_frame.ui
 	call_logs.ui
 	call_statistics.ui
+	chatroom_frame.ui
+	conf_frame.ui
 	config-uri.ui
 	contact.ui
 	dscp_settings.ui
+	in_call_frame.ui
 	keypad.ui
 	ldap.ui
+	login_frame.ui
 	log.ui
 	main.ui
 	parameters.ui
 	password.ui
 	provisioning-fetch.ui
+	setup_wizard.ui
 	sip_account.ui
 	tunnel_config.ui
 	waiting.ui
-	chatroom_frame.ui
-	in_call_frame.ui
-	conf_frame.ui
-	callee_frame.ui
-	login_frame.ui
 )
 
 set(PIXMAPS stock_people.png)
@@ -70,6 +71,7 @@ set(SOURCE_FILES
 	utils.c
 	videowindow.c
 )
+
 if(ENABLE_ASSISTANT)
 	list(APPEND SOURCE_FILES setupwizard.c)
 endif()
@@ -77,18 +79,26 @@ if(WIN32)
 	list(APPEND SOURCE_FILES linphone.rc)
 endif()
 
+set(OBJC_FILES)
+if (APPLE)
+	list(APPEND OBJC_FILES mac.m)
+endif()
+
+apply_compile_flags(OBJC_FILES "CPP" "OBJC")
+apply_compile_flags(SOURCE_FILES "CPP" "C")
+
 if(WIN32)
 	add_executable(linphone-gtk WIN32 ${SOURCE_FILES})
 else()
-	add_executable(linphone-gtk ${SOURCE_FILES})
+	add_executable(linphone-gtk ${SOURCE_FILES} ${OBJC_FILES})
 endif()
 set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone LINKER_LANGUAGE CXX)
 target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS} ${INTL_INCLUDE_DIRS})
-target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES})
+target_link_libraries(linphone-gtk ${LINPHONE_LIBS_FOR_TOOLS} ${GTK2_LIBRARIES} ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
+set_target_properties(linphone-gtk PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 if(INTL_FOUND)
 	target_link_libraries(linphone-gtk ${INTL_LIBRARIES})
 endif()
-
 if(WIN32)
 	target_link_libraries(linphone-gtk Wininet)
 endif()
@@ -96,15 +106,24 @@ if(ENABLE_NOTIFY)
 	target_include_directories(linphone-gtk PUBLIC ${NOTIFY_INCLUDE_DIRS})
 	target_link_libraries(linphone-gtk ${NOTIFY_LIBRARIES})
 endif()
-
-if (HAVE_LIBUDEV_H)
+if(HAVE_LIBUDEV_H)
 	target_link_libraries(linphone-gtk udev)
 endif()
+if(GTKMACINTEGRATION_FOUND)
+	target_include_directories(linphone-gtk PUBLIC ${GTKMACINTEGRATION_INCLUDE_DIRS})
+	target_link_libraries(linphone-gtk ${GTKMACINTEGRATION_LIBRARIES})
+endif()
+if(APPLE)
+	target_link_libraries(linphone-gtk "-framework Cocoa")
+endif()
+
+set_target_properties(linphone-gtk PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
+
 
 install(TARGETS linphone-gtk
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 086d51d61..cbc6ede87 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -20,7 +20,8 @@ UI_FILES=	about.ui \
 		in_call_frame.ui \
 		conf_frame.ui \
 		callee_frame.ui \
-		login_frame.ui
+		login_frame.ui \
+		setup_wizard.ui
 
 PIXMAPS=	\
 		stock_people.png
@@ -60,11 +61,11 @@ linphone_SOURCES=	\
 			audio_assistant.c \
 			videowindow.c \
 			status_icon.c status_icon.h \
-			linphone.h
+			linphone.h regex.h
 
 if BUILD_WIZARD
 linphone_SOURCES+= \
-	setupwizard.c
+	setupwizard.c setupwizard.h
 endif
 
 if BUILD_STATUS_NOTIFIER
@@ -73,8 +74,9 @@ linphone_SOURCES+= \
 	status_notifier.h
 endif
 
+
 linphone_LDADD=	$(top_builddir)/coreapi/liblinphone.la \
-		$(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) $(SQLITE3_LIBS) $(BELLESIP_LIBS)
+		$(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) $(SQLITE3_LIBS) $(BELLESIP_LIBS) $(BCTOOLBOX_LIBS)
 
 
 if BUILD_WIN32
@@ -91,17 +93,21 @@ endif
 uidir=$(datadir)/linphone
 dist_ui_DATA=$(UI_FILES) $(PIXMAPS) $(top_srcdir)/COPYING
 
+if BUILD_MACOS
+linphone_SOURCES+=mac.m
+linphone_LDFLAGS+=-framework Cocoa
+endif
 endif
 
 
-AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ -I$(top_builddir)/coreapi/ \
+AM_CPPFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ -I$(top_builddir)/coreapi/ \
 		$(MEDIASTREAMER_CFLAGS) \
 		$(ORTP_CFLAGS) $(BELLESIP_CFLAGS) \
 		$(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
 		$(TUNNEL_CFLAGS) \
-		$(SQLITE3_CFLAGS)
-
-
+		$(SQLITE3_CFLAGS) \
+		$(BCTOOLBOX_CFLAGS)
+		
 version_date.h: $(top_srcdir)/configure.ac
 	echo "#define LINPHONE_VERSION_DATE \"$(VERSION)-`date +%y%m%d`\"" > $@
 
diff --git a/gtk/audio_assistant.c b/gtk/audio_assistant.c
index a8a71676f..418931bc9 100644
--- a/gtk/audio_assistant.c
+++ b/gtk/audio_assistant.c
@@ -62,13 +62,13 @@ static gboolean deactivate_play_button(void){
 	return FALSE;
 }
 
-static gchar *get_record_file(){
+static gchar *get_record_file(void){
 	char filename[256]={0};
 	char date[64]={0};
 	time_t curtime=time(NULL);
 	struct tm loctime;
 
-	#ifdef WIN32
+	#ifdef _WIN32
 		loctime=*localtime(&curtime);
 	#else
 		localtime_r(&curtime,&loctime);
@@ -211,14 +211,15 @@ static gboolean linphone_gtk_stop_record(gpointer data){
 
 void linphone_gtk_start_record_sound(GtkWidget *w, gpointer data){
 	LinphoneCore *lc = linphone_gtk_get_core();
+	MSFactory *factory = linphone_core_get_ms_factory(lc);
 	AudioStream *stream = NULL;
-	MSSndCardManager *manager = ms_snd_card_manager_get();
+	MSSndCardManager *manager = ms_factory_get_snd_card_manager(factory);
 	gboolean active=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
 	gint timeout_id;
 
 	if(active){
 		gchar *path = get_record_file();
-		stream=audio_stream_new(8888, 8889, FALSE);
+		stream=audio_stream_new(factory, 8888, 8889, FALSE);
 		if(stream != NULL){
 			audio_stream_start_full(stream,&av_profile,"127.0.0.1",8888,"127.0.0.1",8889,0,0,NULL,
 				path,NULL,ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE);
@@ -255,13 +256,14 @@ static void endoffile_cb(void *ud, MSFilter *f, unsigned int ev,void * arg){
 
 void linphone_gtk_start_play_record_sound(GtkWidget *w,gpointer data){
 	LinphoneCore *lc = linphone_gtk_get_core();
+	MSFactory *factory = linphone_core_get_ms_factory(lc);
 	gboolean active=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
 	AudioStream *stream = NULL;
-	MSSndCardManager *manager = ms_snd_card_manager_get();
+	MSSndCardManager *manager = ms_factory_get_snd_card_manager(factory);
 
 	if(active){
 		gchar *path = g_object_get_data(G_OBJECT(audio_assistant),"path");
-		stream=audio_stream_new(8888, 8889, FALSE);
+		stream=audio_stream_new(factory, 8888, 8889, FALSE);
 		if(path != NULL){
 			audio_stream_start_full(stream,&av_profile,"127.0.0.1",8888,"127.0.0.1",8889,0,0,path,
 				NULL,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),NULL,FALSE);
@@ -291,10 +293,10 @@ void display_popup(GtkMessageType type,const gchar *message){
 	gtk_widget_show(dialog);
 }
 
-static void open_mixer(){
+static void open_mixer(void){
 	GError *error = NULL;
 
-#ifdef WIN32
+#ifdef _WIN32
 	if(!g_spawn_command_line_async("control mmsys.cpl",&error)){
 		display_popup(GTK_MESSAGE_WARNING,_("Sound preferences not found "));
 		g_error_free(error);
@@ -320,7 +322,7 @@ static void open_mixer(){
 #endif
 }
 
-static GtkWidget *create_intro(){
+static GtkWidget *create_intro(void){
 	GtkWidget *vbox=gtk_vbox_new(FALSE,2);
 	GtkWidget *label=gtk_label_new(_("Welcome!\nThis assistant will help you to configure audio settings for Linphone"));
 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
@@ -328,7 +330,7 @@ static GtkWidget *create_intro(){
 	return vbox;
 }
 
-static GtkWidget *create_mic_page(){
+static GtkWidget *create_mic_page(void){
 	GtkWidget *vbox=gtk_table_new(3,2,FALSE);
 	LinphoneCore *lc=linphone_gtk_get_core();
 	const char **sound_devices;
@@ -369,7 +371,7 @@ static GtkWidget *create_mic_page(){
 	return vbox;
 }
 
-static GtkWidget *create_speaker_page(){
+static GtkWidget *create_speaker_page(void){
 	GtkWidget *vbox=gtk_table_new(3,2,FALSE);
 	LinphoneCore *lc=linphone_gtk_get_core();
 
@@ -405,7 +407,7 @@ static GtkWidget *create_speaker_page(){
 	return vbox;
 }
 
-static GtkWidget *create_play_record_page(){
+static GtkWidget *create_play_record_page(void){
 	GtkWidget *vbox=gtk_table_new(2,2,FALSE);
 	GtkWidget *labelRecord=gtk_label_new(_("Press the record button and say some words"));
 	GtkWidget *labelPlay=gtk_label_new(_("Listen to your record voice"));
@@ -435,7 +437,7 @@ static GtkWidget *create_play_record_page(){
 	return vbox;
 }
 
-static GtkWidget *create_end_page(){
+static GtkWidget *create_end_page(void){
 	GtkWidget *vbox=gtk_vbox_new(FALSE,2);
 	GtkWidget *label=gtk_label_new(_("Let's start Linphone now"));
 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
@@ -446,14 +448,15 @@ static GtkWidget *create_end_page(){
 static void prepare(GtkAssistant *w){
 	AudioStream *audio_stream = NULL;
 	LinphoneCore *lc=linphone_gtk_get_core();
+	MSFactory *factory = linphone_core_get_ms_factory(lc);
 	int page = gtk_assistant_get_current_page(w);
 	GtkWidget *mic_audiolevel = get_widget_from_assistant("mic_audiolevel");
 	GtkWidget *label_audiolevel = get_widget_from_assistant("label_audiolevel");
 
 	//Speaker page
 	if(page == 1){
-		MSSndCardManager *manager = ms_snd_card_manager_get();
-		audio_stream = audio_stream_start_with_sndcards(&av_profile,9898,"127.0.0.1",19898,0,0,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE);
+		MSSndCardManager *manager =  ms_factory_get_snd_card_manager(factory);
+		audio_stream = audio_stream_start_with_sndcards(factory, &av_profile,9898,"127.0.0.1",19898,0,0,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE);
 		if (mic_audiolevel != NULL && audio_stream != NULL){
 			g_object_set_data(G_OBJECT(audio_assistant),"stream",audio_stream);
 			linphone_gtk_init_audio_meter(mic_audiolevel,(get_volume_t)audio_stream_get_record_volume,audio_stream);
@@ -475,7 +478,7 @@ static void prepare(GtkAssistant *w){
 void linphone_gtk_close_audio_assistant(GtkWidget *w){
 	gchar *path;
 	AudioStream *stream;
-	
+
 	path = g_object_get_data(G_OBJECT(audio_assistant),"path");
 	if(path != NULL){
 		g_unlink(path);
diff --git a/gtk/buddylookup.c b/gtk/buddylookup.c
index 1d41dc82a..1831acb04 100644
--- a/gtk/buddylookup.c
+++ b/gtk/buddylookup.c
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "linphone.h"
 #include "sipsetup.h"
 
-static void linphone_gtk_display_lookup_results(GtkWidget *w, const MSList *results);
+static void linphone_gtk_display_lookup_results(GtkWidget *w, const bctbx_list_t *results);
 
 enum {
 	LOOKUP_RESULT_NAME,
@@ -136,7 +136,7 @@ static gboolean linphone_gtk_process_buddy_lookup(GtkWidget *w){
 	SipSetupContext *ctx;
 	int last_state;
 	gchar *tmp;
-	MSList *results=NULL;
+	bctbx_list_t *results=NULL;
 	GtkProgressBar *pb=GTK_PROGRESS_BAR(linphone_gtk_get_widget(w,"progressbar"));
 	BuddyLookupRequest *req=(BuddyLookupRequest*)g_object_get_data(G_OBJECT(w),"buddylookup_request");
 
@@ -148,7 +148,7 @@ static gboolean linphone_gtk_process_buddy_lookup(GtkWidget *w){
 		return FALSE;
 	}
 	bls=req->status;
-	if (last_state==bls) return TRUE;
+	if (last_state==(int)bls) return TRUE;
 	
 	switch(bls){
 		case BuddyLookupNone:
@@ -177,9 +177,8 @@ static gboolean linphone_gtk_process_buddy_lookup(GtkWidget *w){
 					linphone_gtk_get_widget(w,"search_results"),
 					results);
 			gtk_progress_bar_set_fraction(pb,1);
-			tmp=g_strdup_printf(ngettext("Found %i contact",
-                        "Found %i contacts", ms_list_size(results)),
-                    ms_list_size(results));
+			tmp=g_strdup_printf(ngettext("Found %u contact", "Found %u contacts",
+				(unsigned int)bctbx_list_size(results)), (unsigned int)bctbx_list_size(results));
 			gtk_progress_bar_set_text(pb,tmp);
 			g_free(tmp);
 			sip_setup_context_buddy_lookup_free(ctx,req);
@@ -228,11 +227,11 @@ void linphone_gtk_keyword_changed(GtkEditable *e){
 	g_object_set_data(G_OBJECT(w),"typing_timeout",GINT_TO_POINTER(tid));
 }
 
-static void linphone_gtk_display_lookup_results(GtkWidget *w, const MSList *results){
+static void linphone_gtk_display_lookup_results(GtkWidget *w, const bctbx_list_t *results){
 	GtkTreeStore *store;
 	GtkTreeIter iter;
 	gchar *tmp;
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	store=GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(w)));
 	gtk_tree_store_clear(store);
 	disable_add_buddy_button(gtk_widget_get_toplevel(w));
@@ -283,14 +282,15 @@ void linphone_gtk_add_buddy_from_database(GtkWidget *button){
 		char *name;
 		char *addr;
 		LinphoneFriend *lf;
+		LinphoneCore *lc = linphone_gtk_get_core();
 		int presence=linphone_gtk_get_ui_config_int("use_subscribe_notify",1);
 		gtk_tree_model_get (model, &iter,LOOKUP_RESULT_SIP_URI , &uri,LOOKUP_RESULT_NAME, &name, -1);
 		addr=g_strdup_printf("%s <%s>",name,uri);
 
-		lf=linphone_friend_new_with_address(addr);
+		lf=linphone_core_create_friend_with_address(lc, addr);
 		linphone_friend_set_inc_subscribe_policy(lf,presence ? LinphoneSPAccept : LinphoneSPDeny);
 		linphone_friend_send_subscribe(lf,presence);
-		linphone_core_add_friend(linphone_gtk_get_core(),lf);
+		linphone_core_add_friend(lc, lf);
 		linphone_gtk_show_friends();
 		g_free(addr);
 		g_free(uri);
diff --git a/gtk/calllogs.c b/gtk/calllogs.c
index aa83db99b..98daa9f12 100644
--- a/gtk/calllogs.c
+++ b/gtk/calllogs.c
@@ -18,13 +18,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include "linphone.h"
+#include <bctoolbox/vfs.h>
+
+#define CONFIG_FILE ".linphone-call-history.db"
+
+char *linphone_gtk_call_logs_storage_get_db_file(const char *filename){
+	const int path_max=1024;
+	char *db_file=NULL;
+
+	db_file=(char *)g_malloc(path_max*sizeof(char));
+	if (filename==NULL) filename=CONFIG_FILE;
+	/*try accessing a local file first if exists*/
+	if (bctbx_file_exist(CONFIG_FILE)==0){
+		snprintf(db_file,path_max,"%s",filename);
+	}else{
+#ifdef _WIN32
+		const char *appdata=getenv("APPDATA");
+		if (appdata){
+			snprintf(db_file,path_max,"%s\\%s",appdata,LINPHONE_CONFIG_DIR);
+			CreateDirectory(db_file,NULL);
+			snprintf(db_file,path_max,"%s\\%s\\%s",appdata,LINPHONE_CONFIG_DIR,filename);
+		}
+#else
+		const char *home=getenv("HOME");
+		if (home==NULL) home=".";
+		snprintf(db_file,path_max,"%s/%s",home,filename);
+#endif
+	}
+	return db_file;
+}
 
 static void fill_renderers(GtkTreeView *v){
 	GtkTreeViewColumn *c;
 	GtkCellRenderer *r;
-	r=gtk_cell_renderer_pixbuf_new();
 
-	c=gtk_tree_view_column_new_with_attributes("icon",r,"pixbuf",0,NULL);
+	r=gtk_cell_renderer_pixbuf_new();
+	c=gtk_tree_view_column_new_with_attributes("icon",r,"icon-name",0,NULL);
 	gtk_tree_view_append_column (v,c);
 
 	r=gtk_cell_renderer_text_new ();
@@ -87,7 +116,7 @@ void linphone_gtk_call_log_add_contact(GtkWidget *w){
 			la = linphone_call_log_get_dir(cl)==LinphoneCallIncoming ? linphone_call_log_get_from(cl) : linphone_call_log_get_to(cl);
 			if (la != NULL){
 				char *uri=linphone_address_as_string(la);
-				lf=linphone_friend_new_with_address(uri);
+				lf=linphone_core_create_friend_with_address(linphone_gtk_get_core(), uri);
 				linphone_gtk_show_contact(lf, main_window);
 				ms_free(uri);
 			}
@@ -126,10 +155,11 @@ static void linphone_gtk_call_selected(GtkTreeView *treeview){
 }
 
 static GtkWidget *linphone_gtk_create_call_log_menu(GtkWidget *call_log){
-	GtkWidget *menu=gtk_menu_new();
+	GtkWidget *menu=NULL;
 	GtkWidget *menu_item;
 	gchar *call_label=NULL;
 	gchar *text_label=NULL;
+	gchar *add_contact_label=NULL;
 	gchar *name=NULL;
 	GtkWidget *image;
 	GtkTreeSelection *select;
@@ -148,34 +178,46 @@ static GtkWidget *linphone_gtk_create_call_log_menu(GtkWidget *call_log){
 			name=linphone_address_as_string(la);
 			call_label=g_strdup_printf(_("Call %s"),name);
 			text_label=g_strdup_printf(_("Send text to %s"),name);
+			if (!linphone_gtk_is_friend(linphone_gtk_get_core(), name)) {
+				add_contact_label=g_strdup_printf(_("Add %s to your contact list"),name);
+			}
 			ms_free(name);
+			menu=gtk_menu_new();
 		}
 	}
-	if (call_label){
+	if (menu && call_label){
 		menu_item=gtk_image_menu_item_new_with_label(call_label);
-		image=gtk_image_new_from_stock(GTK_STOCK_NETWORK,GTK_ICON_SIZE_MENU);
+		image=gtk_image_new_from_icon_name("linphone-start-call",GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
 		gtk_widget_show(image);
 		gtk_widget_show(menu_item);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
 		g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_call_selected,call_log);
 	}
-	if (text_label){
+	if (menu && text_label){
 		menu_item=gtk_image_menu_item_new_with_label(text_label);
-		image=gtk_image_new_from_stock(GTK_STOCK_NETWORK,GTK_ICON_SIZE_MENU);
+		image=gtk_image_new_from_icon_name("linphone-start-chat",GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
 		gtk_widget_show(image);
 		gtk_widget_show(menu_item);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
 		g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_call_log_chat_selected,call_log);
 	}
-	menu_item=gtk_image_menu_item_new_from_stock(GTK_STOCK_ADD,NULL);
-	gtk_widget_show(menu_item);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
-	g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_call_log_add_contact,call_log);
-	gtk_widget_show(menu);
-	gtk_menu_attach_to_widget(GTK_MENU(menu),call_log, NULL);
+	if (menu && add_contact_label){
+		menu_item=gtk_image_menu_item_new_with_label(add_contact_label);
+		image=gtk_image_new_from_icon_name("linphone-contact-add",GTK_ICON_SIZE_MENU);
+		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
+		gtk_widget_show(image);
+		gtk_widget_show(menu_item);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
+		g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_call_log_add_contact,call_log);
+	}
+	if (menu) {
+		gtk_widget_show(menu);
+		gtk_menu_attach_to_widget(GTK_MENU(menu),call_log, NULL);
+	}
 
+	if (add_contact_label) g_free(add_contact_label);
 	if (call_label) g_free(call_label);
 	if (text_label) g_free(text_label);
 	return menu;
@@ -183,9 +225,12 @@ static GtkWidget *linphone_gtk_create_call_log_menu(GtkWidget *call_log){
 
 gboolean linphone_gtk_call_log_popup_contact(GtkWidget *list, GdkEventButton *event){
 	GtkWidget *m=linphone_gtk_create_call_log_menu(list);
-	gtk_menu_popup (GTK_MENU (m), NULL, NULL, NULL, NULL,
-                  event ? event->button : 0, event ? event->time : gtk_get_current_event_time());
-	return TRUE;
+	if (m) {
+		gtk_menu_popup (GTK_MENU (m), NULL, NULL, NULL, NULL,
+			event ? event->button : 0, event ? event->time : gtk_get_current_event_time());
+		return TRUE;
+	}
+	return FALSE;
 }
 
 gboolean linphone_gtk_call_log_button_pressed(GtkWidget *widget, GdkEventButton *event){
@@ -195,20 +240,10 @@ gboolean linphone_gtk_call_log_button_pressed(GtkWidget *widget, GdkEventButton
 	return FALSE;
 }
 
-void linphone_gtk_call_log_clear_missed_call(){
-	GtkWidget *mw=linphone_gtk_get_main_window();
-	GtkNotebook *notebook=GTK_NOTEBOOK(linphone_gtk_get_widget(mw,"viewswitch"));
-	GtkWidget *page=gtk_notebook_get_nth_page(notebook,0);
-	GtkWidget *box=gtk_hbox_new(FALSE,0);
-	GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_REFRESH,GTK_ICON_SIZE_MENU);
-	GtkWidget *l;
-	const gchar*text=gtk_label_get_text(GTK_LABEL(linphone_gtk_get_widget(mw,"label3")));
-
-	l=gtk_label_new(text);
-	gtk_box_pack_start(GTK_BOX(box),image,FALSE,FALSE,0);
-	gtk_box_pack_start(GTK_BOX(box),l,FALSE,FALSE,0);
-	gtk_notebook_set_tab_label(notebook,page,box);
-	gtk_widget_show_all(box);
+void linphone_gtk_call_log_clear_missed_call(void){
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *label = linphone_gtk_get_widget(mw, "history_tab_label");
+	gtk_label_set_text(GTK_LABEL(label), _("Recent calls"));
 }
 
 gboolean linphone_gtk_call_log_reset_missed_call(GtkWidget *w, GdkEvent *event,gpointer user_data){
@@ -221,25 +256,10 @@ gboolean linphone_gtk_call_log_reset_missed_call(GtkWidget *w, GdkEvent *event,g
 }
 
 void linphone_gtk_call_log_display_missed_call(int nb){
-	GtkWidget *mw=linphone_gtk_get_main_window();
-	GtkNotebook *notebook=GTK_NOTEBOOK(linphone_gtk_get_widget(mw,"viewswitch"));
-	GtkWidget *page=gtk_notebook_get_nth_page(notebook,0);
-	GtkWidget *ebox=gtk_event_box_new();
-	GtkWidget *box=gtk_hbox_new(FALSE,0);
-	GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_REFRESH,GTK_ICON_SIZE_MENU);
-	GtkWidget *l;
-	gchar *buf;
-
-	buf=g_markup_printf_escaped(_("<b>Recent calls (%i)</b>"),nb);
-	l=gtk_label_new(NULL);
-	gtk_label_set_markup(GTK_LABEL(l),buf);
-	gtk_box_pack_start(GTK_BOX(box),image,FALSE,FALSE,0);
-	gtk_box_pack_start(GTK_BOX(box),l,FALSE,FALSE,0);
-	gtk_container_add(GTK_CONTAINER(ebox),box);
-	gtk_notebook_set_tab_label(notebook,page,ebox);
-	gtk_widget_add_events(ebox,GDK_BUTTON_PRESS_MASK);
-	g_signal_connect(G_OBJECT(ebox),"button_press_event",(GCallback)linphone_gtk_call_log_reset_missed_call,NULL);
-	gtk_widget_show_all(ebox);
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *label = linphone_gtk_get_widget(mw, "history_tab_label");
+	gchar *buf = g_markup_printf_escaped(_("<b>Recent calls (%i)</b>"), nb);
+	gtk_label_set_markup(GTK_LABEL(label), buf);
 }
 
 void linphone_gtk_call_log_update(GtkWidget *w){
@@ -252,7 +272,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 
 	store=(GtkTreeStore*)gtk_tree_view_get_model(v);
 	if (store==NULL){
-		store=gtk_tree_store_new(3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_POINTER,G_TYPE_STRING);
+		store=gtk_tree_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_POINTER,G_TYPE_STRING);
 		gtk_tree_view_set_model(v,GTK_TREE_MODEL(store));
 		g_object_unref(G_OBJECT(store));
 		fill_renderers(GTK_TREE_VIEW(linphone_gtk_get_widget(w,"logs_view")));
@@ -261,8 +281,6 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 		g_signal_connect_swapped(G_OBJECT(select),"changed",(GCallback)call_log_selection_changed,v);
 		g_signal_connect(G_OBJECT(notebook),"focus-tab",(GCallback)linphone_gtk_call_log_reset_missed_call,NULL);
 		g_signal_connect(G_OBJECT(v),"button-press-event",(GCallback)linphone_gtk_call_log_button_pressed,NULL);
-//		gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"call_back_button")),
-//		                     create_pixmap (linphone_gtk_get_ui_config("callback_button","status-green.png")));
 	}
 	nb=linphone_core_get_missed_calls_count(linphone_gtk_get_core());
 	if(nb > 0)
@@ -282,9 +300,9 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 		LinphoneFriend *lf=NULL;
 		int duration=linphone_call_log_get_duration(cl);
 		time_t start_date_time=linphone_call_log_get_start_date(cl);
-		GdkPixbuf *pbuf;
+		const gchar *call_status_icon_name;
 
-#if GLIB_CHECK_VERSION(2,26,0)
+#if GLIB_CHECK_VERSION(2,30,0) // The g_date_time_format function exists since 2.26.0 but the '%c' format is only supported since 2.30.0
 		if (start_date_time){
 			GDateTime *dt=g_date_time_new_from_unix_local(start_date_time);
 			start_date=g_date_time_format(dt,"%c");
@@ -292,13 +310,15 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 		}
 #else
 		start_date=g_strdup(ctime(&start_date_time));
+		if (start_date[strlen(start_date) - 1] == '\n') {
+			start_date[strlen(start_date) - 1] = '\0';
+		}
 #endif
 		lf=linphone_core_get_friend_by_address(linphone_gtk_get_core(),addr);
 		if(lf != NULL){
-			if ((display=linphone_address_get_display_name(linphone_friend_get_address(lf)))) {
-				/*update display name from friend*/
-				linphone_address_set_display_name(la,display);
-			}
+			/*update display name from friend*/
+			display = linphone_friend_get_name(lf);
+			if (display != NULL) linphone_address_set_display_name(la, display);
 		} else {
 			display=linphone_address_get_display_name(la);
 		}
@@ -347,13 +367,13 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 		g_free(seconds);
 		if (start_date) g_free(start_date);
 		gtk_tree_store_append (store,&iter,NULL);
-		pbuf = linphone_call_log_get_dir(cl)==LinphoneCallOutgoing ? create_pixbuf("call_status_outgoing.png") : create_pixbuf("call_status_incoming.png");
+		call_status_icon_name = linphone_call_log_get_dir(cl) == LinphoneCallOutgoing ?
+			"linphone-call-status-outgoing" : "linphone-call-status-incoming";
 		gtk_tree_store_set (store,&iter,
-		               0, pbuf,
+		               0, call_status_icon_name,
 		               1, headtxt,2,cl,-1);
 		gtk_tree_store_append (store,&iter2,&iter);
 		gtk_tree_store_set (store,&iter2,1,logtxt,-1);
-		g_object_unref(pbuf);
 		ms_free(addr);
 		g_free(logtxt);
 		g_free(headtxt);
@@ -396,19 +416,3 @@ void linphone_gtk_call_log_response(GtkWidget *w, guint response_id){
 	g_object_set_data(G_OBJECT(mw),"call_logs",NULL);
 	gtk_widget_destroy(w);
 }
-
-// GtkWidget * linphone_gtk_show_call_logs(void){
-// 	GtkWidget *mw=linphone_gtk_get_main_window();
-// 
-// 	GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(linphone_gtk_get_main_window()),"call_logs");
-// 	if (w==NULL){
-// 		w=linphone_gtk_create_window("call_logs");
-// //		gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"call_back_button")),
-// //		                     create_pixmap (linphone_gtk_get_ui_config("callback_button","status-green.png")));
-// 		g_object_set_data(G_OBJECT(mw),"call_logs",w);
-// 		g_signal_connect(G_OBJECT(w),"response",(GCallback)linphone_gtk_call_log_response,NULL);
-// 		gtk_widget_show(w);
-// 		linphone_gtk_call_log_update(w);
-// 	}else gtk_window_present(GTK_WINDOW(w));
-// 	return w;
-// }
diff --git a/gtk/chat.c b/gtk/chat.c
index cfc987af9..17c15d364 100644
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -18,19 +18,44 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include "linphone.h"
+#include <bctoolbox/vfs.h>
 
 #ifdef HAVE_GTK_OSX
 #include <gtkosxapplication.h>
 #endif
 
-#if defined(WIN32) && !defined(F_OK)
+#if defined(_WIN32) && !defined(F_OK)
 #define F_OK 00 /*visual studio does not define F_OK*/
 #endif
 
-#define NB_MSG_HIST 250
+#define NB_MSG_HIST 250000
 
 #define CONFIG_FILE ".linphone-history.db"
 
+#include "regex.h"
+
+GRegex *uri_regex = NULL;
+
+static void free_uri_regex(void) {
+	if(uri_regex) g_regex_unref(uri_regex);
+}
+
+static const GRegex *get_uri_regex(void) {
+	const gchar *pattern = BC_REGEX_URI;
+	GError *error = NULL;
+	if(uri_regex == NULL) {
+		uri_regex = g_regex_new(pattern, G_REGEX_OPTIMIZE, 0, &error);
+		if(error) {
+			g_warning("Could not parse regex pattern for URIs: %s", error->message);
+			g_error_free(error);
+			uri_regex = NULL;
+			return NULL;
+		}
+		atexit(free_uri_regex);
+	}
+	return uri_regex;
+}
+
 char *linphone_gtk_message_storage_get_db_file(const char *filename){
 	const int path_max=1024;
 	char *db_file=NULL;
@@ -38,10 +63,10 @@ char *linphone_gtk_message_storage_get_db_file(const char *filename){
 	db_file=(char *)g_malloc(path_max*sizeof(char));
 	if (filename==NULL) filename=CONFIG_FILE;
 	/*try accessing a local file first if exists*/
-	if (access(CONFIG_FILE,F_OK)==0){
+	if (bctbx_file_exist(CONFIG_FILE)==0){
 		snprintf(db_file,path_max,"%s",filename);
 	}else{
-#ifdef WIN32
+#ifdef _WIN32
 		const char *appdata=getenv("APPDATA");
 		if (appdata){
 			snprintf(db_file,path_max,"%s\\%s",appdata,LINPHONE_CONFIG_DIR);
@@ -57,6 +82,12 @@ char *linphone_gtk_message_storage_get_db_file(const char *filename){
 	return db_file;
 }
 
+void linphone_gtk_mark_chat_read(LinphoneChatRoom *cr) {
+	linphone_chat_room_mark_as_read(cr);
+#ifdef __APPLE__
+	linphone_gtk_update_badge_count();
+#endif
+}
 
 void linphone_gtk_quit_chatroom(LinphoneChatRoom *cr) {
 	GtkWidget *main_window=linphone_gtk_get_main_window ();
@@ -67,8 +98,7 @@ void linphone_gtk_quit_chatroom(LinphoneChatRoom *cr) {
 
 	g_return_if_fail(w!=NULL);
 	gtk_notebook_remove_page(GTK_NOTEBOOK(nb),gtk_notebook_page_num(GTK_NOTEBOOK(nb),w));
-	linphone_chat_room_mark_as_read(cr);
-	linphone_gtk_friend_list_update_chat_picture();
+	linphone_gtk_mark_chat_read(cr);
 	g_object_set_data(G_OBJECT(friendlist),"chatview",NULL);
 	from=g_object_get_data(G_OBJECT(w),"from_message");
 	if (from){
@@ -89,85 +119,33 @@ const char* get_display_name(const LinphoneAddress *from){
 	return display;
 }
 
-GtkWidget *create_tab_chat_header(LinphoneChatRoom *cr,const LinphoneAddress *uri){
-	GtkWidget *w=gtk_hbox_new (FALSE,0);
-	GtkWidget *i=create_pixmap ("chat.png");
-	GtkWidget *l;
-	GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,GTK_ICON_SIZE_MENU);
-	GtkWidget *b=gtk_button_new();
-
-	gtk_button_set_image(GTK_BUTTON(b),image);
-	gtk_button_set_relief(GTK_BUTTON(b),GTK_RELIEF_NONE);
-	gtk_widget_set_size_request(b,25,20);
-	g_signal_connect_swapped(G_OBJECT(b),"clicked",G_CALLBACK(linphone_gtk_quit_chatroom),cr);
-	l=gtk_label_new(get_display_name(uri));
-	gtk_box_pack_start (GTK_BOX(w),i,FALSE,FALSE,0);
-	gtk_box_pack_start (GTK_BOX(w),l,FALSE,FALSE,0);
-	gtk_box_pack_end(GTK_BOX(w),b,TRUE,TRUE,0);
-	gtk_widget_show_all(w);
-	return w;
+GtkWidget *create_tab_chat_header(LinphoneChatRoom *cr, const LinphoneAddress *uri){
+	GtkWidget *tab_header = linphone_gtk_make_tab_header(get_display_name(uri), "linphone-start-chat", TRUE, G_CALLBACK(linphone_gtk_quit_chatroom), cr);
+	gtk_widget_show_all(tab_header);
+	return tab_header;
 }
 
-void udpate_tab_chat_header(GtkWidget *chat_view,const LinphoneAddress *uri,LinphoneChatRoom *cr){
-	GtkWidget *main_window=linphone_gtk_get_main_window();
-	GtkNotebook *notebook=GTK_NOTEBOOK(linphone_gtk_get_widget(main_window,"viewswitch"));
-	GtkWidget *w=gtk_hbox_new (FALSE,0);
-	GtkWidget *i=create_pixmap ("chat.png");
-	GtkWidget *l;
-	GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,GTK_ICON_SIZE_MENU);
-	GtkWidget *b=gtk_button_new();
-
-	gtk_button_set_image(GTK_BUTTON(b),image);
-	gtk_button_set_relief(GTK_BUTTON(b),GTK_RELIEF_NONE);
-	gtk_widget_set_size_request(b,25,20);
-	g_signal_connect_swapped(G_OBJECT(b),"clicked",G_CALLBACK(linphone_gtk_quit_chatroom),cr);
-	l=gtk_label_new (get_display_name(uri));
-	gtk_box_pack_start (GTK_BOX(w),i,FALSE,FALSE,0);
-	gtk_box_pack_start (GTK_BOX(w),l,FALSE,FALSE,0);
-	gtk_box_pack_end(GTK_BOX(w),b,TRUE,TRUE,0);
-	gtk_notebook_set_tab_label(notebook,chat_view,w);
-	gtk_widget_show_all(w);
+void update_chat_header(GtkNotebook *notebook, GtkWidget *chat_view, LinphoneChatRoom *cr, const LinphoneAddress *uri) {
+	GtkWidget *header = linphone_gtk_make_tab_header(get_display_name(uri), "linphone-start-chat", TRUE, G_CALLBACK(linphone_gtk_quit_chatroom), cr);
+	gtk_widget_show_all(header);
+	gtk_notebook_set_tab_label(notebook, chat_view, header);
 }
 
 static gboolean scroll_to_end(GtkTextView *w){
 	GtkTextBuffer *buffer=gtk_text_view_get_buffer(w);
-	GtkTextMark *mark;
 	GtkTextIter iter;
 	gtk_text_buffer_get_end_iter(buffer,&iter);
-	mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE);
-	gtk_text_view_scroll_mark_onscreen(w,mark);
+	gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (w), &iter, 0.0, FALSE, 0, 0);
 	return FALSE;
 }
 
-static gboolean word_starts_with(const GtkTextIter *word_start, const char *prefix) {
-	gboolean res;
-	gchar *schema = NULL;
-	GtkTextIter end = *word_start;
-	gtk_text_iter_forward_chars(&end, strlen(prefix));
-	schema = gtk_text_iter_get_slice(word_start, &end);
-	res = ( g_strcmp0(schema, prefix) == 0 );
-	g_free(schema);
-	return res;
-}
-
-static gboolean is_space(gunichar ch, gpointer user_data) {
-	return g_unichar_isspace(ch);
-}
-
-static void insert_link_tags(GtkTextBuffer *buffer, const GtkTextIter *begin, const GtkTextIter *end) {
-	GtkTextIter iter = *begin;
-	while(gtk_text_iter_compare(&iter, end) < 0) {
-		if(gtk_text_iter_starts_word(&iter) && (
-				word_starts_with(&iter, "http://") ||
-				word_starts_with(&iter, "https://") ||
-				word_starts_with(&iter, "ftp://") ||
-				word_starts_with(&iter, "ftps://"))) {
-			GtkTextIter uri_begin = iter;
-			if(gtk_text_iter_forward_find_char(&iter, is_space, NULL, end)) {
-				gtk_text_buffer_apply_tag_by_name(buffer, "link", &uri_begin, &iter);
-			}
-		}
-		gtk_text_iter_forward_char(&iter);
+static void write_body(GtkTextBuffer *buffer, GtkTextIter *iter, const gchar *text, gint len, gboolean is_me, gboolean is_link) {
+	const char *me_tag_name = is_me ? "me" : NULL;
+	const char *link_tag_name = is_link ? "link" : NULL;
+	if(me_tag_name) {
+		gtk_text_buffer_insert_with_tags_by_name(buffer, iter, text, len, "body", me_tag_name, link_tag_name, NULL);
+	} else {
+		gtk_text_buffer_insert_with_tags_by_name(buffer, iter, text, len, "body", link_tag_name, NULL);
 	}
 }
 
@@ -175,17 +153,20 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
                  gboolean me,LinphoneChatRoom *cr,LinphoneChatMessage *msg, gboolean hist){
 	GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(w,"textview"));
 	GtkTextBuffer *buffer=gtk_text_view_get_buffer(text);
-	GtkTextIter iter, link_start;
-	GtkTextMark *link_start_mark = NULL;
+	GtkTextIter iter;
 	char *from_str=linphone_address_as_string_uri_only(from);
 	gchar *from_message=(gchar *)g_object_get_data(G_OBJECT(w),"from_message");
 	GHashTable *table=(GHashTable*)g_object_get_data(G_OBJECT(w),"table");
+	const GRegex *uri_regex = get_uri_regex();
+	GMatchInfo *match_info = NULL;
+	const char *message = linphone_chat_message_get_text(msg);
 	time_t t;
 	char buf[80];
 	time_t tnow;
 	struct tm *tm;
 	int tnow_day;
 	int tnow_year;
+	int pos = 0, start, end;
 
 	gtk_text_buffer_get_end_iter(buffer, &iter);
 	if (g_strcmp0(from_message,from_str)!=0){
@@ -199,23 +180,33 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
 	}
 	ms_free(from_str);
 
-	link_start_mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, TRUE);
-	gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, linphone_chat_message_get_text(msg), -1,
-	                                         "body", me ? "me" : NULL, NULL);
-	gtk_text_buffer_insert(buffer,&iter,"\n",-1);
-	gtk_text_buffer_get_iter_at_mark(buffer, &link_start, link_start_mark);
-	insert_link_tags(buffer, &link_start, &iter);
-	gtk_text_buffer_delete_mark(buffer, link_start_mark);
+	if (!message) {
+		const char *external_body_url = linphone_chat_message_get_external_body_url(msg);
+		if (external_body_url) message = external_body_url;
+	}
 
-	t=linphone_chat_message_get_time(msg);
+	// Inserts message body and tags URIs as hypertext links
+	if(message) {
+		g_regex_match(uri_regex, message, 0, &match_info);
+		while(g_match_info_matches(match_info)) {
+			g_match_info_fetch_pos(match_info, 0, &start, &end);
+			if(pos < start) write_body(buffer, &iter, &message[pos], start-pos, me, FALSE);
+			write_body(buffer, &iter, &message[start], end-start, me, TRUE);
+			pos = end;
+			g_match_info_next(match_info, NULL);
+		}
+		if((size_t)pos < strlen(message)) write_body(buffer, &iter, &message[pos], -1, me, FALSE);
+		gtk_text_buffer_insert(buffer,&iter,"\n",-1);
+		g_match_info_free(match_info);
+	}
+
+	g_hash_table_insert(table,GUINT_TO_POINTER(linphone_chat_message_get_storage_id(msg)),GINT_TO_POINTER(gtk_text_iter_get_line(&iter)));
 	switch (linphone_chat_message_get_state (msg)){
 		case LinphoneChatMessageStateInProgress:
-			g_hash_table_insert(table,(gpointer)msg,GINT_TO_POINTER(gtk_text_iter_get_line(&iter)));
-			gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Sending ..",-1,
-												"status", me ? "me" : NULL, NULL);
-			//g_object_set_data(G_OBJECT(w),"table",table);
+			gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,_("Sending..."),-1,"status", me ? "me" : NULL, NULL);
 			break;
 		case LinphoneChatMessageStateDelivered:
+			t=linphone_chat_message_get_time(msg);
 			tnow=time(NULL);
 			tm=localtime(&tnow);
 			tnow_day=tm->tm_yday;
@@ -224,17 +215,15 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
 			if(tnow_day != tm->tm_yday || (tnow_day == tm->tm_yday && tnow_year != tm->tm_year)) {
 				strftime(buf,80,"%a %x, %H:%M",tm);
 			} else {
-				strftime(buf,80,"%H:%M",tm);
+				strftime(buf,80,"%H:%M:%S",tm);
 			}
-			gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,buf,-1,
-	                      "status", me ? "me" : NULL, NULL);
+			gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,buf,-1,"status", me ? "me" : NULL, NULL);
 			break;
-		case  LinphoneChatMessageStateNotDelivered:
-			gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Message not sent",-1,
-	                       "status", me ? "me" : NULL, NULL);
+		case LinphoneChatMessageStateNotDelivered:
+			gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,_("Message not sent"),-1,"status", me ? "me" : NULL, NULL);
+			break;
+		default:
 			break;
-		default : gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Sending ..",-1,
-	                       "status", me ? "me" : NULL, NULL);
 	}
 	gtk_text_buffer_insert(buffer,&iter,"\n",-1);
 	g_idle_add((GSourceFunc)scroll_to_end,text);
@@ -246,52 +235,47 @@ void update_chat_state_message(LinphoneChatMessageState state,LinphoneChatMessag
 	GtkWidget *page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
 	GHashTable *table=(GHashTable*)g_object_get_data(G_OBJECT(page),"table");
 
-	if(page!=NULL){
+	if (page!=NULL) {
+		char buf[80];
+		time_t t;
+		struct tm *tm;
 		GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(page,"textview"));
 		GtkTextBuffer *b=gtk_text_view_get_buffer(text);
 		GtkTextIter iter;
 		GtkTextIter end;
 		GtkTextIter start;
-		gchar *result;
 		gint line;
-		line=GPOINTER_TO_INT(g_hash_table_lookup(table,msg));
-
-		gtk_text_buffer_get_iter_at_line(b,&iter,line);
-		if(gtk_text_iter_get_chars_in_line(&iter) >0) {
-			gtk_text_buffer_get_iter_at_line_offset(b,&start,line,
-					gtk_text_iter_get_chars_in_line(&iter)-1);
-		}else{
-			gtk_text_buffer_get_iter_at_line_offset(b,&start,line,0);
-		}
-		gtk_text_buffer_get_iter_at_line_offset(b,&end,line,0);
-		gtk_text_buffer_delete(b,&start,&end);
-		gtk_text_buffer_get_iter_at_line(b,&iter,line);
-
-		switch (state) {
-			case LinphoneChatMessageStateInProgress:
-				result="Sending ..";
-				break;
-			case LinphoneChatMessageStateDelivered:
-			{
-				time_t t=time(NULL);
-				struct tm *tm=localtime(&t);
-				char buf[80];
-				strftime(buf,80,"%H:%M",tm);
-				result=buf;
-				g_hash_table_remove(table,msg);
-				break;
+		gpointer hash_table_ptr = g_hash_table_lookup(table,GUINT_TO_POINTER(linphone_chat_message_get_storage_id(msg)));
+		if (hash_table_ptr != NULL) {
+			line = GPOINTER_TO_INT(hash_table_ptr);
+			gtk_text_buffer_get_iter_at_line(b,&iter,line);
+			if(gtk_text_iter_get_chars_in_line(&iter) >0) {
+				gtk_text_buffer_get_iter_at_line_offset(b,&start,line,
+						gtk_text_iter_get_chars_in_line(&iter)-1);
+			}else{
+				gtk_text_buffer_get_iter_at_line_offset(b,&start,line,0);
 			}
-			case  LinphoneChatMessageStateNotDelivered:
-			{
-				result="Message not sent";
-				g_hash_table_remove(table,msg);
-				break;
+			gtk_text_buffer_get_iter_at_line_offset(b,&end,line,0);
+			gtk_text_buffer_delete(b,&start,&end);
+			gtk_text_buffer_get_iter_at_line(b,&iter,line);
+
+			switch (state) {
+				case LinphoneChatMessageStateInProgress:
+					gtk_text_buffer_insert_with_tags_by_name(b,&iter,_("Sending..."),-1,"status", "me", NULL);
+					break;
+				case LinphoneChatMessageStateDelivered:
+					t=time(NULL);
+					tm=localtime(&t);
+					strftime(buf,80,"%H:%M:%S",tm);
+					gtk_text_buffer_insert_with_tags_by_name(b,&iter,(gchar*)buf,-1,"status", "me", NULL);
+					break;
+				case LinphoneChatMessageStateNotDelivered:
+					gtk_text_buffer_insert_with_tags_by_name(b,&iter,_("Message not sent"),-1,"status", "me", NULL);
+					break;
+				default:
+					break;
 			}
-			default : result="Sending ..";
 		}
-		gtk_text_buffer_insert_with_tags_by_name(b,&iter,result,-1,
-												"status", "me", NULL);
-		//g_object_set_data(G_OBJECT(page),"table",table);
 	}
 }
 
@@ -306,12 +290,12 @@ void linphone_gtk_compose_text(void) {
 	LinphoneChatRoom *cr=g_object_get_data(G_OBJECT(w),"cr");
 	if (cr) {
 		linphone_chat_room_compose(cr);
-		linphone_chat_room_mark_as_read(cr);
-		linphone_gtk_friend_list_update_chat_picture();
+		linphone_gtk_mark_chat_read(cr);
+		linphone_gtk_friend_list_update_button_display(GTK_TREE_VIEW(friendlist));
 	}
 }
 
-void linphone_gtk_send_text(){
+void linphone_gtk_send_text(void){
 	GtkWidget *main_window=linphone_gtk_get_main_window();
 	GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
 	GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
@@ -322,7 +306,7 @@ void linphone_gtk_send_text(){
 	if (strlen(entered)>0) {
 		LinphoneChatMessage *msg;
 		LinphoneChatMessageCbs *cbs;
-		msg=linphone_chat_room_create_message(cr,entered);
+		msg=linphone_chat_message_ref(linphone_chat_room_create_message(cr,entered));
 		cbs=linphone_chat_message_get_callbacks(msg);
 		linphone_chat_message_cbs_set_msg_state_changed(cbs,on_chat_state_changed);
 		linphone_chat_room_send_chat_message(cr,msg);
@@ -333,6 +317,8 @@ void linphone_gtk_send_text(){
 		g_signal_handlers_disconnect_by_func(G_OBJECT(entry),(GCallback)linphone_gtk_compose_text,NULL);
 		gtk_entry_set_text(GTK_ENTRY(entry),"");
 		g_signal_connect_swapped(G_OBJECT(entry),"changed",(GCallback)linphone_gtk_compose_text,NULL);
+
+		linphone_chat_message_unref(msg);
 	}
 }
 
@@ -340,14 +326,14 @@ static void linphone_gtk_chat_message_destroy(LinphoneChatMessage *msg){
 	linphone_chat_message_destroy(msg);
 }
 
-void linphone_gtk_free_list(MSList *messages){
-	ms_list_for_each(messages,(void (*)(void*))linphone_gtk_chat_message_destroy);
-	ms_list_free(messages);
+void linphone_gtk_free_list(bctbx_list_t *messages){
+	bctbx_list_for_each(messages,(void (*)(void*))linphone_gtk_chat_message_destroy);
+	bctbx_list_free(messages);
 }
 
-void display_history_message(GtkWidget *chat_view,MSList *messages,const LinphoneAddress *with){
+void display_history_message(GtkWidget *chat_view,bctbx_list_t *messages,const LinphoneAddress *with){
 	if (messages != NULL){
-		MSList *it;
+		bctbx_list_t *it;
 		char *from_str;
 		char *with_str;
 		gchar *tmp;
@@ -367,24 +353,25 @@ void display_history_message(GtkWidget *chat_view,MSList *messages,const Linphon
 			g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
 			g_free(tmp);
 		}
-		
+
 		linphone_gtk_free_list(messages);
 	}
 }
 
 static void linphone_gtk_chat_add_contact(const LinphoneAddress *addr){
 	LinphoneFriend *lf=NULL;
+	LinphoneCore *lc = linphone_gtk_get_core();
 	gboolean show_presence=FALSE;
 	char *uri=linphone_address_as_string(addr);
 
-	lf=linphone_friend_new_with_address(uri);
+	lf=linphone_core_create_friend_with_address(lc, uri);
 	ms_free(uri);
 
 	linphone_friend_set_inc_subscribe_policy(lf,LinphoneSPWait);
 	linphone_friend_send_subscribe(lf,show_presence);
 
 	linphone_friend_set_address(lf,addr);
-	linphone_core_add_friend(linphone_gtk_get_core(),lf);
+	linphone_core_add_friend(lc, lf);
 	linphone_gtk_show_friends();
 }
 
@@ -399,11 +386,15 @@ static GdkColor *_linphone_gtk_chatroom_get_link_color(GtkWidget *chatview) {
 	return (GdkColor *)g_value_get_boxed(&color_value);
 }
 
-static gboolean link_event_handler(GtkTextTag *tag, GObject *text_view,GdkEvent *event, GtkTextIter *iter, gpointer user_data) {
+static gboolean link_event_handler(GtkTextTag *tag, GObject *text_view,GdkEvent *event, GtkTextIter *iter, GtkWidget *chat_view) {
 	if(event->type == GDK_BUTTON_PRESS) {
 		GtkTextIter uri_begin = *iter;
 		GtkTextIter uri_end = *iter;
 		gchar *uri = NULL;
+		LinphoneChatRoom *chat_room = (LinphoneChatRoom *)g_object_get_data(G_OBJECT(chat_view), "cr");
+		GtkWidget *main_window = linphone_gtk_get_main_window();
+		GtkWidget *friendlist = linphone_gtk_get_widget(main_window, "contact_list");
+
 		gtk_text_iter_backward_to_tag_toggle(&uri_begin, tag);
 		gtk_text_iter_forward_to_tag_toggle(&uri_end, tag);
 		uri = gtk_text_iter_get_slice(&uri_begin, &uri_end);
@@ -415,6 +406,10 @@ static gboolean link_event_handler(GtkTextTag *tag, GObject *text_view,GdkEvent
 			gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 3, gdk_event_get_time(event));
 		}
 		g_free(uri);
+
+		linphone_gtk_mark_chat_read(chat_room);
+		linphone_gtk_friend_list_update_button_display(GTK_TREE_VIEW(friendlist));
+
 		return TRUE;
 	}
 	return FALSE;
@@ -445,8 +440,8 @@ static gboolean chatroom_event(GtkWidget *widget, GdkEvent *event, gpointer user
 	GtkTextIter iter;
 	if(event->type == GDK_MOTION_NOTIFY) {
 		GdkEventMotion *motion_ev = (GdkEventMotion *)event;
-		wx = motion_ev->x;
-		wy = motion_ev->y;
+		wx = (gint)motion_ev->x;
+		wy = (gint)motion_ev->y;
 		gtk_text_view_window_to_buffer_coords(chatroom, GTK_TEXT_WINDOW_TEXT, wx, wy, &bx, &by);
 		gtk_text_view_get_iter_at_location(chatroom, &iter, bx, by);
 		if(gtk_text_iter_has_tag(&iter, link_tag)) {
@@ -472,6 +467,28 @@ static gboolean copy_uri_into_clipboard_handler(GtkMenuItem *menuitem, gpointer
 	return FALSE;
 }
 
+static void refresh_lime_icon(GtkWidget* chat_view, LinphoneChatRoom*cr) {
+	GtkWidget *lime_icon = linphone_gtk_get_widget(chat_view, "lime_icon");
+	if (linphone_chat_room_lime_available(cr)) {
+		gtk_widget_show(lime_icon);
+	} else {
+		gtk_widget_hide(lime_icon);
+	}
+}
+
+static gint linphone_gtk_window_focused(GtkWidget* widget, GdkEvent *event, gpointer user_data) {
+	// if we are in a chat, mark it as read
+	GtkWidget *main_window=linphone_gtk_get_main_window();
+	GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
+	GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
+	LinphoneChatRoom *cr=w?g_object_get_data(G_OBJECT(w),"cr"):NULL;
+	if (cr) {
+		linphone_gtk_mark_chat_read(cr);
+	}
+	refresh_lime_icon(w, cr);
+	return FALSE;
+}
+
 GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddress *with){
 	GtkWidget *chat_view=linphone_gtk_create_widget("chatroom_frame");
 	GtkWidget *main_window=linphone_gtk_get_main_window();
@@ -483,7 +500,7 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
 	int idx;
 	GtkWidget *button;
 	GtkWidget *entry = linphone_gtk_get_widget(chat_view,"text_entry");
-	MSList *messages;
+	bctbx_list_t *messages;
 	GHashTable *table;
 	GtkTextTag *tmp_tag;
 	GtkWidget *link_ctx_menu = gtk_menu_new();
@@ -532,7 +549,7 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
 		"underline", PANGO_UNDERLINE_SINGLE,
 		"foreground_gdk", _linphone_gtk_chatroom_get_link_color(chat_view),
 		NULL);
-	g_signal_connect(G_OBJECT(tmp_tag), "event", G_CALLBACK(link_event_handler), NULL);
+	g_signal_connect(G_OBJECT(tmp_tag), "event", G_CALLBACK(link_event_handler), chat_view);
 	g_signal_connect(G_OBJECT(text), "event", G_CALLBACK(chatroom_event), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(link_ctx_menu), link_ctx_menu_copy_item);
 	g_signal_connect(G_OBJECT(link_ctx_menu_copy_item), "activate", G_CALLBACK(copy_uri_into_clipboard_handler), NULL);
@@ -548,6 +565,11 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
 	g_signal_connect_swapped(G_OBJECT(entry),"activate",(GCallback)linphone_gtk_send_text,NULL);
 	g_signal_connect_swapped(G_OBJECT(entry),"changed",(GCallback)linphone_gtk_compose_text,NULL);
 	g_signal_connect(G_OBJECT(notebook),"switch_page",(GCallback)linphone_gtk_notebook_tab_select,NULL);
+
+	gtk_signal_connect(GTK_OBJECT(main_window), "focus-in-event", GTK_SIGNAL_FUNC(linphone_gtk_window_focused), NULL);
+
+	refresh_lime_icon(chat_view, cr);
+
 	return chat_view;
 }
 
@@ -558,12 +580,13 @@ LinphoneChatRoom * linphone_gtk_create_chatroom(const LinphoneAddress *with){
 
 void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,GtkWidget *chat_view){
 	GtkWidget *main_window=linphone_gtk_get_main_window ();
+	GtkWidget *notebook = linphone_gtk_get_widget(main_window, "viewswitch");
 	LinphoneChatRoom *cr2=(LinphoneChatRoom *)g_object_get_data(G_OBJECT(chat_view),"cr");
 	const LinphoneAddress *from=linphone_chat_room_get_peer_address(cr2);
 	char *from_str=linphone_address_as_string_uri_only(from);
 	char *uri_str=linphone_address_as_string(uri);
 	char *uri_only=linphone_address_as_string_uri_only(uri);
-	MSList *messages=NULL;
+	bctbx_list_t *messages=NULL;
 
 	if(g_strcmp0(from_str,uri_only)!=0){
 		GtkTextView *text_view=GTK_TEXT_VIEW(linphone_gtk_get_widget(chat_view,"textview"));
@@ -574,7 +597,7 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,
 		text_buffer=gtk_text_view_get_buffer(text_view);
 		gtk_text_buffer_get_bounds(text_buffer, &start, &end);
 		gtk_text_buffer_delete (text_buffer, &start, &end);
-		udpate_tab_chat_header(chat_view,uri,cr);
+		update_chat_header(GTK_NOTEBOOK(notebook), chat_view, cr, uri);
 		g_object_set_data(G_OBJECT(chat_view),"cr",cr);
 		g_object_set_data(G_OBJECT(linphone_gtk_get_widget(main_window,"contact_list")),"chatview",(gpointer)chat_view);
 		messages=linphone_chat_room_get_history(cr,NB_MSG_HIST);
@@ -583,6 +606,8 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,
 		gtk_text_buffer_get_end_iter(text_buffer,&end);
 		gtk_text_view_scroll_to_iter(text_view,&end,0,FALSE,1.0,0);
 	}
+	refresh_lime_icon(chat_view, cr);
+
 	ms_free(from_str);
 	ms_free(uri_str);
 	ms_free(uri_only);
@@ -618,7 +643,7 @@ void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
 		}
 	} else {
 	/* Chat window closed */
-#ifdef MSG_STORAGE_ENABLED
+#ifdef SQLITE_STORAGE_ENABLED
 		send=FALSE;
 #else
 		send=TRUE;
@@ -637,7 +662,7 @@ void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
 #else
 	if ( !gtk_window_is_active ( GTK_WINDOW ( main_window ) ) ) {
 		if ( !GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( w ),"is_notified" ) ) ) {
-			linphone_gtk_notify ( NULL,linphone_chat_message_get_text ( msg ) );
+			linphone_gtk_notify ( NULL, msg, NULL );
 			g_object_set_data ( G_OBJECT ( w ),"is_notified",GINT_TO_POINTER ( TRUE ) );
 		} else {
 			g_object_set_data ( G_OBJECT ( w ),"is_notified",GINT_TO_POINTER ( FALSE ) );
@@ -654,5 +679,7 @@ void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
 }
 
 void linphone_gtk_is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room) {
-	linphone_gtk_friend_list_update_chat_picture();
+	GtkWidget *main_window = linphone_gtk_get_main_window();
+	GtkWidget *friendlist = linphone_gtk_get_widget(main_window, "contact_list");
+	linphone_gtk_friend_list_update_button_display(GTK_TREE_VIEW(friendlist));
 }
diff --git a/gtk/chatroom_frame.ui b/gtk/chatroom_frame.ui
index 8d3b46c4a..d7b8137a3 100644
--- a/gtk/chatroom_frame.ui
+++ b/gtk/chatroom_frame.ui
@@ -37,6 +37,20 @@
           <object class="GtkHBox" id="hbox10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="spacing">10</property>
+            <child>
+              <object class="GtkImage" id="lime_icon">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pixel_size">16</property>
+                <property name="icon_name">linphone-security-ok</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkEntry" id="text_entry">
                 <property name="visible">True</property>
@@ -51,7 +65,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -67,7 +81,7 @@
                       <object class="GtkImage" id="send_picture">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="stock">gtk-ok</property>
+                        <property name="icon_name">linphone-chat-send</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -94,7 +108,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
diff --git a/gtk/conf_frame.ui b/gtk/conf_frame.ui
index 1012efa88..c9503e7f6 100644
--- a/gtk/conf_frame.ui
+++ b/gtk/conf_frame.ui
@@ -43,11 +43,10 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkToggleButton" id="conf_record_button">
-                <property name="label">gtk-media-record</property>
+                <property name="label" translatable="yes">Record</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
                 <signal name="toggled" handler="linphone_gtk_record_call_toggled" swapped="no"/>
               </object>
               <packing>
diff --git a/gtk/conference.c b/gtk/conference.c
index 75a36cbdd..9073d629e 100644
--- a/gtk/conference.c
+++ b/gtk/conference.c
@@ -34,7 +34,7 @@
 
 static GtkWidget *create_conference_label(void){
 	GtkWidget *box=gtk_hbox_new(FALSE,0);
-	gtk_box_pack_start(GTK_BOX(box),gtk_image_new_from_stock(GTK_STOCK_ADD,GTK_ICON_SIZE_MENU),FALSE,FALSE,0);
+	gtk_box_pack_start(GTK_BOX(box),gtk_image_new_from_icon_name("linphone-conference-start",GTK_ICON_SIZE_MENU),FALSE,FALSE,0);
 	gtk_box_pack_end(GTK_BOX(box),gtk_label_new(_("Conference")),TRUE,FALSE,0);
 	gtk_widget_show_all(box);
 	return box;
@@ -84,11 +84,13 @@ static GtkWidget * create_conference_panel(void){
 	GtkWidget *conf_frame=linphone_gtk_create_widget("conf_frame");
 	GtkWidget *conf_box=linphone_gtk_get_widget(conf_frame,"conf_box");
 	GtkWidget *button_conf=linphone_gtk_get_widget(conf_frame,"terminate_conf");
-	GtkWidget *image=create_pixmap("stopcall-small.png");
+	GtkWidget *image=gtk_image_new_from_icon_name("linphone-stop-call", GTK_ICON_SIZE_BUTTON);
 	GtkWidget *box;
 	GtkWidget *viewswitch=linphone_gtk_get_widget(mw,"viewswitch");
 	GtkWidget *participant;
+	GtkWidget *record = linphone_gtk_get_widget(conf_frame, "conf_record_button");
 
+	gtk_button_set_image(GTK_BUTTON(record), gtk_image_new_from_icon_name("linphone-record", GTK_ICON_SIZE_BUTTON));
 	gtk_button_set_image(GTK_BUTTON(button_conf),image);
 	g_signal_connect_swapped(G_OBJECT(button_conf),"clicked",(GCallback)linphone_gtk_terminate_call,NULL);
 	g_object_set_data(G_OBJECT(mw),"conf_frame",(gpointer)conf_frame);
@@ -176,4 +178,6 @@ void linphone_gtk_unset_from_conference(LinphoneCall *call){
 	}
 }
 
-
+bool_t linphone_gtk_call_is_in_conference_view(LinphoneCall *call) {
+	return (find_conferencee_from_call(call) != NULL);
+}
diff --git a/gtk/config-fetching.c b/gtk/config-fetching.c
index 44cc8bc21..6e3dbef91 100644
--- a/gtk/config-fetching.c
+++ b/gtk/config-fetching.c
@@ -36,12 +36,30 @@ void linphone_gtk_config_uri_changed(GtkWidget *button){
 	
 	if (uri && (strlen(uri)==0 || strcmp(uri,"https://")==0)) uri=NULL;
 	
-	linphone_core_set_provisioning_uri(linphone_gtk_get_core(),uri);
-	gtk_widget_destroy(w);
-	
-	if (uri){
-		linphone_gtk_schedule_restart();
-		gtk_main_quit();
+	if(linphone_core_set_provisioning_uri(linphone_gtk_get_core(),uri) == 0) {
+		gtk_widget_destroy(w);
+		if (uri){
+#ifndef _WIN32
+			linphone_gtk_schedule_restart();
+			gtk_main_quit();
+#else
+			GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(linphone_gtk_get_main_window()),
+													   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+													   GTK_MESSAGE_INFO,
+													   GTK_BUTTONS_OK,
+													   _("Remote provisioning URI successfully set. Please restart Linphone in order to load the new remote settings"));
+			g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), dialog);
+			gtk_widget_show(dialog);
+#endif
+		}
+	} else {
+		GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(w),
+								   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+								   GTK_MESSAGE_ERROR,
+								   GTK_BUTTONS_OK,
+								   _("Invalid remote provisioning URI"));
+		g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), dialog);
+		gtk_widget_show(dialog);
 	}
 }
 
diff --git a/gtk/config-uri.ui b/gtk/config-uri.ui
index cc99c40db..26c1fef0e 100644
--- a/gtk/config-uri.ui
+++ b/gtk/config-uri.ui
@@ -19,11 +19,10 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label">gtk-undo</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="linphone_gtk_config_uri_cancel" swapped="no"/>
               </object>
@@ -39,7 +38,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="linphone_gtk_config_uri_changed" swapped="no"/>
               </object>
@@ -77,7 +75,7 @@ Please enter or modify the configuration URI below. After clicking OK, Linphone
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="invisible_char">•</property>
-            <property name="text" translatable="no">https://</property>
+            <property name="text">https://</property>
             <property name="primary_icon_activatable">False</property>
             <property name="secondary_icon_activatable">False</property>
             <property name="primary_icon_sensitive">True</property>
diff --git a/gtk/friendlist.c b/gtk/friendlist.c
index 8564728b1..0e5c2f942 100644
--- a/gtk/friendlist.c
+++ b/gtk/friendlist.c
@@ -17,21 +17,21 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <gtk/gtk.h>
 #include "linphone.h"
+#include <bctoolbox/vfs.h>
+#include <gdk/gdkkeysyms.h>
 
 static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list);
 
 enum{
 	FRIEND_PRESENCE_IMG,
 	FRIEND_NAME,
-	FRIEND_PRESENCE_STATUS,
 	FRIEND_ID,
 	FRIEND_CHATROOM,
 	FRIEND_SIP_ADDRESS,
-	FRIEND_ICON,
-	FRIEND_CALL,
 	FRIEND_CHAT,
+	FRIEND_CALL_BUTTON_VISIBLE,
+	FRIEND_CHAT_BUTTON_VISIBLE,
 	FRIEND_LIST_NCOL
 };
 
@@ -41,88 +41,38 @@ typedef struct _status_picture_tab_t{
 } status_picture_tab_t;
 
 status_picture_tab_t status_picture_tab[]={
-	{	LinphoneStatusOnline,		"status-green.png"	},
-	{	LinphoneStatusBusy,		"status-orange.png"		},
-	{	LinphoneStatusBeRightBack,	"status-orange.png"		},
-	{	LinphoneStatusAway,		"status-orange.png"		},
-	{	LinphoneStatusOnThePhone,	"status-orange.png"		},
-	{	LinphoneStatusOutToLunch,	"status-orange.png"		},
-	{	LinphoneStatusDoNotDisturb,	"status-red.png"	},
-	{	LinphoneStatusMoved,		"status-orange.png"	},
-	{	LinphoneStatusAltService,	"status-orange.png"	},
-	{	LinphoneStatusOffline,	"status-offline.png"		},
-	{	LinphoneStatusPending,	"status-offline.png"		},
-	{	LinphoneStatusEnd,		NULL			},
+	{ LinphoneStatusOnline       , "linphone-status-online"       },
+	{ LinphoneStatusBusy         , "linphone-status-away"         },
+	{ LinphoneStatusBeRightBack  , "linphone-status-away"         },
+	{ LinphoneStatusAway         , "linphone-status-away"         },
+	{ LinphoneStatusOnThePhone   , "linphone-status-away"         },
+	{ LinphoneStatusOutToLunch   , "linphone-status-away"         },
+	{ LinphoneStatusDoNotDisturb , "linphone-status-donotdisturb" },
+	{ LinphoneStatusMoved        , "linphone-status-away"         },
+	{ LinphoneStatusAltService   , "linphone-status-away"         },
+	{ LinphoneStatusOffline      , "linphone-status-offline"      },
+	{ LinphoneStatusPending      , "linphone-status-offline"      },
+	{ LinphoneStatusEnd          , NULL                           }
 };
 
-static GdkPixbuf *create_status_picture(LinphoneOnlineStatus ss){
+static const char *status_to_icon_name(LinphoneOnlineStatus ss) {
 	status_picture_tab_t *t=status_picture_tab;
 	while(t->img!=NULL){
-		if (ss==t->status){
-			GdkPixbuf *pixbuf;
-			pixbuf = create_pixbuf(t->img);
-			return pixbuf;
+		if (ss==t->status) {
+			return t->img;
 		}
 		++t;
 	}
-	g_error("No pixmap defined for status %i",ss);
+	g_error("No icon name defined for status %i",ss);
 	return NULL;
 }
 
-static GdkPixbuf *create_call_picture(){
-	GdkPixbuf *pixbuf;
-	pixbuf = create_pixbuf("call.png");
-	return pixbuf;
+static GtkWidget *create_status_picture(LinphoneOnlineStatus ss, GtkIconSize icon_size){
+	const char *icon_name = status_to_icon_name(ss);
+	if(icon_name) return gtk_image_new_from_icon_name(icon_name, icon_size);
+	else return NULL;
 }
 
-static GdkPixbuf *create_unread_msg(){
-	GdkPixbuf *pixbuf;
-	pixbuf = create_pixbuf("active_chat.png");
-	return pixbuf;
-}
-
-static GdkPixbuf *create_chat_picture(){
-	GdkPixbuf *pixbuf;
-	pixbuf = create_pixbuf("chat.png");
-	return pixbuf;
-}
-
-static GdkPixbuf *create_composing_unread_msg(){
-	GdkPixbuf *pixbuf;
-	pixbuf = create_pixbuf("composing_active_chat.png");
-	return pixbuf;
-}
-
-static GdkPixbuf *create_composing_chat_picture(){
-	GdkPixbuf *pixbuf;
-	pixbuf = create_pixbuf("composing_chat.png");
-	return pixbuf;
-}
-
-/*
-void linphone_gtk_set_friend_status(GtkWidget *friendlist , LinphoneFriend * fid, const gchar *url, const gchar *status, const gchar *img){
-	GtkTreeIter iter;
-	LinphoneFriend *tmp=0;
-
-	GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
-	if (gtk_tree_model_get_iter_first(model,&iter)) {
-		do{
-			gtk_tree_model_get(model,&iter,FRIEND_ID,&tmp,-1);
-			//printf("tmp=%i, fid=%i",tmp,fid);
-			if (fid==tmp) {
-				GdkPixbuf *pixbuf;
-				gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_STATUS,status,-1);
-				pixbuf = create_pixbuf(img);
-				if (pixbuf)
-				{
-					gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_IMG, pixbuf,-1);
-				}
-			}
-		}while(gtk_tree_model_iter_next(model,&iter));
-	}
-}
-*/
-
 gboolean linphone_gtk_friend_list_is_contact(const LinphoneAddress *addr){
 	LinphoneFriend *lf;
 	char *addr_str=linphone_address_as_string(addr);
@@ -139,12 +89,15 @@ static void linphone_gtk_set_selection_to_uri_bar(GtkTreeView *treeview){
 	LinphoneFriend *lf=NULL;
 	gchar* friend;
 	select = gtk_tree_view_get_selection (treeview);
-	if (gtk_tree_selection_get_selected (select, &model, &iter))
-	{
+	if (gtk_tree_selection_get_selected (select, &model, &iter)) {
+		const LinphoneAddress *addr;
 		gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1);
-		friend=linphone_address_as_string(linphone_friend_get_address(lf));
-		gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"uribar")),friend);
-		ms_free(friend);
+		addr = linphone_friend_get_address(lf);
+		if (addr) {
+			friend=linphone_address_as_string(addr);
+			gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"uribar")),friend);
+			ms_free(friend);
+		}
 	}
 }
 
@@ -190,6 +143,64 @@ void linphone_gtk_remove_contact(GtkWidget *button){
 	}
 }
 
+gboolean linphone_gtk_on_key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+
+	if (event->type == GDK_KEY_PRESS && ((GdkEventKey*)event)->state & GDK_CONTROL_MASK) {
+		int cpt;
+		int key = -1;
+		static int key_map[9] = {0};
+		if (key_map[0] == 0) {
+			GdkKeymapKey *keys = NULL;
+			gint n_keys = 0;
+			for (cpt = 0; cpt < 9; cpt++) {
+				if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(),
+					GDK_KEY_1+cpt, &keys, &n_keys))
+					key_map[cpt] = keys->keycode;
+			}
+		}
+
+		for(cpt = 0; cpt < 9 ; cpt++) {
+			if (key_map[cpt] == (((GdkEventKey*)event)->hardware_keycode)) {
+				key = cpt;
+				break;
+			}
+		}
+
+		if (key != -1) {
+			GtkWidget *main_window = linphone_gtk_get_main_window();
+			GtkWidget *friendlist = linphone_gtk_get_widget(main_window,"contact_list");
+			GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
+			GtkTreeIter iter;
+
+			if (gtk_tree_model_get_iter_first(model, &iter)) {
+				int index = 0;
+				LinphoneFriend *lf = NULL;
+				LinphoneChatRoom *cr;
+				do{
+					if (index == key) {
+						const LinphoneAddress *addr;
+						gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
+						gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1);
+						if (lf != NULL) {
+							addr = linphone_friend_get_address(lf);
+							if (addr != NULL) {
+								linphone_gtk_friend_list_set_chat_conversation(addr);
+							}
+						}
+						if (cr != NULL){
+							linphone_gtk_mark_chat_read(cr);
+							linphone_gtk_friend_list_update_button_display(GTK_TREE_VIEW(friendlist));
+						}
+						return TRUE;
+					}
+					index++;
+				}while(gtk_tree_model_iter_next(model,&iter) && index <= 9);
+			}
+		}
+	}
+	return FALSE;
+}
+
 void linphone_gtk_delete_history(GtkWidget *button){
 	GtkWidget *w=linphone_gtk_get_main_window();
 	GtkTreeSelection *select;
@@ -211,16 +222,18 @@ void linphone_gtk_delete_history(GtkWidget *button){
 		if(chat_view!=NULL){
 			const LinphoneAddress *from=linphone_gtk_friend_list_get_active_address();
 			const LinphoneAddress *addr=linphone_friend_get_address(lf);
-			if(linphone_address_weak_equal(from,addr)){
-				GtkTextView *text_view=GTK_TEXT_VIEW(linphone_gtk_get_widget(chat_view,"textview"));
-				GtkTextIter start;
-				GtkTextIter end;
-				GtkTextBuffer *text_buffer;
+			if (addr != NULL) {
+				if(linphone_address_weak_equal(from,addr)){
+					GtkTextView *text_view=GTK_TEXT_VIEW(linphone_gtk_get_widget(chat_view,"textview"));
+					GtkTextIter start;
+					GtkTextIter end;
+					GtkTextBuffer *text_buffer;
 
-				text_buffer=gtk_text_view_get_buffer(text_view);
-				gtk_text_buffer_get_bounds(text_buffer, &start, &end);
-				gtk_text_buffer_delete (text_buffer, &start, &end);
-				g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
+					text_buffer=gtk_text_view_get_buffer(text_view);
+					gtk_text_buffer_get_bounds(text_buffer, &start, &end);
+					gtk_text_buffer_delete (text_buffer, &start, &end);
+					g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
+				}
 			}
 		}
 		linphone_gtk_show_friends();
@@ -233,35 +246,57 @@ static void linphone_gtk_call_selected(GtkTreeView *treeview){
 					"start_call"));
 }
 
-void linphone_gtk_friend_list_update_chat_picture(){
-	GtkTreeIter iter;
-	GtkWidget *w = linphone_gtk_get_main_window();
-	GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list");
-	GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
+void linphone_gtk_friend_list_update_button_display(GtkTreeView *friendlist){
+	GtkTreeIter iter, selected_iter;
+	GtkTreeModel *model=gtk_tree_view_get_model(friendlist);
+	GtkTreeSelection *select=gtk_tree_view_get_selection(friendlist);
 	LinphoneChatRoom *cr=NULL;
-	bool_t is_composing;
+	gboolean is_composing;
 	int nbmsg=0;
+	GtkTreePath *selected_path = NULL;
+	GtkTreePath *hovered_row = (GtkTreePath *)g_object_get_data(G_OBJECT(friendlist), "hovered_row");
+
+	if (gtk_tree_selection_get_selected(select, &model, &selected_iter)){
+		selected_path = gtk_tree_model_get_path(model, &selected_iter);
+	}
+
 	if (gtk_tree_model_get_iter_first(model,&iter)) {
 		do{
-			GdkPixbuf *pbuf = NULL;
+			const char *icon_name = NULL;
+			gboolean show_chat_button = FALSE;
+			gboolean show_call_button = FALSE;
+			GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
+
 			gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
 			nbmsg=linphone_chat_room_get_unread_messages_count(cr);
 			is_composing=linphone_chat_room_is_remote_composing(cr);
 			if(nbmsg != 0){
-				if (is_composing == TRUE)
-					pbuf = create_composing_unread_msg();
-				else
-					pbuf = create_unread_msg();
+				if (is_composing) icon_name = "linphone-chat-new-message-and-writing";
+				else icon_name = "linphone-chat-new-message";
+				show_chat_button = TRUE;
 			} else {
-				if (is_composing == TRUE)
-					pbuf = create_composing_chat_picture();
-				else
-					pbuf = create_chat_picture();
+				if (is_composing) {
+					icon_name = "linphone-chat-writing";
+					show_chat_button = TRUE;
+				} else {
+					icon_name = "linphone-chat-nothing";
+				}
 			}
-			gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,pbuf,-1);
-			if (pbuf) g_object_unref(pbuf);
+
+			if ((selected_path && gtk_tree_path_compare(path, selected_path) == 0)
+					|| (hovered_row && gtk_tree_path_compare(path, hovered_row) == 0)){
+				show_chat_button = TRUE;
+				show_call_button = TRUE;
+			}
+
+			gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,icon_name,
+					FRIEND_CHAT_BUTTON_VISIBLE, show_chat_button, -1);
+			gtk_list_store_set(GTK_LIST_STORE(model), &iter, FRIEND_CALL_BUTTON_VISIBLE, show_call_button, -1);
+
+			gtk_tree_path_free(path);
 		}while(gtk_tree_model_iter_next(model,&iter));
 	}
+	if (selected_path) gtk_tree_path_free(selected_path);
 }
 
 static gboolean grab_focus(GtkWidget *w){
@@ -291,47 +326,43 @@ void linphone_gtk_friend_list_set_chat_conversation(const LinphoneAddress *la){
 	LinphoneFriend *lf=NULL;
 	LinphoneChatRoom *cr=NULL;
 	GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(w,"viewswitch");
+	GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(friendlist));
 
 	lf=linphone_core_find_friend(linphone_gtk_get_core(),la);
 	if(lf==NULL){
 		cr=linphone_gtk_create_chatroom(la);
 		linphone_gtk_friend_list_set_active_address(la);
-		if(chat_view==NULL){
+	} else {
+		store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)));
+		if (gtk_tree_model_get_iter_first(model,&iter)) {
+			do{
+				const LinphoneAddress *addr;
+				gtk_tree_model_get(model, &iter,FRIEND_ID , &lf, -1);
+				addr=linphone_friend_get_address(lf);
+				if (addr != NULL) {
+					if (linphone_address_weak_equal(addr,la)){
+						gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
+						if(cr==NULL){
+							cr=linphone_gtk_create_chatroom(addr);
+							gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
+						}
+						linphone_gtk_friend_list_set_active_address(addr);
+						gtk_tree_selection_select_iter(selection, &iter);
+						break;
+					}
+				}
+			}while(gtk_tree_model_iter_next(model,&iter));
+		}
+	}
+	if(cr) {
+		if(chat_view == NULL){
 			chat_view=linphone_gtk_init_chatroom(cr,la);
 			g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)chat_view);
 		} else {
 			linphone_gtk_load_chatroom(cr,la,chat_view);
 		}
 		gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,chat_view));
-		linphone_gtk_friend_list_update_chat_picture();
 		g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(chat_view,"text_entry"));
-	} else {
-		store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)));
-		if (gtk_tree_model_get_iter_first(model,&iter)) {
-			do{
-				const LinphoneAddress *uri;
-				gtk_tree_model_get(model, &iter,FRIEND_ID , &lf, -1);
-				uri=linphone_friend_get_address(lf);
-				if (linphone_address_weak_equal(uri,la)){
-					gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
-					if(cr==NULL){
-						cr=linphone_gtk_create_chatroom(uri);
-						gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
-					}
-					linphone_gtk_friend_list_set_active_address(uri);
-					if(chat_view==NULL){
-						chat_view=linphone_gtk_init_chatroom(cr,uri);
-						g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)chat_view);
-					} else {
-						linphone_gtk_load_chatroom(cr,uri,chat_view);
-					}
-					gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,chat_view));
-					linphone_gtk_friend_list_update_chat_picture();
-					g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(chat_view,"text_entry"));
-					break;
-				}
-			}while(gtk_tree_model_iter_next(model,&iter));
-		}
 	}
 }
 
@@ -346,7 +377,7 @@ void linphone_gtk_notebook_tab_select(GtkNotebook *notebook,GtkWidget *page,guin
  		if(gtk_notebook_page_num(notebook,page)==gtk_notebook_page_num(notebook,chat_view)){
  			cr=g_object_get_data(G_OBJECT(chat_view),"cr");
  			if(cr!=NULL){
-				linphone_chat_room_mark_as_read(cr);
+				linphone_gtk_mark_chat_read(cr);
  				linphone_gtk_show_friends();
 			}
  		}
@@ -368,47 +399,45 @@ void linphone_gtk_chat_selected(GtkWidget *item){
 	store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(item)));
 	if (gtk_tree_selection_get_selected (select, &model, &iter)){
 		GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(w,"viewswitch");
-		const LinphoneAddress *uri;
+		const LinphoneAddress *addr;
 		gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1);
 		gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
-		uri=linphone_friend_get_address(lf);
-		if(cr==NULL){
-			cr=linphone_gtk_create_chatroom(uri);
-			gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
+		addr=linphone_friend_get_address(lf);
+		if (addr != NULL) {
+			if(cr==NULL){
+				cr=linphone_gtk_create_chatroom(addr);
+				gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
+			}
+			page=GTK_WIDGET(g_object_get_data(G_OBJECT(friendlist),"chatview"));
+			linphone_gtk_friend_list_set_active_address(addr);
+			if(page==NULL){
+				page=linphone_gtk_init_chatroom(cr,addr);
+				g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)page);
+			} else {
+				linphone_gtk_load_chatroom(cr,addr,page);
+			}
+			linphone_gtk_mark_chat_read(cr);
+			gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,page));
+			g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(page,"text_entry"));
 		}
-		page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
-		linphone_gtk_friend_list_set_active_address(uri);
-		if(page==NULL){
-			page=linphone_gtk_init_chatroom(cr,uri);
-			g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)page);
-		} else {
-			linphone_gtk_load_chatroom(cr,uri,page);
-		}
-		linphone_chat_room_mark_as_read(cr);
-		gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,page));
-		linphone_gtk_friend_list_update_chat_picture();
-		g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(page,"text_entry"));
 	}
 }
 
-void linphone_gtk_contact_activated(GtkTreeView     *treeview,
-                                    GtkTreePath     *path,
-                                    GtkTreeViewColumn *column,
-                                        gpointer         user_data)
-{
-	//linphone_gtk_call_selected(treeview);
-}
+void linphone_gtk_contact_clicked(GtkTreeSelection *selection){
+	GtkTreeView *friendlist = gtk_tree_selection_get_tree_view(selection);
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *edit_button = linphone_gtk_get_widget(mw, "edit_button");
+	GtkWidget *remove_button = linphone_gtk_get_widget(mw, "remove_button");
 
-void linphone_gtk_contact_clicked(GtkTreeView     *treeview){
-	linphone_gtk_set_selection_to_uri_bar(treeview);
-	if(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(treeview),"numcol"))==1){
-		linphone_gtk_call_selected(treeview);
+	linphone_gtk_set_selection_to_uri_bar(friendlist);
+	linphone_gtk_friend_list_update_button_display(friendlist);
+	if(gtk_tree_selection_get_selected(selection, NULL, NULL)) {
+		gtk_widget_set_sensitive(edit_button, TRUE);
+		gtk_widget_set_sensitive(remove_button, TRUE);
 	} else {
-		if(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(treeview),"numcol"))==2){
-			linphone_gtk_chat_selected(GTK_WIDGET(treeview));
-		}
+		gtk_widget_set_sensitive(edit_button, FALSE);
+		gtk_widget_set_sensitive(remove_button, FALSE);
 	}
-	g_object_set_data(G_OBJECT(treeview),"numcol",GINT_TO_POINTER(0));
 }
 
 
@@ -424,20 +453,17 @@ void linphone_gtk_remove_button_clicked(GtkWidget *button){
 	linphone_gtk_remove_contact(button);
 }
 
-static GtkWidget * create_presence_menu(){
+static GtkWidget * create_presence_menu(void){
 	GtkWidget *menu=gtk_menu_new();
 	GtkWidget *menu_item;
-	GdkPixbuf *pbuf;
 	status_picture_tab_t *t;
 	for(t=status_picture_tab;t->img!=NULL;++t){
 		if (t->status==LinphoneStatusPending){
 			continue;
 		}
 		menu_item=gtk_image_menu_item_new_with_label(linphone_online_status_to_string(t->status));
-		pbuf=create_status_picture(t->status);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),
-						gtk_image_new_from_pixbuf(pbuf));
-		g_object_unref(G_OBJECT(pbuf));
+				gtk_image_new_from_icon_name(t->img, GTK_ICON_SIZE_LARGE_TOOLBAR));
 		gtk_widget_show(menu_item);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
 		g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_set_my_presence,GINT_TO_POINTER(t->status));
@@ -447,10 +473,9 @@ static GtkWidget * create_presence_menu(){
 
 void linphone_gtk_set_my_presence(LinphoneOnlineStatus ss){
 	GtkWidget *button=linphone_gtk_get_widget(linphone_gtk_get_main_window(),"presence_button");
-	GdkPixbuf *pbuf=create_status_picture(ss);
-	GtkWidget *image=gtk_image_new_from_pixbuf(pbuf);
+	GtkWidget *image=create_status_picture(ss, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	GtkWidget *menu;
-	g_object_unref(G_OBJECT(pbuf));
+
 	gtk_widget_set_tooltip_text(button,linphone_online_status_to_string(ss));
 	gtk_button_set_image(GTK_BUTTON(button),image);
 	/*prepare menu*/
@@ -486,7 +511,7 @@ static void icon_press_handler(GtkEntry *entry){
 		lf=linphone_core_get_friend_by_address(linphone_gtk_get_core(),uri);
 		ms_free(uri);
 		if (lf==NULL)
-			lf=linphone_friend_new();
+			lf=linphone_core_create_friend(linphone_gtk_get_core());
 		if (lf!=NULL){
 			linphone_friend_set_address(lf,addr);
 			linphone_gtk_show_contact(lf, w);
@@ -496,50 +521,31 @@ static void icon_press_handler(GtkEntry *entry){
 }
 
 static void update_star(GtkEntry *entry, gboolean is_known){
-	GdkPixbuf *active,*starred,*unstarred;
-	active=gtk_entry_get_icon_pixbuf(entry,GTK_ENTRY_ICON_SECONDARY);
-	starred=g_object_get_data(G_OBJECT(entry),"starred_icon");
-	unstarred=g_object_get_data(G_OBJECT(entry),"unstarred_icon");
-	if (is_known && (active==unstarred)){
-		gtk_entry_set_icon_from_pixbuf(entry,GTK_ENTRY_ICON_SECONDARY,starred);
+	if (is_known){
+		gtk_entry_set_icon_from_icon_name(entry,GTK_ENTRY_ICON_SECONDARY,NULL);
+		gtk_entry_set_icon_sensitive(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,FALSE);
 		gtk_entry_set_icon_tooltip_text(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,NULL);
-	}else if ((!is_known) && (active==starred)){
+	}else{
+		gtk_entry_set_icon_from_icon_name(entry,GTK_ENTRY_ICON_SECONDARY,"linphone-contact-add");
+		gtk_entry_set_icon_sensitive(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,TRUE);
 		gtk_entry_set_icon_tooltip_text(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,_("Add to addressbook"));
-		gtk_entry_set_icon_from_pixbuf(entry,GTK_ENTRY_ICON_SECONDARY,unstarred);
 	}
 }
 
 static void check_contact(GtkEditable *editable, LinphoneCore *lc){
-	char *tmp=gtk_editable_get_chars(editable,0,-1);
-	if (tmp!=NULL){
-		if (strlen(tmp)>0){
-			LinphoneAddress *addr=linphone_core_interpret_url(lc,tmp);
-			if (addr){
-				char *uri=linphone_address_as_string_uri_only(addr);
-				LinphoneFriend *lf=linphone_core_get_friend_by_address(lc,uri);
-				ms_free(uri);
-				linphone_address_destroy(addr);
-				if (lf) {
-					update_star(GTK_ENTRY(editable),TRUE);
-					g_free(tmp);
-					return;
-				}
-			}
+	bool_t known = TRUE;
+	char *tmp = gtk_editable_get_chars(editable, 0, -1);
+	if (tmp != NULL) {
+		if (strlen(tmp) > 0) {
+			known = linphone_gtk_is_friend(lc, tmp);
 		}
 		g_free(tmp);
 	}
-	update_star(GTK_ENTRY(editable),FALSE);
+	update_star(GTK_ENTRY(editable), known);
 }
 
 static void linphone_gtk_init_bookmark_icon(void){
-	GtkWidget *mw=linphone_gtk_get_main_window();
-	GtkWidget *entry=linphone_gtk_get_widget(mw,"uribar");
-	GdkPixbuf *pbuf=create_pixbuf("contact_unstarred.png");
-	gtk_entry_set_icon_from_pixbuf(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,pbuf);
-	g_object_set_data_full(G_OBJECT(entry),"unstarred_icon",pbuf,g_object_unref);
-	pbuf=create_pixbuf("contact_starred.png");
-	g_object_set_data_full(G_OBJECT(entry),"starred_icon",pbuf,g_object_unref);
-	gtk_entry_set_icon_activatable(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,TRUE);
+	GtkWidget *entry = linphone_gtk_get_widget(linphone_gtk_get_main_window(), "uribar");
 	g_signal_connect(G_OBJECT(entry),"icon-release",(GCallback)icon_press_handler,NULL);
 	g_signal_connect(G_OBJECT(GTK_EDITABLE(entry)),"changed",(GCallback)check_contact,linphone_gtk_get_core());
 }
@@ -581,7 +587,7 @@ static gint friend_sort(GtkTreeModel *model, GtkTreeIter *a,GtkTreeIter *b,gpoin
 	return ret;
 }
 
-static void on_name_column_clicked(GtkTreeModel *model){
+void linphone_gtk_friend_list_on_name_column_clicked(GtkTreeModel *model){
 	GtkSortType st;
 	gint column;
 
@@ -596,8 +602,12 @@ static void on_name_column_clicked(GtkTreeModel *model){
 static int get_friend_weight(const LinphoneFriend *lf){
 	int w=0;
 	LinphoneCore *lc=linphone_gtk_get_core();
-	LinphoneChatRoom *cr=linphone_core_get_chat_room(lc,linphone_friend_get_address(lf));
+	const LinphoneAddress *addr = linphone_friend_get_address(lf);
+	LinphoneChatRoom *cr = NULL;
 
+	if (addr != NULL) {
+		cr = linphone_core_get_chat_room(lc, addr);
+	}
 	if (cr && linphone_chat_room_get_unread_messages_count(cr)>0){
 		w+=2000;
 	}
@@ -618,7 +628,7 @@ static int get_friend_weight(const LinphoneFriend *lf){
 }
 
 static int friend_compare_func(const LinphoneFriend *lf1, const LinphoneFriend *lf2){
-	int w1,w2;
+	int w1,w2,ret;
 	w1=get_friend_weight(lf1);
 	w2=get_friend_weight(lf2);
 	if (w1==w2){
@@ -626,28 +636,38 @@ static int friend_compare_func(const LinphoneFriend *lf1, const LinphoneFriend *
 		const LinphoneAddress *addr1,*addr2;
 		addr1=linphone_friend_get_address(lf1);
 		addr2=linphone_friend_get_address(lf2);
-		u1=linphone_address_get_username(addr1);
-		u2=linphone_address_get_username(addr2);
-		if (u1 && u2) return strcasecmp(u1,u2);
-		if (u1) return 1;
-		else return -1;
-	}
-	return w2-w1;
-}
-
-static MSList *sort_friend_list(const MSList *friends){
-	MSList *ret=NULL;
-	const MSList *elem;
-	LinphoneFriend *lf;
-
-	for(elem=friends;elem!=NULL;elem=elem->next){
-		lf=(LinphoneFriend*)elem->data;
-		ret=ms_list_insert_sorted(ret,lf,(MSCompareFunc)friend_compare_func);
+		if ((addr1 == NULL) && (addr2 == NULL)) return 0;
+		if ((addr1 == NULL) && (addr2 != NULL)) return -1;
+		if ((addr1 != NULL) && (addr2 == NULL)) return 1;
+		u1=linphone_friend_get_name(lf1) ? linphone_friend_get_name(lf1) : linphone_address_get_display_name(addr1) ? linphone_address_get_display_name(addr1) : linphone_address_get_username(addr1);
+		u2=linphone_friend_get_name(lf2) ? linphone_friend_get_name(lf2) :linphone_address_get_display_name(addr2) ? linphone_address_get_display_name(addr2) : linphone_address_get_username(addr2);
+		if (u1 && u2) {
+			ret = strcasecmp(u1,u2);
+		} else if (u1) {
+			ret = 1;
+		} else {
+			ret = -1;
+		}
+	} else {
+		ret = w2-w1;
 	}
 	return ret;
 }
 
-static void on_presence_column_clicked(GtkTreeModel *model){
+static bctbx_list_t *sort_friend_list(const bctbx_list_t *friends){
+	bctbx_list_t *ret=NULL;
+	const bctbx_list_t *elem;
+	LinphoneFriend *lf;
+
+	for(elem=friends;elem!=NULL;elem=elem->next){
+		lf=(LinphoneFriend*)elem->data;
+		ret=bctbx_list_insert_sorted(ret,lf,(bctbx_compare_func)friend_compare_func);
+	}
+	return ret;
+}
+
+#if 0
+void linphone_gtk_friend_list_on_presence_column_clicked(GtkTreeModel *model){
 	GtkSortType st;
 	gint column;
 
@@ -658,87 +678,19 @@ static void on_presence_column_clicked(GtkTreeModel *model){
 	}else st=GTK_SORT_ASCENDING;
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),FRIEND_ID,st);
 }
-
-void create_button(){
-	GtkWidget *main_window = linphone_gtk_get_main_window ();
-	GtkWidget *button_add = linphone_gtk_get_widget(main_window,"add_button");
-	GtkWidget *image;
-
-	image=gtk_image_new_from_stock(GTK_STOCK_ADD,GTK_ICON_SIZE_MENU);
-	gtk_container_add (GTK_CONTAINER (button_add), image);
-}
-
-static void linphone_gtk_friend_list_init(GtkWidget *friendlist){
-	GtkListStore *store;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-	GtkTreeSelection *select;
-
-	linphone_gtk_init_bookmark_icon();
-
-	store = gtk_list_store_new(FRIEND_LIST_NCOL,GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,  G_TYPE_POINTER,
-								G_TYPE_POINTER, G_TYPE_STRING, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF);
-
-	gtk_tree_view_set_model(GTK_TREE_VIEW(friendlist),GTK_TREE_MODEL(store));
-	g_object_unref(G_OBJECT(store));
-
-	/* Tree specification*/
-	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(friendlist),FALSE);
-	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(friendlist),friend_search_func,NULL,NULL);
-	gtk_tree_view_set_search_column(GTK_TREE_VIEW(friendlist),FRIEND_NAME);
-	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store),FRIEND_NAME,friend_sort,NULL,NULL);
-
-	/*Name and presence column*/
-	renderer = gtk_cell_renderer_text_new ();
-	column = gtk_tree_view_column_new_with_attributes (_("Presence status"),
-                                                   renderer,
-                                                   "text", FRIEND_PRESENCE_STATUS,
-                                                   NULL);
-	g_object_set (G_OBJECT(column), "resizable", TRUE, NULL);
-	g_signal_connect_swapped(G_OBJECT(column),"clicked",(GCallback)on_presence_column_clicked,GTK_TREE_MODEL(store));
-	gtk_tree_view_column_set_clickable(column,TRUE);
-	gtk_tree_view_column_set_visible(column,linphone_gtk_get_ui_config_int("friendlist_status",1));
-	gtk_tree_view_column_set_min_width(column,50);
-
-	renderer = gtk_cell_renderer_pixbuf_new();
-	gtk_tree_view_column_pack_start(column,renderer,TRUE);
-	gtk_tree_view_column_add_attribute  (column,renderer,
-                                                         "pixbuf",
-                                                         FRIEND_PRESENCE_IMG);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column);
-
-	renderer = gtk_cell_renderer_text_new ();
-	column = gtk_tree_view_column_new_with_attributes (_("Name"),
-                                                   renderer,
-                                                   "text", FRIEND_NAME,NULL);
-	g_object_set (G_OBJECT(column), "resizable", TRUE, NULL);
-	g_signal_connect_swapped(G_OBJECT(column),"clicked",(GCallback)on_name_column_clicked,GTK_TREE_MODEL(store));
-	gtk_tree_view_column_set_clickable(column,TRUE);
-	gtk_tree_view_column_set_expand(column,TRUE);
-	gtk_tree_view_column_set_max_width(column,60);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column);
-
-	/* Call column*/
-	renderer = gtk_cell_renderer_pixbuf_new();
-	column = gtk_tree_view_column_new_with_attributes (_("Call"),renderer,"pixbuf",FRIEND_CALL,NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column);
-
-	/* Chat column*/
-	renderer = gtk_cell_renderer_pixbuf_new();
-	column = gtk_tree_view_column_new_with_attributes (_("Chat"),renderer,"pixbuf",FRIEND_CHAT,NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column);
-
-	select = gtk_tree_view_get_selection (GTK_TREE_VIEW (friendlist));
-	gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
-
-	gtk_tree_view_set_grid_lines(GTK_TREE_VIEW(friendlist),GTK_TREE_VIEW_GRID_LINES_NONE);
-#if GTK_CHECK_VERSION(2,12,0)
-	gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(friendlist),FRIEND_SIP_ADDRESS);
 #endif
 
-	gtk_widget_set_size_request(friendlist,200,120);
-	/*gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(
-					gtk_widget_get_toplevel(friendlist),"show_category")),0);*/
+static void linphone_gtk_friend_list_init(GtkWidget *friendlist){
+	GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
+	GtkTreeSelection *select = gtk_tree_view_get_selection (GTK_TREE_VIEW (friendlist));
+
+	linphone_gtk_init_bookmark_icon();
+	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(friendlist),friend_search_func,NULL,NULL);
+	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store),FRIEND_NAME,friend_sort,NULL,NULL);
+	gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
+	g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(linphone_gtk_contact_clicked), NULL);
+
+	g_object_set_data(G_OBJECT(friendlist), "friendlist_initialized", (gpointer)TRUE);
 }
 
 void linphone_gtk_show_directory_search(void){
@@ -747,7 +699,7 @@ void linphone_gtk_show_directory_search(void){
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	GtkWidget *search_box=linphone_gtk_get_widget(mw,"directory_search_box");
 
-	linphone_core_get_default_proxy(linphone_gtk_get_core(),&cfg);
+	cfg = linphone_core_get_default_proxy_config(linphone_gtk_get_core());
 	if (cfg){
 		ssc=linphone_proxy_config_get_sip_setup_context(cfg);
 		if (ssc!=NULL && sip_setup_context_get_capabilities(ssc) & SIP_SETUP_CAP_BUDDY_LOOKUP){
@@ -784,7 +736,7 @@ gboolean linphone_gtk_directory_search_focus_in(GtkWidget *entry){
 void linphone_gtk_directory_search_activate(GtkWidget *entry){
 	LinphoneProxyConfig *cfg;
 	GtkWidget *w;
-	linphone_core_get_default_proxy(linphone_gtk_get_core(),&cfg);
+	cfg = linphone_core_get_default_proxy_config(linphone_gtk_get_core());
 	w=linphone_gtk_show_buddy_lookup_window(linphone_proxy_config_get_sip_setup_context(cfg));
 	if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry),"active"))==1)
 		linphone_gtk_buddy_lookup_set_keyword(w,gtk_entry_get_text(GTK_ENTRY(entry)));
@@ -800,106 +752,82 @@ void linphone_gtk_show_friends(void){
 	GtkWidget *friendlist=linphone_gtk_get_widget(mw,"contact_list");
 	GtkListStore *store=NULL;
 	GtkTreeIter iter;
-	const MSList *itf;
-	//GtkWidget *filter=linphone_gtk_get_widget(mw,"search_bar");
+	const bctbx_list_t *itf;
 	LinphoneCore *core=linphone_gtk_get_core();
-	//const gchar *search=NULL;
-	//gboolean lookup=FALSE;
-	MSList *sorted;
+	bctbx_list_t *sorted;
 	LinphoneChatRoom *cr=NULL;
 
 	linphone_gtk_show_directory_search();
-	if (gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))==NULL){
+	if (!g_object_get_data(G_OBJECT(friendlist), "friendlist_initialized")) {
 		linphone_gtk_friend_list_init(friendlist);
 	}
 
 	store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)));
 	gtk_list_store_clear(store);
 
-	//search=gtk_entry_get_text(GTK_ENTRY(filter));
-	//if (search==NULL || search[0]=='\0')
-	//	lookup=FALSE;
-	//else lookup=TRUE;
-
 	sorted=sort_friend_list(linphone_core_get_friend_list(core));
 
-	for(itf=sorted;itf!=NULL;itf=ms_list_next(itf)){
+	for(itf=sorted;itf!=NULL;itf=bctbx_list_next(itf)){
 		LinphoneFriend *lf=(LinphoneFriend*)itf->data;
-		const LinphoneAddress *f_uri=linphone_friend_get_address(lf);
-		char *uri=linphone_address_as_string(f_uri);
-		const char *name=linphone_address_get_display_name(f_uri);
+		const LinphoneAddress *f_addr=linphone_friend_get_address(lf);
+		const char *name=linphone_friend_get_name(lf);
+		char *uri = NULL;
 		const char *display=name;
 		char *escaped=NULL;
-		//char buf[26]={0};
 		int nbmsg=0;
-		GdkPixbuf *pbuf, *pbuf2, *pbuf3;
 
-		/*if (lookup){
-			if (strstr(uri,search)==NULL){
-				ms_free(uri);
-				continue;
-			}
-		}*/
 		//BuddyInfo *bi;
 		gboolean send_subscribe=linphone_friend_get_send_subscribe(lf);
-		if (name==NULL || name[0]=='\0') {
-			display=linphone_address_get_username(f_uri);
+		if (f_addr != NULL) uri = linphone_address_as_string(f_addr);
+		if ((display==NULL || display[0]=='\0') && (f_addr != NULL)) {
+			display=linphone_address_get_username(f_addr);
 		}
 		gtk_list_store_append(store,&iter);
-		pbuf = create_chat_picture();
-		pbuf2 = create_call_picture();
-		pbuf3 = send_subscribe ? create_status_picture(linphone_friend_get_status(lf)) : NULL;
 		gtk_list_store_set(store,&iter,FRIEND_NAME, display,FRIEND_ID,lf,
-			    FRIEND_PRESENCE_IMG, pbuf3,
-				FRIEND_CHAT,pbuf,FRIEND_CALL,pbuf2,-1);
-		g_object_unref(pbuf);
-		g_object_unref(pbuf2);
-		if (pbuf3) g_object_unref(pbuf3);
-		cr=linphone_gtk_create_chatroom(f_uri);
-		gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
-		nbmsg=linphone_chat_room_get_unread_messages_count(cr);
-		if(nbmsg != 0){
-			pbuf = create_unread_msg();
-			gtk_list_store_set(store,&iter,FRIEND_CHAT,pbuf,-1);
-			g_object_unref(pbuf);
-		}
-		escaped=g_markup_escape_text(uri,-1);
-		gtk_list_store_set(store,&iter,FRIEND_SIP_ADDRESS,escaped,-1);
-		g_free(escaped);
-		//bi=linphone_friend_get_info(lf);
-		/*if (bi!=NULL && bi->image_data!=NULL){
-			GdkPixbuf *pbuf=
-				_gdk_pixbuf_new_from_memory_at_scale(bi->image_data,bi->image_length,-1,40,TRUE);
-			if (pbuf) {
-				//gtk_list_store_set(store,&iter,FRIEND_ICON,pbuf,-1);
-				g_object_unref(G_OBJECT(pbuf));
+				FRIEND_PRESENCE_IMG, send_subscribe ? status_to_icon_name(linphone_friend_get_status(lf)) : NULL,
+				FRIEND_CHAT,"linphone-chat-nothing", -1);
+
+		if (f_addr != NULL) {
+			cr=linphone_gtk_create_chatroom(f_addr);
+			gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
+			nbmsg=linphone_chat_room_get_unread_messages_count(cr);
+			if(nbmsg != 0){
+				gtk_list_store_set(store,&iter,FRIEND_CHAT,"linphone-chat-new-message",
+						FRIEND_CHAT_BUTTON_VISIBLE, TRUE, -1);
 			}
-		}*/
-		ms_free(uri);
+			escaped=g_markup_escape_text(uri,-1);
+			gtk_list_store_set(store,&iter,FRIEND_SIP_ADDRESS,escaped,-1);
+			g_free(escaped);
+			ms_free(uri);
+		}
 	}
-	ms_list_free(sorted);
+	bctbx_list_free(sorted);
 }
 
 void linphone_gtk_show_contact(LinphoneFriend *lf, GtkWidget *parent){
-	GtkWidget *w=linphone_gtk_create_window("contact", parent);
+	GtkWidget *w = linphone_gtk_create_window("contact", parent);
 	char *uri;
-	const char *name;
-	const LinphoneAddress *f_uri=linphone_friend_get_address(lf);
-	uri=linphone_address_as_string_uri_only(f_uri);
-	name=linphone_address_get_display_name(f_uri);
-	if (uri) {
-		gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"sip_address")),uri);
-		ms_free(uri);
+	const char *name = linphone_friend_get_name(lf);
+	const LinphoneAddress *f_addr = linphone_friend_get_address(lf);
+
+	if (f_addr != NULL) {
+		uri=linphone_address_as_string_uri_only(f_addr);
+		if (uri) {
+			gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"sip_address")),uri);
+			ms_free(uri);
+		}
 	}
+
 	if (name){
 		gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"name")),name);
 	}
+
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"show_presence")),
 					linphone_friend_get_send_subscribe(lf));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"allow_presence")),
 					linphone_friend_get_inc_subscribe_policy(lf)==LinphoneSPAccept);
 	g_object_set_data(G_OBJECT(w),"friend_ref",(gpointer)lf);
-	
+
 	gtk_widget_show(w);
 }
 
@@ -915,7 +843,7 @@ void linphone_gtk_contact_ok(GtkWidget *button){
 	const gchar *name,*uri;
 	LinphoneAddress* friend_address;
 	if (lf==NULL){
-		lf=linphone_friend_new();
+		lf=linphone_core_create_friend(linphone_gtk_get_core());
 		if (linphone_gtk_get_ui_config_int("use_subscribe_notify",1)==1){
 			show_presence=FALSE;
 			allow_presence=FALSE;
@@ -937,9 +865,8 @@ void linphone_gtk_contact_ok(GtkWidget *button){
 		return ;
 	}
 
-	linphone_address_set_display_name(friend_address,name);
-	linphone_friend_set_name(lf,name);
 	linphone_friend_set_address(lf,friend_address);
+	linphone_friend_set_name(lf,name);
 	linphone_friend_send_subscribe(lf,show_presence);
 	linphone_friend_set_inc_subscribe_policy(lf,allow_presence==TRUE ? LinphoneSPAccept : LinphoneSPDeny);
 	if (linphone_friend_in_list(lf)) {
@@ -960,11 +887,10 @@ void linphone_gtk_contact_ok(GtkWidget *button){
 static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
 	GtkWidget *menu=gtk_menu_new();
 	GtkWidget *menu_item;
-	gchar *call_label=NULL;
-	gchar *text_label=NULL;
 	gchar *edit_label=NULL;
 	gchar *delete_label=NULL;
 	gchar *delete_hist_label=NULL;
+	gchar *add_contact_label=NULL;
 	gchar *name=NULL;
 	GtkTreeSelection *select;
 	GtkTreeIter iter;
@@ -973,44 +899,27 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
 	LinphoneCore *lc=linphone_gtk_get_core();
 	LinphoneProxyConfig *cfg=NULL;
 	SipSetupContext * ssc=NULL;
+	bool_t show_menu_separator=FALSE;
 
-	linphone_core_get_default_proxy(lc,&cfg);
+	cfg = linphone_core_get_default_proxy_config(lc);
 	if (cfg){
 		ssc=linphone_proxy_config_get_sip_setup_context(cfg);
 	}
 
 	g_signal_connect(G_OBJECT(menu), "selection-done", G_CALLBACK (gtk_widget_destroy), NULL);
 	select = gtk_tree_view_get_selection(GTK_TREE_VIEW(contact_list));
+	add_contact_label=g_strdup_printf(_("Add a new contact"));
 	if (gtk_tree_selection_get_selected (select, &model, &iter)){
 		gtk_tree_model_get(model, &iter,FRIEND_NAME , &name, -1);
-		call_label=g_strdup_printf(_("Call %s"),name);
-		text_label=g_strdup_printf(_("Send text to %s"),name);
 		edit_label=g_strdup_printf(_("Edit contact '%s'"),name);
 		delete_label=g_strdup_printf(_("Delete contact '%s'"),name);
 		delete_hist_label=g_strdup_printf(_("Delete chat history of '%s'"),name);
 		g_free(name);
-	}
-	if (call_label){
-		menu_item=gtk_image_menu_item_new_with_label(call_label);
-		image=gtk_image_new_from_stock(GTK_STOCK_NETWORK,GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
-		gtk_widget_show(image);
-		gtk_widget_show(menu_item);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
-		g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_call_selected,contact_list);
-	}
-	if (text_label){
-		menu_item=gtk_image_menu_item_new_with_label(text_label);
-		image=gtk_image_new_from_stock(GTK_STOCK_NETWORK,GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
-		gtk_widget_show(image);
-		gtk_widget_show(menu_item);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
-		g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_chat_selected,contact_list);
+		show_menu_separator=TRUE;
 	}
 	if (edit_label){
 		menu_item=gtk_image_menu_item_new_with_label(edit_label);
-		image=gtk_image_new_from_stock(GTK_STOCK_EDIT,GTK_ICON_SIZE_MENU);
+		image=gtk_image_new_from_icon_name("linphone-edit",GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
 		gtk_widget_show(image);
 		gtk_widget_show(menu_item);
@@ -1019,7 +928,7 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
 	}
 	if (delete_label){
 		menu_item=gtk_image_menu_item_new_with_label(delete_label);
-		image=gtk_image_new_from_stock(GTK_STOCK_DELETE,GTK_ICON_SIZE_MENU);
+		image=gtk_image_new_from_icon_name("linphone-delete",GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
 		gtk_widget_show(image);
 		gtk_widget_show(menu_item);
@@ -1028,8 +937,11 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
 	}
 
 	if (delete_hist_label){
+		GtkWidget *menu_item_separator=gtk_separator_menu_item_new();
+		gtk_widget_show(menu_item_separator);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_separator);
 		menu_item=gtk_image_menu_item_new_with_label(delete_hist_label);
-		image=gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_MENU);
+		image=gtk_image_new_from_icon_name("linphone-delete",GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
 		gtk_widget_show(image);
 		gtk_widget_show(menu_item);
@@ -1041,24 +953,31 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
 		gchar *tmp=g_strdup_printf(_("Add new contact from %s directory"),linphone_proxy_config_get_domain(cfg));
 		menu_item=gtk_image_menu_item_new_with_label(tmp);
 		g_free(tmp);
-		image=gtk_image_new_from_stock(GTK_STOCK_ADD,GTK_ICON_SIZE_MENU);
+		image=gtk_image_new_from_icon_name("linphone-contact-add",GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
 		gtk_widget_show(image);
 		gtk_widget_show(menu_item);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
 		g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_show_buddy_lookup_window,ssc);
-		gtk_widget_show(menu);
 	}
 
-	menu_item=gtk_image_menu_item_new_from_stock(GTK_STOCK_ADD,NULL);
+	if (show_menu_separator) {
+		GtkWidget *menu_item_separator=gtk_separator_menu_item_new();
+		gtk_widget_show(menu_item_separator);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_separator);
+	}
+
+	menu_item=gtk_image_menu_item_new_with_label(add_contact_label);
+	image=gtk_image_new_from_icon_name("linphone-contact-add",GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
+	gtk_widget_show(image);
 	gtk_widget_show(menu_item);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
 	g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_add_contact,contact_list);
 	gtk_widget_show(menu);
 	gtk_menu_attach_to_widget (GTK_MENU (menu), contact_list, NULL);
 
-	if (call_label) g_free(call_label);
-	if (text_label) g_free(text_label);
+	g_free(add_contact_label);
 	if (edit_label) g_free(edit_label);
 	if (delete_label) g_free(delete_label);
 	return menu;
@@ -1071,61 +990,115 @@ gboolean linphone_gtk_popup_contact_menu(GtkWidget *list, GdkEventButton *event)
 	return TRUE;
 }
 
-gint get_col_number_from_tree_view_column (GtkTreeViewColumn *col){
-	GList *cols;
-	gint   num;
-	g_return_val_if_fail ( col != NULL, -1 );
-	g_return_val_if_fail ( col->tree_view != NULL, -1 );
-	cols = gtk_tree_view_get_columns(GTK_TREE_VIEW(col->tree_view));
-	num = g_list_index(cols, (gpointer) col);
-	g_list_free(cols);
-
-	return num;
+static int get_column_index(GtkTreeView *friendlist, const GtkTreeViewColumn *column) {
+	GList *columns = gtk_tree_view_get_columns(friendlist);
+	int i = g_list_index(columns, column);
+	g_list_free(columns);
+	return i;
 }
 
-static gint tree_view_get_cell_from_pos(GtkTreeView *view, guint x, guint y){
-	GtkTreeViewColumn *col = NULL;
-	GList *node, *columns;
-	gint colx = 0;
+static void select_row(GtkTreeView *treeview, GtkTreePath *path) {
+	GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
+	gtk_tree_selection_select_path(selection, path);
+}
+
+gboolean linphone_gtk_contact_list_button_pressed(GtkTreeView *friendlist, GdkEventButton *event){
+	/* Ignore double-clicks and triple-clicks */
+	gboolean ret = FALSE;
+	int x_bin, y_bin;
 	GtkTreePath *path;
-	GtkTreeViewDropPosition pos;
+	GtkTreeViewColumn *column;
+	GtkTreeSelection *selection = gtk_tree_view_get_selection(friendlist);
 
-	g_return_val_if_fail ( view != NULL, 0 );
-	columns = gtk_tree_view_get_columns(view);
+	gtk_tree_view_convert_widget_to_bin_window_coords(friendlist, (gint)event->x, (gint)event->y, &x_bin, &y_bin);
+	gtk_tree_view_get_path_at_pos(friendlist, x_bin, y_bin, &path, &column, NULL, NULL);
 
-	gtk_tree_view_get_dest_row_at_pos(view,x,y,&path,&pos);
-	if(path != NULL){
-		for (node = columns;  node != NULL && col == NULL;  node = node->next){
-			GtkTreeViewColumn *checkcol = (GtkTreeViewColumn*) node->data;
-			if (x >= colx  &&  x < (colx + checkcol->width)){
-				col = checkcol;
-				return get_col_number_from_tree_view_column(col);
-			} else {
-				colx += checkcol->width;
+	if (event->button == 3 && event->type == GDK_BUTTON_PRESS) {
+		if(path) gtk_tree_selection_select_path(selection, path);
+		ret = linphone_gtk_popup_contact_menu(GTK_WIDGET(friendlist), event);
+	} else if(event->button == 1 && event->type == GDK_BUTTON_PRESS){
+		if(path && column) {
+			int numcol = get_column_index(friendlist, column);
+			if(numcol == 2) {
+				select_row(friendlist, path);
+				linphone_gtk_call_selected(friendlist);
+				ret = TRUE;
+			} else if(numcol == 3) {
+				select_row(friendlist, path);
+				linphone_gtk_chat_selected(GTK_WIDGET(friendlist));
+				ret = TRUE;
 			}
 		}
 	}
-	g_list_free(columns);
-	return 0;
-}
-
-gboolean linphone_gtk_contact_list_button_pressed(GtkWidget *widget, GdkEventButton *event){
-	/* Ignore double-clicks and triple-clicks */
-	if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
-	{
-		return linphone_gtk_popup_contact_menu(widget, event);
-	} else if(event->button == 1 && event->type == GDK_BUTTON_PRESS){
-		gint numcol = tree_view_get_cell_from_pos(GTK_TREE_VIEW(widget),event->x,event->y);
-		if(numcol==2){
-			g_object_set_data(G_OBJECT(widget),"numcol",GINT_TO_POINTER(1));
-		} else if(numcol==3){
-			g_object_set_data(G_OBJECT(widget),"numcol",GINT_TO_POINTER(2));
-		}
-	}
-	return FALSE;
+	if(path) gtk_tree_path_free(path);
+	return ret;
 }
 
 void linphone_gtk_buddy_info_updated(LinphoneCore *lc, LinphoneFriend *lf){
 	/*refresh the entire list*/
 	linphone_gtk_show_friends();
 }
+
+static gboolean update_hovered_row_path(GtkTreeView *friendlist, int x_window, int y_window) {
+	int x_bin, y_bin;
+	GtkTreePath *new_path;
+	GtkTreePath *old_path = (GtkTreePath *)g_object_get_data(G_OBJECT(friendlist), "hovered_row");
+	gtk_tree_view_convert_widget_to_bin_window_coords(friendlist, x_window, y_window, &x_bin, &y_bin);
+	gtk_tree_view_get_path_at_pos(friendlist, x_bin, y_bin, &new_path, NULL, NULL, NULL);
+	if((new_path == NULL && old_path == NULL) || (new_path && old_path && gtk_tree_path_compare(new_path, old_path) == 0)) {
+		if(new_path) gtk_tree_path_free(new_path);
+		return FALSE;
+	} else {
+		g_object_set_data_full(G_OBJECT(friendlist), "hovered_row", new_path, (GDestroyNotify)gtk_tree_path_free);
+		return TRUE;
+	}
+}
+
+gboolean linphone_gtk_friend_list_enter_event_handler(GtkTreeView *friendlist, GdkEventCrossing *event) {
+	gboolean path_has_changed = update_hovered_row_path(friendlist, (int)event->x, (int)event->y);
+	if(path_has_changed) linphone_gtk_friend_list_update_button_display(friendlist);
+	return FALSE;
+}
+
+gboolean linphone_gtk_friend_list_leave_event_handler(GtkTreeView *friendlist, GdkEventCrossing *event) {
+	GtkTreePath *hovered_row = (GtkTreePath *)g_object_get_data(G_OBJECT(friendlist), "hovered_row");
+	if(hovered_row) {
+		g_object_set_data(G_OBJECT(friendlist), "hovered_row", NULL);
+		linphone_gtk_friend_list_update_button_display(friendlist);
+	}
+	return FALSE;
+}
+
+gboolean linphone_gtk_friend_list_motion_event_handler(GtkTreeView *friendlist, GdkEventMotion *event) {
+	gboolean path_has_changed = update_hovered_row_path(friendlist, (int)event->x, (int)event->y);
+	if(path_has_changed) linphone_gtk_friend_list_update_button_display(friendlist);
+	return FALSE;
+}
+
+#define CONFIG_FILE ".linphone-friends.db"
+
+char *linphone_gtk_friends_storage_get_db_file(const char *filename){
+	const int path_max=1024;
+	char *db_file=NULL;
+
+	db_file=(char *)g_malloc(path_max*sizeof(char));
+	if (filename==NULL) filename=CONFIG_FILE;
+	/*try accessing a local file first if exists*/
+	if (bctbx_file_exist(CONFIG_FILE)==0){
+		snprintf(db_file,path_max,"%s",filename);
+	}else{
+#ifdef _WIN32
+		const char *appdata=getenv("APPDATA");
+		if (appdata){
+			snprintf(db_file,path_max,"%s\\%s",appdata,LINPHONE_CONFIG_DIR);
+			CreateDirectory(db_file,NULL);
+			snprintf(db_file,path_max,"%s\\%s\\%s",appdata,LINPHONE_CONFIG_DIR,filename);
+		}
+#else
+		const char *home=getenv("HOME");
+		if (home==NULL) home=".";
+		snprintf(db_file,path_max,"%s/%s",home,filename);
+#endif
+	}
+	return db_file;
+}
diff --git a/gtk/in_call_frame.ui b/gtk/in_call_frame.ui
index 5721081b6..1e713d19c 100644
--- a/gtk/in_call_frame.ui
+++ b/gtk/in_call_frame.ui
@@ -2,6 +2,12 @@
 <interface>
   <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkImage" id="zrtp_button_icon">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixel_size">16</property>
+    <property name="icon_name">linphone-security-pending</property>
+  </object>
   <object class="GtkFrame" id="in_call_frame">
     <property name="can_focus">False</property>
     <property name="extension_events">cursor</property>
@@ -44,66 +50,68 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="encryption_box">
+              <object class="GtkHBox" id="zrtp_box">
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkImage" id="dialog_authenticator_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-dialog-authentication</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage" id="encryption_status_icon">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-apply</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="encryption_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="padding">2</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="encryption_verify_button">
-                    <property name="label" translatable="yes">Set verified</property>
+                  <object class="GtkButton" id="zrtp_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="image">zrtp_button_icon</property>
+                    <property name="relief">none</property>
                     <signal name="clicked" handler="linphone_gtk_auth_token_verified_clicked" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">False</property>
-                    <property name="position">3</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkHBox" id="encryption_status_box">
+                <property name="can_focus">False</property>
+                <property name="spacing">4</property>
+                <child>
+                  <object class="GtkImage" id="encryption_status_icon">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="pixel_size">16</property>
+                    <property name="icon_name">linphone-security-ok</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="encryption_status_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">Encryption status</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkHBox" id="incall_audioview">
                 <property name="visible">True</property>
@@ -198,7 +206,7 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="padding">5</property>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
             <child>
@@ -237,7 +245,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">4</property>
+                <property name="position">5</property>
               </packing>
             </child>
             <child>
@@ -245,12 +253,11 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkToggleButton" id="record_button">
-                    <property name="label">gtk-media-record</property>
+                    <property name="label" translatable="yes">Record</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Record this call to an audio file</property>
-                    <property name="use_stock">True</property>
                     <signal name="toggled" handler="linphone_gtk_record_call_toggled" swapped="no"/>
                   </object>
                   <packing>
@@ -276,7 +283,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">5</property>
+                <property name="position">6</property>
               </packing>
             </child>
             <child>
@@ -366,7 +373,7 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="padding">7</property>
-                <property name="position">6</property>
+                <property name="position">7</property>
               </packing>
             </child>
           </object>
diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index bc37896fd..27e494629 100644
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -29,8 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "linphone.h"
 
-
-gboolean linphone_gtk_use_in_call_view(){
+gboolean linphone_gtk_use_in_call_view(void){
 	static int val=-1;
 	if (val==-1) val=linphone_gtk_get_ui_config_int("use_incall_view",1);
 	return val;
@@ -40,9 +39,9 @@ LinphoneCall *linphone_gtk_get_currently_displayed_call(gboolean *is_conf){
 	LinphoneCore *lc=linphone_gtk_get_core();
 	GtkWidget *main_window=linphone_gtk_get_main_window ();
 	GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch");
-	const MSList *calls=linphone_core_get_calls(lc);
+	const bctbx_list_t *calls=linphone_core_get_calls(lc);
 	if (is_conf) *is_conf=FALSE;
-	if (!linphone_gtk_use_in_call_view() || ms_list_size(calls)==1){
+	if (!linphone_gtk_use_in_call_view() || bctbx_list_size(calls)==1){
 		if (calls) return (LinphoneCall*)calls->data;
 	}else{
 		int idx=gtk_notebook_get_current_page (notebook);
@@ -64,15 +63,9 @@ LinphoneCall *linphone_gtk_get_currently_displayed_call(gboolean *is_conf){
 }
 
 static GtkWidget *make_tab_header(int number){
-	GtkWidget *w=gtk_hbox_new (FALSE,0);
-	GtkWidget *i=create_pixmap ("startcall-small.png");
-	GtkWidget *l;
-	gchar *text=g_strdup_printf(_("Call #%i"),number);
-	l=gtk_label_new (text);
-	gtk_box_pack_start (GTK_BOX(w),i,FALSE,FALSE,0);
-	gtk_box_pack_end(GTK_BOX(w),l,TRUE,TRUE,0);
-	gtk_widget_show_all(w);
-	return w;
+	gchar text[20];
+	g_snprintf(text, sizeof(text), _("Call #%i"), number);
+	return linphone_gtk_make_tab_header(text, "linphone-start-call", FALSE, NULL, NULL);
 }
 
 void linphone_gtk_call_update_tab_header(LinphoneCall *call,gboolean pause){
@@ -86,9 +79,9 @@ void linphone_gtk_call_update_tab_header(LinphoneCall *call,gboolean pause){
 	gchar *text;
 
 	if(pause){
-		i=gtk_image_new_from_stock(GTK_STOCK_MEDIA_PAUSE,GTK_ICON_SIZE_SMALL_TOOLBAR);
+		i=gtk_image_new_from_icon_name("linphone-hold-off",GTK_ICON_SIZE_BUTTON);
 	} else {
-		i=create_pixmap ("startcall-small.png");
+		i=gtk_image_new_from_icon_name("linphone-start-call", GTK_ICON_SIZE_BUTTON);
 	}
 
 	text=g_strdup_printf(_("Call #%i"),call_index);
@@ -101,18 +94,15 @@ void linphone_gtk_call_update_tab_header(LinphoneCall *call,gboolean pause){
 	g_free(text);
 }
 
-static void linphone_gtk_in_call_set_animation_image(GtkWidget *callview, const char *image_name, gboolean is_stock){
+static void linphone_gtk_in_call_set_animation_image(GtkWidget *callview, const char *image_name){
 	GtkWidget *container=linphone_gtk_get_widget(callview,"in_call_animation");
 	GList *elem=gtk_container_get_children(GTK_CONTAINER(container));
 	GtkWidget *image;
 
-	if (!is_stock){
-		if (image_name==NULL){
-			gtk_widget_hide(container);
-		}
-		image=create_pixmap(image_name);
-	}else
-		image=gtk_image_new_from_stock(image_name,GTK_ICON_SIZE_DND);
+	if (image_name==NULL){
+		gtk_widget_hide(container);
+	}
+	image=gtk_image_new_from_icon_name(image_name,GTK_ICON_SIZE_DIALOG);
 	if (elem)
 		gtk_widget_destroy((GtkWidget*)elem->data);
 	gtk_widget_show(image);
@@ -144,7 +134,7 @@ void transfer_button_clicked(GtkWidget *button, gpointer call_ref){
 	GtkWidget *menu=gtk_menu_new();
 	LinphoneCall *call=(LinphoneCall*)call_ref;
 	LinphoneCore *lc=linphone_gtk_get_core();
-	const MSList *elem=linphone_core_get_calls(lc);
+	const bctbx_list_t *elem=linphone_core_get_calls(lc);
 
 	for(;elem!=NULL;elem=elem->next){
 		LinphoneCall *other_call=(LinphoneCall*)elem->data;
@@ -153,10 +143,11 @@ void transfer_button_clicked(GtkWidget *button, gpointer call_ref){
 			int call_index=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(call_view),"call_index"));
 			char *remote_uri=linphone_call_get_remote_address_as_string (other_call);
 			char *text=g_strdup_printf(_("Transfer to call #%i with %s"),call_index,remote_uri);
+			GtkWidget *image = gtk_image_new_from_icon_name("linphone-start-call", GTK_ICON_SIZE_MENU);
 			menu_item=gtk_image_menu_item_new_with_label(text);
 			ms_free(remote_uri);
 			g_free(text);
-			gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),create_pixmap("status-green.png"));
+			gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image);
 			gtk_widget_show(menu_item);
 			gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
 			g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_transfer_call,other_call);
@@ -167,7 +158,7 @@ void transfer_button_clicked(GtkWidget *button, gpointer call_ref){
 }
 
 void linphone_gtk_enable_transfer_button(LinphoneCore *lc, gboolean value){
-	const MSList *elem=linphone_core_get_calls(lc);
+	const bctbx_list_t *elem=linphone_core_get_calls(lc);
 	for(;elem!=NULL;elem=elem->next){
 		LinphoneCall *call=(LinphoneCall*)elem->data;
 		GtkWidget *call_view=(GtkWidget*)linphone_call_get_user_pointer(call);
@@ -186,7 +177,7 @@ static void conference_button_clicked(GtkWidget *button, gpointer call_ref){
 }
 
 void linphone_gtk_enable_conference_button(LinphoneCore *lc, gboolean value){
-	const MSList *elem=linphone_core_get_calls(lc);
+	const bctbx_list_t *elem=linphone_core_get_calls(lc);
 	for(;elem!=NULL;elem=elem->next){
 		LinphoneCall *call=(LinphoneCall*)elem->data;
 		GtkWidget *call_view=(GtkWidget*)linphone_call_get_user_pointer(call);
@@ -360,18 +351,69 @@ void linphone_gtk_enable_video_button(LinphoneCall *call, gboolean sensitive, gb
 	gtk_widget_set_visible(GTK_WIDGET(button),sensitive);
 }
 
+
+typedef enum { VOLUME_CTRL_PLAYBACK, VOLUME_CTRL_RECORD } VolumeControlType;
+
+static void volume_control_value_changed(GtkScaleButton *button, gdouble value, gpointer user_data) {
+	LinphoneCall *call = (LinphoneCall *)g_object_get_data(G_OBJECT(button), "call");
+	VolumeControlType type = (VolumeControlType)GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "type"));
+
+	if(type == VOLUME_CTRL_PLAYBACK) {
+		linphone_call_set_speaker_volume_gain(call, (float)value);
+	} else if(type == VOLUME_CTRL_RECORD) {
+		linphone_call_set_microphone_volume_gain(call, (float)value);
+	}
+}
+
+static gboolean volume_control_button_update_value(GtkWidget *widget) {
+	LinphoneCall *call = (LinphoneCall *)g_object_get_data(G_OBJECT(widget), "call");
+	VolumeControlType type = (VolumeControlType)GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "type"));
+	float gain = -1;
+
+	if(type == VOLUME_CTRL_PLAYBACK) {
+		gain = linphone_call_get_speaker_volume_gain(call);
+	} else if(type == VOLUME_CTRL_RECORD) {
+		gain = linphone_call_get_microphone_volume_gain(call);
+	}
+	if(gain >= 0.0f) {
+		gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), gain);
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+static gboolean volume_control_button_enter_event_handler(GtkWidget *widget) {
+	volume_control_button_update_value(widget);
+	return FALSE;
+}
+
+static void volume_control_init(GtkWidget *vol_ctrl, VolumeControlType type, LinphoneCall *call) {
+	g_object_set_data(G_OBJECT(vol_ctrl), "call", call);
+	g_object_set_data(G_OBJECT(vol_ctrl), "type", GINT_TO_POINTER(type));
+	if(!volume_control_button_update_value(vol_ctrl)) {
+		gtk_widget_set_sensitive(vol_ctrl, FALSE);
+	} else {
+		gtk_widget_set_sensitive(vol_ctrl, TRUE);
+		g_signal_connect(G_OBJECT(vol_ctrl), "enter-notify-event", G_CALLBACK(volume_control_button_enter_event_handler), NULL);
+		g_signal_connect(G_OBJECT(vol_ctrl), "value-changed", G_CALLBACK(volume_control_value_changed), NULL);
+	}
+}
+
 void linphone_gtk_create_in_call_view(LinphoneCall *call){
 	GtkWidget *call_view=linphone_gtk_create_widget("in_call_frame");
 	GtkWidget *main_window=linphone_gtk_get_main_window ();
 	GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch");
+	GtkWidget *audio_bar = linphone_gtk_get_widget(call_view, "incall_audioview");
 	static int call_index=1;
 	int idx;
+	GtkWidget *record;
 	GtkWidget *transfer;
 	GtkWidget *conf;
 	GtkWidget *button;
 	GtkWidget *image;
 
-	if (ms_list_size(linphone_core_get_calls(linphone_gtk_get_core()))==1){
+	if (bctbx_list_size(linphone_core_get_calls(linphone_gtk_get_core()))==1){
 		/*this is the only call at this time */
 		call_index=1;
 	}
@@ -390,31 +432,38 @@ void linphone_gtk_create_in_call_view(LinphoneCall *call){
 	linphone_gtk_enable_mute_button(
 					GTK_BUTTON(linphone_gtk_get_widget(call_view,"incall_mute")),FALSE);
 
+	record = linphone_gtk_get_widget(call_view, "record_button");
+	gtk_button_set_image(GTK_BUTTON(record), gtk_image_new_from_icon_name("linphone-record", GTK_ICON_SIZE_BUTTON));
+	gtk_widget_hide(record);
 	transfer = linphone_gtk_get_widget(call_view,"transfer_button");
-	gtk_button_set_image(GTK_BUTTON(transfer),gtk_image_new_from_stock
-							 (GTK_STOCK_GO_FORWARD,GTK_ICON_SIZE_BUTTON));
+	gtk_button_set_image(GTK_BUTTON(transfer),gtk_image_new_from_icon_name("linphone-call-transfer",GTK_ICON_SIZE_BUTTON));
 	g_signal_connect(G_OBJECT(transfer),"clicked",(GCallback)transfer_button_clicked,call);
 	gtk_widget_hide(transfer);
 
 	conf = linphone_gtk_get_widget(call_view,"conference_button");
-	gtk_button_set_image(GTK_BUTTON(conf),gtk_image_new_from_stock (GTK_STOCK_ADD,GTK_ICON_SIZE_BUTTON));
+	gtk_button_set_image(GTK_BUTTON(conf),gtk_image_new_from_icon_name("linphone-conference-start",GTK_ICON_SIZE_BUTTON));
 	g_signal_connect(G_OBJECT(conf),"clicked",(GCallback)conference_button_clicked,call);
 	gtk_widget_hide(conf);
 
 	button=linphone_gtk_get_widget(call_view,"terminate_call");
-	image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-small.png"));
+	image=gtk_image_new_from_icon_name(
+		linphone_gtk_get_ui_config("stop_call_icon_name","linphone-stop-call"),
+		GTK_ICON_SIZE_BUTTON
+	);
 	gtk_button_set_label(GTK_BUTTON(button),_("Hang up"));
 	gtk_button_set_image(GTK_BUTTON(button),image);
 	gtk_widget_show(image);
 	g_signal_connect_swapped(G_OBJECT(linphone_gtk_get_widget(call_view,"quality_indicator")),"button-press-event",(GCallback)linphone_gtk_show_call_stats,call);
+	
+	gtk_widget_hide(audio_bar);
 }
 
 static void video_button_clicked(GtkWidget *button, LinphoneCall *call){
 	gboolean adding=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"adding_video"));
 	LinphoneCore *lc=linphone_call_get_core(call);
-	LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
+	LinphoneCallParams *params = linphone_core_create_call_params(lc, call);
 	gtk_widget_set_sensitive(button,FALSE);
-	linphone_call_params_enable_video(params,adding);
+	linphone_call_params_enable_video(params, adding);
 	linphone_core_update_call(lc,call,params);
 	linphone_call_params_destroy(params);
 }
@@ -431,7 +480,7 @@ void linphone_gtk_update_video_button(LinphoneCall *call){
 	button=linphone_gtk_get_widget(call_view,"video_button");
 
 	gtk_button_set_image(GTK_BUTTON(button),
-	gtk_image_new_from_stock(has_video ? GTK_STOCK_REMOVE : GTK_STOCK_ADD,GTK_ICON_SIZE_BUTTON));
+	gtk_image_new_from_icon_name(has_video ? "linphone-camera-disabled" : "linphone-camera-enabled",GTK_ICON_SIZE_BUTTON));
 	g_object_set_data(G_OBJECT(button),"adding_video",GINT_TO_POINTER(!has_video));
 	if (!linphone_core_video_supported(linphone_call_get_core(call))){
 		gtk_widget_set_sensitive(button,FALSE);
@@ -460,25 +509,30 @@ void linphone_gtk_remove_in_call_view(LinphoneCall *call){
 	GtkWidget *w=(GtkWidget*)linphone_call_get_user_pointer (call);
 	GtkWidget *main_window=linphone_gtk_get_main_window ();
 	GtkWidget *nb=linphone_gtk_get_widget(main_window,"viewswitch");
-	gboolean in_conf=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call));
-	int idx;
+	int idx,id_current_page;
 	g_return_if_fail(w!=NULL);
 	idx=gtk_notebook_page_num(GTK_NOTEBOOK(nb),w);
-	if (in_conf){
+	if (linphone_gtk_call_is_in_conference_view(call)){
 		linphone_gtk_unset_from_conference(call);
 	}
 	linphone_call_set_user_pointer (call,NULL);
 	linphone_call_unref(call);
 	call=linphone_core_get_current_call(linphone_gtk_get_core());
-	if (call==NULL){
-		if (linphone_core_is_in_conference(linphone_gtk_get_core())){
-			/*show the conference*/
+	id_current_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(nb));
+	if (id_current_page == idx) {
+		if (call==NULL){
+			if (linphone_core_is_in_conference(linphone_gtk_get_core())){
+				/*show the conference*/
+				gtk_notebook_set_current_page(GTK_NOTEBOOK(nb),gtk_notebook_page_num(GTK_NOTEBOOK(nb),
+								g_object_get_data(G_OBJECT(main_window),"conf_frame")));
+			} else {
+				gtk_notebook_set_current_page(GTK_NOTEBOOK(nb),0);
+			}
+		}else{
+			/*show the active call*/
 			gtk_notebook_set_current_page(GTK_NOTEBOOK(nb),gtk_notebook_page_num(GTK_NOTEBOOK(nb),
-		                            g_object_get_data(G_OBJECT(main_window),"conf_frame")));
-		}else gtk_notebook_prev_page(GTK_NOTEBOOK(nb));
-	}else{
-		/*show the active call*/
-		gtk_notebook_set_current_page(GTK_NOTEBOOK(nb),gtk_notebook_page_num(GTK_NOTEBOOK(nb),                                                                     linphone_call_get_user_pointer(call)));
+							linphone_call_get_user_pointer(call)));
+		}
 	}
 	gtk_notebook_remove_page (GTK_NOTEBOOK(nb),idx);
 	gtk_widget_destroy(w);
@@ -527,16 +581,16 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call){
 	display_peer_name_in_label(callee,linphone_call_get_remote_address (call));
 
 	answer_button=linphone_gtk_get_widget(callview,"accept_call");
-	image=create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-small.png"));
+	image=gtk_image_new_from_icon_name("linphone-start-call", GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_label(GTK_BUTTON(answer_button),_("Answer"));
 	gtk_button_set_image(GTK_BUTTON(answer_button),image);
 	gtk_widget_show(image);
 
-	image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-small.png"));
+	image=gtk_image_new_from_icon_name("linphone-stop-call", GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),image);
 	gtk_widget_show(image);
 
-	linphone_gtk_in_call_set_animation_image(callview,GTK_STOCK_DIALOG_INFO,TRUE);
+	linphone_gtk_in_call_set_animation_image(callview,"linphone-call-status-incoming");
 }
 
 static void rating_to_color(float rating, GdkColor *color){
@@ -587,11 +641,13 @@ static gboolean linphone_gtk_in_call_view_refresh(LinphoneCall *call){
 	}
 	rating_to_color(rating,&color);
 	gtk_widget_modify_bg(qi,GTK_STATE_NORMAL,&color);
+	
+	linphone_gtk_update_video_button(call); /*in case of no ice re-invite, video button status shall be checked by polling*/
 	return TRUE;
 }
 
 #define UNSIGNIFICANT_VOLUME (-23)
-#define SMOOTH 0.15
+#define SMOOTH 0.15f
 
 static gboolean update_audio_meter(volume_ctx_t *ctx){
 	float volume_db=ctx->get_volume(ctx->data);
@@ -637,55 +693,19 @@ void linphone_gtk_uninit_audio_meter(GtkWidget *w){
 	}
 }
 
-typedef enum { VOLUME_CTRL_PLAYBACK, VOLUME_CTRL_RECORD } VolumeControlType;
-
-static void volume_control_value_changed(GtkScaleButton *button, gdouble value, gpointer user_data) {
-	LinphoneCall *call = (LinphoneCall *)g_object_get_data(G_OBJECT(button), "call");
-	VolumeControlType type = (VolumeControlType)g_object_get_data(G_OBJECT(button), "type");
-
-	if(type == VOLUME_CTRL_PLAYBACK) {
-		linphone_call_set_speaker_volume_gain(call, value);
-	} else if(type == VOLUME_CTRL_RECORD) {
-		linphone_call_set_microphone_volume_gain(call, value);
-	}
-}
-
-static void volume_control_button_update_value(GtkWidget *widget) {
-	LinphoneCall *call = (LinphoneCall *)g_object_get_data(G_OBJECT(widget), "call");
-	VolumeControlType type = (VolumeControlType)g_object_get_data(G_OBJECT(widget), "type");
-
-	if(type == VOLUME_CTRL_PLAYBACK) {
-		gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), linphone_call_get_speaker_volume_gain(call));
-	} else if(type == VOLUME_CTRL_RECORD) {
-		gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), linphone_call_get_microphone_volume_gain(call));
-	}
-}
-
-static gboolean volume_control_button_enter_event_handler(GtkWidget *widget) {
-	volume_control_button_update_value(widget);
-	return FALSE;
-}
-
-static void volume_control_init(GtkWidget *vol_ctrl, VolumeControlType type, LinphoneCall *call) {
-	g_object_set_data(G_OBJECT(vol_ctrl), "call", call);
-	g_object_set_data(G_OBJECT(vol_ctrl), "type", (gpointer)type);
-	g_signal_connect(G_OBJECT(vol_ctrl), "enter-notify-event", G_CALLBACK(volume_control_button_enter_event_handler), NULL);
-	g_signal_connect(G_OBJECT(vol_ctrl), "value-changed", G_CALLBACK(volume_control_value_changed), NULL);
-}
-
 void linphone_gtk_in_call_view_enable_audio_view(LinphoneCall *call, gboolean val){
 	GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call);
 	GtkWidget *audio_view=linphone_gtk_get_widget(callview,"incall_audioview");
 	GtkWidget *mic_level=linphone_gtk_get_widget(callview,"mic_audiolevel");
 	GtkWidget *spk_level=linphone_gtk_get_widget(callview,"spk_audiolevel");
-	GtkWidget *spk_vol_ctrl = linphone_gtk_get_widget(callview, "incall_spk_vol_ctrl_button");
-	GtkWidget *mic_vol_ctrl = linphone_gtk_get_widget(callview, "incall_mic_vol_ctrl_button");
+	GtkWidget *mic_ctrl = linphone_gtk_get_widget(callview, "incall_mic_vol_ctrl_button");
+	GtkWidget *spk_ctrl = linphone_gtk_get_widget(callview, "incall_spk_vol_ctrl_button");
 
 	if (val){
 		linphone_gtk_init_audio_meter(mic_level,(get_volume_t)linphone_call_get_record_volume,call);
 		linphone_gtk_init_audio_meter(spk_level,(get_volume_t)linphone_call_get_play_volume,call);
-		volume_control_init(spk_vol_ctrl, VOLUME_CTRL_PLAYBACK, call);
-		volume_control_init(mic_vol_ctrl, VOLUME_CTRL_RECORD, call);
+		volume_control_init(mic_ctrl, VOLUME_CTRL_RECORD, call);
+		volume_control_init(spk_ctrl, VOLUME_CTRL_PLAYBACK, call);
 		gtk_widget_show_all(audio_view);
 	}else{
 		linphone_gtk_uninit_audio_meter(mic_level);
@@ -702,43 +722,55 @@ void linphone_gtk_auth_token_verified_clicked(GtkButton *button){
 }
 
 void linphone_gtk_in_call_view_show_encryption(LinphoneCall *call){
-	GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call);
-	GtkWidget *encryption_box=linphone_gtk_get_widget(callview,"encryption_box");
-	GtkWidget *label=linphone_gtk_get_widget(callview,"encryption_label");
-	GtkWidget *status_icon=linphone_gtk_get_widget(callview,"encryption_status_icon");
-	GtkWidget *verify_button=linphone_gtk_get_widget(callview,"encryption_verify_button");
-	LinphoneMediaEncryption me=linphone_call_params_get_media_encryption(linphone_call_get_current_params(call));
-	bool_t verified=linphone_call_get_authentication_token_verified(call);
-	switch(me){
+	GtkWidget *callview = (GtkWidget*)linphone_call_get_user_pointer(call);
+	GtkWidget *encryption_status_box = linphone_gtk_get_widget(callview, "encryption_status_box");
+	GtkWidget *encryption_status_label = linphone_gtk_get_widget(callview, "encryption_status_label");
+	GtkWidget *encryption_status_icon = linphone_gtk_get_widget(callview, "encryption_status_icon");
+	GtkWidget *zrtp_box = linphone_gtk_get_widget(callview, "zrtp_box");
+	GtkWidget *zrtp_button = linphone_gtk_get_widget(callview, "zrtp_button");
+	GtkWidget *zrtp_status_icon = gtk_button_get_image(GTK_BUTTON(zrtp_button));
+	LinphoneMediaEncryption me = linphone_call_params_get_media_encryption(linphone_call_get_current_params(call));
+
+	switch (me) {
 		case LinphoneMediaEncryptionSRTP:
-			gtk_widget_show_all(encryption_box);
-			gtk_label_set_markup(GTK_LABEL(label),_("Secured by SRTP"));
-			gtk_widget_hide(status_icon);
-			gtk_widget_hide(verify_button);
-		break;
+			gtk_widget_hide_all(zrtp_box);
+			gtk_widget_show_all(encryption_status_box);
+			gtk_label_set_markup(GTK_LABEL(encryption_status_label), _("Secured by SRTP"));
+			gtk_image_set_from_icon_name(GTK_IMAGE(encryption_status_icon), "linphone-security-ok", GTK_ICON_SIZE_MENU);
+			break;
 		case LinphoneMediaEncryptionDTLS:
-			gtk_widget_show_all(encryption_box);
-			gtk_label_set_markup(GTK_LABEL(label),_("Secured by DTLS"));
-			gtk_widget_hide(status_icon);
-			gtk_widget_hide(verify_button);
-		break;
+			gtk_widget_hide_all(zrtp_box);
+			gtk_widget_show_all(encryption_status_box);
+			gtk_label_set_markup(GTK_LABEL(encryption_status_label), _("Secured by DTLS"));
+			gtk_image_set_from_icon_name(GTK_IMAGE(encryption_status_icon), "linphone-security-ok", GTK_ICON_SIZE_MENU);
+			break;
 		case LinphoneMediaEncryptionZRTP:
 		{
-			gchar *text=g_strdup_printf(_("Secured by ZRTP - [auth token: %s]"),linphone_call_get_authentication_token(call));
-			gtk_label_set_markup(GTK_LABEL(label),text);
+			bool_t verified = linphone_call_get_authentication_token_verified(call);
+			gchar *text = g_strdup_printf(_("Secured by ZRTP - [auth token: %s]"), linphone_call_get_authentication_token(call));
+			gtk_button_set_label(GTK_BUTTON(zrtp_button), text);
 			g_free(text);
-			gtk_image_set_from_stock(GTK_IMAGE(status_icon),
-			                          verified ? GTK_STOCK_APPLY : GTK_STOCK_DIALOG_WARNING,GTK_ICON_SIZE_MENU);
-			gtk_button_set_label(GTK_BUTTON(verify_button),
-			                     verified ? _("Set unverified") : _("Set verified"));
-			gtk_widget_show_all(encryption_box);
+			gtk_image_set_from_icon_name(GTK_IMAGE(zrtp_status_icon), verified ? "linphone-security-ok" : "linphone-security-pending", GTK_ICON_SIZE_MENU);
+			gtk_widget_set_tooltip_text(zrtp_button, verified ? _("Set unverified") : _("Set verified"));
+			gtk_widget_hide_all(encryption_status_box);
+			gtk_widget_show_all(zrtp_box);
 		}
 		break;
 		default:
-			gtk_widget_hide_all(encryption_box);
+			gtk_widget_hide_all(encryption_status_box);
+			gtk_widget_hide_all(zrtp_box);
+			break;
 	}
 }
 
+void linphone_gtk_in_call_view_hide_encryption(LinphoneCall *call) {
+	GtkWidget *callview = (GtkWidget*)linphone_call_get_user_pointer(call);
+	GtkWidget *encryption_status_box = linphone_gtk_get_widget(callview, "encryption_status_box");
+	GtkWidget *zrtp_box = linphone_gtk_get_widget(callview, "zrtp_box");
+	gtk_widget_hide_all(encryption_status_box);
+	gtk_widget_hide_all(zrtp_box);
+}
+
 char *linphone_gtk_address(const LinphoneAddress *addr){
 	const char *displayname=linphone_address_get_display_name(addr);
 	if (!displayname) return linphone_address_as_string_uri_only(addr);
@@ -751,7 +783,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
 	GtkWidget *callee=linphone_gtk_get_widget(callview,"in_call_uri");
 	GtkWidget *duration=linphone_gtk_get_widget(callview,"in_call_duration");
 	guint taskid=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(callview),"taskid"));
-	gboolean in_conf=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call));
+	gboolean in_conf=(linphone_call_get_conference(call) != NULL);
 	GtkWidget *call_stats=(GtkWidget*)g_object_get_data(G_OBJECT(callview),"call_stats");
 
 	linphone_gtk_in_call_show_video(call);
@@ -765,7 +797,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
 	gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"transfer_button"),!in_conf);
 
 	gtk_label_set_text(GTK_LABEL(duration),_("00:00:00"));
-	linphone_gtk_in_call_set_animation_image(callview,GTK_STOCK_MEDIA_PLAY,TRUE);
+	linphone_gtk_in_call_set_animation_image(callview,"linphone-media-play");
 	linphone_gtk_call_update_tab_header(call,FALSE);
 	linphone_gtk_enable_mute_button(
 					GTK_BUTTON(linphone_gtk_get_widget(callview,"incall_mute")),TRUE);
@@ -794,10 +826,12 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
 void linphone_gtk_in_call_view_set_paused(LinphoneCall *call){
 	GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call);
 	GtkWidget *status=linphone_gtk_get_widget(callview,"in_call_status");
+	GtkWidget *record_bar = linphone_gtk_get_widget(callview, "record_hbox");
 	gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel"));
 	gtk_label_set_markup(GTK_LABEL(status),_("<b>Paused call</b>"));
 	linphone_gtk_in_call_show_video(call);
-	linphone_gtk_in_call_set_animation_image(callview,GTK_STOCK_MEDIA_PAUSE,TRUE);
+	linphone_gtk_in_call_set_animation_image(callview,"linphone-media-pause");
+	gtk_widget_show_all(record_bar);
 }
 
 void linphone_gtk_in_call_view_update_duration(LinphoneCall *call){
@@ -808,7 +842,7 @@ void linphone_gtk_in_call_view_update_duration(LinphoneCall *call){
 	int seconds=duration%60;
 	int minutes=(duration/60)%60;
 	int hours=duration/3600;
-	snprintf(tmp,sizeof(tmp)-1,"%02i::%02i::%02i",hours,minutes,seconds);
+	snprintf(tmp,sizeof(tmp)-1,"%02i:%02i:%02i",hours,minutes,seconds);
 	gtk_label_set_text(GTK_LABEL(duration_label),tmp);
 }
 
@@ -827,7 +861,7 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
 	video_window=(GtkWidget*)g_object_get_data(G_OBJECT(callview),"video_window");
 	status=linphone_gtk_get_widget(callview,"in_call_status");
 	taskid=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(callview),"taskid"));
-	in_conf=linphone_call_params_get_local_conference_mode(linphone_call_get_current_params(call));
+	in_conf=(linphone_call_get_conference(call) != NULL);
 	if (video_window) gtk_widget_destroy(video_window);
 	if (status==NULL) return;
 	if (error_msg==NULL)
@@ -837,8 +871,9 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
 		gtk_label_set_markup(GTK_LABEL(status),msg);
 		g_free(msg);
 	}
-	linphone_gtk_in_call_set_animation_image(callview,
-	           linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"),FALSE);
+	
+	linphone_gtk_in_call_set_animation_image(callview, linphone_gtk_get_ui_config("stop_call_icon_name","linphone-stop-call"));
+	linphone_gtk_in_call_view_hide_encryption(call);
 
 	gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel"));
 	gtk_widget_hide(linphone_gtk_get_widget(callview,"record_hbox"));
@@ -887,7 +922,7 @@ void linphone_gtk_draw_mute_button(GtkButton *button, gboolean active){
 
 void linphone_gtk_mute_clicked(GtkButton *button){
 	int active=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"active"));
-	linphone_core_mute_mic(linphone_gtk_get_core(),!active);
+	linphone_core_enable_mic(linphone_gtk_get_core(),active);
 	linphone_gtk_draw_mute_button(button,!active);
 }
 
@@ -898,22 +933,13 @@ void linphone_gtk_enable_mute_button(GtkButton *button, gboolean sensitive){
 }
 
 void linphone_gtk_draw_hold_button(GtkButton *button, gboolean active){
+	const gchar *icon_name = active ? "linphone-hold-on" : "linphone-hold-off";
+	const gchar *label = active ? _("Resume") : _("Pause");
+	GtkWidget *image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON);
 	g_object_set_data(G_OBJECT(button),"active",GINT_TO_POINTER(active));
-	if (active){
-		GtkWidget *image=create_pixmap("hold_off.png");
-		gtk_button_set_label(GTK_BUTTON(button),_("Resume"));
-		if (image!=NULL) {
-			gtk_button_set_image(GTK_BUTTON(button),image);
-			gtk_widget_show(image);
-		}
-	}else{
-		GtkWidget *image=create_pixmap("hold_on.png");
-		gtk_button_set_label(GTK_BUTTON(button),_("Pause"));
-		if (image!=NULL) {
-			gtk_button_set_image(GTK_BUTTON(button),image);
-			gtk_widget_show(image);
-		}
-	}
+	gtk_button_set_label(GTK_BUTTON(button),label);
+	gtk_button_set_image(GTK_BUTTON(button),image);
+	gtk_widget_show(image);
 }
 
 void linphone_gtk_hold_clicked(GtkButton *button){
diff --git a/gtk/keypad.ui b/gtk/keypad.ui
index 86c957531..020204f2b 100644
--- a/gtk/keypad.ui
+++ b/gtk/keypad.ui
@@ -4,6 +4,7 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="keypad">
     <property name="can_focus">False</property>
+    <signal name="delete-event" handler="linphone_gtk_keypad_destroyed_handler" swapped="no"/>
     <child>
       <object class="GtkFrame" id="frame3">
         <property name="visible">True</property>
@@ -29,12 +30,11 @@
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="dtmf_D">
-                    <property name="label" translatable="no">D</property>
+                    <property name="label">D</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -45,12 +45,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_#">
-                    <property name="label" translatable="no">#</property>
+                    <property name="label">#</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -61,12 +60,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_0">
-                    <property name="label" translatable="no">0</property>
+                    <property name="label">0</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -77,12 +75,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_*">
-                    <property name="label" translatable="no">*</property>
+                    <property name="label">*</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="top_attach">3</property>
@@ -91,12 +88,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_C">
-                    <property name="label" translatable="no">C</property>
+                    <property name="label">C</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -107,12 +103,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_9">
-                    <property name="label" translatable="no">9</property>
+                    <property name="label">9</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -123,12 +118,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_8">
-                    <property name="label" translatable="no">8</property>
+                    <property name="label">8</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -139,12 +133,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_7">
-                    <property name="label" translatable="no">7</property>
+                    <property name="label">7</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="top_attach">2</property>
@@ -153,12 +146,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_B">
-                    <property name="label" translatable="no">B</property>
+                    <property name="label">B</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -169,12 +161,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_6">
-                    <property name="label" translatable="no">6</property>
+                    <property name="label">6</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -185,12 +176,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_5">
-                    <property name="label" translatable="no">5</property>
+                    <property name="label">5</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -201,12 +191,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_4">
-                    <property name="label" translatable="no">4</property>
+                    <property name="label">4</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="top_attach">1</property>
@@ -215,12 +204,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_A">
-                    <property name="label" translatable="no">A</property>
+                    <property name="label">A</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">3</property>
@@ -229,12 +217,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_3">
-                    <property name="label" translatable="no">3</property>
+                    <property name="label">3</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -243,12 +230,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_2">
-                    <property name="label" translatable="no">2</property>
+                    <property name="label">2</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -257,14 +243,13 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="dtmf_1">
-                    <property name="label" translatable="no">1</property>
+                    <property name="label">1</property>
                     <property name="width_request">40</property>
                     <property name="height_request">40</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_action_appearance">False</property>
                   </object>
                 </child>
               </object>
diff --git a/gtk/linphone.h b/gtk/linphone.h
index 2eb3f0026..141a3dab7 100644
--- a/gtk/linphone.h
+++ b/gtk/linphone.h
@@ -21,8 +21,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "config.h"
 #endif
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#endif
+
 #include <gtk/gtk.h>
-#ifdef WIN32
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
+#ifdef _WIN32
 // alloca is already defined by gtk
 #undef alloca
 #endif
@@ -60,7 +72,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define LINPHONE_VERSION LINPHONE_VERSION_DATE
 #endif
 
+#include "setupwizard.h"
+
 #define LINPHONE_ICON "linphone.png"
+#define LINPHONE_ICON_NAME "linphone"
 
 enum {
 	COMPLETION_HISTORY,
@@ -99,15 +114,17 @@ LINPHONE_PUBLIC void linphone_gtk_destroy_window(GtkWidget *window);
 LINPHONE_PUBLIC GtkWidget *linphone_gtk_create_window(const char *window_name, GtkWidget *parent);
 LINPHONE_PUBLIC GtkWidget *linphone_gtk_get_widget(GtkWidget *window, const char *name);
 LINPHONE_PUBLIC GtkWidget *linphone_gtk_create_widget(const char* widget_name);
+LINPHONE_PUBLIC GtkWidget *linphone_gtk_make_tab_header(const gchar *label, const gchar *icon_name, gboolean show_quit_button, GCallback cb, gpointer user_data);
 
 char *linphone_gtk_message_storage_get_db_file(const char *filename);
-LINPHONE_PUBLIC void linphone_gtk_show_assistant(GtkWidget* parent);
+char *linphone_gtk_call_logs_storage_get_db_file(const char *filename);
+char *linphone_gtk_friends_storage_get_db_file(const char* filename);
 LINPHONE_PUBLIC void linphone_gtk_close_assistant(void);
 
 LINPHONE_PUBLIC LinphoneCore *linphone_gtk_get_core(void);
-LINPHONE_PUBLIC GtkWidget *linphone_gtk_get_main_window();
+LINPHONE_PUBLIC GtkWidget *linphone_gtk_get_main_window(void);
 LINPHONE_PUBLIC void linphone_gtk_display_something(GtkMessageType type, const gchar *message);
-LINPHONE_PUBLIC void linphone_gtk_call_terminated();
+LINPHONE_PUBLIC void linphone_gtk_call_terminated(LinphoneCall *call, const char *error);
 LINPHONE_PUBLIC void linphone_gtk_set_my_presence(LinphoneOnlineStatus ss);
 LINPHONE_PUBLIC void linphone_gtk_show_parameters(void);
 LINPHONE_PUBLIC void linphone_gtk_fill_soundcards(GtkWidget *pb);
@@ -120,7 +137,7 @@ LINPHONE_PUBLIC void linphone_gtk_show_main_window(void);
 LINPHONE_PUBLIC void linphone_gtk_log_push(OrtpLogLevel lev, const char *fmt, va_list args);
 LINPHONE_PUBLIC void linphone_gtk_destroy_log_window(void);
 LINPHONE_PUBLIC void linphone_gtk_refer_received(LinphoneCore *lc, const char *refer_to);
-LINPHONE_PUBLIC gboolean linphone_gtk_check_logs();
+LINPHONE_PUBLIC gboolean linphone_gtk_check_logs(void);
 LINPHONE_PUBLIC const gchar *linphone_gtk_get_ui_config(const char *key, const char *def);
 LINPHONE_PUBLIC int linphone_gtk_get_ui_config_int(const char *key, int def);
 LINPHONE_PUBLIC void linphone_gtk_set_ui_config_int(const char *key, int val);
@@ -142,27 +159,31 @@ LINPHONE_PUBLIC void linphone_gtk_terminate_call(GtkWidget *button);
 LINPHONE_PUBLIC void linphone_gtk_call_update_tab_header(LinphoneCall *call, gboolean pause);
 LINPHONE_PUBLIC void linphone_gtk_show_directory_search(void);
 LINPHONE_PUBLIC void linphone_gtk_status_icon_set_blinking(gboolean val);
-LINPHONE_PUBLIC void linphone_gtk_notify(LinphoneCall *call, const char *msg);
+LINPHONE_PUBLIC void linphone_gtk_notify(LinphoneCall *call, LinphoneChatMessage *chat_message, const char *msg);
 
 LINPHONE_PUBLIC void linphone_gtk_load_chatroom(LinphoneChatRoom *cr, const LinphoneAddress *uri, GtkWidget *chat_view);
-LINPHONE_PUBLIC void linphone_gtk_send_text();
+LINPHONE_PUBLIC void linphone_gtk_send_text(void);
 LINPHONE_PUBLIC GtkWidget * linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddress *with);
 LINPHONE_PUBLIC LinphoneChatRoom * linphone_gtk_create_chatroom(const LinphoneAddress *with);
 LINPHONE_PUBLIC void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *msg);
 LINPHONE_PUBLIC void linphone_gtk_is_composing_received(LinphoneCore *lc, LinphoneChatRoom *room);
 
-LINPHONE_PUBLIC void linphone_gtk_friend_list_update_chat_picture();
+LINPHONE_PUBLIC void linphone_gtk_friend_list_update_button_display(GtkTreeView *friendlist);
 LINPHONE_PUBLIC void linphone_gtk_friend_list_set_chat_conversation(const LinphoneAddress *la);
 LINPHONE_PUBLIC gboolean linphone_gtk_friend_list_is_contact(const LinphoneAddress *addr);
 LINPHONE_PUBLIC void linphone_gtk_friend_list_set_active_address(const LinphoneAddress *addr);
 LINPHONE_PUBLIC const LinphoneAddress *linphone_gtk_friend_list_get_active_address(void);
+LINPHONE_PUBLIC gboolean linphone_gtk_friend_list_enter_event_handler(GtkTreeView *friendlist, GdkEventCrossing *event);
+LINPHONE_PUBLIC gboolean linphone_gtk_friend_list_leave_event_handler(GtkTreeView *friendlist, GdkEventCrossing *event);
+LINPHONE_PUBLIC gboolean linphone_gtk_friend_list_motion_event_handler(GtkTreeView *friendlist, GdkEventMotion *event);
+LINPHONE_PUBLIC void linphone_gtk_friend_list_on_name_column_clicked(GtkTreeModel *model);
 LINPHONE_PUBLIC void linphone_gtk_notebook_tab_select(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data);
 LINPHONE_PUBLIC void linphone_gtk_show_friends(void);
 LINPHONE_PUBLIC void linphone_gtk_show_contact(LinphoneFriend *lf, GtkWidget *parent);
 LINPHONE_PUBLIC void linphone_gtk_buddy_info_updated(LinphoneCore *lc, LinphoneFriend *lf);
 
 /*functions controlling the different views*/
-LINPHONE_PUBLIC gboolean linphone_gtk_use_in_call_view();
+LINPHONE_PUBLIC gboolean linphone_gtk_use_in_call_view(void);
 LINPHONE_PUBLIC LinphoneCall *linphone_gtk_get_currently_displayed_call(gboolean *is_conf);
 LINPHONE_PUBLIC void linphone_gtk_create_in_call_view(LinphoneCall *call);
 LINPHONE_PUBLIC void linphone_gtk_in_call_view_set_calling(LinphoneCall *call);
@@ -180,8 +201,10 @@ LINPHONE_PUBLIC void linphone_gtk_enable_transfer_button(LinphoneCore *lc, gbool
 LINPHONE_PUBLIC void linphone_gtk_enable_conference_button(LinphoneCore *lc, gboolean value);
 LINPHONE_PUBLIC void linphone_gtk_set_in_conference(LinphoneCall *call);
 LINPHONE_PUBLIC void linphone_gtk_unset_from_conference(LinphoneCall *call);
+LINPHONE_PUBLIC bool_t linphone_gtk_call_is_in_conference_view(LinphoneCall *call);
 LINPHONE_PUBLIC void linphone_gtk_terminate_conference_participant(LinphoneCall *call);
 LINPHONE_PUBLIC void linphone_gtk_in_call_view_show_encryption(LinphoneCall *call);
+LINPHONE_PUBLIC void linphone_gtk_in_call_view_hide_encryption(LinphoneCall *call);
 LINPHONE_PUBLIC void linphone_gtk_update_video_button(LinphoneCall *call);
 LINPHONE_PUBLIC void linphone_gtk_init_audio_meter(GtkWidget *w, get_volume_t get_volume, void *data);
 LINPHONE_PUBLIC void linphone_gtk_uninit_audio_meter(GtkWidget *w);
@@ -190,7 +213,7 @@ LINPHONE_PUBLIC void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg, gbo
 LINPHONE_PUBLIC void linphone_gtk_exit_login_frame(void);
 LINPHONE_PUBLIC void linphone_gtk_set_ui_config(const char *key, const char *value);
 
-LINPHONE_PUBLIC void linphone_gtk_log_uninit();
+LINPHONE_PUBLIC void linphone_gtk_log_uninit(void);
 
 LINPHONE_PUBLIC bool_t linphone_gtk_init_instance(const char *app_name, int option, const char *addr_to_call);
 LINPHONE_PUBLIC void linphone_gtk_uninit_instance(void);
@@ -199,6 +222,7 @@ LINPHONE_PUBLIC void linphone_gtk_unmonitor_usb(void);
 
 LINPHONE_PUBLIC void linphone_gtk_fill_combo_box(GtkWidget *combo, const char **devices, const char *selected, DeviceCap cap);
 LINPHONE_PUBLIC gchar *linphone_gtk_get_record_path(const LinphoneAddress *address, gboolean is_conference);
+LINPHONE_PUBLIC gchar *linphone_gtk_get_snapshot_path(void);
 LINPHONE_PUBLIC void linphone_gtk_schedule_restart(void);
 
 LINPHONE_PUBLIC void linphone_gtk_show_audio_assistant(void);
@@ -219,15 +243,14 @@ LINPHONE_PUBLIC void linphone_gtk_history_row_activated(GtkWidget *treeview);
 LINPHONE_PUBLIC void linphone_gtk_history_row_selected(GtkWidget *treeview);
 LINPHONE_PUBLIC void linphone_gtk_clear_call_logs(GtkWidget *button);
 LINPHONE_PUBLIC void linphone_gtk_add_contact(void);
-LINPHONE_PUBLIC void linphone_gtk_contact_activated(GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
-LINPHONE_PUBLIC void linphone_gtk_contact_clicked(GtkTreeView *treeview);
+LINPHONE_PUBLIC void linphone_gtk_contact_clicked(GtkTreeSelection *selection);
 LINPHONE_PUBLIC void linphone_gtk_add_button_clicked(void);
 LINPHONE_PUBLIC void linphone_gtk_edit_button_clicked(GtkWidget *button);
 LINPHONE_PUBLIC void linphone_gtk_remove_button_clicked(GtkWidget *button);
 LINPHONE_PUBLIC void linphone_gtk_my_presence_clicked(GtkWidget *button);
 LINPHONE_PUBLIC void linphone_gtk_directory_search_button_clicked(GtkWidget *button);
 LINPHONE_PUBLIC gboolean linphone_gtk_popup_contact_menu(GtkWidget *list, GdkEventButton *event);
-LINPHONE_PUBLIC gboolean linphone_gtk_contact_list_button_pressed(GtkWidget *widget, GdkEventButton *event);
+LINPHONE_PUBLIC gboolean linphone_gtk_contact_list_button_pressed(GtkTreeView* firendlist, GdkEventButton* event);
 LINPHONE_PUBLIC void linphone_gtk_auth_token_verified_clicked(GtkButton *button);
 LINPHONE_PUBLIC void linphone_gtk_hold_clicked(GtkButton *button);
 LINPHONE_PUBLIC void linphone_gtk_record_call_toggled(GtkWidget *button);
@@ -250,7 +273,8 @@ LINPHONE_PUBLIC void linphone_gtk_used_identity_changed(GtkWidget *w);
 LINPHONE_PUBLIC void on_proxy_refresh_button_clicked(GtkWidget *w);
 LINPHONE_PUBLIC void linphone_gtk_link_to_website(GtkWidget *item);
 LINPHONE_PUBLIC void linphone_gtk_options_activate(GtkWidget *item);
-LINPHONE_PUBLIC void linphone_gtk_create_keypad(GtkWidget *button);
+LINPHONE_PUBLIC void linphone_gtk_show_keypad_checked(GtkCheckMenuItem *check_menu_item);
+LINPHONE_PUBLIC gboolean linphone_gtk_keypad_destroyed_handler(void);
 
 LINPHONE_PUBLIC void linphone_gtk_keyword_changed(GtkEditable *e);
 LINPHONE_PUBLIC void linphone_gtk_buddy_lookup_contact_activated(GtkWidget *treeview);
@@ -272,6 +296,7 @@ LINPHONE_PUBLIC void linphone_gtk_mtu_set(GtkWidget *w);
 LINPHONE_PUBLIC void linphone_gtk_mtu_changed(GtkWidget *w);
 LINPHONE_PUBLIC void linphone_gtk_use_sip_info_dtmf_toggled(GtkWidget *w);
 LINPHONE_PUBLIC void linphone_gtk_ipv6_toggled(GtkWidget *w);
+LINPHONE_PUBLIC void linphone_gtk_lime_changed(GtkComboBoxText *comboext);
 LINPHONE_PUBLIC void linphone_gtk_disabled_udp_port_toggle(GtkCheckButton *button);
 LINPHONE_PUBLIC void linphone_gtk_random_udp_port_toggle(GtkCheckButton *button);
 LINPHONE_PUBLIC void linphone_gtk_udp_port_value_changed(GtkSpinButton *button);
@@ -337,3 +362,18 @@ LINPHONE_PUBLIC void linphone_gtk_tunnel_ok(GtkButton *button);
 LINPHONE_PUBLIC void linphone_gtk_notebook_current_page_changed(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data);
 LINPHONE_PUBLIC void linphone_gtk_reload_sound_devices(void);
 LINPHONE_PUBLIC void linphone_gtk_reload_video_devices(void);
+LINPHONE_PUBLIC bool_t linphone_gtk_is_friend(LinphoneCore *lc, const char *contact);
+LINPHONE_PUBLIC gboolean linphone_gtk_auto_answer_enabled(void);
+LINPHONE_PUBLIC void linphone_gtk_auto_answer_delay_changed(GtkSpinButton *spinbutton, gpointer user_data);
+LINPHONE_PUBLIC void linphone_gtk_update_status_bar_icons(void);
+LINPHONE_PUBLIC void linphone_gtk_enable_auto_answer(GtkToggleButton *checkbox, gpointer user_data);
+
+LINPHONE_PUBLIC void linphone_gtk_import_contacts(void);
+LINPHONE_PUBLIC void linphone_gtk_export_contacts(void);
+
+LINPHONE_PUBLIC void linphone_gtk_mark_chat_read(LinphoneChatRoom *cr);
+#ifdef __APPLE__
+LINPHONE_PUBLIC void linphone_gtk_update_badge_count();
+#endif
+
+LINPHONE_PUBLIC gboolean linphone_gtk_on_key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data);
\ No newline at end of file
diff --git a/gtk/log.ui b/gtk/log.ui
index 4fe887e26..40658b7db 100644
--- a/gtk/log.ui
+++ b/gtk/log.ui
@@ -30,7 +30,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
-                <property name="active">True</property>
+                <property name="active">False</property>
                 <property name="draw_indicator">True</property>
                 <signal name="toggled" handler="linphone_gtk_log_scroll_to_end" swapped="no"/>
               </object>
diff --git a/gtk/logging.c b/gtk/logging.c
index 68d3d6cac..068428564 100644
--- a/gtk/logging.c
+++ b/gtk/logging.c
@@ -19,11 +19,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "linphone.h"
 
-#ifndef WIN32
+#ifdef _WIN32
+#include <direct.h>
+#define mkdir _mkdir
+#else
 #include <sys/stat.h>
 #include <sys/types.h>
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 
 extern gchar *linphone_logfile;
 
@@ -57,7 +65,7 @@ static FILE *_logfile = NULL;
 
 /* Called on exit, print out the marker, close the file and avoid to
    continue logging. */
-void linphone_gtk_log_uninit()
+void linphone_gtk_log_uninit(void)
 {
 	if (_logfile != NULL) {
 		fprintf(_logfile, "%s\n", LOGFILE_MARKER_STOP);
@@ -70,7 +78,7 @@ void linphone_gtk_log_uninit()
    perform rotation, insert the start marker and return the pointer to
    the file that should be used for logging, or NULL on errors or if
    disabled. */
-static FILE *linphone_gtk_log_init()
+static FILE *linphone_gtk_log_init(void)
 {
 	static char _logdir[1024];
 	static char _logfname[1024];
@@ -88,7 +96,7 @@ static FILE *linphone_gtk_log_init()
 			/* arrange for _logdir to contain a
 			 directory that has been created and _logfname to contain the
 			 path to a file to which we will log */
-#ifdef WIN32
+#ifdef _WIN32
 			const char *appdata=getenv("LOCALAPPDATA");
 			if (appdata) {
 				snprintf(_logdir, sizeof(_logdir),"%s\\Linphone", appdata);
@@ -115,7 +123,7 @@ static FILE *linphone_gtk_log_init()
 		}else if (linphone_logfile!=NULL){
 			snprintf(_logfname,sizeof(_logfname),"%s",linphone_logfile);
 		}
-		
+
 		if (_logfname[0]!='\0'){
 			/* If the constant LOGFILE_ROTATION is greater than zero, then
 			 we kick away a simple rotation that will ensure that there
@@ -216,7 +224,6 @@ void linphone_gtk_create_log_window(void){
 	/*prevent the log window from being destroyed*/
 	g_signal_connect (G_OBJECT (log_window), "delete-event",
 		G_CALLBACK (gtk_widget_hide_on_delete), log_window);
-
 }
 
 void linphone_gtk_destroy_log_window(void){
@@ -272,7 +279,7 @@ static void linphone_gtk_display_log(GtkTextView *v, OrtpLogLevel lev, const cha
 	gtk_text_buffer_get_iter_at_offset(b,&begin,off);
 	if (lev==ORTP_ERROR || lev==ORTP_FATAL) gtk_text_buffer_apply_tag_by_name(b,"red",&begin,&iter);
 	else if (lev==ORTP_WARNING) gtk_text_buffer_apply_tag_by_name(b,"orange",&begin,&iter);
-	
+
 	while(gtk_text_buffer_get_char_count(b)>LOG_MAX_CHARS){
 		GtkTextIter iter_line_after;
 		gtk_text_buffer_get_start_iter(b,&iter);
@@ -281,7 +288,7 @@ static void linphone_gtk_display_log(GtkTextView *v, OrtpLogLevel lev, const cha
 			gtk_text_buffer_delete(b,&iter,&iter_line_after);
 		}
 	}
-	
+
 }
 
 static void stick_to_end(GtkTextView *v){
@@ -292,17 +299,18 @@ static void stick_to_end(GtkTextView *v){
 	gtk_text_view_scroll_to_iter(v,&iter,0,FALSE,1.0,0);
 }
 
-void linphone_gtk_log_scroll_to_end(GtkToggleButton *button){
+void linphone_gtk_log_scroll_to_end(GtkToggleButton *button) {
 	if (gtk_toggle_button_get_active(button)){
 		GtkTextView *v=GTK_TEXT_VIEW(linphone_gtk_get_widget(log_window,"textview"));
 		stick_to_end(v);
 	}
+	lp_config_set_int(linphone_core_get_config(linphone_gtk_get_core()), "GtkUi", "logs_scroll_to_end", gtk_toggle_button_get_active(button) ? 1 : 0);
 }
 
 /*
  * called from Gtk main loop.
 **/
-gboolean linphone_gtk_check_logs(){
+gboolean linphone_gtk_check_logs(void){
 	GList *elem;
 	GtkTextView *v=NULL;
 	if (log_window) v=GTK_TEXT_VIEW(linphone_gtk_get_widget(log_window,"textview"));
@@ -316,8 +324,10 @@ gboolean linphone_gtk_check_logs(){
 	if (log_queue) g_list_free(log_queue);
 	log_queue=NULL;
 	g_static_mutex_unlock(&log_mutex);
-	if (v)
+	if (v) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(log_window,"scroll_to_end")), lp_config_get_int(linphone_core_get_config(linphone_gtk_get_core()), "GtkUi", "logs_scroll_to_end", 0) == 1);
 		linphone_gtk_log_scroll_to_end(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(log_window,"scroll_to_end")));
+	}
 	return TRUE;
 }
 
@@ -332,7 +342,7 @@ void linphone_gtk_log_push(OrtpLogLevel lev, const char *fmt, va_list args){
 	struct timeval tp;
 	struct tm *lt;
 	time_t tt;
-	
+
 	ortp_gettimeofday(&tp, NULL);
 	tt = (time_t)tp.tv_sec;
 	lt = localtime((const time_t*)&tt);
diff --git a/gtk/loginframe.c b/gtk/loginframe.c
index 87bed11ae..bf9693520 100644
--- a/gtk/loginframe.c
+++ b/gtk/loginframe.c
@@ -143,7 +143,7 @@ void linphone_gtk_exit_login_frame(void){
 void linphone_gtk_logout_clicked(void){
 	LinphoneCore *lc=linphone_gtk_get_core();
 	LinphoneProxyConfig *cfg=NULL;
-	linphone_core_get_default_proxy(lc,&cfg);
+	cfg = linphone_core_get_default_proxy_config(lc);
 	if (cfg){
 		SipSetupContext *ss=linphone_proxy_config_get_sip_setup_context(cfg);
 		if (ss){
diff --git a/gtk/mac.m b/gtk/mac.m
new file mode 100644
index 000000000..7a45d0d48
--- /dev/null
+++ b/gtk/mac.m
@@ -0,0 +1,47 @@
+/*
+linphone, gtk-glade interface.
+Copyright (C) 2008  Simon MORLAT (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifdef __APPLE__
+
+#import <Cocoa/Cocoa.h>
+#import "linphone.h"
+
+
+static int unread_messages_count() {
+	LinphoneCore* lc = linphone_gtk_get_core();
+	int count = 0;
+	const MSList *rooms = linphone_core_get_chat_rooms(lc);
+	const MSList *item = rooms;
+	while (item) {
+		LinphoneChatRoom *room = (LinphoneChatRoom *)item->data;
+		if (room) {
+			count += linphone_chat_room_get_unread_messages_count(room);
+		}
+		item = item->next;
+	}
+	return count;
+}
+
+void linphone_gtk_update_badge_count() {
+	int count = unread_messages_count();
+	NSString* badgeStr = (count > 0) ? [NSString stringWithFormat:@"%d", count] : @"";
+	[[NSApp dockTile] setBadgeLabel:badgeStr];
+}
+
+#endif
diff --git a/gtk/main.c b/gtk/main.c
index e4c17cfee..547c8c770 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -23,11 +23,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "linphone.h"
 #include "lpconfig.h"
 #include "liblinphone_gitversion.h"
-
+#include <bctoolbox/vfs.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 
@@ -35,9 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <gtkosxapplication.h>
 #endif
 
-#ifdef WIN32
-#define chdir _chdir
+#ifdef _WIN32
 #include "direct.h"
+#define chdir _chdir
 #ifndef F_OK
 #define F_OK 00 /*visual studio does not define F_OK*/
 #endif
@@ -69,11 +69,7 @@ static void linphone_gtk_registration_state_changed(LinphoneCore *lc, LinphonePr
 static void linphone_gtk_notify_recv(LinphoneCore *lc, LinphoneFriend * fid);
 static void linphone_gtk_new_unknown_subscriber(LinphoneCore *lc, LinphoneFriend *lf, const char *url);
 static void linphone_gtk_auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain);
-static void linphone_gtk_display_status(LinphoneCore *lc, const char *status);
 static void linphone_gtk_configuring_status(LinphoneCore *lc, LinphoneConfiguringState status, const char *message);
-static void linphone_gtk_display_message(LinphoneCore *lc, const char *msg);
-static void linphone_gtk_display_warning(LinphoneCore *lc, const char *warning);
-static void linphone_gtk_display_url(LinphoneCore *lc, const char *msg, const char *url);
 static void linphone_gtk_call_log_updated(LinphoneCore *lc, LinphoneCallLog *cl);
 static void linphone_gtk_call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cs, const char *msg);
 static void linphone_gtk_call_encryption_changed(LinphoneCore *lc, LinphoneCall *call, bool_t enabled, const char *token);
@@ -152,7 +148,7 @@ static GOptionEntry linphone_options[]={
 #define RELATIVE_XML_DIR
 #define BUILD_TREE_XML_DIR "gtk"
 
-#ifndef WIN32
+#ifndef _WIN32
 #define CONFIG_FILE ".linphonerc"
 #define SECRETS_FILE ".linphone-zidcache"
 #define CERTIFICATES_PATH ".linphone-usr-crt"
@@ -166,13 +162,10 @@ char *linphone_gtk_get_config_file(const char *filename){
 	const int path_max=1024;
 	char *config_file=g_malloc0(path_max);
 	if (filename==NULL) filename=CONFIG_FILE;
-	/*try accessing a local file first if exists*/
-	if (access(CONFIG_FILE,F_OK)==0){
-		snprintf(config_file,path_max,"%s",filename);
-	} else if (g_path_is_absolute(filename)) {
+	if (g_path_is_absolute(filename)) {
 		snprintf(config_file,path_max,"%s",filename);
 	} else{
-#ifdef WIN32
+#ifdef _WIN32
 		const char *appdata=getenv("APPDATA");
 		if (appdata){
 			snprintf(config_file,path_max,"%s\\%s",appdata,LINPHONE_CONFIG_DIR);
@@ -190,10 +183,10 @@ char *linphone_gtk_get_config_file(const char *filename){
 
 #define FACTORY_CONFIG_FILE "linphonerc.factory"
 static char _factory_config_file[1024];
-static const char *linphone_gtk_get_factory_config_file(){
+static const char *linphone_gtk_get_factory_config_file(void){
 	char* path = NULL;
 	/*try accessing a local file first if exists*/
-	if (access(FACTORY_CONFIG_FILE,F_OK)==0){
+	if (bctbx_file_exist(FACTORY_CONFIG_FILE)==0){
 		path = ms_strdup(FACTORY_CONFIG_FILE);
 	} else {
 		char *progdir;
@@ -201,7 +194,7 @@ static const char *linphone_gtk_get_factory_config_file(){
 		if (progpath != NULL) {
 			char *basename;
 			progdir = strdup(progpath);
-#ifdef WIN32
+#ifdef _WIN32
 			basename = strrchr(progdir, '\\');
 			if (basename != NULL) {
 				basename ++;
@@ -223,7 +216,7 @@ static const char *linphone_gtk_get_factory_config_file(){
 	}
 	if (path) {
 		//use factory file only if it exists
-		if (access(path,F_OK)==0){
+		if (bctbx_file_exist(path)==0){
 			snprintf(_factory_config_file, sizeof(_factory_config_file), "%s", path);
 			ms_free(path);
 			return _factory_config_file;
@@ -259,7 +252,8 @@ gboolean linphone_gtk_get_audio_assistant_option(void){
 }
 
 static void linphone_gtk_init_liblinphone(const char *config_file,
-		const char *factory_config_file, const char *db_file) {
+		const char *factory_config_file, const char *chat_messages_db_file,
+		const char *call_logs_db_file, const char *friends_db_file) {
 	LinphoneCoreVTable vtable={0};
 	gchar *secrets_file=linphone_gtk_get_config_file(SECRETS_FILE);
 	gchar *user_certificates_dir=linphone_gtk_get_config_file(CERTIFICATES_PATH);
@@ -270,12 +264,7 @@ static void linphone_gtk_init_liblinphone(const char *config_file,
 	vtable.notify_presence_received=linphone_gtk_notify_recv;
 	vtable.new_subscription_requested=linphone_gtk_new_unknown_subscriber;
 	vtable.auth_info_requested=linphone_gtk_auth_info_requested;
-	vtable.display_status=linphone_gtk_display_status;
-	vtable.display_message=linphone_gtk_display_message;
-	vtable.display_warning=linphone_gtk_display_warning;
-	vtable.display_url=linphone_gtk_display_url;
 	vtable.call_log_updated=linphone_gtk_call_log_updated;
-	//vtable.text_received=linphone_gtk_text_received;
 	vtable.message_received=linphone_gtk_text_received;
 	vtable.is_composing_received=linphone_gtk_is_composing_received;
 	vtable.refer_received=linphone_gtk_refer_received;
@@ -309,24 +298,25 @@ static void linphone_gtk_init_liblinphone(const char *config_file,
 		_linphone_gtk_enable_video(FALSE);
 		linphone_gtk_set_ui_config_int("videoselfview",0);
 	}
-	if (db_file) linphone_core_set_chat_database_path(the_core,db_file);
+	if (chat_messages_db_file) linphone_core_set_chat_database_path(the_core,chat_messages_db_file);
+	if (call_logs_db_file) linphone_core_set_call_logs_database_path(the_core, call_logs_db_file);
+	if (friends_db_file) linphone_core_set_friends_database_path(the_core, friends_db_file);
 }
 
 LinphoneCore *linphone_gtk_get_core(void){
 	return the_core;
 }
 
-GtkWidget *linphone_gtk_get_main_window(){
+GtkWidget *linphone_gtk_get_main_window(void){
 	return the_ui;
 }
 
-void linphone_gtk_destroy_main_window() {
+void linphone_gtk_destroy_main_window(void) {
 	linphone_gtk_destroy_window(the_ui);
 	the_ui = NULL;
 }
 
 static void linphone_gtk_configure_window(GtkWidget *w, const char *window_name){
-	static const char *icon_path=NULL;
 	static const char *hiddens=NULL;
 	static const char *shown=NULL;
 	static bool_t config_loaded=FALSE;
@@ -334,35 +324,17 @@ static void linphone_gtk_configure_window(GtkWidget *w, const char *window_name)
 	if (config_loaded==FALSE){
 		hiddens=linphone_gtk_get_ui_config("hidden_widgets",NULL);
 		shown=linphone_gtk_get_ui_config("shown_widgets",NULL);
-		icon_path=linphone_gtk_get_ui_config("icon",LINPHONE_ICON);
 		config_loaded=TRUE;
 	}
-	if (hiddens)
-		linphone_gtk_visibility_set(hiddens,window_name,w,FALSE);
-	if (shown)
-		linphone_gtk_visibility_set(shown,window_name,w,TRUE);
-	if (icon_path) {
-		GdkPixbuf *pbuf=create_pixbuf(icon_path);
-		if(pbuf) {
-			GList *pbuf_list = NULL;
-			GdkPixbuf *pbuf_16=gdk_pixbuf_scale_simple(pbuf, 16, 16, GDK_INTERP_BILINEAR);
-			GdkPixbuf *pbuf_32=gdk_pixbuf_scale_simple(pbuf, 32, 32, GDK_INTERP_BILINEAR);
-			pbuf_list = g_list_append(pbuf_list, pbuf);
-			pbuf_list = g_list_append(pbuf_list, pbuf_16);
-			pbuf_list = g_list_append(pbuf_list, pbuf_32);
-			gtk_window_set_icon_list(GTK_WINDOW(w), pbuf_list);
-			gtk_window_set_default_icon_list(pbuf_list);
-			g_list_foreach(pbuf_list, (GFunc)g_object_unref,NULL);
-			g_list_free(pbuf_list);
-		}
-	}
+	if (hiddens) linphone_gtk_visibility_set(hiddens,window_name,w,FALSE);
+	if (shown) linphone_gtk_visibility_set(shown,window_name,w,TRUE);
 }
 
 static int get_ui_file(const char *name, char *path, int pathsize){
 	snprintf(path,pathsize,"%s/%s.ui",BUILD_TREE_XML_DIR,name);
-	if (access(path,F_OK)!=0){
+	if (bctbx_file_exist(path)!=0){
 		snprintf(path,pathsize,"%s/%s.ui",INSTALLED_XML_DIR,name);
-		if (access(path,F_OK)!=0){
+		if (bctbx_file_exist(path)!=0){
 			g_error("Could not locate neither %s/%s.ui nor %s/%s.ui",BUILD_TREE_XML_DIR,name,
 				INSTALLED_XML_DIR,name);
 			return -1;
@@ -530,7 +502,7 @@ void linphone_gtk_show_about(void){
 		}
 		g_free(license);
 	}
-	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),LIBLINPHONE_GIT_VERSION);
+	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),linphone_core_get_version());
 	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("title","Linphone"));
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("home","http://www.linphone.org"));
 	if (logo) {
@@ -597,7 +569,7 @@ static gboolean uribar_completion_matchfunc(GtkEntryCompletion *completion, cons
 	return ret;
 }
 
-static void load_uri_history(){
+static void load_uri_history(void){
 	GtkEntry *uribar=GTK_ENTRY(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"uribar"));
 	char key[20];
 	int i;
@@ -624,7 +596,7 @@ static void load_uri_history(){
 	g_signal_connect (G_OBJECT (uribar), "changed", G_CALLBACK(linphone_gtk_on_uribar_changed), NULL);
 }
 
-static void save_uri_history(){
+static void save_uri_history(void){
 	LinphoneCore *lc=linphone_gtk_get_core();
 	LpConfig *cfg=linphone_core_get_config(lc);
 	GtkEntry *uribar=GTK_ENTRY(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"uribar"));
@@ -673,7 +645,7 @@ static void completion_add_text(GtkEntry *entry, const char *text){
 	save_uri_history();
 }
 
-void on_contact_provider_search_results( LinphoneContactSearch* req, MSList* friends, void* data )
+void on_contact_provider_search_results( LinphoneContactSearch* req, bctbx_list_t* friends, void* data )
 {
 	GtkTreeIter    iter;
 	GtkEntry*    uribar = GTK_ENTRY(data);
@@ -799,6 +771,12 @@ bool_t linphone_gtk_video_enabled(void){
 
 void linphone_gtk_show_main_window(){
 	GtkWidget *w=linphone_gtk_get_main_window();
+#ifdef HAVE_GTK_OSX
+	GtkWidget *icon = linphone_gtk_get_widget(w, "history_tab_icon");
+	GtkWidget *label = linphone_gtk_get_widget(w, "history_tab_label");
+	gtk_misc_set_alignment(GTK_MISC(icon), 0.5f, 0.25f);
+	gtk_misc_set_alignment(GTK_MISC(label), 0.5f, 0.f);
+#endif
 	gtk_widget_show(w);
 	gtk_window_present(GTK_WINDOW(w));
 }
@@ -815,10 +793,10 @@ void linphone_gtk_call_terminated(LinphoneCall *call, const char *error){
 static void linphone_gtk_update_call_buttons(LinphoneCall *call){
 	LinphoneCore *lc=linphone_gtk_get_core();
 	GtkWidget *mw=linphone_gtk_get_main_window();
-	const MSList *calls=linphone_core_get_calls(lc);
+	const bctbx_list_t *calls=linphone_core_get_calls(lc);
 	GtkWidget *button;
 	bool_t add_call=(calls!=NULL);
-	int call_list_size=ms_list_size(calls);
+	int call_list_size=bctbx_list_size(calls);
 	GtkWidget *conf_frame;
 
 	button=linphone_gtk_get_widget(mw,"start_call");
@@ -859,7 +837,7 @@ gchar *linphone_gtk_get_record_path(const LinphoneAddress *address, gboolean is_
 	int i;
 	const char *ext="wav";
 
-#ifdef WIN32
+#ifdef _WIN32
 	loctime=*localtime(&curtime);
 #else
 	localtime_r(&curtime,&loctime);
@@ -893,13 +871,36 @@ gchar *linphone_gtk_get_record_path(const LinphoneAddress *address, gboolean is_
 	return g_build_filename(dir,filename,NULL);
 }
 
+gchar *linphone_gtk_get_snapshot_path(void) {
+	const char *dir=g_get_user_special_dir(G_USER_DIRECTORY_PICTURES);
+	char filename[256]={0};
+	char date[64]={0};
+	time_t curtime=time(NULL);
+	struct tm loctime;
+	const char *ext="jpg";
+
+#ifdef _WIN32
+	loctime=*localtime(&curtime);
+#else
+	localtime_r(&curtime,&loctime);
+#endif
+	snprintf(date,sizeof(date)-1,"%i%02i%02i-%02i%02i%02i",loctime.tm_year+1900,loctime.tm_mon+1,loctime.tm_mday, loctime.tm_hour, loctime.tm_min, loctime.tm_sec);
+	snprintf(filename,sizeof(filename)-1,"%s-snapshot-%s.%s",
+			linphone_gtk_get_ui_config("title","Linphone"),
+			date, ext);
+	if (!dir) {
+		ms_message ("No directory for pictures, using [%s] instead",dir=getenv("HOME"));
+	}
+	return g_build_filename(dir,filename,NULL);
+}
+
 static gboolean linphone_gtk_start_call_do(GtkWidget *uri_bar){
 	const char *entered=gtk_entry_get_text(GTK_ENTRY(uri_bar));
 	LinphoneCore *lc=linphone_gtk_get_core();
 	LinphoneAddress *addr=linphone_core_interpret_url(lc,entered);
 
 	if (addr!=NULL){
-		LinphoneCallParams *params=linphone_core_create_default_call_parameters(lc);
+		LinphoneCallParams *params=linphone_core_create_call_params(lc, NULL);
 		gchar *record_file=linphone_gtk_get_record_path(addr,FALSE);
 		linphone_call_params_set_record_file(params,record_file);
 		linphone_core_invite_address_with_params(lc,addr,params);
@@ -913,10 +914,9 @@ static gboolean linphone_gtk_start_call_do(GtkWidget *uri_bar){
 	return FALSE;
 }
 
-
 static void accept_incoming_call(LinphoneCall *call){
 	LinphoneCore *lc=linphone_gtk_get_core();
-	LinphoneCallParams *params=linphone_core_create_default_call_parameters(lc);
+	LinphoneCallParams *params = linphone_core_create_call_params(lc, call);
 	gchar *record_file=linphone_gtk_get_record_path(linphone_call_get_remote_address(call),FALSE);
 	linphone_call_params_set_record_file(params,record_file);
 	linphone_core_accept_call_with_params(lc,call,params);
@@ -1022,12 +1022,21 @@ void linphone_gtk_used_identity_changed(GtkWidget *w){
 
 void on_proxy_refresh_button_clicked(GtkWidget *w){
 	LinphoneCore *lc=linphone_gtk_get_core();
-	MSList const *item=linphone_core_get_proxy_config_list(lc);
-	while (item != NULL) {
-		LinphoneProxyConfig *lpc=(LinphoneProxyConfig*)item->data;
-		linphone_proxy_config_edit(lpc);
-		linphone_proxy_config_done(lpc);
-		item = item->next;
+	linphone_core_refresh_registers(lc);
+}
+
+static gboolean grab_focus(GtkWidget *w){
+	gtk_widget_grab_focus(w);
+	return FALSE;
+}
+
+void linphone_gtk_viewswitch_changed(GtkNotebook *notebook, GtkWidget *page, gint page_num, gpointer user_data){
+	GtkWidget *main_window = linphone_gtk_get_main_window();
+	GtkWidget *friendlist = linphone_gtk_get_widget(main_window,"contact_list");
+	GtkWidget *w = (GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
+
+	if (page_num == gtk_notebook_page_num(GTK_NOTEBOOK(notebook),w)) {
+		g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(page,"text_entry"));
 	}
 }
 
@@ -1148,34 +1157,12 @@ static void linphone_gtk_dtmf_received(LinphoneCore *lc, LinphoneCall *call, int
 	ms_message("Dtmf %c received.",dtmf);
 }
 
-static void linphone_gtk_display_status(LinphoneCore *lc, const char *status){
-	GtkWidget *w=linphone_gtk_get_main_window();
-	GtkWidget *status_bar=linphone_gtk_get_widget(w,"status_bar");
-
-	gtk_statusbar_push(GTK_STATUSBAR(status_bar),
-			gtk_statusbar_get_context_id(GTK_STATUSBAR(status_bar),""),
-			status);
-}
 
 static void linphone_gtk_configuring_status(LinphoneCore *lc, LinphoneConfiguringState status, const char *message) {
 	if (config_fetching_dialog) linphone_gtk_close_config_fetching(config_fetching_dialog, status);
 	config_fetching_dialog=NULL;
 }
 
-static void linphone_gtk_display_message(LinphoneCore *lc, const char *msg){
-	linphone_gtk_display_something(GTK_MESSAGE_INFO,msg);
-}
-
-static void linphone_gtk_display_warning(LinphoneCore *lc, const char *warning){
-	linphone_gtk_display_something(GTK_MESSAGE_WARNING,warning);
-}
-
-static void linphone_gtk_display_url(LinphoneCore *lc, const char *msg, const char *url){
-	char richtext[4096];
-	snprintf(richtext,sizeof(richtext),"%s %s",msg,url);
-	linphone_gtk_display_something(GTK_MESSAGE_INFO,richtext);
-}
-
 static void linphone_gtk_call_log_updated(LinphoneCore *lc, LinphoneCallLog *cl){
 	GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(linphone_gtk_get_main_window()),"call_logs");
 	if (w) linphone_gtk_call_log_update(w);
@@ -1183,7 +1170,7 @@ static void linphone_gtk_call_log_updated(LinphoneCore *lc, LinphoneCallLog *cl)
 }
 
 #ifdef HAVE_NOTIFY
-static bool_t notify_actions_supported() {
+static bool_t notify_actions_supported(void) {
 	bool_t accepts_actions = FALSE;
 	GList *capabilities = notify_get_server_caps();
 	GList *c;
@@ -1208,10 +1195,14 @@ static NotifyNotification* build_notification(const char *title, const char *bod
 	);
 #ifndef HAVE_NOTIFY1
 	{
-		const char *icon_path = linphone_gtk_get_ui_config("icon", LINPHONE_ICON);
-		GdkPixbuf *pbuf = create_pixbuf(icon_path);
-		/*with notify1, this function makes the notification crash the app with obscure dbus glib critical errors*/
-		notify_notification_set_icon_from_pixbuf(n, pbuf);
+		GError *error = NULL;
+		const char *icon_name = linphone_gtk_get_ui_config("icon_name", LINPHONE_ICON_NAME);
+		GdkPixbuf *pbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), icon_name, 48, 0, &error);
+		if(error) {
+			g_warning("Could not load '%s' icon: %s", icon_name, error->message);
+			g_error_free(error);
+		}
+		notify_notification_set_image_from_pixbuf(n, pbuf);
 	}
 #endif
 	return n;
@@ -1228,25 +1219,31 @@ static void make_notification(const char *title, const char *body){
 
 #endif
 
-void linphone_gtk_notify(LinphoneCall *call, const char *msg){
+void linphone_gtk_notify(LinphoneCall *call, LinphoneChatMessage *chat_message, const char *msg){
 #ifdef HAVE_NOTIFY
 	if (!notify_is_initted())
 		if (!notify_init ("Linphone")) ms_error("Libnotify failed to init.");
 #endif
 	if (!call) {
-
 #ifdef HAVE_NOTIFY
-		if (!notify_notification_show(notify_notification_new("Linphone",msg,NULL
+		if (chat_message) {
+			const LinphoneAddress *address = linphone_chat_message_get_peer_address(chat_message);
+			char *remote = linphone_address_as_string(address);
+			make_notification(remote, linphone_chat_message_get_text(chat_message));
+		} else {
+			if (!notify_notification_show(notify_notification_new("Linphone",msg,NULL
 #ifdef HAVE_NOTIFY1
-	,NULL
+				,NULL
 #endif
-),NULL))
-
+				),NULL)) {
 				ms_error("Failed to send notification.");
+			}
+		}
 #else
 		linphone_gtk_show_main_window();
 #endif
 	} else if (!gtk_window_is_active((GtkWindow*)linphone_gtk_get_main_window())) {
+		gboolean show_main_window = FALSE;
 #ifdef HAVE_NOTIFY
 		char *body=NULL;
 		char *remote=call!=NULL ? linphone_call_get_remote_address_as_string(call) : NULL;
@@ -1260,13 +1257,15 @@ void linphone_gtk_notify(LinphoneCall *call, const char *msg){
 			break;
 			case LinphoneCallIncomingReceived:
 				n=build_notification(_("Incoming call"),body=g_markup_printf_escaped("<b>%s</b>",remote));
-				if (notify_actions_supported()) {
-					notify_notification_add_action (n,"answer", _("Answer"),
-						NOTIFY_ACTION_CALLBACK(linphone_gtk_answer_clicked),NULL,NULL);
-					notify_notification_add_action (n,"decline",_("Decline"),
-						NOTIFY_ACTION_CALLBACK(linphone_gtk_decline_clicked),NULL,NULL);
-				}
-				show_notification(n);
+				if (n){
+					if (notify_actions_supported()) {
+						notify_notification_add_action (n,"answer", _("Answer"),
+							NOTIFY_ACTION_CALLBACK(linphone_gtk_answer_clicked),NULL,NULL);
+						notify_notification_add_action (n,"decline",_("Decline"),
+							NOTIFY_ACTION_CALLBACK(linphone_gtk_decline_clicked),NULL,NULL);
+					}
+					show_notification(n);
+				}else show_main_window = TRUE;
 			break;
 			case LinphoneCallPausedByRemote:
 				make_notification(_("Call paused"),body=g_markup_printf_escaped(_("<b>by %s</b>"),remote));
@@ -1276,7 +1275,11 @@ void linphone_gtk_notify(LinphoneCall *call, const char *msg){
 		}
 		if (body) g_free(body);
 		if (remote) g_free(remote);
+#else
+		if (linphone_call_get_state(call) == LinphoneCallIncomingReceived)
+			show_main_window = TRUE;
 #endif
+		if (show_main_window) linphone_gtk_show_main_window();
 	}
 }
 
@@ -1305,7 +1308,7 @@ static void on_call_updated_response(GtkWidget *dialog, gint responseid, gpointe
 	LinphoneCall *call = (LinphoneCall *)g_object_get_data(G_OBJECT(dialog), "call");
 	if (linphone_call_get_state(call)==LinphoneCallUpdatedByRemote){
 		LinphoneCore *lc=linphone_call_get_core(call);
-		LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
+		LinphoneCallParams *params = linphone_core_create_call_params(lc, call);
 		linphone_call_params_enable_video(params,responseid==GTK_RESPONSE_YES);
 		linphone_core_accept_call_update(lc,call,params);
 		linphone_call_params_destroy(params);
@@ -1373,7 +1376,7 @@ static void linphone_gtk_call_state_changed(LinphoneCore *lc, LinphoneCall *call
 			linphone_gtk_create_in_call_view(call);
 			linphone_gtk_in_call_view_set_incoming(call);
 			linphone_gtk_status_icon_set_blinking(TRUE);
-			if (linphone_gtk_get_ui_config_int("auto_answer", 0))  {
+			if (linphone_gtk_auto_answer_enabled())  {
 				int delay = linphone_gtk_get_ui_config_int("auto_answer_delay", 2000);
 				linphone_call_ref(call);
 				g_timeout_add(delay, (GSourceFunc)linphone_gtk_auto_answer, call);
@@ -1397,7 +1400,7 @@ static void linphone_gtk_call_state_changed(LinphoneCore *lc, LinphoneCall *call
 		default:
 		break;
 	}
-	linphone_gtk_notify(call, msg);
+	linphone_gtk_notify(call, NULL, msg);
 	linphone_gtk_update_call_buttons (call);
 }
 
@@ -1414,7 +1417,7 @@ static void update_registration_status(LinphoneProxyConfig *cfg, LinphoneRegistr
 	GtkTreeModel *model=gtk_combo_box_get_model(box);
 	GtkTreeIter iter;
 	gboolean found=FALSE;
-	const char *stock_id=NULL;
+	const char *icon_name=NULL;
 
 	if (gtk_tree_model_get_iter_first(model,&iter)){
 		gpointer p;
@@ -1432,21 +1435,21 @@ static void update_registration_status(LinphoneProxyConfig *cfg, LinphoneRegistr
 	}
 	switch (rs){
 		case LinphoneRegistrationOk:
-			stock_id=GTK_STOCK_YES;
+			icon_name="linphone-ok";
 		break;
 		case LinphoneRegistrationProgress:
-			stock_id=GTK_STOCK_REFRESH;
+			icon_name="linphone-inprogress";
 		break;
 		case LinphoneRegistrationCleared:
-			stock_id=NULL;
+			icon_name=NULL;
 		break;
 		case LinphoneRegistrationFailed:
-			stock_id=GTK_STOCK_DIALOG_WARNING;
+			icon_name="linphone-failed";
 		break;
 		default:
 		break;
 	}
-	gtk_list_store_set(GTK_LIST_STORE(model),&iter,1,stock_id,-1);
+	gtk_list_store_set(GTK_LIST_STORE(model),&iter,1,icon_name,-1);
 }
 
 static void linphone_gtk_registration_state_changed(LinphoneCore *lc, LinphoneProxyConfig *cfg,
@@ -1477,7 +1480,7 @@ void linphone_gtk_open_browser(const char *uri) {
 		g_warning("Could not open %s: %s", uri, error->message);
 		g_error_free(error);
 	}
-#elif defined(WIN32)
+#elif defined(_WIN32)
 	HINSTANCE instance = ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL);
 	if ((int)instance <= 32) {
 		g_warning("Could not open %s (error #%i)", uri, (int)instance);
@@ -1497,7 +1500,7 @@ void linphone_gtk_link_to_website(GtkWidget *item){
 	linphone_gtk_open_browser(home);
 }
 
-static GtkWidget *create_icon_menu(){
+static GtkWidget *create_icon_menu(void){
 	GtkWidget *menu=gtk_menu_new();
 	GtkWidget *menu_item;
 	GtkWidget *image;
@@ -1585,6 +1588,9 @@ void linphone_gtk_status_icon_set_blinking(gboolean val) {
 	if(icon) {
 		linphone_status_icon_enable_blinking(icon, val);
 	}
+#ifdef __APPLE__
+	linphone_gtk_update_badge_count();
+#endif
 }
 
 void linphone_gtk_options_activate(GtkWidget *item){
@@ -1602,13 +1608,13 @@ static void init_identity_combo(GtkComboBox *box){
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(box),(r1=gtk_cell_renderer_text_new()),TRUE);
 	gtk_cell_layout_pack_end(GTK_CELL_LAYOUT(box),(r2=gtk_cell_renderer_pixbuf_new()),FALSE);
 	gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(box),r1,"text",0);
-	gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(box),r2,"stock-id",1);
+	gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(box),r2,"icon-name",1);
 	g_object_set(G_OBJECT(r1),"ellipsize",PANGO_ELLIPSIZE_END,NULL);
 	gtk_combo_box_set_model(box,GTK_TREE_MODEL(store));
 }
 
 void linphone_gtk_load_identities(void){
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	GtkComboBox *box=GTK_COMBO_BOX(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"identities"));
 	char *def_identity;
 	LinphoneProxyConfig *def=NULL;
@@ -1623,18 +1629,18 @@ void linphone_gtk_load_identities(void){
 		store=GTK_LIST_STORE(gtk_combo_box_get_model(box));
 	}
 	gtk_list_store_clear(store);
-	linphone_core_get_default_proxy(linphone_gtk_get_core(),&def);
+	def = linphone_core_get_default_proxy_config(linphone_gtk_get_core());
 	def_identity=g_strdup_printf(_("%s (Default)"),linphone_core_get_primary_contact(linphone_gtk_get_core()));
 	gtk_list_store_append(store,&iter);
 	gtk_list_store_set(store,&iter,0,def_identity,1,NULL,2,NULL,-1);
 	g_free(def_identity);
 	for(i=1,elem=linphone_core_get_proxy_config_list(linphone_gtk_get_core());
 			elem!=NULL;
-			elem=ms_list_next(elem),i++){
+			elem=bctbx_list_next(elem),i++){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
 		gtk_list_store_append(store,&iter);
 		gtk_list_store_set(store,&iter,0,linphone_proxy_config_get_identity(cfg),1,
-						   linphone_proxy_config_is_registered(cfg) ? GTK_STOCK_YES : NULL,
+						   linphone_proxy_config_is_registered(cfg) ? "linphone-ok" : NULL,
 						   2,cfg,-1);
 		if (cfg==def) {
 			def_index=i;
@@ -1650,7 +1656,7 @@ static void linphone_gtk_dtmf_pressed(GtkButton *button){
 	gtk_editable_insert_text(GTK_EDITABLE(uri_bar),label,1,&pos);
 	linphone_core_play_dtmf (linphone_gtk_get_core(),label[0],-1);
 	if (linphone_core_in_call(linphone_gtk_get_core())){
-		linphone_core_send_dtmf(linphone_gtk_get_core(),label[0]);
+		linphone_call_send_dtmf(linphone_core_get_current_call(linphone_gtk_get_core()),label[0]);
 	}
 }
 
@@ -1680,9 +1686,9 @@ static void linphone_gtk_check_menu_items(void){
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(selfview_item),selfview);
 }
 
-static gboolean linphone_gtk_can_manage_accounts(){
+static gboolean linphone_gtk_can_manage_accounts(void){
 	LinphoneCore *lc=linphone_gtk_get_core();
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	for(elem=linphone_core_get_sip_setups(lc);elem!=NULL;elem=elem->next){
 		SipSetup *ss=(SipSetup*)elem->data;
 		if (sip_setup_get_capabilities(ss) & SIP_SETUP_CAP_ACCOUNT_MANAGER){
@@ -1692,28 +1698,20 @@ static gboolean linphone_gtk_can_manage_accounts(){
 	return FALSE;
 }
 
-static void linphone_gtk_configure_main_window(){
+static void linphone_gtk_configure_main_window(void){
 	static gboolean config_loaded=FALSE;
 	static const char *title;
 	static const char *home;
-	static const char *start_call_icon;
-	static const char *add_call_icon;
-	static const char *start_chat_icon;
 	static const char *search_icon;
 	static gboolean update_check_menu;
-	static gboolean buttons_have_borders;
 	static gboolean show_abcd;
 	GtkWidget *w=linphone_gtk_get_main_window();
 
 	if (!config_loaded){
 		title=linphone_gtk_get_ui_config("title","Linphone");
 		home=linphone_gtk_get_ui_config("home","http://www.linphone.org");
-		start_call_icon=linphone_gtk_get_ui_config("start_call_icon","call_start.png");
-		add_call_icon=linphone_gtk_get_ui_config("add_call_icon","call_add.png");
-		start_chat_icon=linphone_gtk_get_ui_config("start_chat_icon","chat_start.png");
 		search_icon=linphone_gtk_get_ui_config("directory_search_icon",NULL);
 		update_check_menu=linphone_gtk_get_ui_config_int("update_check_menu",0);
-		buttons_have_borders=linphone_gtk_get_ui_config_int("buttons_border",1);
 		show_abcd=linphone_gtk_get_ui_config_int("show_abcd",1);
 		config_loaded=TRUE;
 	}
@@ -1721,24 +1719,6 @@ static void linphone_gtk_configure_main_window(){
 	if (title) {
 		gtk_window_set_title(GTK_WINDOW(w),title);
 	}
-	if (start_call_icon){
-		gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"start_call")),
-							create_pixmap (start_call_icon));
-		if (!buttons_have_borders)
-			gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"start_call")),GTK_RELIEF_NONE);
-	}
-	if (add_call_icon){
-		gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"add_call")),
-							create_pixmap (add_call_icon));
-		if (!buttons_have_borders)
-			gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"add_call")),GTK_RELIEF_NONE);
-	}
-	if (start_chat_icon){
-		gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"start_chat")),
-							create_pixmap (start_chat_icon));
-		if (!buttons_have_borders)
-			gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"start_chat")),GTK_RELIEF_NONE);
-	}
 	if (search_icon){
 		GdkPixbuf *pbuf=create_pixbuf(search_icon);
 		if(pbuf) {
@@ -1752,23 +1732,6 @@ static void linphone_gtk_configure_main_window(){
 		tmp=g_strdup(home);
 		g_object_set_data_full(G_OBJECT(menu_item),"home",tmp, (GDestroyNotify)g_free);
 	}
-	{
-		/*
-		GdkPixbuf *pbuf=create_pixbuf("contact-orange.png");
-		if (pbuf) {
-			gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"contact_tab_icon")),pbuf);
-			g_object_unref(G_OBJECT(pbuf));
-		}
-		*/
-	}
-	{
-		GdkPixbuf *pbuf=create_pixbuf("dialer.png");
-		if (pbuf) {
-			GtkButton *button=GTK_BUTTON(linphone_gtk_get_widget(w,"keypad"));
-			gtk_button_set_image(button,gtk_image_new_from_pixbuf (pbuf));
-			g_object_unref(pbuf);
-		}
-	}
 	if (linphone_gtk_can_manage_accounts()) {
 		gtk_widget_show(linphone_gtk_get_widget(w,"assistant_item"));
 	}
@@ -1780,8 +1743,7 @@ static void linphone_gtk_configure_main_window(){
 
 void linphone_gtk_manage_login(void){
 	LinphoneCore *lc=linphone_gtk_get_core();
-	LinphoneProxyConfig *cfg=NULL;
-	linphone_core_get_default_proxy(lc,&cfg);
+	LinphoneProxyConfig *cfg=linphone_core_get_default_proxy_config(lc);
 	if (cfg){
 		SipSetup *ss=linphone_proxy_config_get_sip_setup(cfg);
 		if (ss && (sip_setup_get_capabilities(ss) & SIP_SETUP_CAP_LOGIN)){
@@ -1868,7 +1830,7 @@ void linphone_gtk_keypad_key_released(GtkWidget *w, GdkEvent *event, gpointer us
 	}
 }
 
-void linphone_gtk_create_keypad(GtkWidget *button){
+static void linphone_gtk_show_keypad(void){
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	GtkWidget *k=(GtkWidget *)g_object_get_data(G_OBJECT(mw),"keypad");
 	GtkWidget *keypad;
@@ -1878,7 +1840,7 @@ void linphone_gtk_create_keypad(GtkWidget *button){
 	keypad=linphone_gtk_create_window("keypad", NULL);
 	linphone_gtk_connect_digits(keypad);
 	linphone_gtk_init_dtmf_table(keypad);
-	g_object_set_data(G_OBJECT(mw),"keypad",(gpointer)keypad);
+	g_object_set_data(G_OBJECT(mw),"keypad", keypad);
 	if(!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mw),"show_abcd"))){
 		gtk_widget_hide(linphone_gtk_get_widget(keypad,"dtmf_A"));
 		gtk_widget_hide(linphone_gtk_get_widget(keypad,"dtmf_B"));
@@ -1889,14 +1851,75 @@ void linphone_gtk_create_keypad(GtkWidget *button){
 	gtk_widget_show(keypad);
 }
 
-static void linphone_gtk_init_main_window(){
+static void linphone_gtk_destroy_keypad(void) {
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *keypad = GTK_WIDGET(g_object_get_data(G_OBJECT(mw), "keypad"));
+	if(keypad) {
+		gtk_widget_destroy(keypad);
+		g_object_set_data(G_OBJECT(mw), "keypad", NULL);
+	}
+}
+
+void linphone_gtk_show_keypad_checked(GtkCheckMenuItem *check_menu_item) {
+	if(gtk_check_menu_item_get_active(check_menu_item)) {
+		linphone_gtk_show_keypad();
+	} else {
+		linphone_gtk_destroy_keypad();
+	}
+}
+
+void linphone_gtk_import_contacts(void) {
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *dialog = gtk_file_chooser_dialog_new("Open vCard file", (GtkWindow *)mw, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+
+	if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+		LinphoneCore *lc = linphone_gtk_get_core();
+		char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+		LinphoneFriendList *list = linphone_core_get_default_friend_list(lc);
+		linphone_friend_list_import_friends_from_vcard4_file(list, filename);
+		g_free(filename);
+		linphone_gtk_show_friends();
+	}
+	gtk_widget_destroy(dialog);
+}
+
+void linphone_gtk_export_contacts(void) {
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *dialog = gtk_file_chooser_dialog_new("Save vCards as", (GtkWindow *)mw, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE);
+
+	if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+		LinphoneCore *lc = linphone_gtk_get_core();
+		char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+		LinphoneFriendList *list = linphone_core_get_default_friend_list(lc);
+		linphone_friend_list_export_friends_as_vcard4_file(list, filename);
+		g_free(filename);
+	}
+	gtk_widget_destroy(dialog);
+}
+
+gboolean linphone_gtk_keypad_destroyed_handler(void) {
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *show_keypad_item = linphone_gtk_get_widget(mw, "show_keypad_menu_item");
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(show_keypad_item), FALSE);
+	return FALSE;
+}
+
+void linphone_gtk_update_status_bar_icons(void) {
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *icon = linphone_gtk_get_widget(mw, "autoanswer_icon");
+	gtk_widget_set_visible(icon, linphone_gtk_auto_answer_enabled());
+}
+
+static void linphone_gtk_init_main_window(void){
 	GtkWidget *main_window;
 	linphone_gtk_configure_main_window();
 	linphone_gtk_manage_login();
-	load_uri_history();
 	linphone_gtk_load_identities();
 	linphone_gtk_set_my_presence(linphone_core_get_presence_info(linphone_gtk_get_core()));
 	linphone_gtk_show_friends();
+	linphone_gtk_update_status_bar_icons();
+	load_uri_history();
 	linphone_core_reset_missed_calls_count(linphone_gtk_get_core());
 	main_window=linphone_gtk_get_main_window();
 	linphone_gtk_call_log_update(main_window);
@@ -1909,6 +1932,7 @@ static void linphone_gtk_init_main_window(){
 		G_CALLBACK (linphone_gtk_close), main_window);
 #ifdef HAVE_GTK_OSX
 	{
+		gtk_widget_show(main_window);
 		GtkWidget *menubar=linphone_gtk_get_widget(main_window,"menubar1");
 		GtkosxApplication *theMacApp = gtkosx_application_get();
 		gtkosx_application_set_menu_bar(theMacApp,GTK_MENU_SHELL(menubar));
@@ -1926,7 +1950,7 @@ static void linphone_gtk_init_main_window(){
 #endif
 }
 
-void linphone_gtk_log_handler(OrtpLogLevel lev, const char *fmt, va_list args){
+void linphone_gtk_log_handler(const char*domain, OrtpLogLevel lev, const char *fmt, va_list args){
 	if (verbose){
 		const char *lname="undef";
 		char *msg;
@@ -1967,16 +1991,25 @@ void linphone_gtk_log_handler(OrtpLogLevel lev, const char *fmt, va_list args){
 
 
 void linphone_gtk_refer_received(LinphoneCore *lc, const char *refer_to){
-	GtkEntry * uri_bar =GTK_ENTRY(linphone_gtk_get_widget(
-		linphone_gtk_get_main_window(), "uribar"));
-	char *text;
-	linphone_gtk_notify(NULL,(text=ms_strdup_printf(_("We are transferred to %s"),refer_to)));
-	g_free(text);
-	gtk_entry_set_text(uri_bar, refer_to);
-	linphone_gtk_start_call(linphone_gtk_get_main_window());
+	char method[20] = "";
+	LinphoneAddress *addr = linphone_address_new(refer_to);
+	if(addr) {
+		const char *tmp = linphone_address_get_method_param(addr);
+		strncpy(method, tmp, sizeof(20));
+		linphone_address_destroy(addr);
+	}
+	if(strlen(method) == 0 || strcmp(method, "INVITE") == 0) {
+		GtkEntry * uri_bar =GTK_ENTRY(linphone_gtk_get_widget(
+			linphone_gtk_get_main_window(), "uribar"));
+		char *text;
+		linphone_gtk_notify(NULL,NULL,(text=ms_strdup_printf(_("We are transferred to %s"),refer_to)));
+		g_free(text);
+		gtk_entry_set_text(uri_bar, refer_to);
+		linphone_gtk_start_call(linphone_gtk_get_main_window());
+	}
 }
 
-static void linphone_gtk_check_soundcards(){
+static void linphone_gtk_check_soundcards(void){
 	const char **devices=linphone_core_get_sound_devices(linphone_gtk_get_core());
 	if (devices==NULL || devices[0]==NULL){
 		linphone_gtk_display_something(GTK_MESSAGE_WARNING,
@@ -1986,6 +2019,12 @@ static void linphone_gtk_check_soundcards(){
 }
 
 static void linphone_gtk_quit_core(void){
+#ifdef HAVE_GTK_OSX
+	{
+		GtkosxApplication *theMacApp = gtkosx_application_get();
+		gtkosx_application_set_menu_bar(theMacApp,NULL);
+	}
+#endif
 	linphone_gtk_unmonitor_usb();
 	g_source_remove_by_user_data(linphone_gtk_get_core());
 #ifdef BUILD_WIZARD
@@ -2033,7 +2072,7 @@ static void linphone_gtk_init_ui(void){
 #ifdef BUILD_WIZARD
 	// Veryfing if at least one sip account is configured. If not, show wizard
 	if (linphone_core_get_proxy_config_list(linphone_gtk_get_core()) == NULL) {
-		linphone_gtk_show_assistant(the_ui);
+		linphone_gtk_show_assistant();
 	}
 #endif
 
@@ -2054,16 +2093,41 @@ static void linphone_gtk_init_ui(void){
 	linphone_gtk_monitor_usb();
 }
 
+static void sigint_handler(int signum){
+	gtk_main_quit();
+}
+
+static void populate_xdg_data_dirs_envvar(void) {
+#ifndef _WIN32
+	int i;
+	gchar *value;
+	gchar **paths;
+
+	if(g_getenv("XDG_DATA_DIRS") == NULL) {
+		value = g_strdup("/usr/share:/usr/local/share:/opt/local/share");
+	} else {
+		value = g_strdup(g_getenv("XDG_DATA_DIRS"));
+	}
+	paths = g_strsplit(value, ":", -1);
+	for(i=0; paths[i] && strcmp(paths[i], PACKAGE_DATA_DIR) != 0; i++);
+	if(paths[i] == NULL) {
+		gchar *new_value = g_strdup_printf("%s:%s", PACKAGE_DATA_DIR, value);
+		g_setenv("XDG_DATA_DIRS", new_value, TRUE);
+		g_free(new_value);
+	}
+	g_strfreev(paths);
+#endif
+}
+
 int main(int argc, char *argv[]){
 	char *config_file;
 	const char *factory_config_file;
 	const char *lang;
 	GtkSettings *settings;
-	const char *icon_path=LINPHONE_ICON;
-	GdkPixbuf *pbuf;
+	const char *icon_name=LINPHONE_ICON_NAME;
 	const char *app_name="Linphone";
 	LpConfig *factory;
-	char *db_file;
+	char *chat_messages_db_file, *call_logs_db_file, *friends_db_file;
 	GError *error=NULL;
 	const char *tmp;
 
@@ -2082,18 +2146,8 @@ int main(int argc, char *argv[]){
 	/*for pulseaudio:*/
 	g_setenv("PULSE_PROP_media.role", "phone", TRUE);
 #endif
-	
-	/* Add the data directory of the install prefix to XDG_DATA_DIRS
-	 * This environment variable is used by GTK+ to locate the directory
-	 * which stores icon images. */
-	tmp = g_getenv("XDG_DATA_DIRS");
-	if(tmp && strlen(tmp) > 0) {
-		char *xdg_data_dirs = g_strdup_printf("%s:%s", PACKAGE_DATA_DIR, tmp);
-		g_setenv("XDG_DATA_DIRS", xdg_data_dirs, TRUE);
-		g_free(xdg_data_dirs);
-	} else {
-		g_setenv("XDG_DATA_DIRS", PACKAGE_DATA_DIR, FALSE);
-	}
+
+	populate_xdg_data_dirs_envvar();
 
 	lang=linphone_gtk_get_lang(config_file);
 	if (lang == NULL || lang[0]=='\0'){
@@ -2101,7 +2155,7 @@ int main(int argc, char *argv[]){
 		if (!lang) lang = g_getenv("LANG");
 	}
 	if (lang && lang[0]!='\0'){
-#ifdef WIN32
+#ifdef _WIN32
 		if (strncmp(lang,"zh",2)==0){
 			workaround_gtk_entry_chinese_bug=TRUE;
 		}
@@ -2119,7 +2173,7 @@ int main(int argc, char *argv[]){
 #else
 	g_message("NLS disabled.\n");
 #endif
-#ifdef WIN32
+#ifdef _WIN32
 	gtk_rc_add_default_file("./gtkrc");
 #endif
 	gdk_threads_enter();
@@ -2131,7 +2185,7 @@ int main(int argc, char *argv[]){
 		return -1;
 	}
 	if(version) {
-		g_message("Linphone version %s.", LIBLINPHONE_GIT_VERSION);
+		g_message("Linphone version %s.", linphone_core_get_version());
 		return 0;
 	}
 
@@ -2181,14 +2235,10 @@ int main(int argc, char *argv[]){
 		factory=lp_config_new(NULL);
 		lp_config_read_file(factory,factory_config_file);
 		app_name=lp_config_get_string(factory,"GtkUi","title","Linphone");
-		icon_path=lp_config_get_string(factory,"GtkUi","icon",LINPHONE_ICON);
+		icon_name=lp_config_get_string(factory,"GtkUi","icon_name",LINPHONE_ICON_NAME);
 	}
 	g_set_application_name(app_name);
-	pbuf=create_pixbuf(icon_path);
-	if (pbuf) {
-		gtk_window_set_default_icon(pbuf);
-		g_object_unref(pbuf);
-	}
+	gtk_window_set_default_icon_name(icon_name);
 
 #ifdef HAVE_GTK_OSX
 	GtkosxApplication *theMacApp = gtkosx_application_get();
@@ -2200,27 +2250,38 @@ int main(int argc, char *argv[]){
 
 core_start:
 	if (linphone_gtk_init_instance(app_name, start_option, addr_to_call) == FALSE){
-		g_warning("Another running instance of linphone has been detected. It has been woken-up.");
+		g_warning("Another running instance of Linphone has been detected. It has been woken-up.");
 		g_warning("This instance is going to exit now.");
 		gdk_threads_leave();
 		return 0;
 	}
-
 	the_ui=linphone_gtk_create_window("main", NULL);
 
 	g_object_set_data(G_OBJECT(the_ui),"is_created",GINT_TO_POINTER(FALSE));
+	g_signal_connect(G_OBJECT (the_ui), "key_press_event", G_CALLBACK (linphone_gtk_on_key_press), NULL);
 
 	linphone_gtk_create_log_window();
 	linphone_core_enable_logs_with_cb(linphone_gtk_log_handler);
+	/*it is possible to filter in or out some logs by configuring per log domain:*/
+	/*ortp_set_log_level_mask("belle-sip", ORTP_ERROR);*/
 
-	db_file=linphone_gtk_message_storage_get_db_file(NULL);
-	linphone_gtk_init_liblinphone(config_file, factory_config_file, db_file);
-	g_free(db_file);
+	chat_messages_db_file=linphone_gtk_message_storage_get_db_file(NULL);
+	call_logs_db_file = linphone_gtk_call_logs_storage_get_db_file(NULL);
+	friends_db_file = linphone_gtk_friends_storage_get_db_file(NULL);
+	linphone_gtk_init_liblinphone(config_file, factory_config_file, chat_messages_db_file, call_logs_db_file, friends_db_file);
+	g_free(chat_messages_db_file);
+	g_free(call_logs_db_file);
+	g_free(friends_db_file);
+
+	linphone_gtk_call_log_update(the_ui);
+	linphone_gtk_show_friends();
 
 	/* do not lower timeouts under 30 ms because it exhibits a bug on gtk+/win32, with cpu running 20% all the time...*/
 	gtk_timeout_add(30,(GtkFunction)linphone_gtk_iterate,(gpointer)linphone_gtk_get_core());
 	gtk_timeout_add(30,(GtkFunction)linphone_gtk_check_logs,(gpointer)linphone_gtk_get_core());
 
+	signal(SIGINT, sigint_handler);
+
 	gtk_main();
 	linphone_gtk_quit();
 
@@ -2243,3 +2304,34 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	return main(__argc, __argv);
 }
 #endif
+
+GtkWidget *linphone_gtk_make_tab_header(const gchar *label, const gchar *icon_name, gboolean show_quit_button, GCallback cb, gpointer user_data) {
+	GtkWidget *tab_header=gtk_hbox_new (FALSE,0);
+	GtkWidget *label_widget = gtk_label_new (label);
+
+	if(icon_name) {
+		GtkWidget *icon=gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_MENU);
+#ifdef HAVE_GTK_OSX
+		gtk_misc_set_alignment(GTK_MISC(icon), 0.5f, 0.25f);
+#endif
+		gtk_box_pack_start (GTK_BOX(tab_header),icon,FALSE,FALSE,4);
+	}
+#ifdef HAVE_GTK_OSX
+	gtk_misc_set_alignment(GTK_MISC(label_widget), 0.5f, 0.f);
+#endif
+	gtk_box_pack_start (GTK_BOX(tab_header),label_widget,FALSE,FALSE,0);
+	if(show_quit_button) {
+		GtkWidget *button = gtk_button_new();
+		GtkWidget *button_image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,GTK_ICON_SIZE_MENU);
+		gtk_button_set_image(GTK_BUTTON(button),button_image);
+		gtk_button_set_relief(GTK_BUTTON(button),GTK_RELIEF_NONE);
+#ifdef HAVE_GTK_OSX
+		gtk_misc_set_alignment(GTK_MISC(button_image), 0.5f, 0.f);
+#endif
+		g_signal_connect_swapped(G_OBJECT(button),"clicked",cb,user_data);
+		gtk_box_pack_end(GTK_BOX(tab_header),button,FALSE,FALSE,4);
+		g_object_set_data(G_OBJECT(tab_header), "button", button);
+	}
+	g_object_set_data(G_OBJECT(tab_header), "label", label_widget);
+	return tab_header;
+}
diff --git a/gtk/main.ui b/gtk/main.ui
index 567156394..e7360e215 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -1,75 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="2.18"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <!-- interface-local-resource-path /home/francois/projects/linphone/linphone/pixmaps/hicolor -->
-  <object class="GtkImage" id="add_image">
+  <object class="GtkImage" id="add_call_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="xpad">2</property>
+    <property name="pixel_size">30</property>
+    <property name="icon_name">linphone-add-call</property>
   </object>
   <object class="GtkImage" id="add_image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
+    <property name="icon_name">linphone-contact-add</property>
+  </object>
+  <object class="GtkImage" id="clear_call_history_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="xpad">4</property>
+    <property name="icon_name">linphone-delete</property>
   </object>
   <object class="GtkImage" id="connect_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-connect</property>
+    <property name="icon-size">1</property>
   </object>
-  <object class="GtkImage" id="edit_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-edit</property>
+  <object class="GtkListStore" id="contact_list_model">
+    <columns>
+      <!-- column-name presence_icon -->
+      <column type="gchararray"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gpointer"/>
+      <!-- column-name chatroom -->
+      <column type="gpointer"/>
+      <!-- column-name sip_address -->
+      <column type="gchararray"/>
+      <!-- column-name chat_icon -->
+      <column type="gchararray"/>
+      <!-- column-name call_button_visible -->
+      <column type="gboolean"/>
+      <!-- column-name chat_button_visible -->
+      <column type="gboolean"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">linphone-status-online</col>
+        <col id="1">Toto</col>
+        <col id="4">toto@sip.linphone.org</col>
+        <col id="5">linphone-chat-nothing</col>
+        <col id="6">False</col>
+        <col id="7">False</col>
+      </row>
+      <row>
+        <col id="0">linphone-status-offline</col>
+        <col id="1">Toto2</col>
+        <col id="4">toto2@sip.linphone.org</col>
+        <col id="5">linphone-chat-nothing</col>
+        <col id="6">False</col>
+        <col id="7">False</col>
+      </row>
+      <row>
+        <col id="0">linphone-status-offline</col>
+        <col id="1">Toto3</col>
+        <col id="4">toto3@sip.linphone.org</col>
+        <col id="5">linphone-chat-nothing</col>
+        <col id="6">False</col>
+        <col id="7">False</col>
+      </row>
+    </data>
   </object>
   <object class="GtkImage" id="edit_image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-edit</property>
+    <property name="icon_name">linphone-edit</property>
   </object>
   <object class="GtkImage" id="execute_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-execute</property>
+    <property name="icon-size">1</property>
   </object>
   <object class="GtkImage" id="home_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-home</property>
+    <property name="icon-size">1</property>
   </object>
   <object class="GtkImage" id="info_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-info</property>
-  </object>
-  <object class="GtkListStore" id="model1">
-    <columns>
-      <!-- column-name gchararray -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">All users</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Online users</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model2">
-    <columns>
-      <!-- column-name gchararray -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">ADSL</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Fiber Channel</col>
-      </row>
-    </data>
+    <property name="icon-size">1</property>
   </object>
   <object class="GtkListStore" id="model3">
     <columns>
@@ -85,22 +110,32 @@
   <object class="GtkImage" id="properties_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="yalign">0.49000000953674316</property>
     <property name="stock">gtk-properties</property>
-  </object>
-  <object class="GtkImage" id="remove_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Delete</property>
-    <property name="stock">gtk-remove</property>
+    <property name="icon-size">1</property>
   </object>
   <object class="GtkImage" id="remove_image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="tooltip_text" translatable="yes">Delete</property>
-    <property name="stock">gtk-remove</property>
+    <property name="icon_name">linphone-delete</property>
+  </object>
+  <object class="GtkImage" id="start_call_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="xpad">2</property>
+    <property name="pixel_size">30</property>
+    <property name="icon_name">linphone-start-call</property>
+  </object>
+  <object class="GtkImage" id="start_chat_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="xpad">2</property>
+    <property name="pixel_size">30</property>
+    <property name="icon_name">linphone-start-chat</property>
   </object>
   <object class="GtkWindow" id="main">
+    <property name="width_request">640</property>
+    <property name="height_request">480</property>
     <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="default_width">660</property>
@@ -132,11 +167,12 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="linphone_gtk_show_parameters" swapped="no"/>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkMenuItem" id="provisionning_item">
+                      <object class="GtkMenuItem" id="provisioning_item">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Set configuration URI</property>
@@ -178,18 +214,52 @@
                         <signal name="toggled" handler="linphone_gtk_enable_self_view" swapped="no"/>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="show_keypad_menu_item">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Show keypad</property>
+                        <property name="use_underline">True</property>
+                        <signal name="toggled" handler="linphone_gtk_show_keypad_checked" swapped="no"/>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkMenuItem" id="contacts_import_item">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Import contacts from vCards</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="linphone_gtk_import_contacts" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="contacts_export_item">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Export contacts as vCards</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="linphone_gtk_export_contacts" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkImageMenuItem" id="quit_item">
                         <property name="label">gtk-quit</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="gtk_main_quit" swapped="no"/>
                       </object>
                     </child>
@@ -224,6 +294,7 @@
                         <property name="can_focus">False</property>
                         <property name="image">info_image</property>
                         <property name="use_stock">False</property>
+                        <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="linphone_gtk_log_show" swapped="no"/>
                       </object>
                     </child>
@@ -312,10 +383,11 @@
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">●</property>
                                 <property name="invisible_char_set">True</property>
+                                <property name="secondary_icon_name">linphone-contact-add</property>
                                 <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">True</property>
                                 <property name="primary_icon_sensitive">True</property>
-                                <property name="secondary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">False</property>
                                 <signal name="activate" handler="linphone_gtk_uri_bar_activate" swapped="no"/>
                               </object>
                               <packing>
@@ -345,31 +417,18 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButton" id="keypad">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <signal name="clicked" handler="linphone_gtk_create_keypad" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkButton" id="add_call">
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Initiate a new call</property>
+                    <property name="image">add_call_image</property>
                     <signal name="clicked" handler="linphone_gtk_start_call" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="padding">6</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -377,12 +436,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="image">start_call_image</property>
                     <signal name="clicked" handler="linphone_gtk_start_call" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -390,21 +450,16 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="image">start_chat_image</property>
                     <signal name="clicked" handler="linphone_gtk_start_chat" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="pack_type">end</property>
-                    <property name="position">4</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -417,6 +472,8 @@
               <object class="GtkHPaned" id="central_paned">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="position">200</property>
+                <property name="position_set">True</property>
                 <child>
                   <object class="GtkVBox" id="vbox12">
                     <property name="visible">True</property>
@@ -449,13 +506,66 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="model">contact_list_model</property>
+                            <property name="headers_visible">False</property>
                             <property name="reorderable">True</property>
-                            <property name="enable_search">False</property>
                             <property name="search_column">1</property>
+                            <property name="tooltip_column">4</property>
                             <signal name="button-press-event" handler="linphone_gtk_contact_list_button_pressed" swapped="no"/>
-                            <signal name="cursor-changed" handler="linphone_gtk_contact_clicked" swapped="no"/>
-                            <signal name="row-activated" handler="linphone_gtk_contact_activated" swapped="no"/>
+                            <signal name="leave-notify-event" handler="linphone_gtk_friend_list_leave_event_handler" swapped="no"/>
+                            <signal name="enter-notify-event" handler="linphone_gtk_friend_list_enter_event_handler" swapped="no"/>
+                            <signal name="motion-notify-event" handler="linphone_gtk_friend_list_motion_event_handler" swapped="no"/>
                             <signal name="popup-menu" handler="linphone_gtk_popup_contact_menu" swapped="no"/>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="presence_status_column">
+                                <child>
+                                  <object class="GtkCellRendererPixbuf" id="status_img_cell">
+                                    <property name="stock_size">3</property>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="icon-name">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="contact_name_column">
+                                <property name="max_width">60</property>
+                                <property name="expand">True</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="contact_name_cell"/>
+                                  <attributes>
+                                    <attribute name="text">1</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="contact_call_column">
+                                <child>
+                                  <object class="GtkCellRendererPixbuf" id="contact_call_renderer">
+                                    <property name="icon_name">linphone-start-call2</property>
+                                    <property name="stock_size">3</property>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="visible">6</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkTreeViewColumn" id="contact_chat_column">
+                                <child>
+                                  <object class="GtkCellRendererPixbuf" id="contact_chat_renderer">
+                                    <property name="stock_size">3</property>
+                                  </object>
+                                  <attributes>
+                                    <attribute name="visible">7</attribute>
+                                    <attribute name="icon-name">5</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -470,14 +580,16 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="spacing">2</property>
                         <child>
                           <object class="GtkButton" id="add_button">
+                            <property name="width_request">32</property>
+                            <property name="height_request">32</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="resize_mode">immediate</property>
                             <property name="image">add_image1</property>
-                            <property name="xalign">1</property>
                             <signal name="clicked" handler="linphone_gtk_add_button_clicked" swapped="no"/>
                           </object>
                           <packing>
@@ -488,7 +600,10 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="edit_button">
+                            <property name="width_request">32</property>
+                            <property name="height_request">32</property>
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="image">edit_image1</property>
@@ -502,7 +617,10 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="remove_button">
+                            <property name="width_request">32</property>
+                            <property name="height_request">32</property>
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="image">remove_image1</property>
@@ -518,19 +636,21 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="padding">4</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="resize">False</property>
-                    <property name="shrink">False</property>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkNotebook" id="viewswitch">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <signal name="switch-page" handler="linphone_gtk_viewswitch_changed" swapped="no"/>
                     <child>
                       <placeholder/>
                     </child>
@@ -557,6 +677,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="headers_visible">False</property>
+                                    <property name="show_expanders">False</property>
                                     <signal name="cursor-changed" handler="linphone_gtk_history_row_selected" swapped="no"/>
                                     <signal name="row-activated" handler="linphone_gtk_history_row_activated" swapped="no"/>
                                   </object>
@@ -698,11 +819,11 @@
                                 <property name="layout_style">end</property>
                                 <child>
                                   <object class="GtkButton" id="erase_call_logs_button">
-                                    <property name="label">gtk-clear</property>
+                                    <property name="label" translatable="yes">Clear call history</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="image">clear_call_history_image</property>
                                     <signal name="clicked" handler="linphone_gtk_clear_call_logs" swapped="no"/>
                                   </object>
                                   <packing>
@@ -711,12 +832,6 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -737,35 +852,43 @@
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkHBox" id="hbox6">
+                      <object class="GtkEventBox" id="history_tab_eventbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
+                        <property name="visible_window">False</property>
                         <signal name="button-press-event" handler="linphone_gtk_call_log_reset_missed_call" swapped="no"/>
                         <child>
-                          <object class="GtkImage" id="history_tab_icon">
+                          <object class="GtkHBox" id="history_tab_hbox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="stock">gtk-refresh</property>
-                            <property name="icon-size">1</property>
+                            <child>
+                              <object class="GtkImage" id="history_tab_icon">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">linphone-history</property>
+                                <property name="icon-size">1</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="padding">4</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="history_tab_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Recent calls</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="yalign">0.49000000953674316</property>
-                            <property name="label" translatable="yes">Recent calls</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -891,15 +1014,39 @@
           </packing>
         </child>
         <child>
-          <object class="GtkStatusbar" id="status_bar">
+          <object class="GtkHBox" id="status_bar_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <child>
+              <object class="GtkStatusbar" id="status_bar">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="has_resize_grip">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="autoanswer_icon">
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Autoanswer is enabled</property>
+                <property name="pixel_size">16</property>
+                <property name="icon_name">linphone-warning</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/gtk/parameters.ui b/gtk/parameters.ui
index 32b12b69a..bb90ccefe 100644
--- a/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.18"/>
+  <requires lib="gtk+" version="2.24"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment_download_bw">
     <property name="lower">-1</property>
@@ -53,7 +53,7 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="ajustment_auto_answer_delay">
-    <property name="upper">60000</property>
+    <property name="upper">30000</property>
     <property name="value">2000</property>
     <property name="step_increment">100</property>
     <property name="page_increment">500</property>
@@ -186,13 +186,13 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">default</col>
+        <col id="0" translatable="no">default</col>
       </row>
       <row>
-        <col id="0" translatable="yes">high-fps</col>
+        <col id="0" translatable="no">high-fps</col>
       </row>
       <row>
-        <col id="0" translatable="yes">custom</col>
+        <col id="0" translatable="no">custom</col>
       </row>
     </data>
   </object>
@@ -915,7 +915,10 @@
                                 <property name="model">model1</property>
                                 <signal name="changed" handler="linphone_gtk_capture_device_changed" swapped="no"/>
                                 <child>
-                                  <object class="GtkCellRendererText" id="renderer2"/>
+                                  <object class="GtkCellRendererText" id="renderer2">
+                                    <property name="ellipsize">end</property>
+                                    <property name="width_chars">80</property>
+                                  </object>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -937,7 +940,10 @@
                                 <property name="model">model2</property>
                                 <signal name="changed" handler="linphone_gtk_ring_device_changed" swapped="no"/>
                                 <child>
-                                  <object class="GtkCellRendererText" id="renderer3"/>
+                                  <object class="GtkCellRendererText" id="renderer3">
+                                    <property name="ellipsize">end</property>
+                                    <property name="width_chars">80</property>
+                                  </object>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -1013,7 +1019,10 @@
                                 <property name="model">model3</property>
                                 <signal name="changed" handler="linphone_gtk_playback_device_changed" swapped="no"/>
                                 <child>
-                                  <object class="GtkCellRendererText" id="renderer4"/>
+                                  <object class="GtkCellRendererText" id="renderer4">
+                                    <property name="ellipsize">end</property>
+                                    <property name="width_chars">80</property>
+                                  </object>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>
@@ -1594,7 +1603,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="n_rows">8</property>
+                            <property name="n_rows">6</property>
                             <property name="n_columns">2</property>
                             <child>
                               <object class="GtkLabel" id="sip_udp_port_label">
@@ -1892,54 +1901,14 @@
                                 <property name="bottom_attach">4</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkLabel" id="media_encryption_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Media encryption type</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="media_encryption_combo">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="active">0</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="media_encryption_mandatory">
-                                <property name="label" translatable="yes">Media encryption is mandatory</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="linphone_gtk_set_media_encryption_mandatory" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">5</property>
-                                <property name="bottom_attach">6</property>
-                              </packing>
-                            </child>
                             <child>
                               <object class="GtkLabel" id="tunnel_label">
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Tunnel</property>
                               </object>
                               <packing>
-                                <property name="top_attach">7</property>
-                                <property name="bottom_attach">8</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
                               </packing>
                             </child>
                             <child>
@@ -1953,8 +1922,8 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="top_attach">7</property>
-                                <property name="bottom_attach">8</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
                               </packing>
                             </child>
                             <child>
@@ -1964,8 +1933,8 @@
                                 <property name="label" translatable="yes">DSCP fields</property>
                               </object>
                               <packing>
-                                <property name="top_attach">6</property>
-                                <property name="bottom_attach">7</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
                               </packing>
                             </child>
                             <child>
@@ -1980,8 +1949,8 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="top_attach">6</property>
-                                <property name="bottom_attach">7</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
                               </packing>
                             </child>
                           </object>
@@ -2227,6 +2196,121 @@
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkFrame" id="encryption_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment15">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkTable" id="encryption_table">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="n_rows">3</property>
+                            <property name="n_columns">2</property>
+                            <child>
+                              <object class="GtkLabel" id="media_encryption_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Media encryption type</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="media_encryption_combo">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="active">0</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="chat_lime_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="yalign">0.51999998092651367</property>
+                                <property name="label" translatable="yes">Use Lime for outgoing chat messages</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="media_encryption_mandatory_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Media encryption is mandatory</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="media_encryption_mandatory_checkbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="xalign">0.40000000596046448</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="linphone_gtk_set_media_encryption_mandatory" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="chat_lime_combo">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <items>
+                                  <item translatable="yes">Disabled</item>
+                                  <item translatable="yes">Mandatory</item>
+                                  <item translatable="yes">Preferred</item>
+                                </items>
+                                <signal name="changed" handler="linphone_gtk_lime_changed" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="encryption_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Encryption&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 571bb375a..a356f09c6 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -228,10 +228,10 @@ void linphone_gtk_ldap_save(GtkWidget *button)
 	linphone_dictionary_set_int(dict, "deref_aliases", gtk_toggle_button_get_active(toggle));
 
 	spin = GTK_SPIN_BUTTON(linphone_gtk_get_widget(ldap_widget,"ldap_max_results"));
-	linphone_dictionary_set_int(dict, "max_results", gtk_spin_button_get_value(spin) );
+	linphone_dictionary_set_int(dict, "max_results", (int)gtk_spin_button_get_value(spin) );
 
 	spin = GTK_SPIN_BUTTON(linphone_gtk_get_widget(ldap_widget,"ldap_timeout"));
-	linphone_dictionary_set_int(dict, "timeout", gtk_spin_button_get_value(spin) );
+	linphone_dictionary_set_int(dict, "timeout", (int)gtk_spin_button_get_value(spin) );
 
 	ms_message("Create LDAP from config");
 	// create new LDAP according to the validated config
@@ -267,6 +267,7 @@ void linphone_gtk_fill_video_sizes(GtkWidget *combo){
 void linphone_gtk_parameters_closed(GtkWidget *button){
 	GtkWidget *pb=gtk_widget_get_toplevel(button);
 	gtk_widget_destroy(pb);
+	linphone_gtk_update_status_bar_icons();
 }
 
 void linphone_gtk_update_my_contact(GtkWidget *w){
@@ -323,8 +324,8 @@ void linphone_gtk_min_audio_port_changed(GtkWidget *w){
 		linphone_core_set_audio_port(linphone_gtk_get_core(), (gint) gtk_spin_button_get_value(min_button));
 		gtk_spin_button_set_value(max_button, gtk_spin_button_get_value(min_button));
 	} else {
-		gint min_port = gtk_spin_button_get_value(min_button);
-		gint max_port = gtk_spin_button_get_value(max_button);
+		gint min_port = (gint)gtk_spin_button_get_value(min_button);
+		gint max_port = (gint)gtk_spin_button_get_value(max_button);
 		if (min_port > max_port) {
 			gtk_spin_button_set_value(max_button, min_port);
 			max_port = min_port;
@@ -338,8 +339,8 @@ void linphone_gtk_max_audio_port_changed(GtkWidget *w){
 	GtkWidget *pb = (GtkWidget *) g_object_get_data(G_OBJECT(mw), "parameters");
 	GtkSpinButton *min_button = GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "audio_min_rtp_port"));
 	GtkSpinButton *max_button = GTK_SPIN_BUTTON(w);
-	gint min_port = gtk_spin_button_get_value(min_button);
-	gint max_port = gtk_spin_button_get_value(max_button);
+	gint min_port = (gint)gtk_spin_button_get_value(min_button);
+	gint max_port = (gint)gtk_spin_button_get_value(max_button);
 	if (max_port < min_port) {
 		gtk_spin_button_set_value(min_button, max_port);
 		min_port = max_port;
@@ -358,8 +359,8 @@ void linphone_gtk_min_video_port_changed(GtkWidget *w){
 		linphone_core_set_video_port(linphone_gtk_get_core(), (gint) gtk_spin_button_get_value(min_button));
 		gtk_spin_button_set_value(max_button, gtk_spin_button_get_value(min_button));
 	} else {
-		gint min_port = gtk_spin_button_get_value(min_button);
-		gint max_port = gtk_spin_button_get_value(max_button);
+		gint min_port = (gint)gtk_spin_button_get_value(min_button);
+		gint max_port = (gint)gtk_spin_button_get_value(max_button);
 		if (min_port > max_port) {
 			gtk_spin_button_set_value(max_button, min_port);
 			max_port = min_port;
@@ -373,8 +374,8 @@ void linphone_gtk_max_video_port_changed(GtkWidget *w){
 	GtkWidget *pb = (GtkWidget *) g_object_get_data(G_OBJECT(mw), "parameters");
 	GtkSpinButton *min_button = GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "video_min_rtp_port"));
 	GtkSpinButton *max_button = GTK_SPIN_BUTTON(w);
-	gint min_port = gtk_spin_button_get_value(min_button);
-	gint max_port = gtk_spin_button_get_value(max_button);
+	gint min_port = (gint)gtk_spin_button_get_value(min_button);
+	gint max_port = (gint)gtk_spin_button_get_value(max_button);
 	if (max_port < min_port) {
 		gtk_spin_button_set_value(min_button, max_port);
 		min_port = max_port;
@@ -419,7 +420,7 @@ void linphone_gtk_use_upnp_toggled(GtkWidget *w){
 
 void linphone_gtk_mtu_changed(GtkWidget *w){
 	if (GTK_WIDGET_SENSITIVE(w))
-		linphone_core_set_mtu(linphone_gtk_get_core(),gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)));
+		linphone_core_set_mtu(linphone_gtk_get_core(),(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)));
 }
 
 void linphone_gtk_use_sip_info_dtmf_toggled(GtkWidget *w){
@@ -496,7 +497,7 @@ void linphone_gtk_video_preset_changed(GtkWidget *w) {
 		gtk_widget_set_sensitive(GTK_WIDGET(framerate), FALSE);
 	} else if (g_strcmp0(sel, "high-fps") == 0) {
 		linphone_core_set_video_preset(lc, "high-fps");
-		gtk_spin_button_set_value(framerate, 0);
+		gtk_spin_button_set_value(framerate, 30);
 		gtk_widget_set_sensitive(GTK_WIDGET(framerate), FALSE);
 	} else if (g_strcmp0(sel, "custom") == 0) {
 		linphone_core_set_video_preset(lc, "custom");
@@ -647,9 +648,9 @@ const char *get_codec_color(LinphoneCore *lc, PayloadType *pt){
 	return color;
 }
 
-static void linphone_gtk_show_codecs(GtkTreeView *listview, const MSList *codeclist)
+static void linphone_gtk_show_codecs(GtkTreeView *listview, const bctbx_list_t *codeclist)
 {
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	GtkTreeIter iter;
 	GtkListStore *store=GTK_LIST_STORE(gtk_tree_view_get_model(listview));
 // 	GtkTreeSelection *selection;
@@ -672,7 +673,7 @@ static void linphone_gtk_show_codecs(GtkTreeView *listview, const MSList *codecl
 		}
 		/* get an iterator */
 		gtk_list_store_append(store,&iter);
-		bitrate=linphone_core_get_payload_type_bitrate(linphone_gtk_get_core(),pt);
+		bitrate=(gfloat)linphone_core_get_payload_type_bitrate(linphone_gtk_get_core(),pt);
 		rate=payload_type_get_rate(pt);
 		if (pt->recv_fmtp!=NULL) params=pt->recv_fmtp;
 		gtk_list_store_set(store,&iter,	CODEC_NAME,payload_type_get_mime(pt),
@@ -708,7 +709,7 @@ static void linphone_gtk_check_codec_bandwidth(GtkTreeView *v){
 		gfloat bitrate;
 		gtk_tree_model_get(model,&iter,CODEC_PRIVDATA,&pt,-1);
 
-		bitrate=linphone_core_get_payload_type_bitrate(linphone_gtk_get_core(),pt);
+		bitrate=(gfloat)linphone_core_get_payload_type_bitrate(linphone_gtk_get_core(),pt);
 		gtk_list_store_set(GTK_LIST_STORE(model),&iter,CODEC_COLOR, (gpointer)get_codec_color(linphone_gtk_get_core(),pt),
 					CODEC_BITRATE, bitrate,-1);
 	}while(gtk_tree_model_iter_next(model,&iter));
@@ -732,7 +733,7 @@ static void linphone_gtk_select_codec(GtkTreeView *v, PayloadType *ref){
 }
 
 static void linphone_gtk_draw_codec_list(GtkTreeView *v, int type){ /* 0=audio, 1=video*/
-	const MSList *list;
+	const bctbx_list_t *list;
 	if (type==0) list=linphone_core_get_audio_codecs(linphone_gtk_get_core());
 	else list=linphone_core_get_video_codecs(linphone_gtk_get_core());
 	linphone_gtk_show_codecs(v,list);
@@ -758,7 +759,7 @@ void linphone_gtk_upload_bw_changed(GtkWidget *w){
 
 void linphone_gtk_video_framerate_changed(GtkWidget *w) {
 	linphone_core_set_preferred_framerate(linphone_gtk_get_core(),
-		(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)));
+		(float)(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)));
 }
 
 void linphone_gtk_adaptive_rate_control_toggled(GtkToggleButton *button){
@@ -783,8 +784,8 @@ static void linphone_gtk_codec_move(GtkWidget *button, int dir, int type){ /* 0=
 	else v=GTK_TREE_VIEW(linphone_gtk_get_widget(gtk_widget_get_toplevel(button),"video_codec_list"));
 	sel=gtk_tree_view_get_selection(v);
 	if (gtk_tree_selection_count_selected_rows(sel) == 1){
-		MSList *sel_elem,*before;
-		MSList *codec_list;
+		bctbx_list_t *sel_elem,*before;
+		bctbx_list_t *codec_list;
 
 		GList *selected_rows = gtk_tree_selection_get_selected_rows(sel, &mod);
 		gtk_tree_model_get_iter(mod, &iter, (GtkTreePath *)g_list_nth_data(selected_rows, 0));
@@ -793,20 +794,20 @@ static void linphone_gtk_codec_move(GtkWidget *button, int dir, int type){ /* 0=
 		g_list_free(selected_rows);
 
 		if (pt->type==PAYLOAD_VIDEO)
-			codec_list=ms_list_copy(linphone_core_get_video_codecs(lc));
-		else codec_list=ms_list_copy(linphone_core_get_audio_codecs(lc));
-		sel_elem=ms_list_find(codec_list,pt);
+			codec_list=bctbx_list_copy(linphone_core_get_video_codecs(lc));
+		else codec_list=bctbx_list_copy(linphone_core_get_audio_codecs(lc));
+		sel_elem=bctbx_list_find(codec_list,pt);
 		if (dir>0) {
 			if (sel_elem->prev) before=sel_elem->prev;
 			else before=sel_elem;
-			codec_list=ms_list_insert(codec_list,before,pt);
+			codec_list=bctbx_list_insert(codec_list,before,pt);
 		}
 		else{
 			if (sel_elem->next) before=sel_elem->next->next;
 			else before=sel_elem;
-			codec_list=ms_list_insert(codec_list,before,pt);
+			codec_list=bctbx_list_insert(codec_list,before,pt);
 		}
-		codec_list=ms_list_remove_link(codec_list,sel_elem);
+		codec_list=bctbx_list_erase_link(codec_list,sel_elem);
 		if (pt->type==PAYLOAD_VIDEO)
 			linphone_core_set_video_codecs(lc,codec_list);
 		else linphone_core_set_audio_codecs(lc,codec_list);
@@ -888,7 +889,7 @@ void linphone_gtk_show_sip_accounts(GtkWidget *w){
 	const LinphoneProxyConfig *default_pc = linphone_core_get_default_proxy_config(linphone_gtk_get_core());
 	GtkTreePath *default_pc_path = NULL;
 
-	const MSList *elem;
+	const bctbx_list_t *elem;
 	if (!model){
 		GtkCellRenderer *renderer;
 		GtkTreeViewColumn *column;
@@ -911,7 +912,7 @@ void linphone_gtk_show_sip_accounts(GtkWidget *w){
 		store=GTK_LIST_STORE(model);
 	}
 	gtk_list_store_clear(store);
-	for(elem=linphone_core_get_proxy_config_list(linphone_gtk_get_core());elem!=NULL;elem=ms_list_next(elem)){
+	for(elem=linphone_core_get_proxy_config_list(linphone_gtk_get_core());elem!=NULL;elem=bctbx_list_next(elem)){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
 		GtkTreeIter iter;
 		gtk_list_store_append(store,&iter);
@@ -1186,6 +1187,8 @@ static LangCodes supported_langs[]={
 	{	"sr"	,	N_("Serbian")	},
 	{	"ar"	,	N_("Arabic")	},
 	{	"tr"	,	N_("Turkish")	},
+	{	"fi"	,	N_("Finnish")	},
+	{	"lt"	,	N_("Lithuanian")	},
 	{	NULL	,	NULL		}
 };
 
@@ -1276,7 +1279,7 @@ void linphone_gtk_ui_level_toggled(GtkWidget *w) {
 }
 
 static void linphone_gtk_set_media_encryption_mandatory_sensitive(GtkWidget *propbox, gboolean val){
-	GtkWidget *w=linphone_gtk_get_widget(propbox,"media_encryption_mandatory");
+	GtkWidget *w=linphone_gtk_get_widget(propbox,"media_encryption_mandatory_checkbox");
 	gtk_widget_set_sensitive(w,val);
 }
 
@@ -1284,19 +1287,21 @@ static void linphone_gtk_media_encryption_changed(GtkWidget *combo){
 	char *selected=gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo));
 	LinphoneCore *lc=linphone_gtk_get_core();
 	GtkWidget *toplevel=gtk_widget_get_toplevel(combo);
+	GtkWidget *mandatory_box = linphone_gtk_get_widget(toplevel,"media_encryption_mandatory_checkbox");
 	if (selected!=NULL){
 		if (strcasecmp(selected,"SRTP")==0){
 			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionSRTP);
-			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,TRUE);
+			gtk_widget_set_sensitive(mandatory_box,TRUE);
 		}else if (strcasecmp(selected,"DTLS")==0){
 			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionDTLS);
-			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE);
+			gtk_widget_set_sensitive(mandatory_box,TRUE);
 		}else if (strcasecmp(selected,"ZRTP")==0){
 			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionZRTP);
-			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE);
+			gtk_widget_set_sensitive(mandatory_box,FALSE);
 		} else {
 			linphone_core_set_media_encryption(lc,LinphoneMediaEncryptionNone);
-			linphone_gtk_set_media_encryption_mandatory_sensitive(toplevel,FALSE);
+			gtk_widget_set_sensitive(mandatory_box,FALSE);
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mandatory_box), FALSE);
 		}
 		g_free(selected);
 	}else g_warning("gtk_combo_box_get_active_text() returned NULL");
@@ -1306,6 +1311,10 @@ void linphone_gtk_set_media_encryption_mandatory(GtkWidget *button){
 	linphone_core_set_media_encryption_mandatory(linphone_gtk_get_core(),gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
 
+void linphone_gtk_lime_changed(GtkComboBoxText *combotext) {
+	linphone_core_enable_lime(linphone_gtk_get_core(), gtk_combo_box_get_active(GTK_COMBO_BOX(combotext)));
+}
+
 static void linphone_gtk_show_media_encryption(GtkWidget *pb){
 	LinphoneCore *lc=linphone_gtk_get_core();
 	GtkWidget *combo=linphone_gtk_get_widget(pb,"media_encryption_combo");
@@ -1353,11 +1362,13 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){
 	}
 	if (no_enc){
 		/*hide this setting*/
-		gtk_widget_hide(combo);
-		gtk_widget_hide(linphone_gtk_get_widget(pb,"media_encryption_label"));
-		gtk_widget_hide(linphone_gtk_get_widget(pb,"media_encryption_mandatory"));
+		gtk_widget_hide(linphone_gtk_get_widget(pb,"encryption_label"));
+		gtk_widget_hide(linphone_gtk_get_widget(pb,"encryption_table"));
 	}else{
 		LinphoneMediaEncryption menc=linphone_core_get_media_encryption(lc);
+		gtk_widget_show(linphone_gtk_get_widget(pb,"encryption_label"));
+		gtk_widget_show(linphone_gtk_get_widget(pb,"encryption_table"));
+
 		switch(menc){
 			case LinphoneMediaEncryptionNone:
 				gtk_combo_box_set_active(GTK_COMBO_BOX(combo),0);
@@ -1384,8 +1395,12 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){
 		}
 		g_signal_connect(G_OBJECT(combo),"changed",(GCallback)linphone_gtk_media_encryption_changed,NULL);
 	}
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"media_encryption_mandatory")),
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"media_encryption_mandatory_checkbox")),
 				     linphone_core_is_media_encryption_mandatory(lc));
+
+	gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(pb,"chat_lime_combo")), linphone_core_lime_enabled(lc));
+	gtk_widget_set_sensitive(linphone_gtk_get_widget(pb,"chat_lime_combo"), linphone_core_lime_available(lc));
+
 	g_object_unref(G_OBJECT(model));
 }
 
@@ -1414,9 +1429,10 @@ void linphone_gtk_fill_webcams(GtkWidget *pb){
 void linphone_gtk_fill_video_renderers(GtkWidget *pb){
 #ifdef VIDEO_ENABLED /* video_stream_get_default_video_renderer requires video enabled */
 	LinphoneCore *lc=linphone_gtk_get_core();
+	MSFactory *factory = linphone_core_get_ms_factory(lc);
 	GtkWidget *combo=linphone_gtk_get_widget(pb,"renderers");
-	MSList *l=ms_filter_lookup_by_interface(MSFilterVideoDisplayInterface);
-	MSList *elem;
+	bctbx_list_t *l=ms_factory_lookup_filter_by_interface(factory, MSFilterVideoDisplayInterface);
+	bctbx_list_t *elem;
 	int i;
 	int active=-1;
 	const char *current_renderer=linphone_core_get_video_display_filter(lc);
@@ -1446,7 +1462,7 @@ void linphone_gtk_fill_video_renderers(GtkWidget *pb){
 
 		i++;
 	}
-	ms_list_free(l);
+	bctbx_list_free(l);
 	if (active!=-1) gtk_combo_box_set_active(GTK_COMBO_BOX(combo),active);
 #endif
 }
@@ -1495,7 +1511,7 @@ static gboolean apply_transports(PortConfigCtx *ctx){
 	return FALSE;
 }
 
-static PortConfigCtx* get_port_config() {
+static PortConfigCtx* get_port_config(void) {
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	PortConfigCtx *cfg=(PortConfigCtx*)g_object_get_data(G_OBJECT(mw),"port_config");
 	if (cfg==NULL){
@@ -1701,7 +1717,7 @@ void linphone_gtk_show_parameters(void){
 				linphone_core_get_upload_bandwidth(lc));
 
 	/* CALL PARAMS CONFIG */
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb, "auto_answer_checkbox")), linphone_gtk_get_ui_config_int("auto_answer", 0));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb, "auto_answer_checkbox")), linphone_gtk_auto_answer_enabled());
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "auto_answer_delay_spinbutton")), linphone_gtk_get_ui_config_int("auto_answer_delay", 2000));
 
 	/* UI CONFIG */
@@ -1734,8 +1750,8 @@ void linphone_gtk_fixed_audio_port_toggle(void) {
 	GtkWidget *mw = linphone_gtk_get_main_window();
 	GtkWidget *pb = (GtkWidget *) g_object_get_data(G_OBJECT(mw), "parameters");
 	gboolean fixed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb, "fixed_audio_port")));
-	gint min_port = gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "audio_min_rtp_port")));
-	gint max_port = gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "audio_max_rtp_port")));
+	gint min_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "audio_min_rtp_port")));
+	gint max_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "audio_max_rtp_port")));
 	gtk_widget_set_sensitive(GTK_WIDGET(linphone_gtk_get_widget(pb, "audio_max_rtp_port")), !fixed);
 	if (fixed) {
 		linphone_core_set_audio_port(linphone_gtk_get_core(), min_port);
@@ -1749,8 +1765,8 @@ void linphone_gtk_fixed_video_port_toggle(void) {
 	GtkWidget *mw = linphone_gtk_get_main_window();
 	GtkWidget *pb = (GtkWidget *) g_object_get_data(G_OBJECT(mw), "parameters");
 	gboolean fixed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb, "fixed_video_port")));
-	gint min_port = gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "video_min_rtp_port")));
-	gint max_port = gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "video_max_rtp_port")));
+	gint min_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "video_min_rtp_port")));
+	gint max_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb, "video_max_rtp_port")));
 	gtk_widget_set_sensitive(GTK_WIDGET(linphone_gtk_get_widget(pb, "video_max_rtp_port")), !fixed);
 	if (fixed) {
 		linphone_core_set_video_port(linphone_gtk_get_core(), min_port);
@@ -1769,7 +1785,7 @@ void linphone_gtk_edit_tunnel(GtkButton *button){
 	GtkWidget *w=linphone_gtk_create_window("tunnel_config", gtk_widget_get_toplevel(GTK_WIDGET(button)));
 	LinphoneCore *lc=linphone_gtk_get_core();
 	LinphoneTunnel *tunnel=linphone_core_get_tunnel(lc);
-	const MSList *configs;
+	const bctbx_list_t *configs;
 	const char *host = NULL;
 	int port=0;
 
@@ -1786,10 +1802,16 @@ void linphone_gtk_edit_tunnel(GtkButton *button){
 	if (port==0) port=443;
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"port")), port);
 
-	if (linphone_tunnel_get_mode(tunnel)){
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"radio_enable")),1);
-	} else{
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"radio_disable")),1);
+	switch(linphone_tunnel_get_mode(tunnel)){
+		case LinphoneTunnelModeDisable:
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"radio_disable")),1);
+		break;
+		case LinphoneTunnelModeEnable:
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"radio_enable")),1);
+		break;
+		case LinphoneTunnelModeAuto:
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"tunnel_autodetect")),1);
+		break;
 	}
 	{
 		const char *proxy=NULL,*username=NULL,*password=NULL;
@@ -1817,11 +1839,13 @@ void linphone_gtk_tunnel_ok(GtkButton *button){
 
 	gint port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"port")));
 	gboolean enabled=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"radio_enable")));
+	gboolean autodetect=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"tunnel_autodetect")));
 	const char *host=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"host")));
 	const char *http_host=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"http_host")));
 	gint http_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"http_port")));
 	const char *username=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"username")));
 	const char *password=gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"password")));
+	LinphoneTunnelMode mode = LinphoneTunnelModeDisable;
 
 	if (tunnel==NULL) return;
 	if (host && *host=='\0') host=NULL;
@@ -1830,7 +1854,13 @@ void linphone_gtk_tunnel_ok(GtkButton *button){
 	linphone_tunnel_config_set_host(config, host);
 	linphone_tunnel_config_set_port(config, port);
 	linphone_tunnel_add_server(tunnel, config);
-	linphone_tunnel_set_mode(tunnel, (enabled ? LinphoneTunnelModeEnable : LinphoneTunnelModeDisable));
+	
+	if (enabled){
+		mode = LinphoneTunnelModeEnable;
+	}else if (autodetect){
+		mode = LinphoneTunnelModeAuto;
+	}
+	linphone_tunnel_set_mode(tunnel, mode);
 	linphone_tunnel_set_http_proxy(tunnel,http_host,http_port,username,password);
 
 	gtk_widget_destroy(w);
@@ -1897,8 +1927,12 @@ void linphone_gtk_enable_auto_answer(GtkToggleButton *checkbox, gpointer user_da
 	linphone_gtk_set_ui_config_int("auto_answer", auto_answer_enabled ? 1 : 0);
 }
 
+gboolean linphone_gtk_auto_answer_enabled(void) {
+	return (gboolean)linphone_gtk_get_ui_config_int("auto_answer", 0);
+}
+
 void linphone_gtk_auto_answer_delay_changed(GtkSpinButton *spinbutton, gpointer user_data) {
-	int delay = gtk_spin_button_get_value(spinbutton);
+	int delay = (int)gtk_spin_button_get_value(spinbutton);
 	linphone_gtk_set_ui_config_int("auto_answer_delay", delay);
 }
 
diff --git a/gtk/regex.h b/gtk/regex.h
new file mode 100644
index 000000000..f5b41d40d
--- /dev/null
+++ b/gtk/regex.h
@@ -0,0 +1,67 @@
+/*
+linphone, gtk-glade interface.
+Copyright (C) 2015  Belledonne Communications <info@belledonne-communications.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+/*
+ * Regex matching with any URI that respects the RFC 3986
+ */
+#define BC_REGEX_URI_PCT_ENCODED      "(%[[:xdigit:]]{2})"
+#define BC_REGEX_URI_SUB_DELIMS       "[!$&'()*+,;=]"
+#define BC_REGEX_URI_UNRESERVED       "[[:alnum:]\\-._~]"
+#define BC_REGEX_URI_PCHAR            "(" BC_REGEX_URI_UNRESERVED "|" BC_REGEX_URI_PCT_ENCODED "|" BC_REGEX_URI_SUB_DELIMS "|" "[:@]" ")"
+#define BC_REGEX_URI_SCHEME           "(" "[[:alpha:]][[:alnum:]+\\-.]*" ")"
+#define BC_REGEX_URI_USERINFO         "(" "(" BC_REGEX_URI_UNRESERVED "|" BC_REGEX_URI_PCT_ENCODED "|" BC_REGEX_URI_SUB_DELIMS "|" ":" ")*" ")"
+#define BC_REGEX_URI_HOST             "(" "(" BC_REGEX_URI_UNRESERVED "|" BC_REGEX_URI_PCT_ENCODED "|" BC_REGEX_URI_SUB_DELIMS ")*" ")"
+#define BC_REGEX_URI_PORT             "(" "[\\d]*" ")"
+#define BC_REGEX_URI_AUTHORITY        "(" "(" BC_REGEX_URI_USERINFO "@" ")?" BC_REGEX_URI_HOST "(" ":" BC_REGEX_URI_PORT ")?" ")"
+#define BC_REGEX_URI_SEGMENT          "(" BC_REGEX_URI_PCHAR "*" ")"
+#define BC_REGEX_URI_SEGMENT_NZ       "(" BC_REGEX_URI_PCHAR "+" ")"
+#define BC_REGEX_URI_PATH_ABEMPTY     "(" "(" "/" BC_REGEX_URI_SEGMENT ")*" ")"
+#define BC_REGEX_URI_PATH_ABSOLUTE    "(" "/" "(" BC_REGEX_URI_SEGMENT_NZ "(" "/" BC_REGEX_URI_SEGMENT ")*" ")?" ")"
+#define BC_REGEX_URI_PATH_ROOTLESS    "(" BC_REGEX_URI_SEGMENT_NZ "(" "/" BC_REGEX_URI_SEGMENT ")*" ")"
+#define BC_REGEX_URI_HIER_PART        "(" "//" BC_REGEX_URI_AUTHORITY BC_REGEX_URI_PATH_ABEMPTY "|" BC_REGEX_URI_PATH_ABSOLUTE "|" BC_REGEX_URI_PATH_ROOTLESS ")"
+#define BC_REGEX_URI_QUERY            "(" "(" BC_REGEX_URI_PCHAR "|" "[/?]" ")*" ")"
+#define BC_REGEX_URI_FRAGMENT         "(" "(" BC_REGEX_URI_PCHAR "|" "[/?]" ")*" ")"
+#define BC_REGEX_URI                  "(" BC_REGEX_URI_SCHEME ":" BC_REGEX_URI_HIER_PART "(" "\\?" BC_REGEX_URI_QUERY ")?" "(" "#" BC_REGEX_URI_FRAGMENT ")?" ")"
+
+/*
+ * Regex matching with any domain name (RFC 1034)
+ */
+#define BC_REGEX_DOMAIN_LDH           "[[:alnum:]-]"
+#define BC_REGEX_DOMAIN_LABEL         "(" "[[:alpha:]]" "(" BC_REGEX_DOMAIN_LDH "*" "[[:alnum:]]" ")?" ")"
+#define BC_REGEX_DOMAIN               "(" BC_REGEX_DOMAIN_LABEL "(" "\\." BC_REGEX_DOMAIN_LABEL ")*" ")"
+
+/*
+ * Regex matching with email addresses (RFC 5322) 
+ */
+#define BC_REGEX_EMAIL_ATEXT          "[[:alnum:]!#$%&'*+\\-/=?\\^_`{}|~]"
+#define BC_REGEX_EMAIL_DOT_ATOM_TEXT  "(" BC_REGEX_EMAIL_ATEXT "+" "(" "." BC_REGEX_EMAIL_ATEXT "+" ")*" ")"
+#define BC_REGEX_EMAIL_LOCAL_PART     BC_REGEX_EMAIL_DOT_ATOM_TEXT
+#define BC_REGEX_EMAIL_DTEXT_NO_OBS   "[!-Z\\^-~]"
+#define BC_REGEX_EMAIL_DOMAIN         "(" BC_REGEX_EMAIL_DOT_ATOM_TEXT "|" "\\[" BC_REGEX_EMAIL_DTEXT_NO_OBS "*" "\\]" ")"
+#define BC_REGEX_EMAIL_ADDR_SPEC      "(" BC_REGEX_EMAIL_LOCAL_PART "@" BC_REGEX_EMAIL_DOMAIN ")"
+
+/*
+ * Regex matching with email addresses but with more constraints than RFC 5322.
+ * The additionnal constraints are the folowings:
+ *  + the domain part is a domain name as describe in RFC 1034
+ *  + the domain part must have two label at least
+ *  + the last label of the domain part must have two letter (without digit and hyphen) at least.
+ */
+#define BC_REGEX_RESTRICTIVE_EMAIL_TLD   "(" "[[:alpha:]]" BC_REGEX_DOMAIN_LDH "*" "[[:alnum:]]" ")"
+#define BC_REGEX_RESTRICTIVE_EMAIL_ADDR  "(" BC_REGEX_EMAIL_LOCAL_PART "@" "(" BC_REGEX_DOMAIN_LABEL "\\." ")+" BC_REGEX_RESTRICTIVE_EMAIL_TLD ")"
diff --git a/gtk/setup_wizard.ui b/gtk/setup_wizard.ui
new file mode 100644
index 000000000..95cdcc4e2
--- /dev/null
+++ b/gtk/setup_wizard.ui
@@ -0,0 +1,736 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.18"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAssistant" id="setup_wizard">
+    <property name="can_focus">False</property>
+    <property name="border_width">8</property>
+    <property name="title" translatable="yes">SIP account configuration assistant</property>
+    <property name="resizable">False</property>
+    <signal name="close" handler="linphone_gtk_assistant_closed" swapped="no"/>
+    <signal name="cancel" handler="linphone_gtk_assistant_closed" swapped="no"/>
+    <signal name="prepare" handler="linphone_gtk_assistant_prepare" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkLabel" id="page0">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Welcome!
+This assistant will help you to use a SIP account for your calls.</property>
+      </object>
+      <packing>
+        <property name="page_type">intro</property>
+        <property name="title" translatable="yes">Welcome to the account setup assistant</property>
+        <property name="complete">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkAlignment" id="page1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="top_padding">20</property>
+        <property name="left_padding">30</property>
+        <property name="right_padding">30</property>
+        <child>
+          <object class="GtkVBox" id="p1_vbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkRadioButton" id="radio_create_account">
+                <property name="label" translatable="yes">Create an account on linphone.org</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="radio_setup_lp_account">
+                <property name="label" translatable="yes">I have already a linphone.org account and I just want to use it</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">radio_create_account</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="radio_setup_account">
+                <property name="label" translatable="yes">I have already a sip account and I just want to use it</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">radio_create_account</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="radio_config_uri">
+                <property name="label" translatable="yes">I want to specify a remote configuration URI</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">radio_create_account</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="title" translatable="yes">Account setup assistant</property>
+        <property name="complete">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkAlignment" id="page2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="yalign">0</property>
+        <property name="xscale">0.5</property>
+        <property name="top_padding">30</property>
+        <property name="bottom_padding">10</property>
+        <property name="left_padding">30</property>
+        <child>
+          <object class="GtkTable" id="p2_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">6</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">8</property>
+            <property name="row_spacing">4</property>
+            <child>
+              <object class="GtkLabel" id="p2_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="ypad">8</property>
+                <property name="label" translatable="yes">Enter your account information</property>
+              </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p2_label_username">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Username*</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p2_entry_username">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_external_account_configuration_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p2_label_password">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Password*</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p2_entry_password">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_external_account_configuration_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p2_label_domain">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Domain*</property>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p2_entry_domain">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_external_account_configuration_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p2_label_proxy">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Proxy</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p2_entry_proxy">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_external_account_configuration_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p2_label_error">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <attributes>
+                  <attribute name="foreground" value="#ffff00000000"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="page_type">confirm</property>
+        <property name="title" translatable="yes">Configure your account (step 1/1)</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkAlignment" id="page3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="xscale">0.5</property>
+        <property name="top_padding">30</property>
+        <property name="bottom_padding">10</property>
+        <property name="left_padding">30</property>
+        <property name="right_padding">30</property>
+        <child>
+          <object class="GtkTable" id="p3_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">8</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">8</property>
+            <property name="row_spacing">4</property>
+            <child>
+              <object class="GtkLabel" id="p3_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="ypad">8</property>
+                <property name="label" translatable="yes">Enter your linphone.org username</property>
+              </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p3_label_username">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Username:</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p3_entry_username">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_account_configuration_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p3_label_password">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Password:</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p3_entry_password">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="page_type">confirm</property>
+        <property name="title" translatable="yes">Enter your sip username (step 1/1)</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkAlignment" id="page4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="xscale">0.5</property>
+        <property name="top_padding">10</property>
+        <property name="bottom_padding">10</property>
+        <property name="left_padding">30</property>
+        <property name="right_padding">30</property>
+        <child>
+          <object class="GtkTable" id="p4_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">8</property>
+            <property name="n_rows">7</property>
+            <property name="n_columns">3</property>
+            <property name="column_spacing">8</property>
+            <property name="row_spacing">4</property>
+            <child>
+              <object class="GtkLabel" id="p4_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">(*) Required fields</property>
+              </object>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="y_padding">8</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p4_label_email">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Email: (*)</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p4_entry_email">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_account_creation_email_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="p4_image_email_ok">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-no</property>
+                <property name="icon-size">3</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p4_label_username">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Username: (*)</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p4_entry_username">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_account_creation_username_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="p4_image_username_ok">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-no</property>
+                <property name="icon-size">3</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options"/>
+                <property name="y_options"/>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p4_label_password1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Password: (*)</property>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p4_entry_password1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_account_creation_password_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p4_label_password2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Confirm your password: (*)</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="p4_entry_password2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+                <property name="invisible_char_set">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <signal name="changed" handler="linphone_gtk_account_creation_password_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="p4_image_password_ok">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="stock">gtk-no</property>
+                <property name="icon-size">3</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options"/>
+                <property name="y_options"/>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="p4_label_error">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <attributes>
+                  <attribute name="foreground" value="#ffff00000000"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
+            </child>
+            <!--<child>
+              <object class="GtkCheckButton" id="p4_check_newsletter">
+                <property name="label" translatable="yes">Keep me informed with linphone updates</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
+			</child>-->
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="page_type">confirm</property>
+        <property name="title" translatable="yes">Enter account information (step 1/2)</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="page5">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Your account is being created, please wait.</property>
+      </object>
+      <packing>
+        <property name="page_type">progress</property>
+        <property name="title" translatable="yes">Account creation in progress</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="page6">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Please validate your account by clicking on the link we just sent you by email.
+Then come back here and press Next button.</property>
+      </object>
+      <packing>
+        <property name="title" translatable="yes">Validation (step 2/2)</property>
+        <property name="complete">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="page7">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Checking if your account is been validated, please wait.</property>
+      </object>
+      <packing>
+        <property name="page_type">progress</property>
+        <property name="title" translatable="yes">Account validation check in progress</property>
+        <property name="complete">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="page8">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Error, account not validated, username already used or server unreachable.
+Please go back and try again.</property>
+      </object>
+      <packing>
+        <property name="title" translatable="yes">Error</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="page9">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Thank you. Your account is now configured and ready for use.</property>
+      </object>
+      <packing>
+        <property name="page_type">summary</property>
+        <property name="title" translatable="yes">Terminating</property>
+        <property name="complete">True</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index dad50d983..d8873c0eb 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include "linphone.h"
+#include "regex.h"
 #include <glib.h>
 #include <glib/gprintf.h>
 
@@ -30,9 +31,9 @@ static LinphoneAccountCreator * linphone_gtk_assistant_get_creator(GtkWidget *w)
 	return (LinphoneAccountCreator *)g_object_get_data(G_OBJECT(w), "creator");
 }
 
-static void linphone_gtk_account_validate_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) {
+static void linphone_gtk_create_account_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char* resp) {
 	GtkWidget *assistant = (GtkWidget *)linphone_account_creator_get_user_data(creator);
-	if (status == LinphoneAccountCreatorOk) {
+	if (status == LinphoneAccountCreatorAccountCreated) {
 		// Go to page_6_linphone_account_validation_wait
 		gtk_assistant_set_current_page(GTK_ASSISTANT(assistant), 6);
 	} else { // Error when attempting to create the account
@@ -44,12 +45,12 @@ static void linphone_gtk_account_validate_cb(LinphoneAccountCreator *creator, Li
 
 static void create_account(GtkWidget *assistant) {
 	LinphoneAccountCreator *creator = linphone_gtk_assistant_get_creator(assistant);
-	linphone_account_creator_validate(creator);
+	linphone_account_creator_create_account(creator);
 }
 
-static void linphone_gtk_test_account_validation_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) {
+static void linphone_gtk_test_account_validation_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char* resp) {
 	GtkWidget *assistant = (GtkWidget *)linphone_account_creator_get_user_data(creator);
-	if (status == LinphoneAccountCreatorOk) {
+	if (status == LinphoneAccountCreatorAccountActivated) {
 		// Go to page_9_finish
 		gtk_assistant_set_current_page(GTK_ASSISTANT(assistant), 9);
 	} else {
@@ -60,14 +61,14 @@ static void linphone_gtk_test_account_validation_cb(LinphoneAccountCreator *crea
 
 static void check_account_validation(GtkWidget *assistant) {
 	LinphoneAccountCreator *creator = linphone_gtk_assistant_get_creator(assistant);
-	linphone_account_creator_test_validation(creator);
+	linphone_account_creator_is_account_activated(creator);
 }
 
-static void linphone_gtk_assistant_closed(GtkWidget *w) {
+void linphone_gtk_assistant_closed(GtkWidget *w) {
 	linphone_gtk_close_assistant();
 }
 
-static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page) {
+void linphone_gtk_assistant_prepare(GtkWidget *assistant) {
 	int pagenum = gtk_assistant_get_current_page(GTK_ASSISTANT(assistant));
 
 	switch (pagenum) {
@@ -96,7 +97,6 @@ static gint destroy_assistant(GtkWidget* w){
 
 static int linphone_gtk_assistant_forward(int curpage, gpointer data) {
 	GtkWidget *w = GTK_WIDGET(data);
-	GtkWidget *box = gtk_assistant_get_nth_page(GTK_ASSISTANT(w), curpage);
 	LinphoneAccountCreator *creator = linphone_gtk_assistant_get_creator(w);
 
 	switch (curpage) {
@@ -105,10 +105,10 @@ static int linphone_gtk_assistant_forward(int curpage, gpointer data) {
 			break;
 		case 1:
 			{
-				GtkWidget *create_button = (GtkWidget*)g_object_get_data(G_OBJECT(box), "create_account");
-				GtkWidget *setup_linphone_account = (GtkWidget*)g_object_get_data(G_OBJECT(box), "setup_linphone_account");
-				GtkWidget *setup_account = (GtkWidget*)g_object_get_data(G_OBJECT(box), "setup_account");
-				GtkWidget *config_uri = (GtkWidget*)g_object_get_data(G_OBJECT(box), "config-uri");
+				GtkWidget *create_button = linphone_gtk_get_widget(w, "radio_create_account");
+				GtkWidget *setup_linphone_account = linphone_gtk_get_widget(w, "radio_setup_lp_account");
+				GtkWidget *setup_account = linphone_gtk_get_widget(w, "radio_setup_account");
+				GtkWidget *config_uri = linphone_gtk_get_widget(w, "radio_config_uri");
 
 				if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(create_button))) {
 					curpage = 4; // Go to page_4_linphone_account_creation_configuration
@@ -126,26 +126,42 @@ static int linphone_gtk_assistant_forward(int curpage, gpointer data) {
 			}
 			break;
 		case 2:
-			linphone_account_creator_set_username(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"username"))));
-			linphone_account_creator_set_domain(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"domain"))));
-			linphone_account_creator_set_route(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box), "proxy"))));
-			linphone_account_creator_set_password(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box), "password"))));
+		{
+			GtkEntry *username_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p2_entry_username"));
+			GtkEntry *domain_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p2_entry_domain"));
+			GtkEntry *proxy_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p2_entry_proxy"));
+			GtkEntry *password_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p2_entry_password"));
+			linphone_account_creator_set_username(creator, gtk_entry_get_text(username_entry));
+			linphone_account_creator_set_domain(creator, gtk_entry_get_text(domain_entry));
+			linphone_account_creator_set_route(creator, gtk_entry_get_text(proxy_entry));
+			linphone_account_creator_set_password(creator, gtk_entry_get_text(password_entry));
 			curpage = 9; // Go to page_9_finish
 			break;
+		}
 		case 3:
-			linphone_account_creator_set_username(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"username"))));
+		{
+			GtkEntry *username_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p3_entry_username"));
+			GtkEntry *password_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p3_entry_password"));
+			linphone_account_creator_set_username(creator, gtk_entry_get_text(username_entry));
 			linphone_account_creator_set_domain(creator, "sip.linphone.org");
 			linphone_account_creator_set_route(creator, "sip.linphone.org");
-			linphone_account_creator_set_password(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box), "password"))));
+			linphone_account_creator_set_password(creator, gtk_entry_get_text(password_entry));
 			curpage = 9; // Go to page_9_finish
 			break;
+		}
 		case 4:
-			linphone_account_creator_set_username(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box), "username"))));
-			linphone_account_creator_set_password(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box), "password"))));
-			linphone_account_creator_set_email(creator, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box), "email"))));
-			linphone_account_creator_enable_newsletter_subscription(creator, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(box), "newsletter"))));
+		{
+			GtkEntry *password_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p4_entry_password1"));
+			GtkEntry *username_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p4_entry_username"));
+			GtkEntry *email_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p4_entry_email"));
+			//GtkToggleButton *newsletter = GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w, "p4_check_newsletter"));
+			linphone_account_creator_set_username(creator, gtk_entry_get_text(username_entry));
+			linphone_account_creator_set_password(creator, gtk_entry_get_text(password_entry));
+			linphone_account_creator_set_email(creator, gtk_entry_get_text(email_entry));
+			//linphone_account_creator_enable_newsletter_subscription(creator, gtk_toggle_button_get_active(newsletter));
 			curpage = 5; // Go to page_5_linphone_account_creation_in_progress
 			break;
+		}
 		case 6:
 			curpage = 7; // Go to page_7_linphone_account_validation_check_in_progress
 			break;
@@ -155,37 +171,10 @@ static int linphone_gtk_assistant_forward(int curpage, gpointer data) {
 	return curpage;
 }
 
-static GtkWidget * create_intro_page(void) {
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 2);
-	GtkWidget *label = gtk_label_new(_("Welcome!\nThis assistant will help you to use a SIP account for your calls."));
-	gtk_box_pack_start(GTK_BOX (vbox), label, TRUE, TRUE, 2);
-	g_object_set_data(G_OBJECT(vbox), "label", label);
-	gtk_widget_show_all(vbox);
-	return vbox;
-}
-
-static GtkWidget * create_choice_page(void) {
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 2);
-	GtkWidget *t1 = gtk_radio_button_new_with_label(NULL, _("Create an account on linphone.org"));
-	GtkWidget *t2 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(t1), _("I have already a linphone.org account and I just want to use it"));
-	GtkWidget *t3 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(t1), _("I have already a sip account and I just want to use it"));
-	GtkWidget *t4 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(t1), _("I want to specify a remote configuration URI"));
-
-	gtk_box_pack_start(GTK_BOX (vbox), t1, TRUE, TRUE, 2);
-	gtk_box_pack_start(GTK_BOX (vbox), t2, TRUE, TRUE, 2);
-	gtk_box_pack_start(GTK_BOX (vbox), t3, TRUE, TRUE, 2);
-	gtk_box_pack_start(GTK_BOX (vbox), t4, TRUE, TRUE, 2);
-	gtk_widget_show_all(vbox);
-	g_object_set_data(G_OBJECT(vbox), "create_account", t1);
-	g_object_set_data(G_OBJECT(vbox), "setup_linphone_account", t2);
-	g_object_set_data(G_OBJECT(vbox), "setup_account", t3);
-	g_object_set_data(G_OBJECT(vbox), "config-uri", t4);
-	return vbox;
-}
-
-static int external_account_configuration_complete(GtkWidget *w) {
-	GtkEntry* username = GTK_ENTRY(g_object_get_data(G_OBJECT(w), "username"));
-	GtkEntry* domain = GTK_ENTRY(g_object_get_data(G_OBJECT(w), "domain"));
+static int external_account_configuration_complete(GtkWidget *page) {
+	GtkWidget *assistant = gtk_widget_get_toplevel(page);
+	GtkEntry* username = GTK_ENTRY(linphone_gtk_get_widget(assistant, "p2_entry_username"));
+	GtkEntry* domain = GTK_ENTRY(linphone_gtk_get_widget(assistant, "p2_entry_domain"));
 
 	if ((gtk_entry_get_text_length(username) > 0)
 		&& (gtk_entry_get_text_length(domain) > 0)
@@ -196,154 +185,71 @@ static int external_account_configuration_complete(GtkWidget *w) {
 	return 0;
 }
 
-static void external_account_configuration_changed(GtkEntry *entry, GtkWidget *w) {
-	GtkWidget *assistant = gtk_widget_get_toplevel(w);
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, external_account_configuration_complete(w) > 0);
+void linphone_gtk_external_account_configuration_changed(GtkEntry *entry) {
+	GtkWidget *assistant = gtk_widget_get_toplevel(GTK_WIDGET(entry));
+	gint current_page_num = gtk_assistant_get_current_page(GTK_ASSISTANT(assistant));
+	GtkWidget *page = gtk_assistant_get_nth_page(GTK_ASSISTANT(assistant), current_page_num);
+	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), page, external_account_configuration_complete(page) > 0);
 }
 
-static GtkWidget * create_external_account_configuration_page(void) {
-	GtkWidget *vbox = gtk_table_new(6, 2, FALSE);
-	GtkWidget *label = gtk_label_new(_("Enter your account information"));
-	GdkColor color;
-	GtkWidget *labelEmpty;
-	GtkWidget *labelUsername;
-	GtkWidget *labelPassword;
-	GtkWidget *entryPassword;
-	GtkWidget *labelDomain;
-	GtkWidget *labelProxy;
-	GtkWidget *entryUsername;
-	GtkWidget *entryDomain;
-	GtkWidget *entryRoute;
-
-	gdk_color_parse("red", &color);
-	labelEmpty = gtk_label_new(NULL);
-	gtk_widget_modify_fg(labelEmpty, GTK_STATE_NORMAL, &color);
-	labelUsername = gtk_label_new(_("Username*"));
-	labelPassword = gtk_label_new(_("Password*"));
-	entryPassword = gtk_entry_new();
-	gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
-	labelDomain = gtk_label_new(_("Domain*"));
-	labelProxy = gtk_label_new(_("Proxy"));
-	entryUsername = gtk_entry_new();
-	entryDomain = gtk_entry_new();
-	entryRoute = gtk_entry_new();
-
-	gtk_table_attach_defaults(GTK_TABLE(vbox), label, 0, 2, 0, 1);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelUsername, 0, 1, 1, 2);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryUsername, 1, 2, 1, 2);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelPassword, 0, 1, 2, 3);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryPassword, 1, 2, 2, 3);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelDomain, 0, 1, 3, 4);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryDomain, 1, 2, 3, 4);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelProxy, 0, 1, 4, 5);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryRoute, 1, 2, 4, 5);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelEmpty, 0, 2, 5, 6);
-	gtk_widget_show_all(vbox);
-
-	g_object_set_data(G_OBJECT(vbox), "username", entryUsername);
-	g_object_set_data(G_OBJECT(vbox), "password", entryPassword);
-	g_object_set_data(G_OBJECT(vbox), "domain", entryDomain);
-	g_object_set_data(G_OBJECT(vbox), "proxy", entryRoute);
-	g_object_set_data(G_OBJECT(vbox), "errorstring", labelEmpty);
-	g_signal_connect(G_OBJECT(entryUsername), "changed", (GCallback)external_account_configuration_changed, vbox);
-	g_signal_connect(G_OBJECT(entryDomain), "changed", (GCallback)external_account_configuration_changed, vbox);
-	g_signal_connect(G_OBJECT(entryRoute), "changed", (GCallback)external_account_configuration_changed, vbox);
-
-	return vbox;
+void linphone_gtk_account_configuration_changed(GtkEntry *entry, GtkAssistant *assistant) {
+	gboolean complete = (gtk_entry_get_text_length(entry) > 0);
+	GtkWidget *page = gtk_assistant_get_nth_page(assistant, gtk_assistant_get_current_page(assistant));
+	gtk_assistant_set_page_complete(assistant, page, complete);
 }
 
-static void linphone_account_configuration_changed(GtkEntry *entry, GtkWidget *w) {
-	GtkWidget *assistant = gtk_widget_get_toplevel(w);
-	GtkEntry* username = GTK_ENTRY(g_object_get_data(G_OBJECT(w), "username"));
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, gtk_entry_get_text_length(username) > 0);
+static gboolean linphone_account_creation_configuration_correct(GtkWidget *w) {
+	gint is_username_available = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_username_available"));
+	gint is_email_correct = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_email_correct"));
+	gint is_password_correct = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_password_correct"));
+	return (is_username_available && is_email_correct && is_password_correct);
 }
 
-static GtkWidget * create_linphone_account_configuration_page(void) {
-	GtkWidget *vbox = gtk_table_new(3, 2, TRUE);
-	GtkWidget *label = gtk_label_new(_("Enter your linphone.org username"));
-	GdkColor color;
-	GtkWidget *labelEmpty;
-	GtkWidget *labelUsername;
-	GtkWidget *entryUsername;
-	GtkWidget *labelPassword;
-	GtkWidget *entryPassword;
+static gboolean update_interface_with_username_availability(GtkWidget *page) {
+	GtkWidget *assistant = gtk_widget_get_toplevel(page);
+	GtkImage* isUsernameOk = GTK_IMAGE(linphone_gtk_get_widget(assistant, "p4_image_username_ok"));
+	GtkLabel* usernameError = GTK_LABEL(linphone_gtk_get_widget(assistant, "p4_label_error"));
+	int account_status = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(page), "is_username_used"));
 
-	gdk_color_parse("red", &color);
-	labelEmpty = gtk_label_new(NULL);
-	gtk_widget_modify_fg(labelEmpty, GTK_STATE_NORMAL, &color);
-
-	labelUsername = gtk_label_new(_("Username:"));
-	entryUsername = gtk_entry_new();
-	labelPassword = gtk_label_new(_("Password:"));
-	entryPassword = gtk_entry_new();
-	gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
-
-	gtk_table_attach_defaults(GTK_TABLE(vbox), label, 0, 2, 0, 1);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelUsername, 0, 1, 1, 2);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryUsername, 1, 2, 1, 2);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelPassword, 0, 1, 2, 3);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryPassword, 1, 2, 2, 3);
-
-	gtk_widget_show_all(vbox);
-	g_object_set_data(G_OBJECT(vbox), "username", entryUsername);
-	g_object_set_data(G_OBJECT(vbox), "password", entryPassword);
-	g_object_set_data(G_OBJECT(vbox), "errorstring", labelEmpty);
-	g_signal_connect(G_OBJECT(entryUsername), "changed", (GCallback)linphone_account_configuration_changed, vbox);
-	return vbox;
-}
-
-static int linphone_account_creation_configuration_correct(GtkWidget *w) {
-	int is_username_available = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_username_available"));
-	int is_email_correct = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_email_correct"));
-	int is_password_correct = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_password_correct"));
-	if ((is_username_available == 1) && (is_email_correct == 1) && (is_password_correct == 1)) {
-		return 1;
-	}
-	return 0;
-}
-
-static gboolean update_interface_with_username_availability(void *w) {
-	GtkWidget *assistant = gtk_widget_get_toplevel(GTK_WIDGET(w));
-	GtkImage* isUsernameOk = GTK_IMAGE(g_object_get_data(G_OBJECT(w), "usernameOk"));
-	GtkLabel* usernameError = GTK_LABEL(g_object_get_data(G_OBJECT(w), "error"));
-	int account_existing = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_username_used"));
-
-	if (account_existing == 0) {
-		GdkPixbuf *ok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "ok_pixbuf"));
-		g_object_set_data(G_OBJECT(w), "is_username_available", GINT_TO_POINTER(1));
-		gtk_image_set_from_pixbuf(isUsernameOk, ok_pixbuf);
+	if (account_status == LinphoneAccountCreatorAccountNotExist) {
+		g_object_set_data(G_OBJECT(page), "is_username_available", GINT_TO_POINTER(1));
+		gtk_image_set_from_stock(isUsernameOk, GTK_STOCK_OK, GTK_ICON_SIZE_LARGE_TOOLBAR);
 		gtk_label_set_text(usernameError, "");
+	} else if (account_status == LinphoneAccountCreatorAccountExist) {
+		gtk_label_set_text(usernameError, _("Username is already in use!"));
+		g_object_set_data(G_OBJECT(page), "is_username_available", GINT_TO_POINTER(0));
+		gtk_image_set_from_stock(isUsernameOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	} else {
-		GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf"));
-		gtk_label_set_text(usernameError, "Username is already in use!");
-		g_object_set_data(G_OBJECT(w), "is_username_available", GINT_TO_POINTER(0));
-		gtk_image_set_from_pixbuf(isUsernameOk, nok_pixbuf);
+		gtk_label_set_text(usernameError, _("Failed to check username availability. Please try again later."));
+		g_object_set_data(G_OBJECT(page), "is_username_available", GINT_TO_POINTER(0));
+		gtk_image_set_from_stock(isUsernameOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	}
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), GTK_WIDGET(w), linphone_account_creation_configuration_correct(GTK_WIDGET(w)) > 0);
+	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), page, linphone_account_creation_configuration_correct(page) > 0);
 	return FALSE;
 }
 
-static void linphone_gtk_test_account_existence_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) {
+static void linphone_gtk_test_account_existence_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char* resp) {
 	GtkWidget *assistant = (GtkWidget *)linphone_account_creator_get_user_data(creator);
-	GtkWidget *page = g_object_get_data(G_OBJECT(assistant), "linphone_account_creation_configuration");
-	int account_existing = (status != LinphoneAccountCreatorOk);
-	g_object_set_data(G_OBJECT(page), "is_username_used", GINT_TO_POINTER(account_existing));
-	gdk_threads_add_idle((GSourceFunc)update_interface_with_username_availability, (void*)page);
+	GtkWidget *page = gtk_assistant_get_nth_page(GTK_ASSISTANT(assistant), gtk_assistant_get_current_page(GTK_ASSISTANT(assistant)));
+	g_object_set_data(G_OBJECT(page), "is_username_used", GINT_TO_POINTER(status));
+	gdk_threads_add_idle((GSourceFunc)update_interface_with_username_availability, page);
 }
 
 static gboolean check_username_availability(GtkWidget *assistant) {
 	LinphoneAccountCreator *creator = linphone_gtk_assistant_get_creator(assistant);
-	GtkWidget *page = GUINT_TO_POINTER(g_object_get_data(G_OBJECT(assistant), "linphone_account_creation_configuration"));
+	GtkWidget *page = gtk_assistant_get_nth_page(GTK_ASSISTANT(assistant), gtk_assistant_get_current_page(GTK_ASSISTANT(assistant)));
 	g_object_set_data(G_OBJECT(page), "usernameAvailabilityTimerID", GUINT_TO_POINTER(0));
-	linphone_account_creator_test_existence(creator);
+	linphone_account_creator_is_account_used(creator);
 	return FALSE;
 }
 
-static void linphone_account_creation_username_changed(GtkEntry *entry, GtkWidget *w) {
-	GtkWidget *assistant = gtk_widget_get_toplevel(GTK_WIDGET(w));
-	GtkEntry* username = GTK_ENTRY(g_object_get_data(G_OBJECT(w), "username"));
-	GtkImage* isUsernameOk = GTK_IMAGE(g_object_get_data(G_OBJECT(w), "usernameOk"));
-	GtkLabel* usernameError = GTK_LABEL(g_object_get_data(G_OBJECT(w), "error"));
+void linphone_gtk_account_creation_username_changed(GtkEntry *entry) {
+	GtkWidget *assistant = gtk_widget_get_toplevel(GTK_WIDGET(entry));
+	GtkEntry* username = GTK_ENTRY(linphone_gtk_get_widget(assistant, "p4_entry_username"));
+	GtkImage* isUsernameOk = GTK_IMAGE(linphone_gtk_get_widget(assistant, "p4_image_username_ok"));
+	GtkLabel* usernameError = GTK_LABEL(linphone_gtk_get_widget(assistant, "p4_label_error"));
+	gint current_page_num = gtk_assistant_get_current_page(GTK_ASSISTANT(assistant));
+	GtkWidget *page = gtk_assistant_get_nth_page(GTK_ASSISTANT(assistant), current_page_num);
 
 	LinphoneAccountCreator *creator = linphone_gtk_assistant_get_creator(assistant);
 	linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
@@ -351,280 +257,84 @@ static void linphone_account_creation_username_changed(GtkEntry *entry, GtkWidge
 	linphone_account_creator_set_route(creator, "sip.linphone.org");
 
 	if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
-		guint timerID = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(w), "usernameAvailabilityTimerID"));
+		guint timerID = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(page), "usernameAvailabilityTimerID"));
 		if (timerID > 0) {
 			g_source_remove(timerID);
 		}
 		timerID = g_timeout_add(500, (GSourceFunc)check_username_availability, assistant);
-		g_object_set_data(G_OBJECT(w), "usernameAvailabilityTimerID", GUINT_TO_POINTER(timerID));
+		g_object_set_data(G_OBJECT(page), "usernameAvailabilityTimerID", GUINT_TO_POINTER(timerID));
 	} else {
-		GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf"));
 		if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
 			gtk_label_set_text(usernameError, "Username is too short");
 		} else if (!g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
 			gtk_label_set_text(usernameError, "Unauthorized username");
 		}
-		g_object_set_data(G_OBJECT(w), "is_username_available", GINT_TO_POINTER(0));
-		gtk_image_set_from_pixbuf(isUsernameOk, nok_pixbuf);
-		gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, linphone_account_creation_configuration_correct(w) > 0);
+		g_object_set_data(G_OBJECT(page), "is_username_available", GINT_TO_POINTER(0));
+		gtk_image_set_from_stock(isUsernameOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR);
+		gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), page, linphone_account_creation_configuration_correct(page) > 0);
 	}
 }
 
-static void linphone_account_creation_email_changed(GtkEntry *entry, GtkWidget *w) {
-	GtkEntry* email = GTK_ENTRY(g_object_get_data(G_OBJECT(w), "email"));
-	GtkImage* isEmailOk = GTK_IMAGE(g_object_get_data(G_OBJECT(w), "emailOk"));
-	GtkWidget *assistant = gtk_widget_get_toplevel(w);
+void linphone_gtk_account_creation_email_changed(GtkEntry *entry) {
+	GtkWidget *assistant = gtk_widget_get_toplevel(GTK_WIDGET(entry));
+	GtkEntry* email = GTK_ENTRY(linphone_gtk_get_widget(assistant, "p4_entry_email"));
+	GtkImage* isEmailOk = GTK_IMAGE(linphone_gtk_get_widget(assistant, "p4_image_email_ok"));
+	gint current_page_num = gtk_assistant_get_current_page(GTK_ASSISTANT(assistant));
+	GtkWidget *page = gtk_assistant_get_nth_page(GTK_ASSISTANT(assistant), current_page_num);
 
-	if (g_regex_match_simple("^[a-z0-9]([a-z0-9_\\+\\.-]+)@[a-z0-9]([a-z0-9\\.-]+)\\.[a-z]{2,}$", gtk_entry_get_text(email), 0, 0)) {
-		GdkPixbuf *ok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "ok_pixbuf"));
-		g_object_set_data(G_OBJECT(w), "is_email_correct", GINT_TO_POINTER(1));
-		gtk_image_set_from_pixbuf(isEmailOk, ok_pixbuf);
+	if (g_regex_match_simple("^" BC_REGEX_RESTRICTIVE_EMAIL_ADDR "$", gtk_entry_get_text(email), 0, 0)) {
+		g_object_set_data(G_OBJECT(page), "is_email_correct", GINT_TO_POINTER(1));
+		gtk_image_set_from_stock(isEmailOk, GTK_STOCK_OK, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	} else {
-		GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf"));
-		g_object_set_data(G_OBJECT(w), "is_email_correct", GINT_TO_POINTER(0));
-		gtk_image_set_from_pixbuf(isEmailOk, nok_pixbuf);
+		g_object_set_data(G_OBJECT(page), "is_email_correct", GINT_TO_POINTER(0));
+		gtk_image_set_from_stock(isEmailOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	}
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, linphone_account_creation_configuration_correct(w) > 0);
+	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), page, linphone_account_creation_configuration_correct(page) > 0);
 }
 
-static void linphone_account_creation_password_changed(GtkEntry *entry, GtkWidget *w) {
-	GtkEntry* password = GTK_ENTRY(g_object_get_data(G_OBJECT(w), "password"));
-	GtkImage* isPasswordOk = GTK_IMAGE(g_object_get_data(G_OBJECT(w), "passwordOk"));
-	GtkEntry* password_confirm = GTK_ENTRY(g_object_get_data(G_OBJECT(w), "password_confirm"));
-	GtkWidget *assistant = gtk_widget_get_toplevel(w);
-	GtkLabel* passwordError = GTK_LABEL(g_object_get_data(G_OBJECT(w), "error"));
+void linphone_gtk_account_creation_password_changed(GtkEntry *entry) {
+	GtkWidget *assistant = gtk_widget_get_toplevel(GTK_WIDGET(entry));
+	GtkEntry* password = GTK_ENTRY(linphone_gtk_get_widget(assistant, "p4_entry_password1"));
+	GtkEntry* password_confirm = GTK_ENTRY(linphone_gtk_get_widget(assistant, "p4_entry_password2"));
+	GtkImage* isPasswordOk = GTK_IMAGE(linphone_gtk_get_widget(assistant, "p4_image_password_ok"));
+	GtkLabel* passwordError = GTK_LABEL(linphone_gtk_get_widget(assistant, "p4_label_error"));
+	gint current_page_num = gtk_assistant_get_current_page(GTK_ASSISTANT(assistant));
+	GtkWidget *page = gtk_assistant_get_nth_page(GTK_ASSISTANT(assistant), current_page_num);
 
 	if ((gtk_entry_get_text_length(password) >= PASSWORD_MIN_SIZE)
 		&& (g_ascii_strcasecmp(gtk_entry_get_text(password), gtk_entry_get_text(password_confirm)) == 0)) {
-		GdkPixbuf *ok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "ok_pixbuf"));
-		g_object_set_data(G_OBJECT(w), "is_password_correct", GINT_TO_POINTER(1));
-		gtk_image_set_from_pixbuf(isPasswordOk, ok_pixbuf);
+		g_object_set_data(G_OBJECT(page), "is_password_correct", GINT_TO_POINTER(1));
+		gtk_image_set_from_stock(isPasswordOk, GTK_STOCK_OK, GTK_ICON_SIZE_LARGE_TOOLBAR);
 		gtk_label_set_text(passwordError, "");
 	} else {
-		GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf"));
 		if (gtk_entry_get_text_length(password) < PASSWORD_MIN_SIZE) {
 			gtk_label_set_text(passwordError, "Password is too short !");
-		} else if (!g_ascii_strcasecmp(gtk_entry_get_text(password), gtk_entry_get_text(password_confirm)) == 0) {
+		} else if (g_ascii_strcasecmp(gtk_entry_get_text(password), gtk_entry_get_text(password_confirm)) != 0) {
 			gtk_label_set_text(passwordError, "Passwords don't match !");
 		}
-		g_object_set_data(G_OBJECT(w), "is_password_correct", GINT_TO_POINTER(0));
-		gtk_image_set_from_pixbuf(isPasswordOk, nok_pixbuf);
+		g_object_set_data(G_OBJECT(page), "is_password_correct", GINT_TO_POINTER(0));
+		gtk_image_set_from_stock(isPasswordOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	}
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, linphone_account_creation_configuration_correct(w) > 0);
+	gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), page, linphone_account_creation_configuration_correct(page) > 0);
 }
 
-static GtkWidget * create_linphone_account_creation_configuration_page(void) {
-	GtkWidget *vbox = gtk_table_new(7, 3, FALSE);
-	GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf"));
-	GtkWidget *label = gtk_label_new(_("(*) Required fields"));
-	GtkWidget *labelUsername = gtk_label_new(_("Username: (*)"));
-	GtkWidget *isUsernameOk = gtk_image_new_from_pixbuf(nok_pixbuf);
-	GtkWidget *labelPassword = gtk_label_new(_("Password: (*)"));
-	GtkWidget *isPasswordOk = gtk_image_new_from_pixbuf(nok_pixbuf);
-	GtkWidget *labelEmail = gtk_label_new(_("Email: (*)"));
-	GtkWidget *isEmailOk = gtk_image_new_from_pixbuf(nok_pixbuf);
-	GtkWidget *labelPassword2 = gtk_label_new(_("Confirm your password: (*)"));
-	GtkWidget *entryUsername = gtk_entry_new();
-	GtkWidget *entryPassword = gtk_entry_new();
-	GtkWidget *entryEmail;
-	GtkWidget *entryPassword2;
-	GtkWidget *checkNewsletter;
-	GtkWidget *labelError;
-	GtkWidget *passwordVbox1;
-	GtkWidget *passwordVbox2;
-	GdkColor color;
-
-	gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
-	entryEmail = gtk_entry_new();
-	entryPassword2 = gtk_entry_new();
-	gtk_entry_set_visibility(GTK_ENTRY(entryPassword2), FALSE);
-	checkNewsletter = gtk_check_button_new_with_label(_("Keep me informed with linphone updates"));
-
-	gdk_color_parse("red", &color);
-	labelError = gtk_label_new(NULL);
-	gtk_widget_modify_fg(labelError, GTK_STATE_NORMAL, &color);
-
-	passwordVbox1 = gtk_vbox_new(FALSE, 2);
-	passwordVbox2 = gtk_vbox_new(FALSE, 2);
-	gtk_box_pack_start(GTK_BOX (passwordVbox1), labelPassword, TRUE, FALSE, 2);
-	gtk_box_pack_start(GTK_BOX (passwordVbox1), labelPassword2, TRUE, FALSE, 2);
-	gtk_box_pack_start(GTK_BOX (passwordVbox2), entryPassword, TRUE, FALSE, 2);
-	gtk_box_pack_start(GTK_BOX (passwordVbox2), entryPassword2, TRUE, FALSE, 2);
-
-	gtk_table_attach_defaults(GTK_TABLE(vbox), label, 0, 3, 0, 1);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelEmail, 0, 1, 1, 2);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryEmail, 1, 2, 1, 2);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), isEmailOk, 2, 3, 1, 2);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelUsername, 0, 1, 2, 3);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), entryUsername, 1, 2, 2, 3);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), isUsernameOk, 2, 3, 2, 3);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), passwordVbox1, 0, 1, 3, 4);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), passwordVbox2, 1, 2, 3, 4);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), isPasswordOk, 2, 3, 3, 4);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), labelError, 1, 4, 5, 6);
-	gtk_table_attach_defaults(GTK_TABLE(vbox), checkNewsletter, 0, 3, 6, 7);
-
-	gtk_widget_show_all(vbox);
-	g_object_set_data(G_OBJECT(vbox), "username", entryUsername);
-	g_object_set_data(G_OBJECT(vbox), "password", entryPassword);
-	g_object_set_data(G_OBJECT(vbox), "email", entryEmail);
-	g_object_set_data(G_OBJECT(vbox), "usernameOk", isUsernameOk);
-	g_object_set_data(G_OBJECT(vbox), "passwordOk", isPasswordOk);
-	g_object_set_data(G_OBJECT(vbox), "emailOk", isEmailOk);
-	g_object_set_data(G_OBJECT(vbox), "password_confirm", entryPassword2);
-	g_object_set_data(G_OBJECT(vbox), "newsletter", checkNewsletter);
-	g_object_set_data(G_OBJECT(vbox), "error", labelError);
-	g_signal_connect(G_OBJECT(entryUsername), "changed", (GCallback)linphone_account_creation_username_changed, vbox);
-	g_signal_connect(G_OBJECT(entryPassword), "changed", (GCallback)linphone_account_creation_password_changed, vbox);
-	g_signal_connect(G_OBJECT(entryEmail), "changed", (GCallback)linphone_account_creation_email_changed, vbox);
-	g_signal_connect(G_OBJECT(entryPassword2), "changed", (GCallback)linphone_account_creation_password_changed, vbox);
-	return vbox;
-}
-
-static GtkWidget * create_linphone_account_creation_in_progress_page(void) {
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 2);
-	GtkWidget *label = gtk_label_new(_("Your account is being created, please wait."));
-	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
-	gtk_widget_show_all(vbox);
-	return vbox;
-}
-
-static GtkWidget * create_linphone_account_validation_wait_page(void) {
-	GtkWidget *vbox = gtk_table_new(2, 1, FALSE);
-	GtkWidget *label = gtk_label_new(_("Please validate your account by clicking on the link we just sent you by email.\n"
-		"Then come back here and press Next button."));
-	gtk_table_attach(GTK_TABLE(vbox), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 0, 100);
-	g_object_set_data(G_OBJECT(vbox), "label", label);
-	gtk_widget_show_all(vbox);
-	return vbox;
-}
-
-static GtkWidget * create_linphone_account_validation_check_in_progress_page(void) {
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 2);
-	GtkWidget *label = gtk_label_new(_("Checking if your account is been validated, please wait."));
-	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
-	gtk_widget_show_all(vbox);
-	return vbox;
-}
-
-static GtkWidget * create_error_page(void) {
-	GtkWidget *vbox = gtk_table_new(2, 1, FALSE);
-	GtkWidget *label = gtk_label_new(_("Error, account not validated, username already used or server unreachable.\nPlease go back and try again."));
-	gtk_table_attach(GTK_TABLE(vbox), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 0, 100);
-	g_object_set_data(G_OBJECT(vbox), "label", label);
-	gtk_widget_show_all(vbox);
-	return vbox;
-}
-
-static GtkWidget * create_finish_page(void) {
-	GtkWidget *vbox = gtk_vbox_new(FALSE, 2);
-	GtkWidget *label = gtk_label_new(_("Thank you. Your account is now configured and ready for use."));
-	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
-	gtk_widget_show_all(vbox);
-	return vbox;
-}
-
-static LinphoneAccountCreator * linphone_gtk_assistant_init(GtkWidget *w) {
-	LinphoneAccountCreator *creator = linphone_account_creator_new(linphone_gtk_get_core(), "https://www.linphone.org/wizard.php");
+static void linphone_gtk_assistant_init(GtkWidget *w) {
+	LinphoneAccountCreator *creator = linphone_account_creator_new(linphone_gtk_get_core(), "https://subscribe.linphone.org:444/wizard.php");
 	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
 	linphone_account_creator_set_user_data(creator, w);
-	linphone_account_creator_cbs_set_existence_tested(cbs, linphone_gtk_test_account_existence_cb);
-	linphone_account_creator_cbs_set_validation_tested(cbs, linphone_gtk_test_account_validation_cb);
-	linphone_account_creator_cbs_set_validated(cbs, linphone_gtk_account_validate_cb);
+	linphone_account_creator_cbs_set_is_account_used(cbs, linphone_gtk_test_account_existence_cb);
+	linphone_account_creator_cbs_set_is_account_activated(cbs, linphone_gtk_test_account_validation_cb);
+	linphone_account_creator_cbs_set_create_account(cbs, linphone_gtk_create_account_cb);
 	g_object_set_data(G_OBJECT(w), "creator", creator);
-	return creator;
-}
-
-void linphone_gtk_show_assistant(GtkWidget *parent) {
-	GtkWidget *w;
-	GtkWidget *page_0_intro;
-	GtkWidget *page_1_choice;
-	GtkWidget *page_2_external_account_configuration;
-	GtkWidget *page_3_linphone_account_configuration;
-	GtkWidget *page_4_linphone_account_creation_configuration;
-	GtkWidget *page_5_linphone_account_creation_in_progress;
-	GtkWidget *page_6_linphone_account_validation_wait;
-	GtkWidget *page_7_linphone_account_validation_check_in_progress;
-	GtkWidget *page_8_error;
-	GtkWidget *page_9_finish;
-	GdkPixbuf *ok_pixbuf;
-	GdkPixbuf *nok_pixbuf;
-
-	if (the_assistant != NULL) return;
-
-	w = the_assistant = gtk_assistant_new();
-	gtk_window_set_resizable (GTK_WINDOW(w), FALSE);
-	gtk_window_set_title(GTK_WINDOW(w), _("SIP account configuration assistant"));
-
-	ok_pixbuf = create_pixbuf(linphone_gtk_get_ui_config("ok", "ok.png"));
-	g_object_set_data_full(G_OBJECT(the_assistant), "ok_pixbuf", ok_pixbuf, g_object_unref);
-	nok_pixbuf = create_pixbuf(linphone_gtk_get_ui_config("notok", "notok.png"));
-	g_object_set_data_full(G_OBJECT(the_assistant), "nok_pixbuf", nok_pixbuf, g_object_unref);
-
-	page_0_intro = create_intro_page();
-	page_1_choice = create_choice_page();
-	page_2_external_account_configuration = create_external_account_configuration_page();
-	page_3_linphone_account_configuration = create_linphone_account_configuration_page();
-	page_4_linphone_account_creation_configuration = create_linphone_account_creation_configuration_page();
-	page_5_linphone_account_creation_in_progress = create_linphone_account_creation_in_progress_page();
-	page_6_linphone_account_validation_wait = create_linphone_account_validation_wait_page();
-	page_7_linphone_account_validation_check_in_progress = create_linphone_account_validation_check_in_progress_page();
-	page_8_error = create_error_page();
-	page_9_finish = create_finish_page();
-
-	linphone_gtk_assistant_init(w);
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_0_intro);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_0_intro, GTK_ASSISTANT_PAGE_INTRO);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_0_intro, _("Welcome to the account setup assistant"));
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(w), page_0_intro, TRUE);
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_1_choice);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_1_choice, GTK_ASSISTANT_PAGE_CONTENT);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_1_choice, _("Account setup assistant"));
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(w), page_1_choice, TRUE);
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_2_external_account_configuration);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_2_external_account_configuration, GTK_ASSISTANT_PAGE_CONFIRM);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_2_external_account_configuration, _("Configure your account (step 1/1)"));
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_3_linphone_account_configuration);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_3_linphone_account_configuration, GTK_ASSISTANT_PAGE_CONFIRM);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_3_linphone_account_configuration, _("Enter your sip username (step 1/1)"));
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_4_linphone_account_creation_configuration);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_4_linphone_account_creation_configuration, GTK_ASSISTANT_PAGE_CONFIRM);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_4_linphone_account_creation_configuration, _("Enter account information (step 1/2)"));
-	g_object_set_data(G_OBJECT(w), "linphone_account_creation_configuration", page_4_linphone_account_creation_configuration);
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_5_linphone_account_creation_in_progress);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_5_linphone_account_creation_in_progress, GTK_ASSISTANT_PAGE_PROGRESS);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_5_linphone_account_creation_in_progress, _("Account creation in progress"));
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_6_linphone_account_validation_wait);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_6_linphone_account_validation_wait, GTK_ASSISTANT_PAGE_CONTENT);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_6_linphone_account_validation_wait, _("Validation (step 2/2)"));
-	gtk_assistant_set_page_complete(GTK_ASSISTANT(w), page_6_linphone_account_validation_wait, TRUE);
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_7_linphone_account_validation_check_in_progress);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_7_linphone_account_validation_check_in_progress, GTK_ASSISTANT_PAGE_PROGRESS);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_7_linphone_account_validation_check_in_progress, _("Account validation check in progress"));
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_8_error);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_8_error, GTK_ASSISTANT_PAGE_CONTENT);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_8_error, _("Error"));
-
-	gtk_assistant_append_page(GTK_ASSISTANT(w), page_9_finish);
-	gtk_assistant_set_page_type(GTK_ASSISTANT(w), page_9_finish, GTK_ASSISTANT_PAGE_SUMMARY);
-	gtk_assistant_set_page_title(GTK_ASSISTANT(w), page_9_finish, _("Terminating"));
 
 	gtk_assistant_set_forward_page_func(GTK_ASSISTANT(w), linphone_gtk_assistant_forward, w, NULL);
-	g_signal_connect(G_OBJECT(w), "close", (GCallback)linphone_gtk_assistant_closed, NULL);
-	g_signal_connect(G_OBJECT(w), "cancel", (GCallback)linphone_gtk_assistant_closed, NULL);
-	g_signal_connect(G_OBJECT(w), "prepare", (GCallback)linphone_gtk_assistant_prepare, NULL);
+}
 
-	gtk_window_set_transient_for(GTK_WINDOW(the_assistant), GTK_WINDOW(linphone_gtk_get_main_window()));
-
-	gtk_widget_show(w);
+void linphone_gtk_show_assistant(void) {
+	if (the_assistant != NULL) return;
+	the_assistant = linphone_gtk_create_window("setup_wizard", linphone_gtk_get_main_window());
+	linphone_gtk_assistant_init(the_assistant);
+	gtk_widget_show(the_assistant);
 }
 
 void linphone_gtk_close_assistant(void) {
diff --git a/gtk/setupwizard.h b/gtk/setupwizard.h
new file mode 100644
index 000000000..8b3493c4e
--- /dev/null
+++ b/gtk/setupwizard.h
@@ -0,0 +1,35 @@
+/*
+linphone, gtk-glade interface.
+Copyright (C) 2008  Simon MORLAT (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef SETUP_WIZARD_H
+#define SETUP_WIZARD_H
+
+#include "sipsetup.h"
+
+LINPHONE_PUBLIC void linphone_gtk_show_assistant(void);
+LINPHONE_PUBLIC void linphone_gtk_assistant_prepare(GtkWidget *assistant);
+LINPHONE_PUBLIC void linphone_gtk_assistant_closed(GtkWidget *w);
+
+LINPHONE_PUBLIC void linphone_gtk_external_account_configuration_changed(GtkEntry* entry);
+LINPHONE_PUBLIC void linphone_gtk_account_configuration_changed(GtkEntry *entry, GtkAssistant *assistant);
+LINPHONE_PUBLIC void linphone_gtk_account_creation_username_changed(GtkEntry *entry);
+LINPHONE_PUBLIC void linphone_gtk_account_creation_password_changed(GtkEntry *entry);
+LINPHONE_PUBLIC void linphone_gtk_account_creation_email_changed(GtkEntry *entry);
+
+#endif
\ No newline at end of file
diff --git a/gtk/status_icon.c b/gtk/status_icon.c
index 805ef4a45..22852f38f 100644
--- a/gtk/status_icon.c
+++ b/gtk/status_icon.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <gtkosxapplication.h>
 #endif
 
-#if !defined(WIN32) && !defined(__APPLE__) && GLIB_CHECK_VERSION(2, 26, 0)
+#if !defined(_WIN32) && !defined(__APPLE__) && GLIB_CHECK_VERSION(2, 26, 0)
 #define STATUS_NOTIFIER_IS_USABLE 1
 #endif
 
@@ -208,7 +208,7 @@ static LinphoneStatusIcon *_linphone_status_icon_new(const _LinphoneStatusIconDe
 }
 
 static void _linphone_status_icon_free(LinphoneStatusIcon *obj) {
-	if(obj->desc->uninit) obj->desc->uninit(obj->data);
+	if(obj->desc->uninit) obj->desc->uninit(obj);
 	if(obj->params) linphone_status_icon_params_unref(obj->params);
 	g_free(obj);
 }
@@ -316,22 +316,20 @@ static void _linphone_status_icon_impl_gtk_popup_menu(GtkStatusIcon *status_icon
 }
 
 static void _linphone_status_icon_impl_gtk_init(LinphoneStatusIcon *si) {
-	const char *icon_path=linphone_gtk_get_ui_config("icon",LINPHONE_ICON);
-	const char *call_icon_path=linphone_gtk_get_ui_config("start_call_icon","call_start.png");
-	GdkPixbuf *pbuf=create_pixbuf(icon_path);
-	GtkStatusIcon *icon=gtk_status_icon_new_from_pixbuf(pbuf);
+	const char *icon_name=linphone_gtk_get_ui_config("icon_name",LINPHONE_ICON_NAME);
+	const char *blinking_icon_name=linphone_gtk_get_ui_config("binking_status_icon_name","linphone-start-call");
+	GtkStatusIcon *icon=gtk_status_icon_new_from_icon_name(icon_name);
 	g_signal_connect_swapped(G_OBJECT(icon),"activate", G_CALLBACK(_linphone_status_icon_impl_gtk_on_click_cb), si);
 	g_signal_connect(G_OBJECT(icon), "popup-menu", G_CALLBACK(_linphone_status_icon_impl_gtk_popup_menu), si);
-	g_object_set_data_full(G_OBJECT(icon),"icon",pbuf, g_object_unref);
-	pbuf=create_pixbuf(call_icon_path);
-	g_object_set_data_full(G_OBJECT(icon),"call_icon",pbuf, g_object_unref);
+	g_object_set_data_full(G_OBJECT(icon), "icon", g_strdup(icon_name), g_free);
+	g_object_set_data_full(G_OBJECT(icon), "call_icon", g_strdup(blinking_icon_name), g_free);
 	si->data = icon;
 }
 
-// static void _linphone_status_icon_impl_gtk_uninit(LinphoneStatusIcon *si) {
-// 	GtkStatusIcon *icon = GTK_STATUS_ICON(si->data);
-// 	gtk_status_icon_set_visible(icon, FALSE);
-// }
+static void _linphone_status_icon_impl_gtk_uninit(LinphoneStatusIcon *si) {
+	GtkStatusIcon *icon = GTK_STATUS_ICON(si->data);
+	gtk_status_icon_set_visible(icon, FALSE);
+}
 
 static void _linphone_status_icon_impl_gtk_start(LinphoneStatusIcon *si) {
 	GtkStatusIcon *icon = GTK_STATUS_ICON(si->data);
@@ -344,13 +342,13 @@ static void _linphone_status_icon_impl_gtk_start(LinphoneStatusIcon *si) {
 }
 
 static gboolean _linphone_status_icon_impl_gtk_do_icon_blink_cb(GtkStatusIcon *gi){
-	GdkPixbuf *call_icon=g_object_get_data(G_OBJECT(gi),"call_icon");
-	GdkPixbuf *normal_icon=g_object_get_data(G_OBJECT(gi),"icon");
-	GdkPixbuf *cur_icon=gtk_status_icon_get_pixbuf(gi);
-	if (cur_icon==call_icon){
-		gtk_status_icon_set_from_pixbuf(gi,normal_icon);
+	const gchar *call_icon = (const gchar *)g_object_get_data(G_OBJECT(gi),"call_icon");
+	const gchar *normal_icon = (const gchar *)g_object_get_data(G_OBJECT(gi),"icon");
+	const gchar *cur_icon = (const gchar *)gtk_status_icon_get_icon_name(gi);
+	if (cur_icon == call_icon){
+		gtk_status_icon_set_from_icon_name(gi,normal_icon);
 	}else{
-		gtk_status_icon_set_from_pixbuf(gi,call_icon);
+		gtk_status_icon_set_from_icon_name(gi,call_icon);
 	}
 	return TRUE;
 }
@@ -363,10 +361,10 @@ static void _linphone_status_icon_impl_enable_blinking(LinphoneStatusIcon *si, g
 		tout=g_timeout_add(500,(GSourceFunc)_linphone_status_icon_impl_gtk_do_icon_blink_cb,icon);
 		g_object_set_data(G_OBJECT(icon),"timeout",GINT_TO_POINTER(tout));
 	}else if (!val && tout!=0){
-		GdkPixbuf *normal_icon=g_object_get_data(G_OBJECT(icon),"icon");
+		const gchar *normal_icon = (const gchar *)g_object_get_data(G_OBJECT(icon),"icon");
 		g_source_remove(tout);
 		g_object_set_data(G_OBJECT(icon),"timeout",NULL);
-		gtk_status_icon_set_from_pixbuf(icon,normal_icon);
+		gtk_status_icon_set_from_icon_name(icon,normal_icon);
 	}
 }
 
@@ -383,7 +381,7 @@ static gboolean _linphone_status_icon_impl_is_supported(
 static const _LinphoneStatusIconDesc _linphone_status_icon_impl_gtk_desc = {
 	"gtk_status_icon",
 	_linphone_status_icon_impl_gtk_init,
-	NULL,
+	_linphone_status_icon_impl_gtk_uninit,
 	_linphone_status_icon_impl_gtk_start,
 	_linphone_status_icon_impl_enable_blinking,
 	_linphone_status_icon_impl_is_supported
diff --git a/gtk/status_icon.h b/gtk/status_icon.h
index e09137279..52d28d4e6 100644
--- a/gtk/status_icon.h
+++ b/gtk/status_icon.h
@@ -22,9 +22,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  * technology used to manage the status icon.
  */
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
+
 struct _LinphoneStatusIcon;
 typedef void (*LinphoneStatusIconOnClickCallback)(struct _LinphoneStatusIcon *si, void *user_data);
 
diff --git a/gtk/status_notifier.c b/gtk/status_notifier.c
index ea9a9b67d..1cff84f45 100644
--- a/gtk/status_notifier.c
+++ b/gtk/status_notifier.c
@@ -448,17 +448,16 @@ static void _bc_status_notifier_method_call_cb(
 static void _bc_status_notifier_bus_acquired_cb(GDBusConnection *conn, const gchar *name, BcStatusNotifier *sn) {
 	char *interface_name = g_strdup_printf("%s.%s", sn->params->prefix, ITEM_NAME);
 	char *item_path = g_strdup_printf("/%s", ITEM_NAME);
-	GDBusInterfaceVTable vtable = {
-		(GDBusInterfaceMethodCallFunc)_bc_status_notifier_method_call_cb,
-		(GDBusInterfaceGetPropertyFunc)_bc_status_notifier_get_property_cb,
-		NULL
-	};
-	
+	GDBusInterfaceVTable vtable;
 	GDBusNodeInfo *node_info = g_dbus_node_info_new_for_xml(STATUS_NOTIFIER_INTROSPECTION_DATA, NULL);
 	GDBusInterfaceInfo *interface = g_dbus_node_info_lookup_interface(
 		node_info,
 		interface_name
 	);
+
+	memset(&vtable, 0, sizeof(vtable));
+	vtable.method_call = (GDBusInterfaceMethodCallFunc)_bc_status_notifier_method_call_cb;
+	vtable.get_property = (GDBusInterfaceGetPropertyFunc)_bc_status_notifier_get_property_cb;
 	g_free(interface_name);
 	
 	sn->conn = conn;
diff --git a/gtk/support.c b/gtk/support.c
index ebb61c33d..0321c196f 100644
--- a/gtk/support.c
+++ b/gtk/support.c
@@ -236,14 +236,14 @@ void linphone_gtk_visibility_set(const char *hiddens, const char *window_name, G
 	int len;
 	for(b=i=hiddens;*i!='\0';++i){
 		if (*i==' '){
-			len=MIN(i-b,sizeof(item)-1);
+			len=MIN(i-b,(int)sizeof(item)-1);
 			strncpy(item,b,len);
 			item[len]='\0';
 			b=i+1;
 			parse_item(item,window_name,w,show);
 		}
 	}
-	len=MIN(i-b,sizeof(item)-1);
+	len=MIN(i-b,(int)sizeof(item)-1);
 	if (len>0){
 		strncpy(item,b,len);
 		item[len]='\0';
diff --git a/gtk/tunnel_config.ui b/gtk/tunnel_config.ui
index e0baf91fd..af7eafd29 100644
--- a/gtk/tunnel_config.ui
+++ b/gtk/tunnel_config.ui
@@ -52,7 +52,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="n_rows">4</property>
+                        <property name="n_rows">5</property>
                         <property name="n_columns">2</property>
                         <property name="homogeneous">True</property>
                         <child>
@@ -113,7 +113,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="radio_enable">
-                            <property name="label" translatable="yes">Enable</property>
+                            <property name="label" translatable="yes">Enabled</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -132,7 +132,7 @@
                         </child>
                         <child>
                           <object class="GtkRadioButton" id="radio_disable">
-                            <property name="label" translatable="yes">Disable</property>
+                            <property name="label" translatable="yes">Disabled</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -140,6 +140,26 @@
                             <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
+                            <property name="group">radio_enable</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="tunnel_autodetect">
+                            <property name="label" translatable="yes">Enable on purpose</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radio_enable</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -154,6 +174,9 @@
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -170,7 +193,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">&lt;b&gt;Configure tunnel&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;VoIP anti-blocking (tunnel server)&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>
@@ -315,7 +338,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Configure http proxy (optional)&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;Http proxy (optional)&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>
diff --git a/gtk/update.c b/gtk/update.c
index a38a9d818..9704b6c9e 100644
--- a/gtk/update.c
+++ b/gtk/update.c
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "linphone.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include <wininet.h>
 
@@ -27,13 +27,13 @@ static int linphone_gtk_create_version(const char *version_url, char *version, s
 	DWORD dwDownloaded = 0;
 	HINTERNET  hSession = NULL, hConnect = NULL;
 	int ret=-1;
-	
+
 	hSession=InternetOpen("Linphone",INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0);
-	
+
 	if (hSession==NULL) return -1;
-	
+
 	hConnect=InternetOpenUrl(hSession,version_url,NULL,0,0,0);
-	
+
 	if (hConnect==NULL) {
 		InternetCloseHandle(hSession);
 		return -1;
@@ -46,7 +46,7 @@ static int linphone_gtk_create_version(const char *version_url, char *version, s
 		if (strstr(version,"html")==0)
 			ret=0;
 	}
-	
+
 	// Close any open handles.
 	if (hConnect) InternetCloseHandle(hConnect);
 	if (hSession) InternetCloseHandle(hSession);
@@ -56,7 +56,7 @@ static int linphone_gtk_create_version(const char *version_url, char *version, s
 #else
 
 static int linphone_gtk_create_version(const char *url, char *version, size_t size){
-	
+
 	return -1;
 }
 
@@ -87,7 +87,7 @@ static gboolean popup_new_version(const char *download_site){
 	return FALSE;
 }
 
-static gboolean popup_version_ok(){
+static gboolean popup_version_ok(void){
 	linphone_gtk_display_something(GTK_MESSAGE_INFO,_("You are running the lastest version."));
 	return FALSE;
 }
diff --git a/gtk/utils.c b/gtk/utils.c
index c7dc2d672..eadb4d998 100644
--- a/gtk/utils.c
+++ b/gtk/utils.c
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "linphone.h"
 
-static void run_gtk(){
+static void run_gtk(void){
 	while (gtk_events_pending ())
 		gtk_main_iteration ();
 
@@ -112,6 +112,18 @@ void linphone_gtk_reload_video_devices(void){
 	if (pb) linphone_gtk_fill_webcams(pb);
 }
 
+bool_t linphone_gtk_is_friend(LinphoneCore *lc, const char *contact) {
+	LinphoneAddress *addr = linphone_core_interpret_url(lc, contact);
+	if (addr) {
+		char *uri = linphone_address_as_string_uri_only(addr);
+		LinphoneFriend *lf = linphone_core_get_friend_by_address(lc, uri);
+		linphone_address_destroy(addr);
+		if (uri) ms_free(uri);
+		if (lf) return TRUE;
+	}
+	return FALSE;
+}
+
 #ifdef HAVE_LIBUDEV_H
 
 static struct udev *udevroot=NULL;
diff --git a/gtk/videowindow.c b/gtk/videowindow.c
index 14b2292af..11a90839a 100644
--- a/gtk/videowindow.c
+++ b/gtk/videowindow.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #include <gdk/gdkwin32.h>
 #elif defined(__APPLE__)
 extern void *gdk_quartz_window_get_nswindow(GdkWindow      *window);
@@ -48,27 +48,33 @@ static void on_end_of_play(LinphonePlayer *player, void *user_data){
 
 static void drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
 	GtkSelectionData *selection_data, guint target_type, guint time, gpointer user_data){
-	int datalen=gtk_selection_data_get_length(selection_data) >= 0;
+	int datalen=gtk_selection_data_get_length(selection_data);
 	const void *data=gtk_selection_data_get_data(selection_data);
 	LinphoneCall *call=g_object_get_data(G_OBJECT(widget),"call");
-	
+
 	ms_message("target_type=%i, datalen=%i, data=%p",target_type,datalen,data);
 	if (target_type==TARGET_URILIST && data){
 		LinphonePlayer *player=linphone_call_get_player(call);
-		const char *path=(const char*)data;
+		char *path=ms_strdup(data);
+		while (datalen&&(path[datalen-1]=='\r'||path[datalen-1]=='\n')) {
+			path[datalen-1]='\0';
+			datalen--;
+		}
 		if (player){
-			if (strstr(path,"file://")==path) path+=strlen("file://");
-			if (linphone_player_open(player,path,on_end_of_play,NULL)==0){
+
+			const char* filepath = (strstr(path,"file://")==path) ? path+strlen("file://") : path;
+			if (linphone_player_open(player,filepath,on_end_of_play,NULL)==0){
+
 				linphone_player_start(player);
 			}else{
 				GtkWidget *warn=gtk_message_dialog_new(GTK_WINDOW(widget),GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
 								       GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE,
-									_("Cannot play %s."),path);
+									_("Cannot play %s."),filepath);
 				g_signal_connect(warn,"response",(GCallback)gtk_widget_destroy,NULL);
 				gtk_widget_show(warn);
 			}
 		}
-		
+		ms_free(path);
 	}
 	gtk_drag_finish (context, TRUE, FALSE, time);
 }
@@ -77,7 +83,7 @@ static gboolean drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint
 #if GTK_CHECK_VERSION(2,21,0)
 	GList *l=gdk_drag_context_list_targets(drag_context);
 	GList *elem;
-	
+
 	if (l){
 		ms_message("drag_drop");
 		/* Choose the best target type */
@@ -97,7 +103,7 @@ static gboolean drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint
 static void *get_native_handle(GdkWindow *gdkw){
 #ifdef GDK_WINDOWING_X11
 	return (void *)GDK_WINDOW_XID(gdkw);
-#elif defined(WIN32)
+#elif defined(_WIN32)
 	return (void *)GDK_WINDOW_HWND(gdkw);
 #elif defined(__APPLE__)
 	return (void *)gdk_quartz_window_get_nsview(gdkw);
@@ -109,13 +115,13 @@ static void *get_native_handle(GdkWindow *gdkw){
 static void _resize_video_window(GtkWidget *video_window, MSVideoSize vsize){
 	MSVideoSize cur;
 	gtk_window_get_size(GTK_WINDOW(video_window),&cur.width,&cur.height);
-	if (vsize.width*vsize.height > cur.width*cur.height || 
+	if (vsize.width*vsize.height > cur.width*cur.height ||
 		ms_video_size_get_orientation(vsize)!=ms_video_size_get_orientation(cur) ){
 		gtk_window_resize(GTK_WINDOW(video_window),vsize.width,vsize.height);
 	}
 }
 
-static gint resize_video_window(LinphoneCall *call){
+static gboolean resize_video_window(LinphoneCall *call){
 	const LinphoneCallParams *params=linphone_call_get_current_params(call);
 	if (params){
 		MSVideoSize vsize=linphone_call_params_get_received_video_size(params);
@@ -180,18 +186,27 @@ static void on_controls_response(GtkWidget *dialog, int response_id, GtkWidget *
 			linphone_core_terminate_call(linphone_gtk_get_core(),call);
 		}
 		break;
+		case GTK_RESPONSE_APPLY:
+		{
+			LinphoneCall *call=(LinphoneCall*)g_object_get_data(G_OBJECT(video_window),"call");
+			char *path = (char *)linphone_gtk_get_snapshot_path();
+			linphone_call_take_video_snapshot(call, path);
+		}
 	}
-	
+
 }
 
-static void on_controls_destroy(GtkWidget *w){
+static gboolean on_controls_destroy(GtkWidget *w){
 	GtkWidget *video_window=(GtkWidget*)g_object_get_data(G_OBJECT(w),"video_window");
 	gint timeout=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"timeout"));
 	if (timeout!=0){
 		g_source_remove(timeout);
 		g_object_set_data(G_OBJECT(w),"timeout",GINT_TO_POINTER(0));
 	}
-	g_object_set_data(G_OBJECT(video_window),"controls",NULL);
+	if (video_window) {
+		g_object_set_data(G_OBJECT(video_window),"controls",NULL);
+	}
+	return FALSE;
 }
 
 static gboolean _set_video_controls_position(GtkWidget *video_window){
@@ -216,10 +231,23 @@ static void set_video_controls_position(GtkWidget *video_window){
 }
 
 static gboolean video_window_moved(GtkWidget *widget, GdkEvent  *event, gpointer   user_data){
-	set_video_controls_position(widget);
+	/*Workaround to Video window bug on Windows. */
+	/* set_video_controls_position(widget); */
 	return FALSE;
 }
 
+static gint do_gtk_widget_destroy(GtkWidget *w){
+	gtk_widget_destroy(w);
+	return FALSE;
+}
+
+static void schedule_video_controls_disapearance(GtkWidget *w){
+	gint timeout=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"timeout"));
+	if (timeout != 0) g_source_remove(timeout);
+	timeout=g_timeout_add(3000,(GSourceFunc)do_gtk_widget_destroy,w);
+	g_object_set_data(G_OBJECT(w),"timeout",GINT_TO_POINTER(timeout));
+}
+
 static GtkWidget *show_video_controls(GtkWidget *video_window){
 	GtkWidget *w;
 	w=(GtkWidget*)g_object_get_data(G_OBJECT(video_window),"controls");
@@ -227,28 +255,29 @@ static GtkWidget *show_video_controls(GtkWidget *video_window){
 		gboolean isfullscreen=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(video_window),"fullscreen"));
 		const char *stock_button=isfullscreen ? GTK_STOCK_LEAVE_FULLSCREEN : GTK_STOCK_FULLSCREEN;
 		gint response_id=isfullscreen ? GTK_RESPONSE_NO : GTK_RESPONSE_YES ;
-		gint timeout;
+		GtkWidget *image = gtk_image_new_from_icon_name(linphone_gtk_get_ui_config("stop_call_icon_name","linphone-stop-call"), GTK_ICON_SIZE_BUTTON);
 		GtkWidget *button;
 		w=gtk_dialog_new_with_buttons("",GTK_WINDOW(video_window),GTK_DIALOG_DESTROY_WITH_PARENT,stock_button,response_id,NULL);
 		gtk_window_set_opacity(GTK_WINDOW(w),0.5);
 		gtk_window_set_decorated(GTK_WINDOW(w),FALSE);
 		button=gtk_button_new_with_label(_("Hang up"));
-		gtk_button_set_image(GTK_BUTTON(button),create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-small.png")));
+		gtk_button_set_image(GTK_BUTTON(button), image);
 		gtk_widget_show(button);
 		gtk_dialog_add_action_widget(GTK_DIALOG(w),button,GTK_RESPONSE_REJECT);
+		button=gtk_button_new_with_label(_("Take screenshot"));
+		image = gtk_image_new_from_icon_name("linphone-take-screenshot", GTK_ICON_SIZE_BUTTON);
+		gtk_button_set_image(GTK_BUTTON(button), image);
+		gtk_widget_show(button);
+		gtk_dialog_add_action_widget(GTK_DIALOG(w),button,GTK_RESPONSE_APPLY);
 		g_signal_connect(w,"response",(GCallback)on_controls_response,video_window);
-		timeout=g_timeout_add(3000,(GSourceFunc)gtk_widget_destroy,w);
-		g_object_set_data(G_OBJECT(w),"timeout",GINT_TO_POINTER(timeout));
+		schedule_video_controls_disapearance(w);
 		g_signal_connect(w,"destroy",(GCallback)on_controls_destroy,NULL);
 		g_object_set_data(G_OBJECT(w),"video_window",video_window);
 		g_object_set_data(G_OBJECT(video_window),"controls",w);
 		set_video_controls_position(video_window);
 		gtk_widget_show(w);
 	}else{
-		gint timeout=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"timeout"));
-		g_source_remove(timeout);
-		timeout=g_timeout_add(3000,(GSourceFunc)gtk_widget_destroy,w);
-		g_object_set_data(G_OBJECT(w),"timeout",GINT_TO_POINTER(timeout));
+		schedule_video_controls_disapearance(w);
 	}
 	return w;
 }
@@ -260,10 +289,11 @@ static GtkWidget *create_video_window(LinphoneCall *call){
 	guint timeout;
 	MSVideoSize vsize={MS_VIDEO_SIZE_CIF_W,MS_VIDEO_SIZE_CIF_H};
 	GdkColor color;
-	
+
 	addr=linphone_call_get_remote_address(call);
 	remote=linphone_gtk_address(addr);
 	video_window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	/*gtk_window_set_transient_for(GTK_WINDOW(video_window), GTK_WINDOW(linphone_gtk_get_main_window()));*/
 	title=g_strdup_printf("%s - Video call with %s",linphone_gtk_get_ui_config("title","Linphone"),remote);
 	ms_free(remote);
 	gtk_window_set_title(GTK_WINDOW(video_window),title);
@@ -271,7 +301,7 @@ static GtkWidget *create_video_window(LinphoneCall *call){
 	gtk_window_resize(GTK_WINDOW(video_window),vsize.width,vsize.height);
 	gdk_color_parse("black",&color);
 	gtk_widget_modify_bg(video_window,GTK_STATE_NORMAL,&color);
-	
+
 	gtk_drag_dest_set(video_window, GTK_DEST_DEFAULT_ALL, targets, sizeof(targets)/sizeof(GtkTargetEntry), GDK_ACTION_COPY);
 	gtk_widget_show(video_window);
 	gdk_window_set_events(gtk_widget_get_window(video_window),
@@ -300,6 +330,7 @@ void linphone_gtk_in_call_show_video(LinphoneCall *call){
 				g_object_set_data(G_OBJECT(callview),"video_window",video_window);
 			}
 			linphone_core_set_native_video_window_id(lc,get_native_handle(gtk_widget_get_window(video_window)));
+			gtk_window_present(GTK_WINDOW(video_window));
 		}else{
 			if (video_window){
 				gtk_widget_destroy(video_window);
@@ -337,13 +368,13 @@ static gboolean check_preview_size(GtkWidget *video_preview){
 void linphone_gtk_show_camera_preview_clicked(GtkButton *button){
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	GtkWidget *video_preview=(GtkWidget *)g_object_get_data(G_OBJECT(mw),"video_preview");
-	
+
 	if (!video_preview){
 		gchar *title;
 		LinphoneCore *lc=linphone_gtk_get_core();
 		GdkColor color;
 		guint tid;
-		
+
 		video_preview=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		title=g_strdup_printf("%s - Video preview",linphone_gtk_get_ui_config("title","Linphone"));
 		gtk_window_set_title(GTK_WINDOW(video_preview),title);
diff --git a/include/sal/sal.h b/include/sal/sal.h
new file mode 100644
index 000000000..f9fd31e4a
--- /dev/null
+++ b/include/sal/sal.h
@@ -0,0 +1,962 @@
+/*
+linphone
+Copyright (C) 2010  Simon MORLAT (simon.morlat@free.fr)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+/**
+ This header files defines the Signaling Abstraction Layer.
+ The purpose of this layer is too allow experiment different call signaling
+ protocols and implementations under linphone, for example SIP, JINGLE...
+**/
+
+#ifndef sal_h
+#define sal_h
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mediastreamer2/mediastream.h"
+#include "ortp/rtpsession.h"
+#include "belle-sip/object.h"
+#include "belle-sip/mainloop.h"
+
+#ifndef LINPHONE_PUBLIC
+	#define LINPHONE_PUBLIC MS2_PUBLIC
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*Dirty hack, keep in sync with mediastreamer2/include/mediastream.h */
+#ifndef PAYLOAD_TYPE_FLAG_CAN_RECV
+#define PAYLOAD_TYPE_FLAG_CAN_RECV	PAYLOAD_TYPE_USER_FLAG_1
+#define PAYLOAD_TYPE_FLAG_CAN_SEND	PAYLOAD_TYPE_USER_FLAG_2
+#endif
+struct Sal;
+
+typedef struct Sal Sal;
+
+struct SalOp;
+
+typedef struct SalOp SalOp;
+
+struct SalAddress;
+
+typedef struct SalAddress SalAddress;
+
+struct SalBodyHandler;
+
+typedef struct SalBodyHandler SalBodyHandler;
+
+struct SalCustomHeader;
+
+typedef struct SalCustomHeader SalCustomHeader;
+
+struct SalCustomSdpAttribute;
+
+typedef struct SalCustomSdpAttribute SalCustomSdpAttribute;
+
+struct addrinfo;
+
+typedef enum {
+	SalTransportUDP, /*UDP*/
+	SalTransportTCP, /*TCP*/
+	SalTransportTLS, /*TLS*/
+	SalTransportDTLS, /*DTLS*/
+}SalTransport;
+
+#define SAL_MEDIA_DESCRIPTION_UNCHANGED						0x00
+#define SAL_MEDIA_DESCRIPTION_NETWORK_CHANGED				(1)
+#define SAL_MEDIA_DESCRIPTION_CODEC_CHANGED					(1<<1)
+#define SAL_MEDIA_DESCRIPTION_CRYPTO_KEYS_CHANGED			(1<<2)
+#define SAL_MEDIA_DESCRIPTION_CRYPTO_POLICY_CHANGED			(1<<3)
+#define SAL_MEDIA_DESCRIPTION_STREAMS_CHANGED				(1<<4)
+#define SAL_MEDIA_DESCRIPTION_NETWORK_XXXCAST_CHANGED		(1<<5) /* use to notify when switching from multicast to unicast*/
+#define SAL_MEDIA_DESCRIPTION_FORCE_STREAM_RECONSTRUCTION	(1<<6) /* use force graph reconstruction*/
+#define SAL_MEDIA_DESCRIPTION_ICE_RESTART_DETECTED			(1<<7)
+
+
+
+const char* sal_transport_to_string(SalTransport transport);
+SalTransport sal_transport_parse(const char*);
+/* Address manipulation API*/
+SalAddress * sal_address_new(const char *uri);
+SalAddress * sal_address_clone(const SalAddress *addr);
+SalAddress * sal_address_ref(SalAddress *addr);
+void sal_address_unref(SalAddress *addr);
+const char *sal_address_get_scheme(const SalAddress *addr);
+const char *sal_address_get_display_name(const SalAddress* addr);
+const char *sal_address_get_display_name_unquoted(const SalAddress *addr);
+const char *sal_address_get_username(const SalAddress *addr);
+const char *sal_address_get_domain(const SalAddress *addr);
+int sal_address_get_port(const SalAddress *addr);
+bool_t sal_address_is_secure(const SalAddress *addr);
+void sal_address_set_secure(SalAddress *addr, bool_t enabled);
+
+SalTransport sal_address_get_transport(const SalAddress* addr);
+const char* sal_address_get_transport_name(const SalAddress* addr);
+const char *sal_address_get_method_param(const SalAddress *addr);
+
+void sal_address_set_display_name(SalAddress *addr, const char *display_name);
+void sal_address_set_username(SalAddress *addr, const char *username);
+void sal_address_set_domain(SalAddress *addr, const char *host);
+void sal_address_set_port(SalAddress *uri, int port);
+void sal_address_clean(SalAddress *addr);
+char *sal_address_as_string(const SalAddress *u);
+char *sal_address_as_string_uri_only(const SalAddress *u);
+void sal_address_destroy(SalAddress *u);
+void sal_address_set_param(SalAddress *u,const char* name,const char* value);
+void sal_address_set_transport(SalAddress* addr,SalTransport transport);
+void sal_address_set_transport_name(SalAddress* addr,const char* transport);
+void sal_address_set_method_param(SalAddress *addr, const char *method);
+void sal_address_set_params(SalAddress *addr, const char *params);
+bool_t sal_address_has_param(const SalAddress *addr, const char *name);
+const char * sal_address_get_param(const SalAddress *addr, const char *name);
+void sal_address_set_uri_param(SalAddress *addr, const char *name, const char *value);
+void sal_address_set_uri_params(SalAddress *addr, const char *params);
+bool_t sal_address_has_uri_param(const SalAddress *addr, const char *name);
+const char * sal_address_get_uri_param(const SalAddress *addr, const char *name);
+bool_t sal_address_is_ipv6(const SalAddress *addr);
+bool_t sal_address_is_sip(const SalAddress *addr);
+void sal_address_set_password(SalAddress *addr, const char *passwd);
+const char *sal_address_get_password(const SalAddress *addr);
+void sal_address_set_header(SalAddress *addr, const char *header_name, const char *header_value);
+
+LINPHONE_PUBLIC Sal * sal_init(MSFactory *factory);
+LINPHONE_PUBLIC void sal_uninit(Sal* sal);
+void sal_set_user_pointer(Sal *sal, void *user_data);
+void *sal_get_user_pointer(const Sal *sal);
+
+
+typedef enum {
+	SalAudio,
+	SalVideo,
+	SalText,
+	SalOther
+} SalStreamType;
+const char* sal_stream_type_to_string(SalStreamType type);
+
+typedef enum{
+	SalProtoRtpAvp,
+	SalProtoRtpSavp,
+	SalProtoRtpAvpf,
+	SalProtoRtpSavpf,
+	SalProtoUdpTlsRtpSavp,
+	SalProtoUdpTlsRtpSavpf,
+	SalProtoOther
+}SalMediaProto;
+const char* sal_media_proto_to_string(SalMediaProto type);
+
+typedef enum{
+	SalStreamSendRecv,
+	SalStreamSendOnly,
+	SalStreamRecvOnly,
+	SalStreamInactive
+}SalStreamDir;
+const char* sal_stream_dir_to_string(SalStreamDir type);
+
+
+#define SAL_ENDPOINT_CANDIDATE_MAX 2
+
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_ADDR_LEN 64
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_FOUNDATION_LEN 32
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_TYPE_LEN 6
+
+typedef struct SalIceCandidate {
+	char addr[SAL_MEDIA_DESCRIPTION_MAX_ICE_ADDR_LEN];
+	char raddr[SAL_MEDIA_DESCRIPTION_MAX_ICE_ADDR_LEN];
+	char foundation[SAL_MEDIA_DESCRIPTION_MAX_ICE_FOUNDATION_LEN];
+	char type[SAL_MEDIA_DESCRIPTION_MAX_ICE_TYPE_LEN];
+	unsigned int componentID;
+	unsigned int priority;
+	int port;
+	int rport;
+} SalIceCandidate;
+
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES 20
+
+typedef struct SalIceRemoteCandidate {
+	char addr[SAL_MEDIA_DESCRIPTION_MAX_ICE_ADDR_LEN];
+	int port;
+} SalIceRemoteCandidate;
+
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_REMOTE_CANDIDATES 2
+
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_UFRAG_LEN 256
+#define SAL_MEDIA_DESCRIPTION_MAX_ICE_PWD_LEN 256
+
+/*sufficient for 256bit keys encoded in base 64*/
+#define SAL_SRTP_KEY_SIZE 128
+
+typedef struct SalSrtpCryptoAlgo {
+	unsigned int tag;
+	MSCryptoSuite algo;
+	char master_key[SAL_SRTP_KEY_SIZE];
+} SalSrtpCryptoAlgo;
+
+#define SAL_CRYPTO_ALGO_MAX 4
+
+typedef enum {
+	SalDtlsRoleInvalid,
+	SalDtlsRoleIsServer,
+	SalDtlsRoleIsClient,
+	SalDtlsRoleUnset
+} SalDtlsRole;
+
+typedef enum {
+	SalMulticastInactive=0,
+	SalMulticastSender,
+	SalMulticastReceiver,
+	SalMulticastSenderReceiver
+} SalMulticastRole;
+
+typedef enum {
+	SalOpSDPNormal = 0, /** No special handling for SDP */
+	SalOpSDPSimulateError, /** Will simulate an SDP parsing error */
+	SalOpSDPSimulateRemove /** Will simulate no SDP in the op */
+} SalOpSDPHandling;
+
+typedef struct SalStreamDescription{
+	char name[16]; /*unique name of stream, in order to ease offer/answer model algorithm*/
+	SalMediaProto proto;
+	SalStreamType type;
+	char typeother[32];
+	char proto_other[32];
+	char rtp_addr[64];
+	char rtcp_addr[64];
+	unsigned int rtp_ssrc;
+	char rtcp_cname[256];
+	int rtp_port;
+	int rtcp_port;
+	MSList *payloads; /*<list of PayloadType */
+	MSList *already_assigned_payloads; /*<list of PayloadType offered in the past, used for correct allocation of payload type numbers*/
+	int bandwidth;
+	int ptime;
+	SalStreamDir dir;
+	SalSrtpCryptoAlgo crypto[SAL_CRYPTO_ALGO_MAX];
+	unsigned int crypto_local_tag;
+	int max_rate;
+	bool_t  implicit_rtcp_fb;
+	OrtpRtcpFbConfiguration rtcp_fb;
+	OrtpRtcpXrConfiguration rtcp_xr;
+	SalCustomSdpAttribute *custom_sdp_attributes;
+	SalIceCandidate ice_candidates[SAL_MEDIA_DESCRIPTION_MAX_ICE_CANDIDATES];
+	SalIceRemoteCandidate ice_remote_candidates[SAL_MEDIA_DESCRIPTION_MAX_ICE_REMOTE_CANDIDATES];
+	char ice_ufrag[SAL_MEDIA_DESCRIPTION_MAX_ICE_UFRAG_LEN];
+	char ice_pwd[SAL_MEDIA_DESCRIPTION_MAX_ICE_PWD_LEN];
+	bool_t ice_mismatch;
+	bool_t set_nortpproxy; /*Formely set by ICE to indicate to the proxy that it has nothing to do*/
+	bool_t rtcp_mux;
+	bool_t pad[1];
+	char dtls_fingerprint[256];
+	SalDtlsRole dtls_role;
+	uint8_t zrtphash[128];
+	uint8_t haveZrtpHash; /**< flag for zrtp hash presence */
+	int ttl; /*for multicast -1 to disable*/
+	SalMulticastRole multicast_role;
+} SalStreamDescription;
+
+const char *sal_multicast_role_to_string(SalMulticastRole role);
+const char *sal_stream_description_get_type_as_string(const SalStreamDescription *desc);
+const char *sal_stream_description_get_proto_as_string(const SalStreamDescription *desc);
+
+#define SAL_MEDIA_DESCRIPTION_MAX_STREAMS 8
+
+typedef struct SalMediaDescription{
+	int refcount;
+	char name[64];
+	char addr[64];
+	char username[64];
+	int nb_streams;
+	int bandwidth;
+	unsigned int session_ver;
+	unsigned int session_id;
+	SalStreamDir dir;
+	SalStreamDescription streams[SAL_MEDIA_DESCRIPTION_MAX_STREAMS];
+	SalCustomSdpAttribute *custom_sdp_attributes;
+	OrtpRtcpXrConfiguration rtcp_xr;
+	char ice_ufrag[SAL_MEDIA_DESCRIPTION_MAX_ICE_UFRAG_LEN];
+	char ice_pwd[SAL_MEDIA_DESCRIPTION_MAX_ICE_PWD_LEN];
+	bool_t ice_lite;
+	bool_t set_nortpproxy;
+	bool_t pad[2];
+} SalMediaDescription;
+
+typedef struct SalMessage{
+	const char *from;
+	const char *text;
+	const char *url;
+	const char *message_id;
+	const char *content_type;
+	time_t time;
+}SalMessage;
+
+typedef struct SalIsComposing {
+	const char *from;
+	const char *text;
+} SalIsComposing;
+
+#define SAL_MEDIA_DESCRIPTION_MAX_MESSAGE_ATTRIBUTES 5
+
+SalMediaDescription *sal_media_description_new(void);
+SalMediaDescription * sal_media_description_ref(SalMediaDescription *md);
+void sal_media_description_unref(SalMediaDescription *md);
+bool_t sal_media_description_empty(const SalMediaDescription *md);
+int sal_media_description_equals(const SalMediaDescription *md1, const SalMediaDescription *md2);
+char * sal_media_description_print_differences(int result);
+bool_t sal_media_description_has_dir(const SalMediaDescription *md, SalStreamDir dir);
+LINPHONE_PUBLIC SalStreamDescription *sal_media_description_find_stream(SalMediaDescription *md, SalMediaProto proto, SalStreamType type);
+unsigned int sal_media_description_nb_active_streams_of_type(SalMediaDescription *md, SalStreamType type);
+SalStreamDescription * sal_media_description_get_active_stream_of_type(SalMediaDescription *md, SalStreamType type, unsigned int idx);
+SalStreamDescription * sal_media_description_find_secure_stream_of_type(SalMediaDescription *md, SalStreamType type);
+SalStreamDescription * sal_media_description_find_best_stream(SalMediaDescription *md, SalStreamType type);
+void sal_media_description_set_dir(SalMediaDescription *md, SalStreamDir stream_dir);
+bool_t sal_stream_description_active(const SalStreamDescription *sd);
+bool_t sal_stream_description_has_avpf(const SalStreamDescription *sd);
+bool_t sal_stream_description_has_implicit_avpf(const SalStreamDescription *sd);
+bool_t sal_stream_description_has_srtp(const SalStreamDescription *sd);
+bool_t sal_stream_description_has_dtls(const SalStreamDescription *sd);
+bool_t sal_stream_description_has_ipv6(const SalStreamDescription *md);
+bool_t sal_media_description_has_avpf(const SalMediaDescription *md);
+bool_t sal_media_description_has_implicit_avpf(const SalMediaDescription *md);
+bool_t sal_media_description_has_srtp(const SalMediaDescription *md);
+bool_t sal_media_description_has_dtls(const SalMediaDescription *md);
+bool_t sal_media_description_has_zrtp(const SalMediaDescription *md);
+bool_t sal_media_description_has_ipv6(const SalMediaDescription *md);
+int sal_media_description_get_nb_active_streams(const SalMediaDescription *md);
+
+struct SalOpBase;
+typedef void (*SalOpReleaseCb)(struct SalOpBase *op);
+	
+/*this structure must be at the first byte of the SalOp structure defined by implementors*/
+typedef struct SalOpBase{
+	Sal *root;
+	char *route; /*or request-uri for REGISTER*/
+	MSList* route_addresses; /*list of SalAddress* */
+	SalAddress* contact_address;
+	char *from;
+	SalAddress* from_address;
+	char *to;
+	SalAddress* to_address;
+	char *origin;
+	SalAddress* origin_address;
+	SalAddress* diversion_address;
+	char *remote_ua;
+	SalAddress* remote_contact_address;
+	char *remote_contact;
+	SalMediaDescription *local_media;
+	SalMediaDescription *remote_media;
+	void *user_pointer;
+	const char* call_id;
+	char* realm;
+	SalAddress* service_route; /*as defined by rfc3608, might be a list*/
+	SalCustomHeader *sent_custom_headers;
+	SalCustomHeader *recv_custom_headers;
+	char* entity_tag; /*as defined by rfc3903 (I.E publih)*/
+	SalOpReleaseCb release_cb;
+} SalOpBase;
+
+
+typedef enum SalReason{
+	SalReasonNone, /*no error, please leave first so that it takes 0 value*/
+	SalReasonDeclined,
+	SalReasonBusy,
+	SalReasonRedirect,
+	SalReasonTemporarilyUnavailable,
+	SalReasonRequestTimeout,
+	SalReasonNotFound,
+	SalReasonDoNotDisturb,
+	SalReasonUnsupportedContent,
+	SalReasonForbidden,
+	SalReasonUnknown,
+	SalReasonServiceUnavailable,
+	SalReasonRequestPending,
+	SalReasonUnauthorized,
+	SalReasonNotAcceptable,
+	SalReasonNoMatch, /*equivalent to 481 Transaction/Call leg does not exist*/
+	SalReasonMovedPermanently,
+	SalReasonGone,
+	SalReasonAddressIncomplete,
+	SalReasonNotImplemented,
+	SalReasonBadGateway,
+	SalReasonServerTimeout,
+	SalReasonIOError,
+	SalReasonInternalError
+}SalReason;
+
+const char* sal_reason_to_string(const SalReason reason);
+
+typedef struct SalErrorInfo{
+	SalReason reason;
+	char *status_string;
+	int protocol_code;
+	char *warnings;
+	char *full_string; /*concatenation of status_string + warnings*/
+}SalErrorInfo;
+
+typedef enum SalPresenceStatus{
+	SalPresenceOffline,
+	SalPresenceOnline,
+	SalPresenceBusy,
+	SalPresenceBerightback,
+	SalPresenceAway,
+	SalPresenceOnthephone,
+	SalPresenceOuttolunch,
+	SalPresenceDonotdisturb,
+	SalPresenceMoved,
+	SalPresenceAltService,
+	SalPresenceOnVacation
+}SalPresenceStatus;
+
+struct _SalPresenceModel;
+typedef struct _SalPresenceModel SalPresenceModel;
+
+const char* sal_presence_status_to_string(const SalPresenceStatus status);
+
+typedef enum SalReferStatus{
+	SalReferTrying,
+	SalReferSuccess,
+	SalReferFailed
+}SalReferStatus;
+
+typedef enum SalSubscribeStatus{
+	SalSubscribeNone,
+	SalSubscribePending,
+	SalSubscribeActive,
+	SalSubscribeTerminated
+}SalSubscribeStatus;
+
+typedef enum SalTextDeliveryStatus{
+	SalTextDeliveryInProgress,
+	SalTextDeliveryDone,
+	SalTextDeliveryFailed
+}SalTextDeliveryStatus;
+
+/**
+ * auth event mode
+ * */
+typedef enum SalAuthMode { /*this enum must be same as belle_sip_auth_mode_t*/
+	SalAuthModeHttpDigest, /** Digest authentication requested*/
+	SalAuthModeTls /** Client certificate requested*/
+}SalAuthMode;
+
+struct _SalCertificatesChain;
+typedef struct _SalCertificatesChain SalCertificatesChain;
+struct _SalSigningKey;
+typedef struct _SalSigningKey SalSigningKey;
+
+/**
+ * Format of certificate buffer
+ * */
+typedef enum SalCertificateRawFormat {/*this enum must be same as belle_sip_certificate_raw_format_t*/
+	SAL_CERTIFICATE_RAW_FORMAT_PEM, /** PEM format*/
+	SAL_CERTIFICATE_RAW_FORMAT_DER /** ASN.1 raw format*/
+}SalCertificateRawFormat;
+
+
+
+typedef struct SalAuthInfo{
+	char *username;
+	char *userid;
+	char *password;
+	char *realm;
+	char *domain;
+	char *ha1;
+	SalAuthMode mode;
+	SalSigningKey *key;
+	SalCertificatesChain *certificates;
+}SalAuthInfo;
+
+typedef void (*SalOnCallReceived)(SalOp *op);
+typedef void (*SalOnCallRinging)(SalOp *op);
+typedef void (*SalOnCallAccepted)(SalOp *op);
+typedef void (*SalOnCallAck)(SalOp *op);
+typedef void (*SalOnCallUpdating)(SalOp *op, bool_t is_update);/*< Called when a reINVITE/UPDATE is received*/
+typedef void (*SalOnCallTerminated)(SalOp *op, const char *from);
+typedef void (*SalOnCallFailure)(SalOp *op);
+typedef void (*SalOnCallReleased)(SalOp *salop);
+typedef void (*SalOnCallCancelDone)(SalOp *salop);
+typedef void (*SalOnAuthRequestedLegacy)(SalOp *op, const char *realm, const char *username);
+typedef bool_t (*SalOnAuthRequested)(Sal *sal,SalAuthInfo* info);
+typedef void (*SalOnAuthFailure)(SalOp *op, SalAuthInfo* info);
+typedef void (*SalOnRegisterSuccess)(SalOp *op, bool_t registered);
+typedef void (*SalOnRegisterFailure)(SalOp *op);
+typedef void (*SalOnVfuRequest)(SalOp *op);
+typedef void (*SalOnDtmfReceived)(SalOp *op, char dtmf);
+typedef void (*SalOnRefer)(Sal *sal, SalOp *op, const char *referto);
+typedef void (*SalOnTextReceived)(SalOp *op, const SalMessage *msg);
+typedef void (*SalOnTextDeliveryUpdate)(SalOp *op, SalTextDeliveryStatus);
+typedef void (*SalOnIsComposingReceived)(SalOp *op, const SalIsComposing *is_composing);
+typedef void (*SalOnNotifyRefer)(SalOp *op, SalReferStatus state);
+typedef void (*SalOnSubscribeResponse)(SalOp *op, SalSubscribeStatus status, int will_retry);
+typedef void (*SalOnNotify)(SalOp *op, SalSubscribeStatus status, const char *event, SalBodyHandler *body);
+typedef void (*SalOnSubscribeReceived)(SalOp *salop, const char *event, const SalBodyHandler *body);
+typedef void (*SalOnIncomingSubscribeClosed)(SalOp *salop);
+typedef void (*SalOnParsePresenceRequested)(SalOp *salop, const char *content_type, const char *content_subtype, const char *content, SalPresenceModel **result);
+typedef void (*SalOnConvertPresenceToXMLRequested)(SalOp *salop, SalPresenceModel *presence, const char *contact, char **content);
+typedef void (*SalOnNotifyPresence)(SalOp *op, SalSubscribeStatus ss, SalPresenceModel *model, const char *msg);
+typedef void (*SalOnSubscribePresenceReceived)(SalOp *salop, const char *from);
+typedef void (*SalOnSubscribePresenceClosed)(SalOp *salop, const char *from);
+typedef void (*SalOnPingReply)(SalOp *salop);
+typedef void (*SalOnInfoReceived)(SalOp *salop, SalBodyHandler *body);
+typedef void (*SalOnPublishResponse)(SalOp *salop);
+typedef void (*SalOnNotifyResponse)(SalOp *salop);
+typedef void (*SalOnExpire)(SalOp *salop);
+/*allows sal implementation to access auth info if available, return TRUE if found*/
+
+
+
+typedef struct SalCallbacks{
+	SalOnCallReceived call_received;
+	SalOnCallRinging call_ringing;
+	SalOnCallAccepted call_accepted;
+	SalOnCallAck call_ack;
+	SalOnCallUpdating call_updating;
+	SalOnCallTerminated call_terminated;
+	SalOnCallFailure call_failure;
+	SalOnCallReleased call_released;
+	SalOnCallCancelDone call_cancel_done;
+	SalOnAuthFailure auth_failure;
+	SalOnRegisterSuccess register_success;
+	SalOnRegisterFailure register_failure;
+	SalOnVfuRequest vfu_request;
+	SalOnDtmfReceived dtmf_received;
+	SalOnRefer refer_received;
+	SalOnTextReceived text_received;
+	SalOnTextDeliveryUpdate text_delivery_update;
+	SalOnIsComposingReceived is_composing_received;
+	SalOnNotifyRefer notify_refer;
+	SalOnSubscribeReceived subscribe_received;
+	SalOnIncomingSubscribeClosed incoming_subscribe_closed;
+	SalOnSubscribeResponse subscribe_response;
+	SalOnNotify notify;
+	SalOnSubscribePresenceReceived subscribe_presence_received;
+	SalOnSubscribePresenceClosed subscribe_presence_closed;
+	SalOnParsePresenceRequested parse_presence_requested;
+	SalOnConvertPresenceToXMLRequested convert_presence_to_xml_requested;
+	SalOnNotifyPresence notify_presence;
+	SalOnPingReply ping_reply;
+	SalOnAuthRequested auth_requested;
+	SalOnInfoReceived info_received;
+	SalOnPublishResponse on_publish_response;
+	SalOnExpire on_expire;
+	SalOnNotifyResponse on_notify_response;
+}SalCallbacks;
+
+
+
+SalAuthInfo* sal_auth_info_new(void);
+SalAuthInfo* sal_auth_info_clone(const SalAuthInfo* auth_info);
+void sal_auth_info_delete(SalAuthInfo* auth_info);
+LINPHONE_PUBLIC int sal_auth_compute_ha1(const char* userid,const char* realm,const char* password, char ha1[33]);
+SalAuthMode sal_auth_info_get_mode(const SalAuthInfo* auth_info);
+SalSigningKey *sal_auth_info_get_signing_key(const SalAuthInfo* auth_info);
+SalCertificatesChain *sal_auth_info_get_certificates_chain(const SalAuthInfo* auth_info);
+void sal_auth_info_set_mode(SalAuthInfo* auth_info, SalAuthMode mode);
+
+/** Parse a file containing either a certificate chain order in PEM format or a single DER cert
+ * @param auth_info structure where to store the result of parsing
+ * @param path path to certificate chain file
+ * @param format either PEM or DER
+ */
+void sal_certificates_chain_parse_file(SalAuthInfo* auth_info, const char* path, SalCertificateRawFormat format);
+
+/**
+ * Parse a file containing either a private or public rsa key
+ * @param auth_info structure where to store the result of parsing
+ * @param passwd password (optionnal)
+ */
+void sal_signing_key_parse_file(SalAuthInfo* auth_info, const char* path, const char *passwd);
+
+/** Parse a buffer containing either a certificate chain order in PEM format or a single DER cert
+ * @param auth_info structure where to store the result of parsing
+ * @param buffer the buffer to parse
+ * @param format either PEM or DER
+ */
+void sal_certificates_chain_parse(SalAuthInfo* auth_info, const char* buffer, SalCertificateRawFormat format);
+
+/**
+ * Parse a buffer containing either a private or public rsa key
+ * @param auth_info structure where to store the result of parsing
+ * @param passwd password (optionnal)
+ */
+void sal_signing_key_parse(SalAuthInfo* auth_info, const char* buffer, const char *passwd);
+
+/**
+ * Parse a directory for files containing certificate with the given subject CNAME
+ * @param[out]	certificate_pem				the address of a string to store the certificate in PEM format. To be freed by caller
+ * @param[out]	key_pem						the address of a string to store the key in PEM format. To be freed by caller
+ * @param[in]	path						directory to parse
+ * @param[in]	subject						subject CNAME
+ * @param[in]	format 						either PEM or DER
+ * @param[in]	generate_certificate		if true, if matching certificate and key can't be found, generate it and store it into the given dir, filename will be subject.pem
+ * @param[in]	generate_dtls_fingerprint	if true and we have a certificate, generate the dtls fingerprint as described in rfc4572
+ */
+void sal_certificates_chain_parse_directory(char **certificate_pem, char **key_pem, char **fingerprint, const char* path, const char *subject, SalCertificateRawFormat format, bool_t generate_certificate, bool_t generate_dtls_fingerprint);
+
+void sal_certificates_chain_delete(SalCertificatesChain *chain);
+void sal_signing_key_delete(SalSigningKey *key);
+
+
+
+void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs);
+int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int is_tunneled);
+int sal_get_listening_port(Sal *ctx, SalTransport tr);
+int sal_unlisten_ports(Sal *ctx);
+LINPHONE_PUBLIC int sal_transport_available(Sal *ctx, SalTransport t);
+LINPHONE_PUBLIC bool_t sal_content_encoding_available(Sal *ctx, const char *content_encoding);
+void sal_set_dscp(Sal *ctx, int dscp);
+void sal_set_supported_tags(Sal *ctx, const char* tags);
+void sal_add_supported_tag(Sal *ctx, const char* tag);
+void sal_remove_supported_tag(Sal *ctx, const char* tag);
+const char *sal_get_supported_tags(Sal *ctx);
+int sal_reset_transports(Sal *ctx);
+ortp_socket_t sal_get_socket(Sal *ctx);
+void sal_set_user_agent(Sal *ctx, const char *user_agent);
+const char* sal_get_user_agent(Sal *ctx);
+void sal_append_stack_string_to_user_agent(Sal *ctx);
+/*keepalive period in ms*/
+void sal_set_keepalive_period(Sal *ctx,unsigned int value);
+void sal_use_tcp_tls_keepalive(Sal *ctx, bool_t enabled);
+int sal_set_tunnel(Sal *ctx, void *tunnelclient);
+/*Default value is true*/
+void sal_enable_sip_update_method(Sal *ctx,bool_t value);
+
+/**
+ * returns keepalive period in ms
+ * 0 desactiaved
+ * */
+unsigned int sal_get_keepalive_period(Sal *ctx);
+void sal_use_session_timers(Sal *ctx, int expires);
+void sal_use_dates(Sal *ctx, bool_t enabled);
+void sal_use_one_matching_codec_policy(Sal *ctx, bool_t one_matching_codec);
+void sal_use_rport(Sal *ctx, bool_t use_rports);
+void sal_enable_auto_contacts(Sal *ctx, bool_t enabled);
+void sal_set_root_ca(Sal* ctx, const char* rootCa);
+void sal_set_root_ca_data(Sal* ctx, const char* data);
+const char *sal_get_root_ca(Sal* ctx);
+void sal_verify_server_certificates(Sal *ctx, bool_t verify);
+void sal_verify_server_cn(Sal *ctx, bool_t verify);
+void sal_set_ssl_config(Sal *ctx, void *ssl_config);
+void sal_set_uuid(Sal*ctx, const char *uuid);
+int sal_create_uuid(Sal*ctx, char *uuid, size_t len);
+int sal_generate_uuid(char *uuid, size_t len);
+LINPHONE_PUBLIC void sal_enable_test_features(Sal*ctx, bool_t enabled);
+void sal_use_no_initial_route(Sal *ctx, bool_t enabled);
+
+int sal_iterate(Sal *sal);
+MSList * sal_get_pending_auths(Sal *sal);
+
+/*create an operation */
+SalOp * sal_op_new(Sal *sal);
+
+/*generic SalOp API, working for all operations */
+Sal *sal_op_get_sal(const SalOp *op);
+void sal_op_set_contact_address(SalOp *op, const SalAddress* address);
+void sal_op_set_route(SalOp *op, const char *route);
+void sal_op_set_route_address(SalOp *op, const SalAddress* address);
+void sal_op_add_route_address(SalOp *op, const SalAddress* address);
+void sal_op_set_realm(SalOp *op, const char *realm);
+void sal_op_set_from(SalOp *op, const char *from);
+void sal_op_set_from_address(SalOp *op, const SalAddress *from);
+void sal_op_set_to(SalOp *op, const char *to);
+void sal_op_set_to_address(SalOp *op, const SalAddress *to);
+void sal_op_set_diversion_address(SalOp *op, const SalAddress *diversion);
+SalOp *sal_op_ref(SalOp* h);
+void sal_op_stop_refreshing(SalOp *op);
+int sal_op_refresh(SalOp *op);
+
+void sal_op_kill_dialog(SalOp *op);
+void sal_op_release(SalOp *h);
+/*same as release, but does not stop refresher if any*/
+void* sal_op_unref(SalOp* op);
+
+void sal_op_authenticate(SalOp *h, const SalAuthInfo *info);
+void sal_op_cancel_authentication(SalOp *h);
+void sal_op_set_user_pointer(SalOp *h, void *up);
+SalAuthInfo * sal_op_get_auth_requested(SalOp *h);
+const char *sal_op_get_from(const SalOp *op);
+const SalAddress *sal_op_get_from_address(const SalOp *op);
+const char *sal_op_get_to(const SalOp *op);
+const SalAddress *sal_op_get_to_address(const SalOp *op);
+const SalAddress *sal_op_get_diversion_address(const SalOp *op);
+const SalAddress *sal_op_get_contact_address(const SalOp *op);
+const MSList* sal_op_get_route_addresses(const SalOp *op);
+const char *sal_op_get_proxy(const SalOp *op);
+/*raw contact header value with header params*/
+const char *sal_op_get_remote_contact(const SalOp *op);
+/*contact header address only (I.E without header params*/
+const SalAddress* sal_op_get_remote_contact_address(const SalOp *op);
+/*for incoming requests, returns the origin of the packet as a sip uri*/
+const char *sal_op_get_network_origin(const SalOp *op);
+const SalAddress *sal_op_get_network_origin_address(const SalOp *op);
+/*returns far-end "User-Agent" string */
+const char *sal_op_get_remote_ua(const SalOp *op);
+void *sal_op_get_user_pointer(const SalOp *op);
+const char* sal_op_get_call_id(const SalOp *op);
+char* sal_op_get_dialog_id(const SalOp *op);
+bool_t sal_op_is_forked_of(const SalOp *op1, const SalOp *op2);
+
+const SalAddress* sal_op_get_service_route(const SalOp *op);
+void sal_op_set_service_route(SalOp *op,const SalAddress* service_route);
+
+void sal_op_set_manual_refresher_mode(SalOp *op, bool_t enabled);
+int sal_op_get_address_family(SalOp *op);
+/*returns TRUE if there is no pending request that may block a future one */
+bool_t sal_op_is_idle(SalOp *op);
+
+const SalErrorInfo *sal_error_info_none(void);
+LINPHONE_PUBLIC const SalErrorInfo *sal_op_get_error_info(const SalOp *op);
+void sal_error_info_reset(SalErrorInfo *ei);
+void sal_error_info_set(SalErrorInfo *ei, SalReason reason, int code, const char *status_string, const char *warning);
+
+/*entity tag used for publish (see RFC 3903)*/
+const char *sal_op_get_entity_tag(const SalOp* op);
+void sal_op_set_entity_tag(SalOp *op, const char* entity_tag);
+/*set the event header, for used with out of dialog SIP notify*/
+void sal_op_set_event(SalOp *op, const char *event);
+
+/*Call API*/
+int sal_call_set_local_media_description(SalOp *h, SalMediaDescription *desc);
+int sal_call(SalOp *h, const char *from, const char *to);
+int sal_call_notify_ringing(SalOp *h, bool_t early_media);
+/*accept an incoming call or, during a call accept a reINVITE*/
+int sal_call_accept(SalOp*h);
+int sal_call_decline(SalOp *h, SalReason reason, const char *redirection /*optional*/);
+int sal_call_update(SalOp *h, const char *subject, bool_t no_user_consent);
+void sal_call_cancel_invite(SalOp *op);
+SalMediaDescription * sal_call_get_remote_media_description(SalOp *h);
+LINPHONE_PUBLIC SalMediaDescription * sal_call_get_final_media_description(SalOp *h);
+int sal_call_refer(SalOp *h, const char *refer_to);
+int sal_call_refer_with_replaces(SalOp *h, SalOp *other_call_h);
+int sal_call_accept_refer(SalOp *h);
+/*informs this call is consecutive to an incoming refer */
+int sal_call_set_referer(SalOp *h, SalOp *refered_call);
+/* returns the SalOp of a call that should be replaced by h, if any */
+SalOp *sal_call_get_replaces(SalOp *h);
+int sal_call_send_dtmf(SalOp *h, char dtmf);
+int sal_call_terminate(SalOp *h);
+bool_t sal_call_autoanswer_asked(SalOp *op);
+void sal_call_send_vfu_request(SalOp *h);
+int sal_call_is_offerer(const SalOp *h);
+int sal_call_notify_refer_state(SalOp *h, SalOp *newcall);
+bool_t sal_call_compare_op(const SalOp *op1, const SalOp *op2);
+LINPHONE_PUBLIC bool_t sal_call_dialog_request_pending(const SalOp *op);
+const char * sal_call_get_local_tag(SalOp *op);
+const char * sal_call_get_remote_tag(SalOp *op);
+void sal_call_set_replaces(SalOp *op, const char *call_id, const char *from_tag, const char *to_tag);
+/* Call test API */
+
+
+/**
+ * @brief Invoking this on the SAL will modify every subsequent SalOp to have a special handling for SDP.
+ * @details This is especially useful while testing, to simulate some specific behaviors, like missing SDP or an error in parsing.
+ *
+ * @warning Don't forget to reset the handling method to SalOpSDPNormal afterwards.
+ *
+ * @param h the Sal instance
+ * @param handling_method Could be SalOpSDPNormal, SalOpSDPSimulateError, SalOpSDPSimulateRemoval (\ref SalOpSDPHandling)
+ */
+LINPHONE_PUBLIC void sal_default_set_sdp_handling(Sal* h, SalOpSDPHandling handling_method) ;
+/* Second version: for a specific call*/
+LINPHONE_PUBLIC void sal_call_set_sdp_handling(SalOp *h, SalOpSDPHandling handling) ;
+
+/*Registration*/
+int sal_register(SalOp *op, const char *proxy, const char *from, int expires,SalAddress* old_contact);
+/*refresh a register, -1 mean use the last known value*/
+int sal_register_refresh(SalOp *op, int expires);
+int sal_unregister(SalOp *h);
+
+/*Messaging */
+int sal_text_send(SalOp *op, const char *from, const char *to, const char *text);
+int sal_message_send(SalOp *op, const char *from, const char *to, const char* content_type, const char *msg, const char *peer_uri);
+int sal_message_reply(SalOp *op, SalReason reason);
+
+/*presence Subscribe/notify*/
+int sal_subscribe_presence(SalOp *op, const char *from, const char *to, int expires);
+int sal_notify_presence(SalOp *op, SalPresenceModel *presence);
+int sal_notify_presence_close(SalOp *op);
+
+/*presence publish */
+//int sal_publish_presence(SalOp *op, const char *from, const char *to, int expires, SalPresenceModel *presence);
+SalBodyHandler *sal_presence_model_create_body_handler(SalPresenceModel *presence);
+
+
+/*ping: main purpose is to obtain its own contact address behind firewalls*/
+int sal_ping(SalOp *op, const char *from, const char *to);
+
+/*info messages*/
+int sal_send_info(SalOp *op, const char *from, const char *to, const SalBodyHandler *body);
+
+/*generic subscribe/notify/publish api*/
+int sal_subscribe(SalOp *op, const char *from, const char *to, const char *eventname, int expires, const SalBodyHandler *body);
+int sal_unsubscribe(SalOp *op);
+int sal_subscribe_accept(SalOp *op);
+int sal_subscribe_decline(SalOp *op, SalReason reason);
+int sal_notify_pending_state(SalOp *op);
+int sal_notify(SalOp *op, const SalBodyHandler *body);
+int sal_notify_close(SalOp *op);
+int sal_publish(SalOp *op, const char *from, const char *to, const char*event_name, int expires, const SalBodyHandler *body);
+int sal_op_unpublish(SalOp *op);
+
+/*privacy, must be in sync with LinphonePrivacyMask*/
+typedef enum _SalPrivacy {
+	SalPrivacyNone=0x0,
+	SalPrivacyUser=0x1,
+	SalPrivacyHeader=0x2,
+	SalPrivacySession=0x4,
+	SalPrivacyId=0x8,
+	SalPrivacyCritical=0x10,
+	SalPrivacyDefault=0x8000
+} SalPrivacy;
+typedef  unsigned int SalPrivacyMask;
+
+const char* sal_privacy_to_string(SalPrivacy  privacy);
+void sal_op_set_privacy(SalOp* op,SalPrivacy privacy);
+SalPrivacy sal_op_get_privacy(const SalOp* op);
+
+
+
+#define payload_type_set_number(pt,n)		(pt)->user_data=(void*)((intptr_t)n);
+#define payload_type_get_number(pt)		((int)(intptr_t)(pt)->user_data)
+
+/*misc*/
+void sal_get_default_local_ip(Sal *sal, int address_family, char *ip, size_t iplen);
+
+typedef void (*SalResolverCallback)(void *data, const char *name, struct addrinfo *ai_list);
+
+
+typedef struct SalResolverContext SalResolverContext;
+#define sal_resolver_context_ref(obj) belle_sip_object_ref(obj)
+#define sal_resolver_context_unref(obj) belle_sip_object_unref(obj)
+LINPHONE_PUBLIC SalResolverContext * sal_resolve_a(Sal* sal, const char *name, int port, int family, SalResolverCallback cb, void *data);
+LINPHONE_PUBLIC SalResolverContext * sal_resolve(Sal *sal, const char *service, const char *transport, const char *name, int port, int family, SalResolverCallback cb, void *data);
+void sal_resolve_cancel(SalResolverContext *ctx);
+
+SalCustomHeader *sal_custom_header_append(SalCustomHeader *ch, const char *name, const char *value);
+const char *sal_custom_header_find(const SalCustomHeader *ch, const char *name);
+void sal_custom_header_free(SalCustomHeader *ch);
+SalCustomHeader *sal_custom_header_clone(const SalCustomHeader *ch);
+
+const SalCustomHeader *sal_op_get_recv_custom_header(SalOp *op);
+
+void sal_op_set_sent_custom_header(SalOp *op, SalCustomHeader* ch);
+
+
+SalCustomSdpAttribute * sal_custom_sdp_attribute_append(SalCustomSdpAttribute *csa, const char *name, const char *value);
+const char * sal_custom_sdp_attribute_find(const SalCustomSdpAttribute *csa, const char *name);
+void sal_custom_sdp_attribute_free(SalCustomSdpAttribute *csa);
+SalCustomSdpAttribute * sal_custom_sdp_attribute_clone(const SalCustomSdpAttribute *csa);
+
+/** deprecated. use sal_set_log_level instead **/
+void sal_enable_log(void);
+/** deprecated. use sal_set_log_level instead **/
+void sal_disable_log(void);
+void sal_set_log_level(OrtpLogLevel level);
+
+/*internal API */
+void __sal_op_init(SalOp *b, Sal *sal);
+void __sal_op_set_network_origin(SalOp *op, const char *origin /*a sip uri*/);
+void __sal_op_set_network_origin_address(SalOp *op, SalAddress *origin);
+void __sal_op_set_remote_contact(SalOp *op, const char *ct);
+void __sal_op_free(SalOp *b);
+
+/*test api*/
+/*0 for no error*/
+LINPHONE_PUBLIC	void sal_set_send_error(Sal *sal,int value);
+/*1 for no error*/
+LINPHONE_PUBLIC	void sal_set_recv_error(Sal *sal,int value);
+
+/*always answer 480 if value=true*/
+LINPHONE_PUBLIC	void sal_enable_unconditional_answer(Sal *sal,int value);
+
+LINPHONE_PUBLIC bool_t sal_pending_trans_checking_enabled(const Sal *sal) ;
+LINPHONE_PUBLIC int sal_enable_pending_trans_checking(Sal *sal, bool_t value) ;
+
+
+
+/*refresher retry after value in ms*/
+LINPHONE_PUBLIC	void sal_set_refresher_retry_after(Sal *sal,int value);
+LINPHONE_PUBLIC	int sal_get_refresher_retry_after(const Sal *sal);
+/*enable contact fixing*/
+void sal_nat_helper_enable(Sal *sal,bool_t enable);
+bool_t sal_nat_helper_enabled(Sal *sal);
+
+LINPHONE_PUBLIC	void sal_set_dns_timeout(Sal* sal,int timeout);
+LINPHONE_PUBLIC int sal_get_dns_timeout(const Sal* sal);
+LINPHONE_PUBLIC	void sal_set_transport_timeout(Sal* sal,int timeout);
+LINPHONE_PUBLIC int sal_get_transport_timeout(const Sal* sal);
+void sal_set_dns_servers(Sal *sal, const MSList *servers);
+LINPHONE_PUBLIC void sal_enable_dns_srv(Sal *sal, bool_t enable);
+LINPHONE_PUBLIC bool_t sal_dns_srv_enabled(const Sal *sal);
+LINPHONE_PUBLIC void sal_enable_dns_search(Sal *sal, bool_t enable);
+LINPHONE_PUBLIC bool_t sal_dns_search_enabled(const Sal *sal);
+LINPHONE_PUBLIC void sal_set_dns_user_hosts_file(Sal *sal, const char *hosts_file);
+LINPHONE_PUBLIC const char *sal_get_dns_user_hosts_file(const Sal *sal);
+unsigned int sal_get_random(void);
+LINPHONE_PUBLIC char *sal_get_random_token(int size);
+unsigned char * sal_get_random_bytes(unsigned char *ret, size_t size);
+belle_sip_source_t * sal_create_timer(Sal *sal, belle_sip_source_func_t func, void *data, unsigned int timeout_value_ms, const char* timer_name);
+void sal_cancel_timer(Sal *sal, belle_sip_source_t *timer);
+
+//SalBodyHandler * sal_body_handler_new(const char *type, const char *subtype, void *data, size_t size, const char *encoding);
+SalBodyHandler * sal_body_handler_new(void);
+SalBodyHandler * sal_body_handler_ref(SalBodyHandler *body_handler);
+void sal_body_handler_unref(SalBodyHandler *body_handler);
+const char * sal_body_handler_get_type(const SalBodyHandler *body_handler);
+void sal_body_handler_set_type(SalBodyHandler *body_handler, const char *type);
+const char * sal_body_handler_get_subtype(const SalBodyHandler *body_handler);
+void sal_body_handler_set_subtype(SalBodyHandler *body_handler, const char *subtype);
+const char * sal_body_handler_get_encoding(const SalBodyHandler *body_handler);
+void sal_body_handler_set_encoding(SalBodyHandler *body_handler, const char *encoding);
+void * sal_body_handler_get_data(const SalBodyHandler *body_handler);
+void sal_body_handler_set_data(SalBodyHandler *body_handler, void *data);
+size_t sal_body_handler_get_size(const SalBodyHandler *body_handler);
+void sal_body_handler_set_size(SalBodyHandler *body_handler, size_t size);
+bool_t sal_body_handler_is_multipart(const SalBodyHandler *body_handler);
+SalBodyHandler * sal_body_handler_get_part(const SalBodyHandler *body_handler, int idx);
+SalBodyHandler * sal_body_handler_find_part_by_header(const SalBodyHandler *body_handler, const char *header_name, const char *header_value);
+const char * sal_body_handler_get_header(const SalBodyHandler *body_handler, const char *header_name);
+
+/*this function parses a document with key=value pairs separated by new lines, and extracts the value for a given key*/
+int sal_lines_get_value(const char *data, const char *key, char *value, size_t value_size);
+
+LINPHONE_PUBLIC void *sal_get_stack_impl(Sal *sal);
+const char* sal_op_get_public_address(SalOp *sal, int *port);
+const char* sal_op_get_local_address(SalOp *sal, int *port);
+
+unsigned long sal_begin_background_task(const char *name, void (*max_time_reached)(void *), void *data);
+void sal_end_background_task(unsigned long id);
+
+/*Some old equipment may not only rely on attribute sendonly/recvonly/sendrecv/inative*/
+void sal_op_cnx_ip_to_0000_if_sendonly_enable(SalOp *sal,bool_t yesno);
+bool_t sal_op_cnx_ip_to_0000_if_sendonly_enabled(SalOp *sal);
+
+void sal_set_http_proxy_host(Sal *sal, const char *host) ;
+void sal_set_http_proxy_port(Sal *sal, int port) ;
+const char *sal_get_http_proxy_host(const Sal *sal);
+int sal_get_http_proxy_port(const Sal *sal);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
new file mode 100644
index 000000000..b6a4b8e40
--- /dev/null
+++ b/java/CMakeLists.txt
@@ -0,0 +1,63 @@
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
+
+if(ANDROID)
+	find_package(Java REQUIRED COMPONENTS Development)
+
+	set(JNI_CLASSES
+		"org.linphone.core.ErrorInfoImpl"
+		"org.linphone.core.LinphoneAddressImpl"
+		"org.linphone.core.LinphoneAuthInfoImpl"
+		"org.linphone.core.LinphoneBufferImpl"
+		"org.linphone.core.LinphoneCallImpl"
+		"org.linphone.core.LinphoneCallLogImpl"
+		"org.linphone.core.LinphoneCallParamsImpl"
+		"org.linphone.core.LinphoneCallStatsImpl"
+		"org.linphone.core.LinphoneChatMessageImpl"
+		"org.linphone.core.LinphoneChatRoomImpl"
+		"org.linphone.core.LinphoneConferenceImpl"
+		"org.linphone.core.LinphoneConferenceParamsImpl"
+		"org.linphone.core.LinphoneContentImpl"
+		"org.linphone.core.LinphoneCoreFactoryImpl"
+		"org.linphone.core.LinphoneCoreImpl"
+		"org.linphone.core.LinphoneEventImpl"
+		"org.linphone.core.LinphoneFriendImpl"
+		"org.linphone.core.LinphoneFriendListImpl"
+		"org.linphone.core.LinphoneInfoMessageImpl"
+		"org.linphone.core.LinphoneNatPolicyImpl"
+		"org.linphone.core.LinphonePlayerImpl"
+		"org.linphone.core.LinphoneProxyConfigImpl"
+		"org.linphone.core.LpConfigImpl"
+		"org.linphone.core.PayloadTypeImpl"
+		"org.linphone.core.PresenceActivityImpl"
+		"org.linphone.core.PresenceModelImpl"
+		"org.linphone.core.PresenceNoteImpl"
+		"org.linphone.core.PresencePersonImpl"
+		"org.linphone.core.PresenceServiceImpl"
+		"org.linphone.core.TunnelConfigImpl"
+	)
+
+	# HACK: accessing mediastreamer2 source directory from here is just wrong!
+	add_custom_target(linphonecore-jni-header
+		COMMAND ${Java_JAVAH_EXECUTABLE} -o "${CMAKE_BINARY_DIR}/linphonecore_jni.h" -classpath "${CMAKE_CURRENT_SOURCE_DIR}/impl:${CMAKE_CURRENT_SOURCE_DIR}/common:${CMAKE_CURRENT_SOURCE_DIR}/../mediastreamer2/java/src" ${JNI_CLASSES}
+	)
+endif()
diff --git a/java/common/org/linphone/core/DialPlan.java b/java/common/org/linphone/core/DialPlan.java
new file mode 100644
index 000000000..f604c2793
--- /dev/null
+++ b/java/common/org/linphone/core/DialPlan.java
@@ -0,0 +1,15 @@
+package org.linphone.core;
+
+/**
+ * Dial plan
+ */
+
+public interface DialPlan {
+
+    String getCountryCode();
+    String getCountryName();
+    String getCountryCallingCode();
+    int getNumberLength();
+    String getUsualPrefix();
+
+}
diff --git a/java/common/org/linphone/core/LinphoneAccountCreator.java b/java/common/org/linphone/core/LinphoneAccountCreator.java
new file mode 100644
index 000000000..78297b15d
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneAccountCreator.java
@@ -0,0 +1,161 @@
+/*LinphoneAccountCreator.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+import java.util.Vector;
+
+import org.linphone.core.LinphoneAddress.TransportType;
+
+public interface LinphoneAccountCreator {
+	interface LinphoneAccountCreatorListener {
+		void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorIsAccountLinked(LinphoneAccountCreator accountCreator, Status status);
+		void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, Status status);
+	}
+
+	public static class Status {
+		static private Vector<Status> values = new Vector<Status>();
+		private final int mValue;
+		private final String mStringValue;
+		public final int value() { return mValue; }
+
+		public final static Status Ok = new Status(0, "Ok");
+		public final static Status Failed = new Status(1, "Failed");
+		public final static Status AccountCreated = new Status(2, "AccountCreated");
+		public final static Status AccountNotCreated = new Status(3, "AccountNotCreated");
+		public final static Status AccountExist = new Status(4, "AccountExist");
+		public final static Status AccountExistWithAlias = new Status(5, "AccountExistWithAlias");
+		public final static Status AccountNotExist = new Status(6, "AccountNotExist");
+		public final static Status AccountActivated = new Status(7, "AccountActivated");
+		public final static Status AccountAlreadyActivated = new Status(8, "AccountAlreadyActivated");
+		public final static Status AccountNotActivated = new Status(9, "AccountNotActivated");
+		public final static Status AccountLinked = new Status(10, "AccountLinked");
+		public final static Status AccountNotLinked = new Status(11, "AccountNotLinked");
+		public final static Status EmailInvalid = new Status(12, "EmailInvalid");
+		public final static Status UsernameInvalid = new Status(13, "UsernameInvalid");
+		public final static Status UsernameTooShort = new Status(14, "UsernameTooShort");
+		public final static Status UsernameTooLong = new Status(15, "UsernameTooLong");
+		public final static Status UsernameInvalidSize = new Status(16, "UsernameInvalidSize");
+		public final static Status PhoneNumberInvalid = new Status(17, "PhoneNumberInvalid");
+		public final static Status PhoneNumberTooShort = new Status(18, "PhoneNumberTooShort");
+		public final static Status PhoneNumberTooLong = new Status(19, "PhoneNumberTooLong");
+		public final static Status PhoneNumberUsedAccount = new Status(20, "PhoneNumberUsed");
+		public final static Status PhoneNumberUsedAlias = new Status(21, "PhoneNumberUsed");
+		public final static Status PhoneNumberNotUsed = new Status(22, "PhoneNumberNotUsed");
+		public final static Status PasswordTooShort = new Status(23, "PasswordTooShort");
+		public final static Status PasswordTooLong = new Status(24, "PasswordTooLong");
+		public final static Status DomainInvalid = new Status(25, "DomainInvalid");
+		public final static Status RouteInvalid = new Status(26, "RouteInvalid");
+		public final static Status DisplayNameInvalid = new Status(27, "DisplayNameInvalid");
+		public final static Status TransportNotSupported = new Status(28, "TransportNotSupported");
+		public final static Status CountryCodeInvalid = new Status(29, "CountryCodeInvalid");
+		public final static Status ErrorServer = new Status(30, "ErrorServer");
+
+		private Status(int value, String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue = stringValue;
+		}
+
+		public static Status fromInt(int value) {
+			for (int i=0; i < values.size(); i++) {
+				Status state = (Status) values.elementAt(i);
+				if (state.mValue == value) return state;
+			}
+			throw new RuntimeException("Status not found [" + value + "]");
+		}
+
+		public String toString() {
+			return mStringValue;
+		}
+
+		public int toInt() {
+			return mValue;
+		}
+	}
+
+	void setListener(LinphoneAccountCreatorListener listener);
+
+	Status setUsername(String username);
+
+	String getUsername();
+
+	Status setPhoneNumber(String phoneNumber, String countryCode);
+
+	String getPhoneNumber();
+
+	Status setPassword(String password);
+
+	String getPassword();
+
+	Status setHa1(String ha1);
+
+	String getHa1();
+
+	Status setActivationCode(String activationCode);
+
+	Status setLanguage(String lang);
+
+	Status setTransport(TransportType transport);
+
+	TransportType getTransport();
+
+	Status setDomain(String domain);
+
+	String getDomain();
+
+	Status setRoute(String route);
+
+	String getRoute();
+
+	Status setDisplayName(String displayName);
+
+	String getDisplayName();
+
+	Status setEmail(String email);
+
+	String getEmail();
+
+	String getPrefix(String phone);
+
+	Status isAccountUsed();
+
+	Status createAccount();
+
+	Status activateAccount();
+
+	Status isAccountActivated();
+
+	Status linkPhoneNumberWithAccount();
+
+	Status activatePhoneNumberLink();
+
+	Status isAccountLinked();
+
+	Status isPhoneNumberUsed();
+
+	Status recoverPhoneAccount();
+
+	LinphoneProxyConfig configure();
+}
diff --git a/java/common/org/linphone/core/LinphoneAddress.java b/java/common/org/linphone/core/LinphoneAddress.java
index 26c0e53af..5ccf3e7b4 100644
--- a/java/common/org/linphone/core/LinphoneAddress.java
+++ b/java/common/org/linphone/core/LinphoneAddress.java
@@ -24,7 +24,7 @@ import java.util.Vector;
  * Object that represents a SIP address.
  * The LinphoneAddress is an opaque object to represents SIP addresses, ie the content of SIP's 'from' and 'to' headers. 
  * A SIP address is made of display name, username, domain name, port, and various uri headers (such as tags). 
- * It looks like 'Alice <sip:alice@example.net>'. The LinphoneAddress has methods to extract and manipulate all parts of the address. 
+ * It looks like 'Alice &lt;sip:alice@example.net&gt;'. The LinphoneAddress has methods to extract and manipulate all parts of the address. 
  * When some part of the address (for example the username) is empty, the accessor methods return null.
  * <br> Can be instanciated using both  {@link LinphoneCoreFactory#createLinphoneAddress(String, String, String)} or {@link LinphoneCoreFactory#createLinphoneAddress(String)} 
  * @author jehanmonnier
diff --git a/java/common/org/linphone/core/LinphoneAuthInfo.java b/java/common/org/linphone/core/LinphoneAuthInfo.java
index 6b71d006b..39c3d6be6 100644
--- a/java/common/org/linphone/core/LinphoneAuthInfo.java
+++ b/java/common/org/linphone/core/LinphoneAuthInfo.java
@@ -20,17 +20,16 @@ package org.linphone.core;
 /**
  * Object holding authentication information.
  * In most case, authentication information consists of a username and password. Sometimes, a userid is required by proxy, and realm can be useful to discriminate different SIP domains.
- *<br>This object is instantiated using either {@link LinphoneCoreFactory#createAuthInfo(String, String, String)} or {@link LinphoneCoreFactory#createAuthInfo(String, String, String, String, String)}.
- *<br>
- *Once created and filled, a LinphoneAuthInfo must be added to the LinphoneCore in order to become known and used automatically when needed. 
- *Use {@link LinphoneCore#addAuthInfo(LinphoneAuthInfo)} for that purpose.
- *<br>
- *The LinphoneCore object can take the initiative to request authentication information when needed to the application 
- *through the {@link LinphoneCoreListener#authInfoRequested(LinphoneCore, String, String)} listener.
- *<br>
- *The application can respond to this information request later using  {@link LinphoneCore#addAuthInfo(LinphoneAuthInfo)}. 
- *This will unblock all pending authentication transactions and retry them with authentication headers.
- *
+ * <br>This object is instantiated using either {@link LinphoneCoreFactory#createAuthInfo(String, String, String, String)} or {@link LinphoneCoreFactory#createAuthInfo(String, String, String, String, String, String)}.
+ * <br>
+ * Once created and filled, a LinphoneAuthInfo must be added to the LinphoneCore in order to become known and used automatically when needed. 
+ * Use {@link LinphoneCore#addAuthInfo(LinphoneAuthInfo)} for that purpose.
+ * <br>
+ * The LinphoneCore object can take the initiative to request authentication information when needed to the application 
+ * through the {@link LinphoneCoreListener#authInfoRequested(LinphoneCore, String, String, String)} listener.
+ * <br>
+ * The application can respond to this information request later using  {@link LinphoneCore#addAuthInfo(LinphoneAuthInfo)}. 
+ * This will unblock all pending authentication transactions and retry them with authentication headers.
  */
 public interface LinphoneAuthInfo {
 	/**
@@ -100,6 +99,54 @@ public interface LinphoneAuthInfo {
 	 * @return the clone auth info
 	 */
 	LinphoneAuthInfo clone();
+	
+	/**
+	 * Gets the TLS certificate
+	 * @return the TLS certificate
+	 */
+	String getTlsCertificate();
+	
+	/**
+	 * Gets the TLS key file
+	 * @return the TLS key
+	 */
+	String getTlsKey();
+	
+	/**
+	 * Gets the path to the TLS certificate file
+	 * @return the path to the TLS certificate
+	 */
+	String getTlsCertificatePath();
+	
+	/**
+	 * Gets the path to the TLS key file
+	 * @return the path to the TLS key
+	 */
+	String getTlsKeyPath();
+	
+	/**
+	 * Sets the TLS certificate
+	 * @param cert the certificate
+	 */
+	void setTlsCertificate(String cert);
+	
+	/**
+	 * Sets the TLS key
+	 * @param key the key
+	 */
+	void setTlsKey(String key);
+	
+	/**
+	 * Sets the TLS certificate file path
+	 * @param path the path of the certificate
+	 */
+	void setTlsCertificatePath(String path);
+	
+	/**
+	 * Sets the TLS key file path
+	 * @param path the path of the key
+	 */
+	void setTlsKeyPath(String path);
 }
 
 
diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index 03301470f..2a882c28b 100644
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -26,6 +26,13 @@ import java.util.Vector;
  */
 
 public interface LinphoneCall {
+	/**
+	 * LinphoneCall listener
+	 */
+	interface LinphoneCallListener {
+		void onNextVideoFrameDecoded(LinphoneCall call);
+	}
+
 	/**
 	 * Linphone call states
 	 *
@@ -165,10 +172,16 @@ public interface LinphoneCall {
 	CallDirection getDirection();
 	/**
 	 * get the call log associated to this call.
-	 * @Return LinphoneCallLog
+	 * @return LinphoneCallLog
 	**/
 	LinphoneCallLog getCallLog();
 
+    /**
+     * Returns the diversion address associated to this call if one exists.
+     *
+     */
+    LinphoneAddress getDiversionAddress();
+
 
 	/**
 	 * Get the audio statistics associated with this call.
@@ -237,7 +250,7 @@ public interface LinphoneCall {
 	 * 1-2 = very poor quality <br>
 	 * 0-1 = can't be worse, mostly unusable <br>
 	 *
-	 * @returns The function returns -1 if no quality measurement is available, for example if no 
+	 * @return The function returns -1 if no quality measurement is available, for example if no 
 	 * active audio stream exist. Otherwise it returns the quality rating.
 	 */
 	float getCurrentQuality();
@@ -266,8 +279,18 @@ public interface LinphoneCall {
 	 * @param verified true when displayed SAS is correct
 	 */
 	void setAuthenticationTokenVerified(boolean verified);
-
+	
+	/**
+	 * Checks wether the call is part of a conferece.
+	 * @return A boolean
+	 */
 	boolean isInConference();
+	/**
+	 * Get the conference instance which the call is part of.
+	 * @return An instance of #LinphoneConference if the call is part
+	 * of a conference. null instead.
+	 */
+	LinphoneConference getConference();
 
 	/**
 	 * Indicates whether an operation is in progress at the media side.
@@ -359,5 +382,15 @@ public interface LinphoneCall {
 	 * @return A player
 	 */
 	public LinphonePlayer getPlayer();
+	
+	/**
+	 * Create a new chat room for messaging from a call if not already existing, else return existing one
+	 * @return LinphoneChatRoom where messaging can take place.
+	 */
+	public LinphoneChatRoom getChatRoom() ;
 
+	/**
+	 * Set the callbacks associated with the LinphoneCall.
+	 */
+	void setListener(LinphoneCall.LinphoneCallListener listener);
 }
diff --git a/java/common/org/linphone/core/LinphoneCallLog.java b/java/common/org/linphone/core/LinphoneCallLog.java
index 0967957a8..224da73f7 100644
--- a/java/common/org/linphone/core/LinphoneCallLog.java
+++ b/java/common/org/linphone/core/LinphoneCallLog.java
@@ -118,7 +118,12 @@ public interface LinphoneCallLog {
 	public int getCallDuration();
 	/**
 	 *  Call id from signaling
-	 * @return int
+	 * @return the SIP call-id.
 	 */
-	public int getCallId();
+	public String getCallId();
+	/**
+	 * Tells whether the call was a call to a conference server
+	 * @return true if the call was a call to a conference server
+	 */
+	public boolean wasConference();
 }
diff --git a/java/common/org/linphone/core/LinphoneCallParams.java b/java/common/org/linphone/core/LinphoneCallParams.java
index 739e749bb..2f2220053 100644
--- a/java/common/org/linphone/core/LinphoneCallParams.java
+++ b/java/common/org/linphone/core/LinphoneCallParams.java
@@ -17,7 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 package org.linphone.core;
+import org.linphone.core.LinphoneCore.MediaDirection;
 import org.linphone.core.LinphoneCore.MediaEncryption;
+import org.linphone.core.LinphoneCore.StreamType;
 /**
  * The LinphoneCallParams is an object containing various call related parameters.
  * It can be used to retrieve parameters from a currently running call or modify the call's characteristics
@@ -42,7 +44,7 @@ public interface LinphoneCallParams {
 	MediaEncryption getMediaEncryption();
 	/**
 	 * set media encryption (rtp) to use
-	 * @params menc: MediaEncryption.None, MediaEncryption.SRTP or MediaEncryption.ZRTP
+	 * @param menc MediaEncryption.None, MediaEncryption.SRTP or MediaEncryption.ZRTP
 	 */
 	void setMediaEnctyption(MediaEncryption menc);
 
@@ -92,11 +94,51 @@ public interface LinphoneCallParams {
 	/**
 	 * Returns the value of a custom header given its name.
 	 * If no header with that name exists, then null is returned.
-	 * @param name
 	 * @return value for the header, or null if it doesn't exist.
 	 */
 	String getCustomHeader(String name);
-	
+
+	/**
+	 * Add a custom attribute related to all the streams in the SDP exchanged within SIP messages during a call.
+	 * @param name The name of the attribute to add.
+	 * @param value The content value of the attribute to add.
+	**/
+	void addCustomSdpAttribute(String name, String value);
+
+	/**
+	 * Add a custom attribute related to a specific stream in the SDP exchanged within SIP messages during a call.
+	 * @param type The type of the stream to add a custom SDP attribute to.
+	 * @param name The name of the attribute to add.
+	 * @param value The content value of the attribute to add.
+	**/
+	void addCustomSdpMediaAttribute(StreamType type, String name, String value);
+
+	/**
+	 * Get a custom SDP attribute that is related to all the streams.
+	 * @param name The name of the attribute to get.
+	 * @return The content value of the attribute or null if not found.
+	**/
+	String getCustomSdpAttribute(String name);
+
+	/**
+	 * Get a custom SDP attribute that is related to a specific stream.
+	 * @param type The type of the stream to add a custom SDP attribute to.
+	 * @param name The name of the attribute to get.
+	 * @return The content value of the attribute or null if not found.
+	**/
+	String getCustomSdpMediaAttribute(StreamType type, String name);
+
+	/**
+	 * Clear the custom SDP attributes related to all the streams in the SDP exchanged within SIP messages during a call.
+	**/
+	void clearCustomSdpAttributes();
+
+	/**
+	 * Clear the custom SDP attributes related to a specific stream in the SDP exchanged within SIP messages during a call.
+	 * @param type The type of the stream to clear custom SDP attributes from.
+	**/
+	void clearCustomSdpMediaAttributes(StreamType type);
+
 	/**
 	 * Set the privacy for the call.
 	 * @param privacy_mask a or'd int of values defined in interface {@link org.linphone.core.Privacy}
@@ -158,4 +200,40 @@ public interface LinphoneCallParams {
 	**/
 	boolean videoMulticastEnabled();
 	
+	/**
+	 * Use to enable real time text following rfc4103.
+	 * If enabled, outgoing calls put a m=text line in SDP offer .
+	 * @param yesno if yes, subsequent outgoing calls will propose rtt
+	 * 
+	**/
+	void enableRealTimeText(boolean yesno);
+	/**
+	 * Use to get real time text following rfc4103.
+	 * @return returns true if call rtt is activated.
+	**/
+	boolean realTimeTextEnabled();
+
+	/**
+	 * Get the audio stream direction.
+	 * @return The audio stream direction associated with the call params.
+	**/
+	MediaDirection getAudioDirection();
+
+	/**
+	 * Get the video stream direction.
+	 * @return The video stream direction associated with the call params.
+	**/
+	MediaDirection getVideoDirection();
+
+	/**
+	 * Set the audio stream direction.
+	 * @param dir The audio stream direction associated with this call params.
+	**/
+	void setAudioDirection(MediaDirection dir);
+
+	/**
+	 * Set the video stream direction.
+	 * @param dir The video stream direction associated with this call params.
+	**/
+	void setVideoDirection(MediaDirection dir);
 }
diff --git a/java/common/org/linphone/core/LinphoneCallStats.java b/java/common/org/linphone/core/LinphoneCallStats.java
index beea3b043..e7d238f26 100644
--- a/java/common/org/linphone/core/LinphoneCallStats.java
+++ b/java/common/org/linphone/core/LinphoneCallStats.java
@@ -32,6 +32,10 @@ public interface LinphoneCallStats {
 		 * Video
 		 */
 		static public MediaType Video = new MediaType(1, "Video");
+		/**
+		 * Text
+		*/
+		static public MediaType Text = new MediaType(2, "Text");
 		protected final int mValue;
 		private final String mStringValue;
 
@@ -97,6 +101,22 @@ public interface LinphoneCallStats {
 		}
 	}
 
+	static public enum LinphoneAddressFamily {
+		INET(0),
+		INET_6(1),
+		UNSPEC(2);
+
+		private int value;
+
+		LinphoneAddressFamily(int v) {
+			value = v;
+		}
+
+		public int getInt() {
+			return value;
+		}
+	}
+
 	/**
 	 * Get the stats media type
 	 * @return MediaType
@@ -173,4 +193,24 @@ public interface LinphoneCallStats {
 	 * @return The local late rate percentage.
 	**/
 	public float getLocalLateRate();
+
+	/**
+	 * Get the encoder name of specified payload
+	 * @param pl payload
+	 * @return The name of encoder
+     */
+	public String getEncoderName(PayloadType pl);
+
+	/**
+	 * Get the decoder name of specified payload
+	 * @param pl payload
+	 * @return The name of decoder
+	 */
+	public String getDecoderName(PayloadType pl);
+
+	/**
+	 * Get family of remote ip
+	 * @return enum LinphoneAddressFamily
+     */
+	public int getIpFamilyOfRemote();
 }
diff --git a/java/common/org/linphone/core/LinphoneChatMessage.java b/java/common/org/linphone/core/LinphoneChatMessage.java
index b80c3a070..0ca81f6c0 100644
--- a/java/common/org/linphone/core/LinphoneChatMessage.java
+++ b/java/common/org/linphone/core/LinphoneChatMessage.java
@@ -119,22 +119,18 @@ public interface LinphoneChatMessage {
 	
 	/**
 	 * Linphone message can carry external body as defined by rfc2017
-	 * @param message #LinphoneChatMessage
 	 * @return return external body url null if not present.
 	 */
 	String getExternalBodyUrl();
 	
 	/**
 	 * Linphone message can carry external body as defined by rfc2017
-	 * @param  #LinphoneChatMessage  
 	 * @param url ex: access-type=URL; URL="http://www.foo.com/file"
 	 */
 	void setExternalBodyUrl(String url);
 	
 	/**
 	 * Add a custom header into the message.
-	 * @param name
-	 * @param value
 	 */
 	void addCustomHeader(String name, String value);
 	
@@ -221,10 +217,25 @@ public interface LinphoneChatMessage {
 	/**
 	 * Start the download of the file referenced in a LinphoneChatMessage from remote server.
 	 */
-	void downloadFile();
+	int downloadFile();
 	
 	/**
 	 * Set the callbacks associated with the LinphoneChatMessage.
 	 */
 	void setListener(LinphoneChatMessage.LinphoneChatMessageListener listener);
+	/**
+	 * Fulfill a chat message char by char. Message linked to a Real Time Text Call send char in realtime following RFC 4103/T.140
+	 * To commit a message, use #linphone_chat_room_send_message
+	 * @param character T.140 char
+	 * @throws LinphoneCoreException
+	 */
+	void putChar(long character) throws LinphoneCoreException;
+
+	/**
+	 * Frees the underlying native resource of the message.
+	 * It should not be accessed afterwards.
+	 * This is for optimizing the memory resources at runtime. Not calling this does not result in a memory leak.
+	**/
+	void destroy();
+	
 }
diff --git a/java/common/org/linphone/core/LinphoneChatRoom.java b/java/common/org/linphone/core/LinphoneChatRoom.java
index 978e06080..e75f2479d 100644
--- a/java/common/org/linphone/core/LinphoneChatRoom.java
+++ b/java/common/org/linphone/core/LinphoneChatRoom.java
@@ -42,14 +42,14 @@ public interface LinphoneChatRoom {
 	
 	/**
 	 * Send a message to peer member of this chat room.
-	 * @param chat message
+	 * @param message chat message
+	 * @deprecated
 	 */
 	@Deprecated
 	void sendMessage(LinphoneChatMessage message, LinphoneChatMessage.StateListener listener);
 
 	/**
 	 * Create a LinphoneChatMessage
-	 * @param chatRoom chat room associated to the message
 	 * @param message message to send
 	 * @return LinphoneChatMessage object
 	 */
@@ -76,11 +76,6 @@ public interface LinphoneChatRoom {
 	 */
 	LinphoneChatMessage[] getHistoryRange(int begin, int end);
 
-	/**
-	 * Destroys a LinphoneChatRoom.
-	 */
-	void destroy();
-
 	/**
 	 * Returns the amount of unread messages associated with the peer of this chatRoom.
 	 * @return the amount of unread messages
@@ -144,4 +139,19 @@ public interface LinphoneChatRoom {
 	 * @param message
 	 */
 	void sendChatMessage(LinphoneChatMessage message);
+	
+	/**
+	 * get Curent Call associated to this chatroom if any
+	 * To commit a message, use #linphone_chat_room_send_message
+	 * @return LinphoneCall or NULL.
+	 */
+	public LinphoneCall getCall();
+	/**
+	 * When realtime text is enabled LinphoneCallParams.realTimeTextEnabled, LinphoneCoreListener.isComposingReceived is call every time a char is received from peer.
+	 * At the end of remote typing a regular LinphoneChatMessage is received with committed data from LinphoneCoreListener.messageReceived .
+	 * @return  RFC 4103/T.140 char
+	 */
+	long getChar();
+	
+	
 }
diff --git a/java/common/org/linphone/core/LinphoneConference.java b/java/common/org/linphone/core/LinphoneConference.java
new file mode 100644
index 000000000..d0f244f97
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneConference.java
@@ -0,0 +1,39 @@
+/*
+LinphoneConference.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+package org.linphone.core;
+
+import org.linphone.core.LinphoneAddress;
+import java.util.List;
+
+/**
+ * Interface to manipulate a running conference
+ */
+public interface LinphoneConference {
+	/**
+	 * Get the URIs of all participants of the conference
+	 */
+	public LinphoneAddress[] getParticipants();
+	/**
+	 * Remove a participant from the conference
+	 * @param uri The URI of the participant to remove
+	 * @return 0 if succeed, -1 if not.
+	 */
+	public int removeParticipant(LinphoneAddress uri);
+}
diff --git a/java/common/org/linphone/core/LinphoneConferenceParams.java b/java/common/org/linphone/core/LinphoneConferenceParams.java
new file mode 100644
index 000000000..199bd8c0e
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneConferenceParams.java
@@ -0,0 +1,25 @@
+/*
+LinphoneConferenceParams.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+package org.linphone.core;
+
+public interface LinphoneConferenceParams {
+	public void enableVideo(boolean enable);
+	public boolean isVideoRequested();
+}
diff --git a/java/common/org/linphone/core/LinphoneContent.java b/java/common/org/linphone/core/LinphoneContent.java
index eb41c62f7..f080229ed 100644
--- a/java/common/org/linphone/core/LinphoneContent.java
+++ b/java/common/org/linphone/core/LinphoneContent.java
@@ -1,3 +1,22 @@
+/*
+LinphoneContent.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 package org.linphone.core;
 
 /**
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 11b2302c3..bd1d79f00 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -27,7 +27,7 @@ import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import android.view.SurfaceView;
 
 /**
- * Linphone core main object created by method {@link LinphoneCoreFactory#createLinphoneCore(LinphoneCoreListener, String, String, Object)}.
+ * Linphone core main object created by method {@link LinphoneCoreFactory#createLinphoneCore(LinphoneCoreListener, String, String, Object, Object)}.
  *
  */
 
@@ -170,8 +170,9 @@ public interface LinphoneCore {
 	}
 	/**
 	 * Describes firewall policy.
-	 *
+	 * @deprecated
 	 */
+	@Deprecated
 	static public class FirewallPolicy {
 
 		static private Vector<FirewallPolicy> values = new Vector<FirewallPolicy>();
@@ -224,7 +225,6 @@ public interface LinphoneCore {
 	/**
 	 * Linphone core SIP transport ports.
 	 * Use with {@link LinphoneCore#setSignalingTransportPorts(Transports)}
-	 * @ingroup initializing
 	 */
 	static public class Transports {
 		/**
@@ -250,6 +250,94 @@ public interface LinphoneCore {
 			return "udp["+udp+"] tcp["+tcp+"] tls["+tls+"]";
 		}
 	}
+	/**
+	 * Stream type enum-like.
+	 *
+	 */
+	static public final class StreamType {
+
+		static private Vector<StreamType> values = new Vector<StreamType>();
+		/**
+		 * Audio
+		 */
+		static public final StreamType Audio = new StreamType(0, "Audio");
+		/**
+		 * Video
+		 */
+		static public final StreamType Video = new StreamType(1, "Video");
+		/**
+		 * Text
+		 */
+		static public final StreamType Text = new StreamType(2, "Text");
+		/**
+		 * Unknown
+		 */
+		static public final StreamType Unknown = new StreamType(3, "Unknown");
+		protected final int mValue;
+		private final String mStringValue;
+
+		private StreamType(int value, String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue = stringValue;
+		}
+		public static StreamType fromInt(int value) {
+			for (int i = 0; i < values.size(); i++) {
+				StreamType stype = (StreamType) values.elementAt(i);
+				if (stype.mValue == value) return stype;
+			}
+			throw new RuntimeException("StreamType not found [" + value + "]");
+		}
+		public String toString() {
+			return mStringValue;
+		}
+	}
+	/**
+	 * Stream type enum-like.
+	 *
+	 */
+	static public final class MediaDirection {
+
+		static private Vector<MediaDirection> values = new Vector<MediaDirection>();
+		/**
+		 * Invalid
+		 */
+		static public final MediaDirection Invalid = new MediaDirection(-1, "Invalid");
+		/**
+		 * Inactive
+		 */
+		static public final MediaDirection Inactive = new MediaDirection(0, "Inactive");
+		/**
+		 * SendOnly
+		 */
+		static public final MediaDirection SendOnly = new MediaDirection(1, "SendOnly");
+		/**
+		 * RecvOnly
+		 */
+		static public final MediaDirection RecvOnly = new MediaDirection(2, "RecvOnly");
+		/**
+		 * SendRecv
+		 */
+		static public final MediaDirection SendRecv = new MediaDirection(3, "SendRecv");
+		protected final int mValue;
+		private final String mStringValue;
+
+		private MediaDirection(int value, String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue = stringValue;
+		}
+		public static MediaDirection fromInt(int value) {
+			for (int i = 0; i < values.size(); i++) {
+				MediaDirection dir = (MediaDirection) values.elementAt(i);
+				if (dir.mValue == value) return dir;
+			}
+			throw new RuntimeException("MediaDirection not found [" + value + "]");
+		}
+		public String toString() {
+			return mStringValue;
+		}
+	}
 	/**
 	 * Media (RTP) encryption enum-like.
 	 *
@@ -473,12 +561,87 @@ public interface LinphoneCore {
 			return mStringValue;
 		}
 	}
+	static public final class LinphoneLimeState {
+
+		static private Vector<LinphoneLimeState> values = new Vector<LinphoneLimeState>();
+		/**
+		 * Disabled
+		 */
+		static public final LinphoneLimeState Disabled = new LinphoneLimeState(0, "None");
+		/**
+		 * Mandatory
+		 */
+		static public final LinphoneLimeState Mandatory = new LinphoneLimeState(1,"Mandatory");
+		/**
+		 * Preferred
+		 */
+		static public final LinphoneLimeState Preferred = new LinphoneLimeState(2,"Preferred");
+		protected final int mValue;
+		private final String mStringValue;
+
+
+		private LinphoneLimeState(int value, String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue = stringValue;
+		}
+		public static LinphoneLimeState fromInt(int value) {
+
+			for (int i=0; i<values.size();i++) {
+				LinphoneLimeState menc = (LinphoneLimeState) values.elementAt(i);
+				if (menc.mValue == value) return menc;
+			}
+			throw new RuntimeException("LinphoneLimeState not found ["+value+"]");
+		}
+		public String toString() {
+			return mStringValue;
+		}
+	}
+	/**
+	 * linphone authentication methods
+	 */
+	static public class AuthMethod {
+		static private Vector<AuthMethod> values = new Vector<AuthMethod>();
+		/**
+		 * HTTP Digest
+		 */
+		static public AuthMethod AuthMethodHttpDigest = new AuthMethod(0, "AuthMethodHttpDigest");
+		/**
+		 * TLS
+		 */
+		static public AuthMethod AuthMethodTls = new AuthMethod(1, "AuthMethodTls");
+
+		private final int mValue;
+		private final String mStringValue;
+		
+		private AuthMethod(int value,String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue=stringValue;
+		}
+		public static AuthMethod fromInt(int value) {
+
+			for (int i=0; i<values.size();i++) {
+				AuthMethod state = (AuthMethod) values.elementAt(i);
+				if (state.mValue == value) return state;
+			}
+			throw new RuntimeException("auth method not found ["+value+"]");
+		}
+		public String toString() {
+			return mStringValue;
+		}
+	}
 
 	/**
 	 * Set the context of creation of the LinphoneCore.
 	 */
 	public void setContext(Object context);
 
+	/**
+	 * Get the LinphoneCore's global state.
+	**/
+	public GlobalState getGlobalState();
+
 	/**
 	 * clear all added proxy configs
 	 */
@@ -498,7 +661,6 @@ public interface LinphoneCore {
 
 	/**
 	 * Sets the default proxy.
-	 *<br>
 	 * This default proxy must be part of the list of already entered {@link LinphoneProxyConfig}.
 	 * Toggling it as default will make LinphoneCore favor the identity associated with the proxy configuration in all incoming and outgoing calls.
 	 * Better proxy configuration match may override this choice. Pass null to unset the default proxy.
@@ -533,7 +695,7 @@ public interface LinphoneCore {
 	void clearAuthInfos();
 	/**
 	 * Adds authentication information to the LinphoneCore.
-	 * <br>This information will be used during all SIP transacations that require authentication.
+	 * This information will be used during all SIP transacations that require authentication.
 	 * @param info
 	 */
 	void addAuthInfo(LinphoneAuthInfo info);
@@ -542,18 +704,18 @@ public interface LinphoneCore {
 	 * Build an address according to the current proxy config. In case destination is not a sip address, the default proxy domain is automatically appended
 	 * @param destination
 	 * @return
-	 * @throws If no LinphoneAddress can be built from destination
+	 * @throws LinphoneCoreException if no LinphoneAddress can be built from destination
 	 */
 	public LinphoneAddress interpretUrl(String destination) throws LinphoneCoreException;
 
 	/**
 	 * Starts a call given a destination. Internally calls {@link #interpretUrl(String)} then {@link #invite(LinphoneAddress)}.
-	 * @param uri
+	 * @param destination
 	 */
 	public LinphoneCall invite(String destination)throws LinphoneCoreException;
 	/**
 	 * Initiates an outgoing call given a destination LinphoneAddress
-	 *<br>The LinphoneAddress can be constructed directly using {@link LinphoneCoreFactory#createLinphoneAddress} , or created {@link LinphoneCore#interpretUrl(String)}. .
+	 * The LinphoneAddress can be constructed directly using {@link LinphoneCoreFactory#createLinphoneAddress} , or created {@link LinphoneCore#interpretUrl(String)}. .
 	 * @param to the destination of the call (sip address).
 	 * @return linphone call
 	 * @throws LinphoneCoreException if linphone call cannot be created
@@ -569,7 +731,7 @@ public interface LinphoneCore {
 	 * @param call the LinphoneCall, must be in the {@link LinphoneCall.State#IncomingReceived} state.
 	 * @param reason the reason for rejecting the call: {@link Reason#Declined}  or {@link Reason#Busy}
 	 */
-	public void declineCall(LinphoneCall aCall, Reason reason);
+	public void declineCall(LinphoneCall call, Reason reason);
 	/**
 	 * Returns The LinphoneCall the current call if one is in call
 	 *
@@ -593,12 +755,13 @@ public interface LinphoneCore {
 	public boolean isInComingInvitePending();
 	/**
 	 * Main loop function. It is crucial that your application call it periodically.
-	 *
-	 *	#iterate() performs various backgrounds tasks:
-	 * <li>receiving of SIP messages
-	 * <li> handles timers and timeout
-	 * <li> performs registration to proxies
-	 * <li> authentication retries The application MUST call this function from periodically, in its main loop.
+	 * #iterate() performs various backgrounds tasks:
+	 * <ul>
+	 *  <li>receiving of SIP messages</li>
+	 *  <li> handles timers and timeout</li>
+	 *  <li> performs registration to proxies</li>
+	 *  <li> authentication retries The application MUST call this function from periodically, in its main loop.</li>
+	 * </ul>
 	 * <br> Be careful that this function must be call from the same thread as other liblinphone methods. In not the case make sure all liblinphone calls are serialized with a mutex.
 
 	 */
@@ -653,12 +816,17 @@ public interface LinphoneCore {
 	 */
 	public LinphoneCallLog[] getCallLogs();
 
+	/**
+	 * @return the latest outgoing call log.
+	 */
+	public LinphoneCallLog getLastOutgoingCallLog();
+
 	/**
 	 * This method is called by the application to notify the Linphone core library when network is reachable.
 	 * Calling this method with true trigger Linphone to initiate a registration process for all proxy
 	 * configuration with parameter register set to enable.
 	 * This method disable the automatic registration mode. It means you must call this method after each network state changes
-	 * @param network state
+	 * @param isReachable network state
 	 *
 	 */
 	public void setNetworkReachable(boolean isReachable);
@@ -673,7 +841,7 @@ public interface LinphoneCore {
 	public void destroy();
 	/**
 	 * Allow to control play level before entering  sound card:
-	 * @param level in db
+	 * @param gain in db
 	 */
 	public void setPlaybackGain(float gain);
 	/**
@@ -703,9 +871,14 @@ public interface LinphoneCore {
 	 */
 	boolean isMicMuted();
 
+	/**
+	 * Initiate dtmf if in call
+	 * @param dtmf send dtmf
+	 */
+	void sendDtmfs(String dtmf);
 	/**
 	 * Initiate a dtmf signal if in call
-	 * @param send dtmf ['0'..'9'] | '#', '*'
+	 * @param number send dtmf ['0'..'9'] | '#', '*'
 	 */
 	void sendDtmf(char number);
 	/**
@@ -758,7 +931,7 @@ public interface LinphoneCore {
 	/**
 	 * Enable payload type
 	 * @param pt payload type to enable, can be retrieve from {@link #findPayloadType}
-	 * @param true if enabled
+	 * @param enable for enable or disable the payload type
 	 * @exception LinphoneCoreException
 	 *
 	 */
@@ -851,7 +1024,7 @@ public interface LinphoneCore {
 	boolean isEchoLimiterEnabled();
 	/**
 	 * Set transport ports linphone core will listen on
-	 * @param local transports ports used for signaling (TCP, UDP and TLS)
+	 * @param transports transports ports used for signaling (TCP, UDP and TLS)
 	 */
 	void setSignalingTransportPorts(Transports transports);
 	/**Get
@@ -866,6 +1039,17 @@ public interface LinphoneCore {
 	 */
 	void setSipDscp(int dscp);
 
+	/**
+	 * Set the timeout in milliseconds for SIP transport (TCP or TLS connection establishment maximum time).
+	 * @param timeout_ms
+	 */
+	void setSipTransportTimeout(int timeout_ms);
+
+	/**
+	 * Get the current SIP transport timeout.
+	 */
+	int getSipTransportTimeout();
+
 	/**
 	 * Get DSCP used for SIP socket.
 	 * @return the DSCP value used for the SIP socket.
@@ -888,6 +1072,21 @@ public interface LinphoneCore {
 	 * @throws LinphoneCoreException
 	 */
 	void addFriend(LinphoneFriend lf) throws LinphoneCoreException;
+	
+	/**
+	 * Adds the friend list to the linphone core.
+	 */
+	void addFriendList(LinphoneFriendList friendList) throws LinphoneCoreException;
+	
+	/**
+	 * Removes the friend list from the linphone core.
+	 */
+	void removeFriendList(LinphoneFriendList friendList) throws LinphoneCoreException;
+	
+	/**
+	 * Creates a friend list.
+	 */
+	LinphoneFriendList createLinphoneFriendList() throws LinphoneCoreException;
 
 	/**
 	 * Get list of LinphoneFriend
@@ -896,26 +1095,34 @@ public interface LinphoneCore {
 	LinphoneFriend[] getFriendList();
 
 	/**
-	 * @brief Set my presence status
+	 * Get list of LinphoneFriendList
+	 * @return LinphoneFriendList list
+	 */
+	LinphoneFriendList[] getFriendLists();
+
+	/**
+	 * Set my presence status
 	 * @param minutes_away how long in away
 	 * @param alternative_contact sip uri used to redirect call in state LinphoneStatusMoved
 	 * @param status OnlineStatus
 	 * @deprecated Use setPresenceModel() instead
 	 */
+	@Deprecated
 	void setPresenceInfo(int minutes_away, String alternative_contact, OnlineStatus status);
 	/**
-	 * @brief Get my presence status
+	 * Get my presence status
 	 * @return OnlineStatus
 	 * @deprecated Use getPresenceModel() instead
 	 */
+	@Deprecated
 	OnlineStatus getPresenceInfo();
 	/**
-	 * @brief Set my presence status
+	 * Set my presence status
 	 * @param presence #LinphonePresenceModel
 	 */
 	void setPresenceModel(PresenceModel presence);
 	/**
-	 * @brief Get my presence status
+	 * Get my presence status
 	 * @return A #PresenceModel object, or null if no presence model has been set.
 	 */
 	PresenceModel getPresenceModel();
@@ -926,44 +1133,54 @@ public interface LinphoneCore {
 	 * @return {@link LinphoneChatRoom} where messaging can take place.
 	 */
 	LinphoneChatRoom getOrCreateChatRoom(String to);
+	/**
+	 * Create a new chat room for messaging from a linphone address
+	 * @param to 	destination address for messages
+	 *
+	 * @return {@link LinphoneChatRoom} where messaging can take place.
+	 */
+	LinphoneChatRoom getChatRoom(LinphoneAddress to);
 	/**
 	 * Set the native video window id where the video is to be displayed.
 	 * On Android, it must be of type {@link AndroidVideoWindowImpl}
-	 * @param video window of type {@link AndroidVideoWindowImpl}
-	**/
+	 * @param w window of type {@link AndroidVideoWindowImpl}
+	 */
 	void setVideoWindow(Object w);
 	/**
 	 * Set the native video window id where the video preview is to be displayed.
-	 * On Android, it must of type {@link SurfaceView}
-	 * @param video window of type {@link SurfaceView}
-	**/
+	 * On Android, it must of type android.view.SurfaceView
+	 * @param w window of type android.view.SurfaceView
+	 */
 	void setPreviewWindow(Object w);
 	/**
 	 * Tells the core the device current orientation. This can be used by capture filters
 	 * on mobile devices to select between portrait/landscape mode and to produce properly
 	 * oriented images. The exact meaning of the value in rotation if left to each device
 	 * specific implementations.
-	 *@param rotation . Android supported values are 0, 90, 180 and 270.
-	 *
-	**/
+	 * @param rotation Android supported values are 0, 90, 180 and 270.
+	 */
 	void setDeviceRotation(int rotation);
 	/**
 	 * Sets the active video device.
 	 *
 	 * @param id  of the video device as returned by {@link AndroidCameraConfiguration#retrieveCameras}
-	**/
+	 */
 	void setVideoDevice(int id);
 	/**
 	 * Returns the id of the currently active video device as found in {@link AndroidCameraConfiguration#retrieveCameras}.
-	**/
+	 */
 	int getVideoDevice();
 
 
 	/**
-	 * Teturns true if the underlying sdk support video
-	 *
-	 * */
+	 * Returns true if the underlying sdk support video
+	 */
 	boolean isVideoSupported();
+	
+	/**
+	 * Returns true if the underlying sdk support vCards
+	 */
+	boolean isVCardSupported();
 
 	/**
 	 * Enables video globally.
@@ -976,12 +1193,13 @@ public interface LinphoneCore {
 	 * @param vcap_enabled indicates whether video capture is enabled
 	 * @param display_enabled indicates whether video display should be shown
 	 *
-	**/
+	 */
 	void enableVideo(boolean vcap_enabled, boolean display_enabled);
+
 	/**
 	 * Returns TRUE if video is enabled, FALSE otherwise.
 	 *
-	 ***/
+	 */
 	boolean isVideoEnabled();
 
 	/**
@@ -989,6 +1207,7 @@ public interface LinphoneCore {
 	 * @param stun_server Stun server address and port, such as stun.linphone.org or stun.linphone.org:3478
 	 */
 	void setStunServer(String stun_server);
+
 	/**
 	 * Get STUN server
 	 * @return stun server address if previously set.
@@ -998,29 +1217,56 @@ public interface LinphoneCore {
 	/**
 	 * Sets policy regarding workarounding NATs
 	 * @param pol one of the FirewallPolicy members.
-	**/
+	 * @deprecated
+	 */
+	@Deprecated
 	void setFirewallPolicy(FirewallPolicy pol);
+
 	/**
 	 * @return previously set firewall policy.
+	 * @deprecated
 	 */
+	@Deprecated
 	FirewallPolicy getFirewallPolicy();
+
+	/**
+	 * Create a new LinphoneNatPolicy object with every policies being disabled.
+	 * @return A new LinphoneNatPolicy object.
+	 */
+	LinphoneNatPolicy createNatPolicy();
+
+	/**
+	 * Set the policy to use to pass through NATs/firewalls.
+	 * It may be overridden by a NAT policy for a specific proxy config.
+	 * @param policy LinphoneNatPolicy object
+	 */
+	void setNatPolicy(LinphoneNatPolicy policy);
+
+	/**
+	 * Get The policy that is used to pass through NATs/firewalls.
+	 * It may be overridden by a NAT policy for a specific proxy config.
+	 * @return LinphoneNatPolicy object in use.
+	 */
+	LinphoneNatPolicy getNatPolicy();
+
 	/**
 	 * Initiates an outgoing call given a destination LinphoneAddress
 	 *
-	 * @param addr the destination of the call {@link #LinphoneAddress }.
-	 * @param params call parameters {@link #LinphoneCallParams }
+	 * @param destination the destination of the call {@link LinphoneAddress}.
+	 * @param params call parameters {@link LinphoneCallParams}
 	 *
-	 *<br>The LinphoneAddress can be constructed directly using {@link LinphoneCoreFactory#createLinphoneAddress} , or created {@link LinphoneCore#interpretUrl(String)}. .
+	 * <br>The LinphoneAddress can be constructed directly using {@link LinphoneCoreFactory#createLinphoneAddress} , or created {@link LinphoneCore#interpretUrl(String)}.
 	 *
-	 * @return a {@link #LinphoneCall LinphoneCall} object
+	 * @return a {@link LinphoneCall} object
 	 * @throws LinphoneCoreException  in case of failure
 	**/
-	LinphoneCall inviteAddressWithParams(LinphoneAddress destination, LinphoneCallParams params) throws LinphoneCoreException ;
+	LinphoneCall inviteAddressWithParams(LinphoneAddress destination, LinphoneCallParams params) throws LinphoneCoreException;
+
 	/**
 	 * Updates a running call according to supplied call parameters or parameters changed in the LinphoneCore.
 	 *
 	 * In this version this is limited to the following use cases:
-	 * - setting up/down the video stream according to the video parameter of the {@link LinphoneCallParams} (see {@link LinphoneCallParams#enableVideo} ).
+	 * - setting up/down the video stream according to the video parameter of the {@link LinphoneCallParams} (see {@link LinphoneCallParams#setVideoEnabled(boolean)} ).
 	 * - changing the size of the transmitted video after calling {@link LinphoneCore#setPreferredVideoSize(VideoSize)}
 	 *
 	 * In case no changes are requested through the {@link LinphoneCallParams} argument, then this argument can be omitted and set to null.
@@ -1029,12 +1275,17 @@ public interface LinphoneCore {
 	 * @return 0 if successful, -1 otherwise.
 	**/
 	int updateCall(LinphoneCall call, LinphoneCallParams params);
-	/**
-	 * Get default call parameters reflecting current linphone core configuration
-	 * @return  LinphoneCallParams
-	 */
-	LinphoneCallParams createDefaultCallParameters();
 
+	/**
+	 * Create a LinphoneCallParams suitable to be used for a new incoming call or an established call, in
+	 * methods LinphoneCore.inviteAddressWithParams(), LinphoneCore.updateCall(), LinphoneCore.acceptCallWithParams(), LinphoneCore.acceptCallUpdate().
+	 * The call parameter is optional: when creating a LinphoneCallParams for an outgoing call that is about to be created, 
+	 * it shall be set to null.
+	 * @param call (optional)
+	 * @return a LinphoneCallParams object, representing the call settings guessed from the current LinphoneCore and compatible with the call object if any.
+	 */
+	LinphoneCallParams createCallParams(LinphoneCall call);
+	
 	/**
 	 * Sets the path to a wav file used for ringing.
 	 *
@@ -1055,6 +1306,13 @@ public interface LinphoneCore {
 	 */
 	void setRootCA(String path);
 
+	/**
+	 * Sets trusted root CAs
+	 *
+	 * @param data String with multiple PEM certif
+	 */
+	void setRootCAData(String data);
+
 	/**
 	 * Sets the path to a wav file used for for ringing back.
 	 *
@@ -1083,7 +1341,7 @@ public interface LinphoneCore {
 	 * This is IP bandwidth, in kbit/s.
 	 * This information is used signaled to other parties during
 	 * calls (within SDP messages) so that the remote end can have
-	 * sufficient knowledge to properly configure its audio & video
+	 * sufficient knowledge to properly configure its audio &amp; video
 	 * codec output bitrate to not overflow available bandwidth.
 	 *
 	 * @param bw the bandwidth in kbits/s, 0 for infinite
@@ -1170,10 +1428,10 @@ public interface LinphoneCore {
 	boolean isKeepAliveEnabled();
 	/**
 	 * Start an echo calibration of the sound devices, in order to find adequate settings for the echo canceler automatically.
-	 * status is notified to {@link LinphoneCoreListener#ecCalibrationStatus(EcCalibratorStatus, int, Object)}
+	 * Status is notified to {@link LinphoneCoreListener#ecCalibrationStatus(LinphoneCore, EcCalibratorStatus, int, Object)}
 	 * @param listener the LinphoneEchoCalibrationListener to call when the calibration is done
 	 * @throws LinphoneCoreException if operation is still in progress;
-	**/
+	 */
 	void startEchoCalibration(LinphoneCoreListener listener) throws LinphoneCoreException;
 
 	/**
@@ -1188,6 +1446,24 @@ public interface LinphoneCore {
 	 */
 	boolean hasBuiltInEchoCanceler();
 
+	/**
+	 * Start the speaker and the micro to test the echo
+	 * @param rate
+	 * @return the status
+	 */
+	int startEchoTester(int rate);
+
+	/**
+	 * Stop the speaker and the micro
+	 * @return the status
+	 */
+	int stopEchoTester();
+
+	/**
+	 * Returns true if the OpenGL on this device is crappy and we need to use the old Android display
+	 */
+	boolean hasCrappyOpenGL();
+
 	void enableIpv6(boolean enable);
 
 	boolean isIpv6Enabled();
@@ -1196,6 +1472,7 @@ public interface LinphoneCore {
 	 * @deprecated
 	 * @param i
 	 */
+	@Deprecated
 	void adjustSoftwareVolume(int i);
 
 	/**
@@ -1216,6 +1493,19 @@ public interface LinphoneCore {
 	void setZrtpSecretsCache(String file);
 	void enableEchoLimiter(boolean val);
 
+	/**
+	 * Create a conference
+	 * @param params Parameters of the conference. Can be null
+	 * @return The new conference or null if the creation has failed
+	 */
+	LinphoneConference createConference(LinphoneConferenceParams params);
+	/**
+	 * Return the value of the C pointer on the conference instance.
+	 *
+	 * That function can be used to test whether a conference is running.
+	 * @return A positive value if a conference is running, 0 if not.
+	 **/
+	LinphoneConference getConference();
 	/**
 	 * Indicates whether the local user is part of the conference.
 	**/
@@ -1228,15 +1518,14 @@ public interface LinphoneCore {
 	 * However, by calling {@link #leaveConference()} and {@link #enterConference()} the application can decide to temporarily
 	 * move out and in the local participant from the conference.
 	 *
-	 * @returns true if successful
-	**/
+	 * @return true if successful
+	 */
 	boolean enterConference();
 	/**
 	 * Moves the local participant out of the conference.
 	 * When the local participant is out of the conference, the remote participants can continue to talk normally.
 	**/
 	void leaveConference();
-
 	/**
 	 * Merge a call into a conference.
 	 *
@@ -1249,7 +1538,6 @@ public interface LinphoneCore {
 	void addToConference(LinphoneCall call);
 	/**
 	 * Remove a call from the conference.
-	 * @param call a call that has been previously merged into the conference.
 	 *
 	 * After removing the remote participant belonging to the supplied call, the call becomes a normal call in paused state.
 	 * If one single remote participant is left alone together with the local user in the conference after the removal, then the conference is
@@ -1259,31 +1547,26 @@ public interface LinphoneCore {
 	 * In other words, unless {@link #leaveConference()} is explicitely called, the last remote participant of a conference is automatically
 	 * put in a simple call in running state.
 	 *
-	 **/
+	 * @param call a call that has been previously merged into the conference.
+	 */
 	void removeFromConference(LinphoneCall call);
 	/**
 	 * Add all calls into a conference.
-	 *
 	 * Merge all established calls (either in {@link LinphoneCall.State#StreamsRunning} or {@link LinphoneCall.State#Paused}) into a conference.
-	 *
-	**/
+	 */
 	void addAllToConference();
 
 	/**
 	 * Terminates the conference and the calls associated with it.
-	 *
 	 * All the calls that were merged to the conference are terminated, and the conference resources are destroyed.
-	 *
-	**/
+	 */
 	void terminateConference();
 	/**
 	 * Returns the number of participants to the conference, including the local participant.
-	 *
 	 * Typically, after merging two calls into the conference, there is total of 3 participants:
 	 * the local participant (or local user), and two remote participants that were the destinations of the two previously establised calls.
-	 *
-	 * @returns the number of participants to the conference
-	**/
+	 * @return the number of participants to the conference
+	 */
 	int getConferenceSize();
 
 	/**
@@ -1304,12 +1587,12 @@ public interface LinphoneCore {
 	/**
 	 * Returns all calls.
 	 * @return an array with all call currently handle by Linphone core
-	**/
+	 */
 	LinphoneCall[] getCalls();
 	/**
 	 * Get number of calls currently handled by Linphone core
-	 * @returns number of calls
-	 * */
+	 * @return number of calls
+	 */
 	int getCallsNb();
 
 	/**
@@ -1326,9 +1609,9 @@ public interface LinphoneCore {
 	 * This method will send a transfer request to the transfered person. The phone of the transfered is then
 	 * expected to automatically call to the destination of the transfer. The receiver of the transfer will then automatically
 	 * close the call with us (the 'dest' call).
-	 * @param call a running call you want to transfer
-	 * @param dest a running call whose remote person will receive the transfer
-	**/
+	 * @param callToTransfer a running call you want to transfer
+	 * @param destination a running call whose remote person will receive the transfer
+	 */
 	void transferCallToAnother(LinphoneCall callToTransfer, LinphoneCall destination);
 
 	/**
@@ -1361,6 +1644,7 @@ public interface LinphoneCore {
 	 * @param uri
 	 * @return
 	 */
+	@Deprecated
 	boolean isMyself(String uri);
 
 	/**
@@ -1368,7 +1652,7 @@ public interface LinphoneCore {
 	 * which could result in an active call.
 	 * Eg: don't start a new call if one is in outgoing ringing.
 	 * Eg: don't merge to conference either as it could result
-	 *     in two active calls (conference and accepted call).
+	 *   in two active calls (conference and accepted call).
 	 * @return
 	 */
 	boolean soundResourcesLocked();
@@ -1378,7 +1662,7 @@ public interface LinphoneCore {
 	boolean mediaEncryptionSupported(MediaEncryption menc);
 	/**
 	 * set media encryption (rtp) to use
-	 * @params menc: MediaEncryption.None, MediaEncryption.SRTP or MediaEncryption.ZRTP
+	 * @param menc MediaEncryption.None, MediaEncryption.SRTP or MediaEncryption.ZRTP
 	 */
 	void setMediaEncryption(MediaEncryption menc);
 	/**
@@ -1386,7 +1670,7 @@ public interface LinphoneCore {
 	 * @return MediaEncryption.None, MediaEncryption.SRTP or MediaEncryption.ZRTP
 	 */
 	MediaEncryption getMediaEncryption();
-/**
+	/**
 	 * Set media encryption required for outgoing calls
 	 */
 	void setMediaEncryptionMandatory(boolean yesno);
@@ -1428,6 +1712,7 @@ public interface LinphoneCore {
 	 * Enable or disable tunnel
 	 * @param enable True to enable and false to disable
 	 */
+	@Deprecated
 	void tunnelEnable(boolean enable);
 	
 	/**
@@ -1463,6 +1748,7 @@ public interface LinphoneCore {
 	 * @deprecated Use tunnelSetMode instaead
 	 * Enable tunnel if the mirror RTP session cannot be established
 	 */
+	@Deprecated
 	void tunnelAutoDetect();
 	
 	/**
@@ -1526,8 +1812,8 @@ public interface LinphoneCore {
 	void setStaticPicture(String path);
 	/**
 	 * Sets the user agent string used in SIP messages.
-	 * @param user agent name
-	 * @param user agent version
+	 * @param name user agent name
+	 * @param version user agent version
 	**/
 	void setUserAgent(String name, String version);
 	/**
@@ -1711,7 +1997,7 @@ public interface LinphoneCore {
 
 	/**
 	 * Create an empty INFO message.
-	 * It can later be sent using {@link LinphoneCall.sendInfoMessage() }.
+	 * It can later be sent using {@link LinphoneCall#sendInfoMessage(LinphoneInfoMessage)}.
 	 * @return the new info message.
 	 */
 	public LinphoneInfoMessage createInfoMessage();
@@ -1735,7 +2021,6 @@ public interface LinphoneCore {
 	 * @param resource the destination resource
 	 * @param event the event name
 	 * @param expires the whished duration of the subscription
-	 * @param body an optional body, may be NULL.
 	 * @return a LinphoneEvent holding the context of the created subcription.
 	 */
 	public LinphoneEvent createSubscribe(LinphoneAddress resource, String event, int expires);
@@ -1768,6 +2053,18 @@ public interface LinphoneCore {
 	 */
 	public void setChatDatabasePath(String path);
 
+	/**
+	 * Sets the path to the database where the logs will be stored (if enabled)
+	 * @param path the database where the logs will be stored.
+	 */
+	public void setCallLogsDatabasePath(String path);
+
+	/**
+	 * Sets the path to the database where the friends will be stored (if enabled)
+	 * @param path the database where the friends will be stored.
+	 */
+	public void setFriendsDatabasePath(String path);
+
 	/**
 	 * Gets the chat rooms
 	 * @return an array of LinphoneChatRoom
@@ -1782,22 +2079,25 @@ public interface LinphoneCore {
 
 	/**
 	 * Migrate configuration so that all SIP transports are enabled.
-	 * Versions of linphone < 3.7 did not support using multiple SIP transport simultaneously.
+	 * Versions of linphone &lt; 3.7 did not support using multiple SIP transport simultaneously.
 	 * This function helps application to migrate the configuration so that all transports are enabled.
 	 * Existing proxy configuration are added a transport parameter so that they continue using the unique transport that was set previously.
 	 * This function must be used just after creating the core, before any call to linphone_core_iterate()
-	 * @returns 1 if migration was done, 0 if not done because unnecessary or already done, -1 in case of error.
+	 * @return 1 if migration was done, 0 if not done because unnecessary or already done, -1 in case of error.
 	 */
 	public int migrateToMultiTransport();
 
+	/**
+	 * Migrates the call logs from the linphonerc to the database if not done yet
+	 **/
+	public void migrateCallLogs();
+
 	/**
 	 * When receiving an incoming, accept to start a media session as early-media.
-	 * This means the call is not accepted but audio & video streams can be established if the remote party supports early media.
-	 * However, unlike after call acceptance, mic and camera input are not sent during early-media, though received audio & video are played normally.
+	 * This means the call is not accepted but audio &amp; video streams can be established if the remote party supports early media.
+	 * However, unlike after call acceptance, mic and camera input are not sent during early-media, though received audio &amp; video are played normally.
 	 * The call can then later be fully accepted using linphone_core_accept_call() or linphone_core_accept_call_with_params().
-	 * @param lc the linphonecore
 	 * @param call the call
-	 * @param params the call params, can be NULL.
 	 * @return true if successful, false otherwise.
 	 */
 	public boolean acceptEarlyMedia(LinphoneCall call);
@@ -1805,9 +2105,8 @@ public interface LinphoneCore {
 	/**
 	 * Accept an early media session for an incoming call.
 	 * This is identical as calling linphone_core_accept_early_media_with_params() with NULL call parameters.
-	 * @see linphone_core_accept_early_media_with_params()
-	 * @param lc the core
 	 * @param call the incoming call
+	 * @param params the call params, can be NULL.
 	 * @return true if successful, false otherwise.
 	 */
 	public boolean acceptEarlyMediaWithParams(LinphoneCall call, LinphoneCallParams params);
@@ -1830,7 +2129,7 @@ public interface LinphoneCore {
 	 * Assign an audio file to be played locally in replacement of common telephony tone.
 	 * This is typically used to internationalize tones.
 	 * @param id a tone id
-	 * @param wav a path to a 16 bit PCM linear wav file.
+	 * @param wavfile a path to a 16 bit PCM linear wav file.
 	 */
 	public void setTone(ToneID id, String wavfile);
 
@@ -1859,16 +2158,14 @@ public interface LinphoneCore {
 
 	/**
 	 * Inconditionnaly disable incoming chat messages.
-	 * @param lc the core
-	 * @param deny_reason the deny reason (using ReasonNone has no effect).
-	**/
+	 * @param denycode the deny reason (using ReasonNone has no effect).
+	 */
 	public void disableChat(Reason denycode);
 
 	/**
 	 * Enable reception of incoming chat messages.
 	 * By default it is enabled but it can be disabled with linphone_core_disable_chat().
-	 * @param lc the core
-	**/
+	 */
 	public void enableChat();
 
 
@@ -1956,14 +2253,13 @@ public interface LinphoneCore {
 	/**
 	 * Use to set multicast address to be used for audio stream.
 	 * @param ip an ipv4/6 multicast address
-	 * @return 
-	 * @thow LinphoneCoreException
-	**/
+	 * @throws LinphoneCoreException
+	 */
 	public void setAudioMulticastAddr(String ip) throws LinphoneCoreException;
 	/**
 	 * Use to set multicast address to be used for video stream.
 	 * @param ip an ipv4/6 multicast address
-	 * @thow LinphoneCoreException
+	 * @throws LinphoneCoreException
 	**/
 	public void setVideoMulticastAddr(String ip) throws LinphoneCoreException;
 
@@ -1982,56 +2278,54 @@ public interface LinphoneCore {
 	/**
 	 * Use to set multicast ttl to be used for audio stream.
 	 * @param ttl value or -1 if not used. [0..255] default value is 1
-	 * @thow LinphoneCoreException
+	 * @throws LinphoneCoreException
 	**/
 	public void setAudioMulticastTtl(int ttl)  throws LinphoneCoreException;
 	/**
 	 * Use to set multicast ttl to be used for video stream.
 	 * @param  ttl value or -1 if not used. [0..255] default value is 1
-	 * @thow LinphoneCoreException
+	 * @throws LinphoneCoreException
 	**/
 	public void setVideoMulticastTtl(int ttl) throws LinphoneCoreException;
 
 	/**
 	 * Use to get multicast ttl to be used for audio stream.
 	 * @return a time to leave value
-	 * @thow LinphoneCoreException
-	 * 	**/
+	 */
 	public int getAudioMulticastTtl();
 
 	/**
 	 * Use to get multicast ttl to be used for video stream.
 	 * @return a time to leave value
-	 * @thow LinphoneCoreException
-	**/
+	 */
 	public int getVideoMulticastTtl();
 
 
 	/**
 	 * Use to enable multicast rtp for audio stream.
-	 * * If enabled, outgoing calls put a multicast address from {@link linphone_core_get_video_multicast_addr} into audio cline. In case of outgoing call audio stream is sent to this multicast address.
+	 * If enabled, outgoing calls put a multicast address from {@link getAudioMulticastAddr()} into audio cline. In case of outgoing call audio stream is sent to this multicast address.
 	 * <br> For incoming calls behavior is unchanged.
-	 * @param yesno if yes, subsequent calls will propose multicast ip set by {@link linphone_core_set_audio_multicast_addr}
-	**/
+	 * @param yesno if yes, subsequent calls will propose multicast ip set by {@link setAudioMulticastAddr(String)}
+	 */
 	public void enableAudioMulticast(boolean yesno);
 
 	/**
 	 * Use to get multicast state of audio stream.
-	 * @return true if  subsequent calls will propose multicast ip set by {@link linphone_core_set_audio_multicast_addr}
-	**/
+	 * @return true if  subsequent calls will propose multicast ip set by {@link setAudioMulticastAddr(String)}
+	 */
 	public  boolean audioMulticastEnabled();
 
 	/**
 	 * Use to enable multicast rtp for video stream.
-	 * If enabled, outgoing calls put a multicast address from {@link linphone_core_get_video_multicast_addr} into video cline. In case of outgoing call video stream is sent to this  multicast address.
+	 * If enabled, outgoing calls put a multicast address from {@link getVideoMulticastAddr()} into video cline. In case of outgoing call video stream is sent to this  multicast address.
 	 * <br> For incoming calls behavior is unchanged.
-	 * @param yesno if yes, subsequent outgoing calls will propose multicast ip set by {@link linphone_core_set_video_multicast_addr}
-	**/
+	 * @param yesno if yes, subsequent outgoing calls will propose multicast ip set by {@link setVideoMulticastAddr(String)}
+	 */
 	public void enableVideoMulticast(boolean yesno);
 	/**
 	 * Use to get multicast state of video stream.
-	 * @return true if  subsequent calls will propose multicast ip set by {@link linphone_core_set_video_multicast_addr}
-	**/
+	 * @return true if  subsequent calls will propose multicast ip set by {@link setVideoMulticastAddr(String)}
+	 */
 	public  boolean videoMulticastEnabled();
 
 	/**
@@ -2048,15 +2342,164 @@ public interface LinphoneCore {
 
 	/**
 	 * Set the video preset to be used for video calls.
-	 * @param lc LinphoneCore object
 	 * @param preset The name of the video preset to be used (can be null to use the default video preset).
 	 */
 	public void setVideoPreset(String preset);
 
 	/**
 	 * Get the video preset used for video calls.
-	 * @param lc LinphoneCore object
 	 * @return The name of the video preset used for video calls (can be null if the default video preset is used).
 	 */
 	public String getVideoPreset();
+
+	/**
+	 * Set a provisioning URI to fetch an xml linphonerc config file from, at next LinphoneCore instantiation.
+	**/
+	public void setProvisioningUri(String uri);
+
+	/**
+	 * Get the provisioning URI previously set.
+    **/
+	public String getProvisioningUri();
+
+	/**
+	 * Set an http proxy hostname or IP address to use for SIP connection.
+	 */
+	public void setHttpProxyHost(String host);
+	/**
+	 * Set an http proxy port to use for SIP connection.
+	 */
+	public void setHttpProxyPort(int port);
+	/**
+	 * Get the http proxy host previously set.
+	**/
+	public String getHttpProxyHost();
+	/**
+	 * Get the http proxy port previously set.
+	**/
+	public int getHttpProxyPort();
+
+	/*
+	 * Set the nortp timeout (timeout after which call is closed if no RTP or RTCP packets are received).
+	 */
+	public void setNortpTimeout(int seconds);
+
+	/**
+	 * Get the nortp timeout.
+	 * @return
+	 */
+	public int getNortpTimeout();
+
+	/**
+	 * This method is called by the application to notify the linphone core library when the SIP network is reachable.
+	 * This is for advanced usage, when SIP and RTP layers are required to use different interfaces.
+	 * Most applications just need LinphoneCore.setNetworkReachable().
+	 * @param isReachable whether SIP network is reachable.
+	 */
+	public void setSipNetworkReachable(boolean isReachable);
+	
+	/**
+	 * This method is called by the application to notify the linphone core library when the media (RTP) network is reachable.
+	 * This is for advanced usage, when SIP and RTP layers are required to use different interfaces.
+	 * Most applications just need LinphoneCore.setNetworkReachable().
+	 * @param isReachable whether media network is reachable.
+	 */
+	public void setMediaNetworkReachable(boolean isReachable);
+
+	/**
+	 * Returns the mediastreamer2 (media stack) factory object used by the LinphoneCore. This may be useful to perform
+	 * some advanced media-related configuration options.
+	**/
+	org.linphone.mediastream.Factory getMSFactory();
+
+	/**
+	 * Overrides the list of DNS servers to use.
+	 * Passing null restores the default behaviour, which is to use the dns server list provided by the system.
+	**/
+	public void setDnsServers(String servers[]);
+
+	/**
+	 * Set user certificates directory path (used by SRTP-DTLS).
+	 */
+	public void setUserCertificatesPath(String path);
+
+	/**
+	 * Reload mediastreamer2 plugins from specified directory.
+	 * @param path The path from where plugins are to be loaded.
+	**/
+	public void reloadMsPlugins(String path);
+
+	/**
+	 * Reload sound devices.
+	 * Use it if you change the devices table.
+	 */
+	public void reloadSoundDevices();
+
+	public void setDefaultSoundDevices();
+	
+	public boolean isLimeEncryptionAvailable();
+	
+	public void setLimeEncryption(LinphoneLimeState lime);
+	
+	public LinphoneLimeState getLimeEncryption();
+
+	/**
+	 * Gets the TLS certificate
+	 * @return the TLS certificate
+	 */
+	public String getTlsCertificate();
+
+	/**
+	 * Gets the TLS key file
+	 * @return the TLS key
+	 */
+	public String getTlsKey();
+
+	/**
+	 * Gets the path to the TLS certificate file
+	 * @return the path to the TLS certificate
+	 */
+	public String getTlsCertificatePath();
+
+	/**
+	 * Gets the path to the TLS key file
+	 * @return the path to the TLS key
+	 */
+	public String getTlsKeyPath();
+
+	/**
+	 * Sets the TLS certificate
+	 * @param cert the certificate
+	 */
+	public void setTlsCertificate(String cert);
+	
+	/**
+	 * Sets the TLS key
+	 * @param key the key
+	 */
+	public void setTlsKey(String key);
+
+	/**
+	 * Sets the TLS certificate file path
+	 * @param path the path of the certificate
+	 */
+	public void setTlsCertificatePath(String path);
+	
+	/**
+	 * Sets the TLS key file path
+	 * @param path the path of the key
+	 */
+	public void setTlsKeyPath(String path);
+	
+	/**
+	 * Enable or not openh264
+	 * @param enable
+     */
+	public void enableOpenH264(boolean enable);
+
+	/**
+	 * Return if we enable openh264
+	 * @return
+     */
+	public boolean openH264Enabled();
 }
diff --git a/java/common/org/linphone/core/LinphoneCoreFactory.java b/java/common/org/linphone/core/LinphoneCoreFactory.java
index 52ec82339..5bd3cfe52 100644
--- a/java/common/org/linphone/core/LinphoneCoreFactory.java
+++ b/java/common/org/linphone/core/LinphoneCoreFactory.java
@@ -19,25 +19,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 package org.linphone.core;
 
 
+import android.content.Context;
 
+import org.linphone.tools.OpenH264DownloadHelper;
 
-
+import java.util.ArrayList;
 
 abstract public class LinphoneCoreFactory {
-	
+
+	protected Context fcontext;
 	private static String factoryName = "org.linphone.core.LinphoneCoreFactoryImpl";
-	
-	
-	static LinphoneCoreFactory theLinphoneCoreFactory; 
+
+
+	static LinphoneCoreFactory theLinphoneCoreFactory;
 	/**
 	 * Indicate the name of the class used by this factory
-	 * @param pathName
+	 * @param className
 	 */
 	public static void setFactoryClassName (String className) {
 		factoryName = className;
 	}
-	
-	
+
+
 	public static final synchronized LinphoneCoreFactory instance() {
 		try {
 			if (theLinphoneCoreFactory == null) {
@@ -50,11 +53,12 @@ abstract public class LinphoneCoreFactory {
 		return theLinphoneCoreFactory;
 	}
 	/**
-	 * create  {@link LinphoneAuthInfo}
+	 * Create  {@link LinphoneAuthInfo}
 	 * @param username
-	 * @param userid user id as set in auth header
-	 * @param passwd
-	 * */
+	 * @param password
+	 * @param realm
+	 * @param domain
+	 */
 	abstract public LinphoneAuthInfo createAuthInfo(String username,String password, String realm, String domain);
 	/**
 	 * create  {@link LinphoneAuthInfo}
@@ -65,7 +69,7 @@ abstract public class LinphoneCoreFactory {
 	 * @param realm
 	 * */
 	abstract public LinphoneAuthInfo createAuthInfo(String username, String userid, String passwd, String ha1, String realm, String domain);
-	
+
 	/**
 	 * Create a LinphoneCore object. The LinphoneCore is the root for all liblinphone operations. You need only one per application.
 	 * @param listener listener to receive notifications from the core
@@ -89,10 +93,10 @@ abstract public class LinphoneCoreFactory {
 
 	/**
 	 * Constructs a LinphoneAddress object
-	 * @param username 
+	 * @param username
 	 * @param domain
 	 * @param displayName
-	 * @return 
+	 * @return
 	 */
 	abstract public LinphoneAddress createLinphoneAddress(String username,String domain,String displayName);
 	/**
@@ -103,14 +107,15 @@ abstract public class LinphoneCoreFactory {
 	 */
 	abstract public LinphoneAddress createLinphoneAddress(String address) throws LinphoneCoreException;
 	abstract public LpConfig createLpConfig(String file);
-	
+	abstract public LpConfig createLpConfigFromString(String buffer);
+
 	/**
 	 * Enable verbose traces
 	 * @param enable true to enable debug mode, false to disable it
 	 * @param tag Tag which prefixes each log message.
 	 */
 	abstract public void setDebugMode(boolean enable, String tag);
-	
+
 	/**
 	 * Enable the linphone core log collection to upload logs on a server.
 	 */
@@ -121,22 +126,28 @@ abstract public class LinphoneCoreFactory {
 	 * @param path The path where the log files will be written.
 	 */
 	abstract public void setLogCollectionPath(String path);
-	
+
 	abstract public void setLogHandler(LinphoneLogHandler handler);
-	
+
 	/**
-	 * Create a LinphoneFriend, similar to {@link #createLinphoneFriend()} + {@link LinphoneFriend#setAddress(LinphoneAddress)} 
+	 * Must be calling after the LinphoneCore creation
+	 * @return a new OpenH264DownloadHelper
+	 */
+	abstract public OpenH264DownloadHelper createOpenH264DownloadHelper();
+
+	/**
+	 * Create a LinphoneFriend, similar to {@link #createLinphoneFriend()} + {@link LinphoneFriend#setAddress(LinphoneAddress)}
 	 * @param friendUri a buddy address, must be a sip uri like sip:joe@sip.linphone.org
 	 * @return a new LinphoneFriend with address initialized
 	 */
 	abstract public LinphoneFriend createLinphoneFriend(String friendUri);
-	
+
 	/**
 	 * Create a new LinphoneFriend
 	 * @return
 	 */
 	abstract public LinphoneFriend createLinphoneFriend();
-	
+
 	/**
 	 * Create a LinphoneContent object from string data.
 	 */
@@ -146,7 +157,7 @@ abstract public class LinphoneCoreFactory {
 	 * Create a LinphoneContent object from byte array.
 	 */
 	abstract public LinphoneContent createLinphoneContent(String type, String subType, byte[] data, String encoding);
-	
+
 	/**
 	 * Create a PresenceActivity object.
 	 */
@@ -167,4 +178,20 @@ abstract public class LinphoneCoreFactory {
 	abstract public PresenceModel createPresenceModel();
 	abstract public PresenceModel createPresenceModel(PresenceActivityType type, String description);
 	abstract public PresenceModel createPresenceModel(PresenceActivityType type, String description, String note, String lang);
+
+	/*
+	 * Create TunnelConfig object, used to configure voip anti blocking extension.
+	 */
+	abstract public TunnelConfig createTunnelConfig();
+
+	/**
+	 * Create LinphoneAccountCreator object
+	 */
+	abstract public LinphoneAccountCreator createAccountCreator(LinphoneCore lc, String url);
+
+	/**
+	 * Array of countries list
+	 * @return countries list
+     */
+	abstract public DialPlan[] getAllDialPlan();
 }
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index 55490e6ce..0b6b5eaaf 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -27,9 +27,20 @@ import java.nio.ByteBuffer;
  */
 public interface LinphoneCoreListener {
 
-	/**< Ask the application some authentication information 
-	 * @return */
-	void authInfoRequested(LinphoneCore lc, String realm, String username, String Domain); 
+	/**
+	 * @deprecated
+	 * Ask the application some authentication information 
+	 **/
+	@Deprecated
+	void authInfoRequested(LinphoneCore lc, String realm, String username, String domain);
+	
+	/**
+	 * Ask the application some authentication information
+	 * @param lc the LinphoneCore
+	 * @param authInfo a LinphoneAuthInfo pre-filled with username, realm and domain values as much as possible
+	 * @param method the type of authentication requested (HttpDigest, Tls, ...)
+	 **/
+	void authenticationRequested(LinphoneCore lc, LinphoneAuthInfo authInfo, LinphoneCore.AuthMethod method); 
 
 	/**
 	 * Call stats notification
@@ -102,20 +113,32 @@ public interface LinphoneCoreListener {
 	 */
 	void publishStateChanged(LinphoneCore lc, LinphoneEvent ev, PublishState state);
 
-	/**< @Deprecated Notifies the application that it should show up
-	 * @return */
+	/**
+	 * Notifies the application that it should show up
+	 * @deprecated
+	 */
+	@Deprecated
 	void show(LinphoneCore lc);
 
-	/**< @Deprecated Callback that notifies various events with human readable text.
-	 * @return */
+	/**
+	 * Callback that notifies various events with human readable text.
+	 * @deprecated
+	 */
+	@Deprecated
 	void displayStatus(LinphoneCore lc,String message);
 
-	/**< @Deprecated Callback to display a message to the user 
-	 * @return */
+	/**
+	 * Callback to display a message to the user 
+	 * @deprecated
+	 */
+	@Deprecated
 	void displayMessage(LinphoneCore lc,String message);
 
-	/** @Deprecated Callback to display a warning to the user 
-	 * @return */
+	/**
+	 * Callback to display a warning to the user 
+	 * @deprecated
+	 */
+	@Deprecated
 	void displayWarning(LinphoneCore lc,String message);
 
 	/**
@@ -148,10 +171,10 @@ public interface LinphoneCoreListener {
 	 */
 	int fileTransferSend(LinphoneCore lc, LinphoneChatMessage message, LinphoneContent content, ByteBuffer buffer, int size);
 
-	/** General State notification  
+	/**
+	 * General State notification  
 	 * @param state LinphoneCore.State
-	 * @return 
-	 * */		
+	 */		
 	void globalState(LinphoneCore lc,LinphoneCore.GlobalState state, String message);
 
 	/**
@@ -170,16 +193,15 @@ public interface LinphoneCoreListener {
 	/**
 	 * invoked when a new linphone chat message is received
 	 * @param lc LinphoneCore
-	 * @param  room 	LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
-	 * @param message 	incoming linphone chat message message
+	 * @param cr LinphoneChatRoom involved in this conversation. Can be be created by the framework in case the from is not present in any chat room.
+	 * @param message incoming linphone chat message message
 	 */
 	void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message);
 
 
 	/** Call  State notification  
 	 * @param state LinphoneCall.State
-	 * @return 
-	 * */		
+	 */		
 	void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message);
 
 	/**
@@ -201,7 +223,7 @@ public interface LinphoneCoreListener {
 	/**
 	 * invoked when a composing notification is received
 	 * @param lc LinphoneCore
-	 * @param room LinphoneChatRoom involved in the conversation.
+	 * @param cr LinphoneChatRoom involved in the conversation.
 	 */
 	void isComposingReceived(LinphoneCore lc, LinphoneChatRoom cr);
 
@@ -226,5 +248,19 @@ public interface LinphoneCoreListener {
 	 * @param info Additional information: error message in case of error state, URL of uploaded file in case of success.
 	 */
 	void uploadStateChanged(LinphoneCore lc, LinphoneCore.LogCollectionUploadState state, String info);
+	
+	/**
+	 * Callback prototype for reporting LinphoneFriendList creation.
+	 * @param lc LinphoneCore object
+	 * @param list LinphoneFriendList object
+	 */
+	void friendListCreated(LinphoneCore lc, LinphoneFriendList list);
+	
+	/**
+	 * Callback prototype for reporting LinphoneFriendList removal.
+	 * @param lc LinphoneCore object
+	 * @param list LinphoneFriendList object
+	 */
+	void friendListRemoved(LinphoneCore lc, LinphoneFriendList list);
 }
 
diff --git a/java/common/org/linphone/core/LinphoneCoreListenerBase.java b/java/common/org/linphone/core/LinphoneCoreListenerBase.java
index a7db59c11..7ccc81621 100644
--- a/java/common/org/linphone/core/LinphoneCoreListenerBase.java
+++ b/java/common/org/linphone/core/LinphoneCoreListenerBase.java
@@ -13,10 +13,16 @@ public class LinphoneCoreListenerBase implements LinphoneCoreListener {
 
 	@Override
 	public void authInfoRequested(LinphoneCore lc, String realm,
-			String username, String Domain) {
+			String username, String domain) {
 		// TODO Auto-generated method stub
 
 	}
+	
+	@Override
+	public void authenticationRequested(LinphoneCore lc, 
+			LinphoneAuthInfo authInfo, LinphoneCore.AuthMethod method) {
+		// TODO Auto-generated method stub
+	}
 
 	@Override
 	public void callStatsUpdated(LinphoneCore lc, LinphoneCall call,
@@ -198,4 +204,15 @@ public class LinphoneCoreListenerBase implements LinphoneCoreListener {
 		
 	}
 
+	@Override
+	public void friendListCreated(LinphoneCore lc, LinphoneFriendList list) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void friendListRemoved(LinphoneCore lc, LinphoneFriendList list) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/java/common/org/linphone/core/LinphoneEvent.java b/java/common/org/linphone/core/LinphoneEvent.java
index cca9a3f2d..22b5f4355 100644
--- a/java/common/org/linphone/core/LinphoneEvent.java
+++ b/java/common/org/linphone/core/LinphoneEvent.java
@@ -1,5 +1,8 @@
 package org.linphone.core;
 
+/**
+ * LinphoneEvent
+ */
 public interface LinphoneEvent {
 	/**
 	 * Get the event name as standardized by the event package RFC.
@@ -20,7 +23,7 @@ public interface LinphoneEvent {
 	SubscriptionState getSubscriptionState();
 	/**
 	 * Accept an incoming subscription. After it is accepted the application can immediately start to send notifications with
-	 * {@link LinphoneEvent.notify() }.
+	 * {@link #notify(LinphoneContent) notify()}.
 	 */
 	void acceptSubscription();
 	
@@ -37,13 +40,13 @@ public interface LinphoneEvent {
 	void notify(LinphoneContent content);
 	
 	/**
-	 * Update a subscription initiated previously with {@link LinphoneCore.subscribe() }
+	 * Update a subscription initiated previously with {@link LinphoneCore#subscribe(LinphoneAddress, String, int, LinphoneContent) LinphoneCore.subscribe()}
 	 * @param content the data to be put in the subscribe request.
 	 */
 	void updateSubscribe(LinphoneContent content);
 	
 	/**
-	 * Update a Publish previously started with {@link LinphoneCore.publish() }.
+	 * Update a Publish previously started with {@link LinphoneCore#publish(LinphoneAddress, String, int, LinphoneContent)}.
 	 * @param content the data to be put in the publish request.
 	 */
 	void updatePublish(LinphoneContent content);
diff --git a/java/common/org/linphone/core/LinphoneFriend.java b/java/common/org/linphone/core/LinphoneFriend.java
index 62ad3e1f6..a9c2d9979 100644
--- a/java/common/org/linphone/core/LinphoneFriend.java
+++ b/java/common/org/linphone/core/LinphoneFriend.java
@@ -31,8 +31,7 @@ import java.util.Vector;
 public interface LinphoneFriend {
 	/**
 	 * Enum controlling behavior for incoming subscription request. 
-	 *	Use by {@link LinphoneFriend#setIncSubscribePolicy()}
-	 *
+	 * Used by {@link setIncSubscribePolicy(SubscribePolicy)}
 	 */
 	static class SubscribePolicy {
 
@@ -102,17 +101,38 @@ public interface LinphoneFriend {
 	 * @return true is subscription is activated for this friend.
 	 */
 	boolean isSubscribesEnabled();
+
 	/**
-	 * @brief Get the status of a friend
-	 * @return OnlineStatus
-	 * @deprecated Use getPresenceModel() instead
+	 * get presence received status if already setted
+	 * @return true if presence is received from this friend.
 	 */
+	boolean isPresenceReceived();
+	/**
+	 * Get the status of a friend
+	 * @return OnlineStatus
+	 * @deprecated Use getPresenceModelForUri() instead
+	 */
+	@Deprecated
 	OnlineStatus getStatus();
 	/**
-	 * @brief Get the presence information of a friend
+	 * Get the presence information of a friend
 	 * @return A #PresenceModel object, or null if the friend do not have presence information (in which case he is considered offline)
+	 * @deprecated Use getPresenceModelForUri() instead
 	 */
+	@Deprecated
 	PresenceModel getPresenceModel();
+	
+	/**
+	 * Get the presence information for a specific uri (phone number or sip address)
+	 * @return A #PresenceModel object or null
+	 */
+	PresenceModel getPresenceModelForUri(String uri);
+	
+	/**
+	 * Set the presence information of a friend
+	 * @param presenceModel A #PresenceModel object
+	 */
+	void setPresenceModel(PresenceModel presenceModel);
 	/**
 	 * Starts editing a friend configuration.
 	 *<br> Because friend configuration must be consistent, applications MUST call {@link #edit()} before doing any attempts to modify friend configuration (such as address or subscription policy and so on). 
@@ -145,4 +165,57 @@ public interface LinphoneFriend {
 	 * @return The reference key of the friend.
 	 **/
 	String getRefKey();
+	/**
+	 * Set a name for this friend
+	 * @param name
+	 */
+	void setName(String name);
+	/**
+	 * get a name of this friend
+	 * @return
+	 */
+	String getName();
+	/**
+	 * Set a family name for this friend
+	 * @param name
+	 */
+	void setFamilyName(String name);
+	/**
+	 * get a family name of this friend
+	 * @return
+	 */
+	String getFamilyName();
+	/**
+	 * Set a given name for this friend
+	 * @param name
+	 */
+	void setGivenName(String name);
+	/**
+	 * get a given name of this friend
+	 * @return
+	 */
+	String getGivenName();
+	/**
+	 * Set an organization for this friend
+	 * @param organization
+	 */
+	void setOrganization(String organization);
+	/**
+	 * Get organization of this friend
+	 * @return
+	 */
+	String getOrganization();
+	
+	LinphoneAddress[] getAddresses();
+	void addAddress(LinphoneAddress addr);
+	void removeAddress(LinphoneAddress addr);
+	
+	String[] getPhoneNumbers();
+	void addPhoneNumber(String phone);
+	void removePhoneNumber(String phone);
+	
+	/**
+	 * Returns true if friend has already been added in a LinphoneFriendList, false otherwise
+	 */
+	boolean isAlreadyPresentInFriendList();
 }
diff --git a/java/common/org/linphone/core/LinphoneFriendList.java b/java/common/org/linphone/core/LinphoneFriendList.java
new file mode 100644
index 000000000..ef4ba579a
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneFriendList.java
@@ -0,0 +1,105 @@
+/*
+LinphoneFriend.java
+Copyright (C) 2010  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+import java.util.Vector;
+
+import org.linphone.core.LinphoneChatMessage.State;
+import org.linphone.core.LinphoneAddress;
+
+public interface LinphoneFriendList {
+	public void setRLSAddress(LinphoneAddress addr);
+	public void setRLSUri(String uri);
+	public void addFriend(LinphoneFriend friend);
+	public void addLocalFriend(LinphoneFriend friend);
+	public LinphoneFriend[] getFriendList();
+	public void updateSubscriptions();
+	public void enableSubscriptions(boolean enable);
+	public LinphoneFriend findFriendByUri(String uri);
+	public void setUri(String uri);
+	public void synchronizeFriendsFromServer();
+
+	/**
+	 * Imports LinphoneFriends from a vCard 4 file
+	 * @return the number of friend imported
+	**/
+	public int importFriendsFromVCardFile(String file);
+	
+	/**
+	 * Imports LinphoneFriends from a vCard 4 buffer
+	 * @return the number of friend imported
+	**/
+	public int importFriendsFromVCardBuffer(String buffer);
+	
+	/**
+	 * Exports LinphoneFriends to a vCard 4 file
+	**/
+	public void exportFriendsToVCardFile(String file);
+	
+	long getNativePtr();
+	
+	/**
+	 * Set the callbacks associated with the LinphoneFriendList.
+	 */
+	void setListener(LinphoneFriendList.LinphoneFriendListListener listener);
+	
+	interface LinphoneFriendListListener {
+		void onLinphoneFriendCreated(LinphoneFriendList list, LinphoneFriend lf);
+		
+		void onLinphoneFriendUpdated(LinphoneFriendList list, LinphoneFriend newFriend, LinphoneFriend oldFriend);
+		
+		void onLinphoneFriendDeleted(LinphoneFriendList list, LinphoneFriend lf);
+		
+		void onLinphoneFriendSyncStatusChanged(LinphoneFriendList list, LinphoneFriendList.State status, String message);
+	}
+	public static class State {
+		static private Vector<State> values = new Vector<State>();
+		public final int value() { return mValue; }
+		
+		private final int mValue;
+		private final String mStringValue;
+		
+		public final static State SyncStarted = new State(0, "SyncStarted");
+		public final static State SyncSuccessful = new State(1, "SyncSuccessful");
+		public final static State SyncFailure = new State(2, "SyncFailure");
+		
+		private State(int value,String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue = stringValue;
+		}
+		
+		public static State fromInt(int value) {
+
+			for (int i = 0; i < values.size(); i++) {
+				State state = (State) values.elementAt(i);
+				if (state.mValue == value) return state;
+			}
+			throw new RuntimeException("state not found [" + value + "]");
+		}
+		
+		public String toString() {
+			return mStringValue;
+		}
+		
+		public int toInt() {
+			return mValue;
+		}
+	}
+}
diff --git a/java/common/org/linphone/core/LinphoneInfoMessage.java b/java/common/org/linphone/core/LinphoneInfoMessage.java
index 00362e987..1ae96fd25 100644
--- a/java/common/org/linphone/core/LinphoneInfoMessage.java
+++ b/java/common/org/linphone/core/LinphoneInfoMessage.java
@@ -2,7 +2,7 @@ package org.linphone.core;
 
 /**
  * The LinphoneInfoMessage represents an informational message (INFO) to be transmitted or received by the LinphoneCore.
- * It can be created with {@link LinphoneCore.createInfoMessage() }.
+ * It can be created with {@link LinphoneCore#createInfoMessage()}.
  * @author smorlat
  *
  */
diff --git a/java/common/org/linphone/core/LinphoneLogHandler.java b/java/common/org/linphone/core/LinphoneLogHandler.java
index 9594e1036..1f2c289e9 100644
--- a/java/common/org/linphone/core/LinphoneLogHandler.java
+++ b/java/common/org/linphone/core/LinphoneLogHandler.java
@@ -17,17 +17,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 package org.linphone.core;
+
 /**
  * Interface to implement for handling liblinphone log.
  * <br> use {@link LinphoneCoreFactory#setLogHandler(LinphoneLogHandler)}
  *
  */
 public interface LinphoneLogHandler {
-	public static final int Fatal=1<<4;
-	public static final int Error=1<<3;
-	public static final int Warn=1<<2;
-	public static final int Info=1<<1;
 	public static final int Debug=1;
+	public static final int Trace=1<<1;
+	public static final int Info=1<<2;
+	public static final int Warn=1<<3;
+	public static final int Error=1<<4;
+	public static final int Fatal=1<<5;
 	
 	/**
 	 * Method invoked for each traces
diff --git a/java/common/org/linphone/core/LinphoneNatPolicy.java b/java/common/org/linphone/core/LinphoneNatPolicy.java
new file mode 100644
index 000000000..a177f4d90
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneNatPolicy.java
@@ -0,0 +1,113 @@
+/*
+LinphoneNatPolicy.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+package org.linphone.core;
+
+/**
+ * Policy to use to pass through NATs/firewalls.
+ *
+ */
+public interface LinphoneNatPolicy {
+	/**
+	 * Clear a NAT policy (deactivate all protocols and unset the STUN server).
+	 */
+	void clear();
+
+	/**
+	 * Tell whether STUN is enabled.
+	 * @return Boolean value telling whether STUN is enabled.
+	 */
+	boolean stunEnabled();
+
+	/**
+	 * Enable STUN.
+	 * If TURN is also enabled, TURN will be used instead of STUN.
+	 * @param enable Boolean value telling whether to enable STUN.
+	 */
+	void enableStun(boolean enable);
+
+	/**
+	 * Tell whether TURN is enabled.
+	 * @return Boolean value telling whether TURN is enabled.
+	 */
+	boolean turnEnabled();
+
+	/**
+	 * Enable TURN.
+	 * If STUN is also enabled, it is ignored and TURN is used.
+	 * @param enable Boolean value telling whether to enable TURN.
+	 */
+	void enableTurn(boolean enable);
+
+	/**
+	 * Tell whether ICE is enabled.
+	 * @return Boolean value telling whether ICE is enabled.
+	 */
+	boolean iceEnabled();
+
+	/**
+	 * Enable ICE.
+	 * ICE can be enabled without STUN/TURN, in which case only the local candidates will be used.
+	 * @param enable Boolean value telling whether to enable ICE.
+	 */
+	void enableIce(boolean enable);
+
+	/**
+	 * Tell whether uPnP is enabled.
+	 * @return Boolean value telling whether uPnP is enabled.
+	 */
+	boolean upnpEnabled();
+
+	/**
+	 * Enable uPnP.
+	 * This has the effect to disable every other policies (ICE, STUN and TURN).
+	 * @param enable Boolean value telling whether to enable uPnP.
+	 */
+	void enableUpnp(boolean enable);
+
+	/**
+	 * Get the STUN/TURN server to use with this NAT policy.
+	 * Used when STUN or TURN are enabled.
+	 * @return The STUN server used by this NAT policy.
+	 */
+	String getStunServer();
+
+	/**
+	 * Set the STUN/TURN server to use with this NAT policy.
+	 * Used when STUN or TURN are enabled.
+	 * @param stun_server The STUN server to use with this NAT policy.
+	 */
+	void setStunServer(String stun_server);
+
+	/**
+	 * Get the username used to authenticate with the STUN/TURN server.
+	 * The authentication will search for a LinphoneAuthInfo with this username.
+	 * If it is not set the username of the currently used LinphoneProxyConfig is used to search for a LinphoneAuthInfo.
+	 * @return The username used to authenticate with the STUN/TURN server.
+	 */
+	String getStunServerUsername();
+
+	/**
+	 * Set the username used to authenticate with the STUN/TURN server.
+	 * The authentication will search for a LinphoneAuthInfo with this username.
+	 * If it is not set the username of the currently used LinphoneProxyConfig is used to search for a LinphoneAuthInfo.
+	 * @param username The username used to authenticate with the STUN/TURN server.
+	 */
+	void setStunServerUsername(String username);
+}
diff --git a/java/common/org/linphone/core/LinphoneProxyConfig.java b/java/common/org/linphone/core/LinphoneProxyConfig.java
index 0359c717a..3746ac7a4 100644
--- a/java/common/org/linphone/core/LinphoneProxyConfig.java
+++ b/java/common/org/linphone/core/LinphoneProxyConfig.java
@@ -19,9 +19,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 package org.linphone.core;
 /**
  * The LinphoneProxyConfig object represents a proxy configuration to be used by the LinphoneCore object. Its fields must not be used directly in favour of the accessors methods.
- * Once created and filled properly the LinphoneProxyConfig can be given to LinphoneCore with {@link LinphoneCore#addProxyConfig(LinphoneProxyConfig)}. This will automatically triggers the registration, if enabled.
- *<br>The proxy configuration are persistent to restarts because they are saved in the configuration file. As a consequence, after {@link LinphoneCoreFactory#createLinphoneCore(LinphoneCoreListener, String, String, Object)} there might already be a default proxy that can be examined with {@link LinphoneCore#getDefaultProxyConfig()} .
- *
+ * Once created and filled properly the LinphoneProxyConfig can be given to LinphoneCore with {@link LinphoneCore#addProxyConfig(LinphoneProxyConfig)}. This will automatically triggers the registration, if enabled.<br>
+ * The proxy configuration are persistent to restarts because they are saved in the configuration file. As a consequence, after {@link LinphoneCoreFactory#createLinphoneCore(LinphoneCoreListener, String, String, Object, Object)}
+ * there might already be a default proxy that can be examined with {@link LinphoneCore#getDefaultProxyConfig()} .
  */
 public interface LinphoneProxyConfig {
 
@@ -37,21 +37,34 @@ public interface LinphoneProxyConfig {
 	public void done();
 	/**
 	 * Sets the user identity as a SIP address.
-	 * @param identy This identity is normally formed with display name, username and domain, such as: Alice <sip:alice@example.net> The REGISTER messages will have from and to set to this identity.
+	 * @param identity This identity is normally formed with display name, username and domain, such as: Alice &lt;sip:alice@example.net&gt; The REGISTER messages will have from and to set to this identity.
 	 */
 	public void setIdentity(String identity) throws LinphoneCoreException;
 	/**
 	 *get  the SIP identity that belongs to this proxy configuration.
 	 *
-	 * @return The SIP identity is a SIP address (Display Name <sip:username> )
+	 * @return The SIP identity is a SIP address (Display Name &lt;sip:username&gt; )
 	 */
 	public String getIdentity();
+	/**
+	 * Sets the address of the proxy configuration
+	 * @param address
+	 */
+	public void setAddress(LinphoneAddress address) throws LinphoneCoreException;
+	/**
+	 *get linphoneAddress that belongs to this proxy configuration.
+	 *
+	 * @return LinphoneAddress
+	 */
+	public LinphoneAddress getAddress();
 	/**
 	 *Sets the proxy address
 	 * Examples of valid sip proxy address are:
-	 *<li>IP address: sip:87.98.157.38
-	 *<li>IP address with port: sip:87.98.157.38:5062
-	 *<li>hostnames : sip:sip.example.net
+	 * <ul>
+	 *  <li>IP address: sip:87.98.157.38</li>
+	 *  <li>IP address with port: sip:87.98.157.38:5062</li>
+	 *  <li>hostnames : sip:sip.example.net</li>
+	 * </ul>
 	 * @param proxyUri
 	 * @throws LinphoneCoreException
 	 */
@@ -78,6 +91,13 @@ public interface LinphoneProxyConfig {
 	 * @return
 	 */
 	public String normalizePhoneNumber(String number);
+	/**
+	 * Normalize a human readable sip uri into a fully qualified LinphoneAddress.
+	 * A sip address should look like DisplayName &lt;sip:username\@domain:port&gt;.
+	 * @param username the string to parse
+	 * @return NULL if invalid input, normalized sip address otherwise.
+	 */
+	public LinphoneAddress normalizeSipUri(String username);
 	/**
 	 * Useful function to automatically add international prefix to e164 phone numbers
 	 * @param prefix
@@ -126,8 +146,7 @@ public interface LinphoneProxyConfig {
 	/**
 	 * Indicates  either or not, PUBLISH must be issued for this #LinphoneProxyConfig .
 	 * <br> In case this #LinphoneProxyConfig has been added to #LinphoneCore, follows the linphone_proxy_config_edit() rule.
-	 * @param obj object pointer
-	 * @param val if true, publish will be engaged
+	 * @param enable if true, publish will be engaged
 	 *
 	 */
 	public void enablePublish(boolean enable);
@@ -227,7 +246,7 @@ public interface LinphoneProxyConfig {
 	/**
 	 * Set the outbound proxy realm. It is used in digest authentication to avoid
 	 * re-authentication if a previous token has already been provided.
-	 * @param The new outbound proxy realm.
+	 * @param realm The new outbound proxy realm.
 	 */
 	void setRealm(String realm);
 
@@ -242,7 +261,7 @@ public interface LinphoneProxyConfig {
 	 * @param contact_params a string containing the additional parameters in text form, like "myparam=something;myparam2=something_else"
 	 *
 	 * The main use case for this function is provide the proxy additional information regarding the user agent, like for example unique identifier or android push id.
-	 * As an example, the contact address in the SIP register sent will look like <sip:joe@15.128.128.93:50421>;android-push-id=43143-DFE23F-2323-FA2232.
+	 * As an example, the contact address in the SIP register sent will look like &lt;sip:joe@15.128.128.93:50421&gt;;android-push-id=43143-DFE23F-2323-FA2232.
 	**/
 	public void setContactParameters(String contact_params);
 
@@ -257,7 +276,7 @@ public interface LinphoneProxyConfig {
 	 * @param params a string containing the additional parameters in text form, like "myparam=something;myparam2=something_else"
 	 *
 	 * The main use case for this function is provide the proxy additional information regarding the user agent, like for example unique identifier or apple push id.
-	 * As an example, the contact address in the SIP register sent will look like <sip:joe@15.128.128.93:50421;apple-push-id=43143-DFE23F-2323-FA2232>.
+	 * As an example, the contact address in the SIP register sent will look like &lt;sip:joe@15.128.128.93:50421;apple-push-id=43143-DFE23F-2323-FA2232&gt;.
 	**/
 	public void setContactUriParameters(String params);
 
@@ -269,7 +288,7 @@ public interface LinphoneProxyConfig {
 
 	/**
 	 * Return the international prefix for the given country
-	 * @param country iso code
+	 * @param iso code
 	 */
 	public int lookupCCCFromIso(String iso);
 
@@ -318,4 +337,20 @@ public interface LinphoneProxyConfig {
 	 * @return an Object.
 	 */
 	Object getUserData();
+	
+	/** 
+	 * Set a custom header
+	 * @param name a string containing the name of the header
+	 * @param value a string containing the value of the header
+	 **/
+	public void setCustomHeader(String name, String value);
+	
+	/**
+	 * Return the value of a header
+	 * @param name a string containing the name of the header
+	 * @return the value of the header
+	 **/
+	public String getCustomHeader(String name);
+	
+	
 }
diff --git a/java/common/org/linphone/core/LinphoneXmlRpcRequest.java b/java/common/org/linphone/core/LinphoneXmlRpcRequest.java
new file mode 100644
index 000000000..0bc6a5531
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneXmlRpcRequest.java
@@ -0,0 +1,111 @@
+/*
+LinphoneXmlRpcRequest.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+import java.util.Vector;
+
+public interface LinphoneXmlRpcRequest {
+	interface LinphoneXmlRpcRequestListener {
+		void onXmlRpcRequestResponse(LinphoneXmlRpcRequest request);
+	}
+	
+	public static class ArgType {
+		static private Vector<ArgType> values = new Vector<ArgType>();
+		private final int mValue;
+		private final String mStringValue;
+		
+		public final int value() { return mValue; }
+
+		public final static ArgType None = new ArgType(0, "None");
+		public final static ArgType Int = new ArgType(1, "Int");
+		public final static ArgType String = new ArgType(2, "String");
+		
+		private ArgType(int value, String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue = stringValue;
+		}
+		
+		public static ArgType fromInt(int value) {
+
+			for (int i=0; i < values.size(); i++) {
+				ArgType state = (ArgType) values.elementAt(i);
+				if (state.mValue == value) return state;
+			}
+			throw new RuntimeException("ArgType not found [" + value + "]");
+		}
+		
+		public String toString() {
+			return mStringValue;
+		}
+		
+		public int toInt() {
+			return mValue;
+		}
+	}
+	
+	public static class Status {
+		static private Vector<Status> values = new Vector<Status>();
+		private final int mValue;
+		private final String mStringValue;
+		
+		public final int value() { return mValue; }
+
+		public final static Status Pending = new Status(0, "Pending");
+		public final static Status Ok = new Status(1, "Ok");
+		public final static Status Failed = new Status(2, "Failed");
+		
+		private Status(int value, String stringValue) {
+			mValue = value;
+			values.addElement(this);
+			mStringValue = stringValue;
+		}
+		
+		public static Status fromInt(int value) {
+
+			for (int i=0; i < values.size(); i++) {
+				Status state = (Status) values.elementAt(i);
+				if (state.mValue == value) return state;
+			}
+			throw new RuntimeException("Status not found [" + value + "]");
+		}
+		
+		public String toString() {
+			return mStringValue;
+		}
+		
+		public int toInt() {
+			return mValue;
+		}
+	}
+	
+	void addIntArg(int arg);
+	
+	void addStringArg(String arg);
+	
+	String getContent();
+	
+	Status getStatus();
+	
+	int getIntResponse();
+	
+	String getStringResponse();
+	
+	void setListener(LinphoneXmlRpcRequestListener listener);
+}
diff --git a/java/common/org/linphone/core/LinphoneXmlRpcSession.java b/java/common/org/linphone/core/LinphoneXmlRpcSession.java
new file mode 100644
index 000000000..ef4b27c19
--- /dev/null
+++ b/java/common/org/linphone/core/LinphoneXmlRpcSession.java
@@ -0,0 +1,24 @@
+/*
+LinphoneXmlRpcSession.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+
+public interface LinphoneXmlRpcSession {	
+	void sendRequest(LinphoneXmlRpcRequest request);
+}
diff --git a/java/common/org/linphone/core/LpConfig.java b/java/common/org/linphone/core/LpConfig.java
index 660f6899c..4ddc7b2d5 100644
--- a/java/common/org/linphone/core/LpConfig.java
+++ b/java/common/org/linphone/core/LpConfig.java
@@ -121,7 +121,6 @@ public interface LpConfig {
 	 * Gets a int range from the config
 	 * @param section the section in the lpconfig
 	 * @param key the name of the setting
-	 * @param defaultValue the default value if not set
 	 * @return the value of the setting or the default value if not set
 	 */
 	int[] getIntRange(String section, String key, int defaultMin, int defaultMax);
diff --git a/java/common/org/linphone/core/OnlineStatus.java b/java/common/org/linphone/core/OnlineStatus.java
index d58fc9dd5..b6f2a9bc0 100644
--- a/java/common/org/linphone/core/OnlineStatus.java
+++ b/java/common/org/linphone/core/OnlineStatus.java
@@ -26,6 +26,7 @@ import java.util.Vector;
  * @deprecated Use #PresenceModel and #PresenceActivity instead
  */
 
+@Deprecated
 public class OnlineStatus {
 	
 	static private Vector<OnlineStatus> values = new Vector<OnlineStatus>();
diff --git a/java/common/org/linphone/core/OpenH264DownloadHelperAction.java b/java/common/org/linphone/core/OpenH264DownloadHelperAction.java
new file mode 100644
index 000000000..8ac49b6fd
--- /dev/null
+++ b/java/common/org/linphone/core/OpenH264DownloadHelperAction.java
@@ -0,0 +1,5 @@
+package org.linphone.core;
+
+public interface OpenH264DownloadHelperAction {
+    void startDownload();
+}
diff --git a/java/common/org/linphone/core/OpenH264DownloadHelperListener.java b/java/common/org/linphone/core/OpenH264DownloadHelperListener.java
new file mode 100644
index 000000000..104f042cd
--- /dev/null
+++ b/java/common/org/linphone/core/OpenH264DownloadHelperListener.java
@@ -0,0 +1,18 @@
+package org.linphone.core;
+
+public interface OpenH264DownloadHelperListener {
+	/**
+	 * Called at the beginning of download with current &lt; max Called
+	 * at each iteration of download Called at the ending of download
+	 * with current &gt; max
+	 * @param current: Size of file already downloaded
+	 * @param max: Size of file we want to download
+	 */
+	void OnProgress(int current, int max);
+	
+	/**
+	 * Called when we failed to download codec
+	 * @param error: Error message
+	 */
+	void OnError(String error);
+}
diff --git a/java/common/org/linphone/core/PresenceActivity.java b/java/common/org/linphone/core/PresenceActivity.java
index 17d28bbd9..717227b0f 100644
--- a/java/common/org/linphone/core/PresenceActivity.java
+++ b/java/common/org/linphone/core/PresenceActivity.java
@@ -22,39 +22,39 @@ package org.linphone.core;
 public interface PresenceActivity {
 
 	/**
-	 * @brief Gets the string representation of a presence activity.
+	 * Gets the string representation of a presence activity.
 	 * @return A String representing the given activity.
 	 */
 	String toString();
 
 	/**
-	 * @brief Gets the activity type of a presence activity.
+	 * Gets the activity type of a presence activity.
 	 * @return The #PresenceActivityType of the activity.
 	 */
 	PresenceActivityType getType();
 
 	/**
-	 * @brief Sets the type of activity of a presence activity.
-	 * @param[in] acttype The activity type to set for the activity.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the type of activity of a presence activity.
+	 * @param type The activity type to set for the activity.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setType(PresenceActivityType type);
 
 	/**
-	 * @brief Gets the description of a presence activity.
+	 * Gets the description of a presence activity.
 	 * @return A String containing the description of the presence activity, or null if no description is specified.
 	 */
 	String getDescription();
 
 	/**
-	 * @brief Sets the description of a presence activity.
-	 * @param[in] description An additional description of the activity. Can be null if no additional description is to be added.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the description of a presence activity.
+	 * @param description An additional description of the activity. Can be null if no additional description is to be added.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setDescription(String description);
 
 	/**
-	 * @brief Gets the native pointer for this object.
+	 * Gets the native pointer for this object.
 	 */
 	long getNativePtr();
 
diff --git a/java/common/org/linphone/core/PresenceModel.java b/java/common/org/linphone/core/PresenceModel.java
index 03c372b9c..7e46a1e38 100644
--- a/java/common/org/linphone/core/PresenceModel.java
+++ b/java/common/org/linphone/core/PresenceModel.java
@@ -22,47 +22,47 @@ package org.linphone.core;
 public interface PresenceModel {
 
 	/**
-	 * @brief Gets the basic status of a presence model.
+	 * Gets the basic status of a presence model.
 	 * @return The #BasicStatus of the #PresenceModel object.
 	 */
 	PresenceBasicStatus getBasicStatus();
 
 	/**
-	 * @brief Sets the basic status of a presence model.
-	 * @param[in] basic_status The #BasicStatus to set for the #PresenceModel object.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the basic status of a presence model.
+	 * @param basic_status The #BasicStatus to set for the #PresenceModel object.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setBasicStatus(PresenceBasicStatus basic_status);
 
 	/**
-	 * @brief Gets the timestamp of a presence model.
+	 * Gets the timestamp of a presence model.
 	 * @return The timestamp of the #LinphonePresenceModel object or -1 on error.
 	 */
 	long getTimestamp();
 
 	/**
-	 * @brief Gets the contact of a presence model.
+	 * Gets the contact of a presence model.
 	 * @return A string containing the contact, or null if no contact is found.
 	 */
 	String getContact();
 
 	/**
-	 * @brief Sets the contact of a presence model.
+	 * Sets the contact of a presence model.
 	 * @param contact The contact string to set.
 	 */
 	void setContact(String contact);
 
 	/**
-	 * @brief Gets the first activity of a presence model (there is usually only one).
+	 * Gets the first activity of a presence model (there is usually only one).
 	 * @return A #PresenceActivity object if successful, null otherwise.
 	 */
 	PresenceActivity getActivity();
 
 	/**
-	 * @brief Sets the activity of a presence model (limits to only one activity).
-	 * @param[in] activity The #PresenceActivityType to set for the model.
-	 * @param[in] description An additional description of the activity to set for the model. Can be null if no additional description is to be added.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the activity of a presence model (limits to only one activity).
+	 * @param activity The #PresenceActivityType to set for the model.
+	 * @param description An additional description of the activity to set for the model. Can be null if no additional description is to be added.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 *
 	 * WARNING: This method will modify the basic status of the model according to the activity being set.
 	 * If you don't want the basic status to be modified automatically, you can use the combination of setBasicStatus(), clearActivities() and addActivity().
@@ -70,103 +70,103 @@ public interface PresenceModel {
 	int setActivity(PresenceActivityType activity, String description);
 
 	/**
-	 * @brief Gets the number of activities included in the presence model.
+	 * Gets the number of activities included in the presence model.
 	 * @return The number of activities included in the #PresenceModel object.
 	 */
 	long getNbActivities();
 
 	/**
-	 * @brief Gets the nth activity of a presence model.
+	 * Gets the nth activity of a presence model.
 	 * @param idx The index of the activity to get (the first activity having the index 0).
 	 * @return A #PresenceActivity object if successful, null otherwise.
 	 */
 	PresenceActivity getNthActivity(long idx);
 
 	/**
-	 * @brief Adds an activity to a presence model.
-	 * @param[in] activity The #PresenceActivity to add to the model.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds an activity to a presence model.
+	 * @param activity The #PresenceActivity to add to the model.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int addActivity(PresenceActivity activity);
 
 	/**
-	 * @brief Clears the activities of a presence model.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears the activities of a presence model.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearActivities();
 
 	/**
-	 * @brief Gets the first note of a presence model (there is usually only one).
-	 * @param[in] lang The language of the note to get. Can be null to get a note that has no language specified or to get the first note whatever language it is written into.
+	 * Gets the first note of a presence model (there is usually only one).
+	 * @param lang The language of the note to get. Can be null to get a note that has no language specified or to get the first note whatever language it is written into.
 	 * @return A #PresenceNote object if successful, null otherwise.
 	 */
 	PresenceNote getNote(String lang);
 
 	/**
-	 * @brief Adds a note to a presence model.
-	 * @param[in] note_content The note to be added to the presence model.
-	 * @param[in] lang The language of the note to be added. Can be null if no language is to be specified for the note.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds a note to a presence model.
+	 * @param note_content The note to be added to the presence model.
+	 * @param lang The language of the note to be added. Can be null if no language is to be specified for the note.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 *
 	 * Only one note for each language can be set, so e.g. setting a note for the 'fr' language if there is only one will replace the existing one.
 	 */
 	int addNote(String note_content, String lang);
 
 	/**
-	 * @brief Clears all the notes of a presence model.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears all the notes of a presence model.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearNotes();
 
 	/**
-	 * @brief Gets the number of services included in the presence model.
+	 * Gets the number of services included in the presence model.
 	 * @return The number of services included in the #PresenceModel object.
 	 */
 	long getNbServices();
 
 	/**
-	 * @brief Gets the nth service of a presence model.
-	 * @param[in] idx The index of the service to get (the first service having the index 0).
+	 * Gets the nth service of a presence model.
+	 * @param idx The index of the service to get (the first service having the index 0).
 	 * @return A #PresenceService object if successful, null otherwise.
 	 */
 	PresenceService getNthService(long idx);
 
 	/**
-	 * @brief Adds a service to a presence model.
-	 * @param[in] service The #PresenceService object to add to the model.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds a service to a presence model.
+	 * @param service The #PresenceService object to add to the model.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int addService(PresenceService service);
 
 	/**
-	 * @brief Clears the services of a presence model.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears the services of a presence model.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearServices();
 
 	/**
-	 * @brief Gets the number of persons included in the presence model.
+	 * Gets the number of persons included in the presence model.
 	 * @return The number of persons included in the #PresenceModel object.
 	 */
 	long getNbPersons();
 
 	/**
-	 * @brief Gets the nth person of a presence model.
-	 * @param[in] idx The index of the person to get (the first person having the index 0).
+	 * Gets the nth person of a presence model.
+	 * @param idx The index of the person to get (the first person having the index 0).
 	 * @return A pointer to a #PresencePerson object if successful, null otherwise.
 	 */
 	PresencePerson getNthPerson(long idx);
 
 	/**
-	 * @brief Adds a person to a presence model.
-	 * @param[in] person The #PresencePerson object to add to the model.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds a person to a presence model.
+	 * @param person The #PresencePerson object to add to the model.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int addPerson(PresencePerson person);
 
 	/**
-	 * @brief Clears the persons of a presence model.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears the persons of a presence model.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearPersons();
 
diff --git a/java/common/org/linphone/core/PresenceNote.java b/java/common/org/linphone/core/PresenceNote.java
index 8d9bd55fe..6a497ab3a 100644
--- a/java/common/org/linphone/core/PresenceNote.java
+++ b/java/common/org/linphone/core/PresenceNote.java
@@ -22,33 +22,33 @@ package org.linphone.core;
 public interface PresenceNote {
 
 	/**
-	 * @brief Gets the content of a presence note.
+	 * Gets the content of a presence note.
 	 * @return A String with the content of the presence note.
 	 */
 	String getContent();
 
 	/**
-	 * @brief Sets the content of a presence note.
-	 * @param[in] content The content of the note.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the content of a presence note.
+	 * @param content The content of the note.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setContent(String content);
 
 	/**
-	 * @brief Gets the language of a presence note.
+	 * Gets the language of a presence note.
 	 * @return A String containing the language of the presence note, or null if no language is specified.
 	 */
 	String getLang();
 
 	/**
-	 * @brief Sets the language of a presence note.
-	 * @param[in] lang The language of the note.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the language of a presence note.
+	 * @param lang The language of the note.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setLang(String lang);
 
 	/**
-	 * @brief Gets the native pointer for this object.
+	 * Gets the native pointer for this object.
 	 */
 	long getNativePtr();
 
diff --git a/java/common/org/linphone/core/PresencePerson.java b/java/common/org/linphone/core/PresencePerson.java
index 3db93e26c..0b02cb127 100644
--- a/java/common/org/linphone/core/PresencePerson.java
+++ b/java/common/org/linphone/core/PresencePerson.java
@@ -22,98 +22,98 @@ package org.linphone.core;
 public interface PresencePerson {
 
 	/**
-	 * @brief Gets the id of a presence person.
+	 * Gets the id of a presence person.
 	 * @return A string containing the id.
 	 */
 	String getId();
 
 	/**
-	 * @brief Sets the id of a presence person.
-	 * @param[in] id The id string to set. Can be null to generate it automatically.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the id of a presence person.
+	 * @param id The id string to set. Can be null to generate it automatically.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setId(String id);
 
 	/**
-	 * @brief Gets the number of activities included in the presence person.
+	 * Gets the number of activities included in the presence person.
 	 * @return The number of activities included in the #PresencePerson object.
 	 */
 	long getNbActivities();
 
 	/**
-	 * @brief Gets the nth activity of a presence person.
-	 * @param[in] idx The index of the activity to get (the first activity having the index 0).
+	 * Gets the nth activity of a presence person.
+	 * @param idx The index of the activity to get (the first activity having the index 0).
 	 * @return A #PresenceActivity object if successful, null otherwise.
 	 */
 	PresenceActivity getNthActivity(long idx);
 
 	/**
-	 * @brief Adds an activity to a presence person.
-	 * @param[in] activity The #PresenceActivity object to add to the person.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds an activity to a presence person.
+	 * @param activity The #PresenceActivity object to add to the person.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int addActivity(PresenceActivity activity);
 
 	/**
-	 * @brief Clears the activities of a presence person.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears the activities of a presence person.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearActivities();
 
 	/**
-	 * @brief Gets the number of notes included in the presence person.
+	 * Gets the number of notes included in the presence person.
 	 * @return The number of notes included in the #PresencePerson object.
 	 */
 	long getNbNotes();
 
 	/**
-	 * @brief Gets the nth note of a presence person.
-	 * @param[in] idx The index of the note to get (the first note having the index 0).
+	 * Gets the nth note of a presence person.
+	 * @param idx The index of the note to get (the first note having the index 0).
 	 * @return A pointer to a #PresenceNote object if successful, null otherwise.
 	 */
 	PresenceNote getNthNote(long idx);
 
 	/**
-	 * @brief Adds a note to a presence person.
-	 * @param[in] note The #PresenceNote object to add to the person.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds a note to a presence person.
+	 * @param note The #PresenceNote object to add to the person.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int addNote(PresenceNote note);
 
 	/**
-	 * @brief Clears the notes of a presence person.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears the notes of a presence person.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearNotes();
 
 	/**
-	 * @brief Gets the number of activities notes included in the presence person.
+	 * Gets the number of activities notes included in the presence person.
 	 * @return The number of activities notes included in the #PresencePerson object.
 	 */
 	long getNbActivitiesNotes();
 
 	/**
-	 * @brief Gets the nth activities note of a presence person.
-	 * @param[in] idx The index of the activities note to get (the first note having the index 0).
+	 * Gets the nth activities note of a presence person.
+	 * @param idx The index of the activities note to get (the first note having the index 0).
 	 * @return A pointer to a #PresenceNote object if successful, null otherwise.
 	 */
 	PresenceNote getNthActivitiesNote(long idx);
 
 	/**
-	 * @brief Adds an activities note to a presence person.
-	 * @param[in] note The #PresenceNote object to add to the person.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds an activities note to a presence person.
+	 * @param note The #PresenceNote object to add to the person.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int addActivitiesNote(PresenceNote note);
 
 	/**
-	 * @brief Clears the activities notes of a presence person.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears the activities notes of a presence person.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearActivitesNotes();
 
 	/**
-	 * @brief Gets the native pointer for this object.
+	 * Gets the native pointer for this object.
 	 */
 	long getNativePtr();
 
diff --git a/java/common/org/linphone/core/PresenceService.java b/java/common/org/linphone/core/PresenceService.java
index 6ffcdcd4e..5059ec71e 100644
--- a/java/common/org/linphone/core/PresenceService.java
+++ b/java/common/org/linphone/core/PresenceService.java
@@ -22,72 +22,72 @@ package org.linphone.core;
 public interface PresenceService {
 
 	/**
-	 * @brief Gets the id of a presence service.
+	 * Gets the id of a presence service.
 	 * @return A string containing the id.
 	 */
 	String getId();
 
 	/**
-	 * @brief Sets the id of a presence service.
-	 * @param[in] id The id string to set. Can be null to generate it automatically.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the id of a presence service.
+	 * @param id The id string to set. Can be null to generate it automatically.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setId(String id);
 
 	/**
-	 * @brief Gets the basic status of a presence service.
+	 * Gets the basic status of a presence service.
 	 * @return The #PresenceBasicStatus of the #PresenceService object.
 	 */
 	PresenceBasicStatus getBasicStatus();
 
 	/**
-	 * @brief Sets the basic status of a presence service.
-	 * @param[in] status The #PresenceBasicStatus to set for the #PresenceService object.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the basic status of a presence service.
+	 * @param status The #PresenceBasicStatus to set for the #PresenceService object.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setBasicStatus(PresenceBasicStatus status);
 
 	/**
-	 * @brief Gets the contact of a presence service.
+	 * Gets the contact of a presence service.
 	 * @return A string containing the contact, or null if no contact is found.
 	 */
 	String getContact();
 
 	 /**
-	 * @brief Sets the contact of a presence service.
-	 * @param[in] contact The contact string to set.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Sets the contact of a presence service.
+	 * @param contact The contact string to set.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int setContact(String contact);
 
 	/**
-	 * @brief Gets the number of notes included in the presence service.
+	 * Gets the number of notes included in the presence service.
 	 * @return The number of notes included in the #PresenceService object.
 	 */
 	long getNbNotes();
 
 	/**
-	 * @brief Gets the nth note of a presence service.
-	 * @param[in] idx The index of the note to get (the first note having the index 0).
+	 * Gets the nth note of a presence service.
+	 * @param idx The index of the note to get (the first note having the index 0).
 	 * @return A pointer to a #PresenceNote object if successful, null otherwise.
 	 */
 	PresenceNote getNthNote(long idx);
 
 	/**
-	 * @brief Adds a note to a presence service.
-	 * @param[in] note The #PresenceNote object to add to the service.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Adds a note to a presence service.
+	 * @param note The #PresenceNote object to add to the service.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int addNote(PresenceNote note);
 
 	/**
-	 * @brief Clears the notes of a presence service.
-	 * @return 0 if successful, a value < 0 in case of error.
+	 * Clears the notes of a presence service.
+	 * @return 0 if successful, a value &lt; 0 in case of error.
 	 */
 	int clearNotes();
 
 	/**
-	 * @brief Gets the native pointer for this object.
+	 * Gets the native pointer for this object.
 	 */
 	long getNativePtr();
 
diff --git a/java/common/org/linphone/core/PublishState.java b/java/common/org/linphone/core/PublishState.java
index b89c831eb..58e17331e 100644
--- a/java/common/org/linphone/core/PublishState.java
+++ b/java/common/org/linphone/core/PublishState.java
@@ -14,12 +14,14 @@ public enum PublishState {
 	 */
 	Ok(2), 
 	/**
-	 * Publish encountered an error. {@link LinphoneEvent.getReason()} gives more information about failure.
+	 * Publish encountered an error.
+	 * {@link LinphoneEvent#getReason()} gives more information about failure.
 	 */
 	Error(3),
 	/**
-	 * Publish is about to expire. Application can trigger a refresh by calling {@link LinphoneCore.updatePublish()}
-	 * [sip]->refresh_generic_subscribe property is set to 0.
+	 * Publish is about to expire.
+	 * Application can trigger a refresh by calling {@link LinphoneEvent#updatePublish(LinphoneContent)}
+	 * [sip]-&gt;refresh_generic_subscribe property is set to 0.
 	 */
 	Expiring(4),
 	/**
diff --git a/java/common/org/linphone/core/SubscriptionState.java b/java/common/org/linphone/core/SubscriptionState.java
index 0a278556e..6cfea7191 100644
--- a/java/common/org/linphone/core/SubscriptionState.java
+++ b/java/common/org/linphone/core/SubscriptionState.java
@@ -26,12 +26,12 @@ public enum SubscriptionState {
 	 */
 	Terminated(5), 
 	/**
-	 * Subscription encountered an error, indicated by { @link LinphoneEvent.getReason() }
+	 * Subscription encountered an error, indicated by {@link LinphoneEvent#getReason()}
 	 */
 	Error(6),
 	
 	/**
-	 * Subscription is about to expire, only notified if [sip]->refresh_generic_subscribe property is set to 0
+	 * Subscription is about to expire, only notified if [sip]-&lt;refresh_generic_subscribe property is set to 0
 	 */
 	Expiring(7);
 	protected final int mValue;
diff --git a/java/common/org/linphone/core/TunnelConfig.java b/java/common/org/linphone/core/TunnelConfig.java
new file mode 100644
index 000000000..a7eb28c3f
--- /dev/null
+++ b/java/common/org/linphone/core/TunnelConfig.java
@@ -0,0 +1,53 @@
+package org.linphone.core;
+
+/**
+ * The TunnelConfig interface allows to configure information about a tunnel server (voip anti blocking).
+ * @author smorlat
+ *
+ */
+public interface TunnelConfig {
+	/**
+	 * Get the hostname of the tunnel server
+	 * @return
+	 */
+	String getHost();
+	/**
+	 * Set the hostname (or ip address) of the tunnel server.
+	 * @param host
+	 */
+	void setHost(String host);
+	/**
+	 * Get the port where to connect.
+	 * @return
+	 */
+	int getPort();
+	/**
+	 * Set the port where to connect to the tunnel server.
+	 * When not set, the default value is used (443).
+	 * @param port
+	 */
+	void setPort(int port);
+	/**
+	 * Get the remote udp mirror port, which is used to check udp connectivity of the network.
+	 * @return
+	 */
+	int getRemoteUdpMirrorPort();
+	/**
+	 * Set the udp mirror port, which is used to check udp connectivity.
+	 * When not set, a default value of 12345 is used.
+	 * @param remoteUdpMirrorPort
+	 */
+	void setRemoteUdpMirrorPort(int remoteUdpMirrorPort);
+	/**
+	 * Get the maximum amount of time for waiting for UDP packets to come back during 
+	 * the UDP connectivity check, in milliseconds.
+	 * 
+	 * @return
+	 */
+	int getDelay();
+	/**
+	 * Set the maximum amount of time for waiting for UDP packets to come back during 
+	 * the UDP connectivity check, in milliseconds.
+	 */
+	void setDelay(int delay);
+}
diff --git a/java/impl/org/linphone/core/DialPlanImpl.java b/java/impl/org/linphone/core/DialPlanImpl.java
new file mode 100644
index 000000000..cf97433c3
--- /dev/null
+++ b/java/impl/org/linphone/core/DialPlanImpl.java
@@ -0,0 +1,44 @@
+package org.linphone.core;
+
+
+public class DialPlanImpl implements DialPlan {
+    private final String countryName;
+    private final String countryCode;
+    private final String countryCallingCode;
+    private final int numberLength;
+    private final String usualPrefix;
+
+    public DialPlanImpl(String countryName, String countryCode, String countryCallingCode, int numberLength, String usualPrefix) {
+        this.countryName = countryName;
+        this.countryCode = countryCode;
+        this.countryCallingCode = countryCallingCode;
+        this.numberLength = numberLength;
+        this.usualPrefix = usualPrefix;
+    }
+
+
+    @Override
+    public final String getCountryCode() {
+        return countryCode;
+    }
+
+    @Override
+    public final String getCountryName() {
+        return countryName;
+    }
+
+    @Override
+    public final String getCountryCallingCode() {
+        return countryCallingCode;
+    }
+
+    @Override
+    public final int getNumberLength() {
+        return numberLength;
+    }
+
+    @Override
+    public final String getUsualPrefix() {
+        return usualPrefix;
+    }
+}
diff --git a/java/impl/org/linphone/core/LinphoneAccountCreatorImpl.java b/java/impl/org/linphone/core/LinphoneAccountCreatorImpl.java
new file mode 100644
index 000000000..a43b9d33b
--- /dev/null
+++ b/java/impl/org/linphone/core/LinphoneAccountCreatorImpl.java
@@ -0,0 +1,234 @@
+/*LinphoneAccountCreatorImpl.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+import org.linphone.core.LinphoneAddress.TransportType;
+
+public class LinphoneAccountCreatorImpl implements LinphoneAccountCreator {
+	protected long nativePtr;
+
+	protected LinphoneAccountCreatorImpl(long aNativePtr)  {
+		nativePtr = aNativePtr;
+	}
+
+	private native long newLinphoneAccountCreator(long lc, String url);
+	public LinphoneAccountCreatorImpl(LinphoneCore lc, String url) {
+		nativePtr = newLinphoneAccountCreator(((LinphoneCoreImpl)lc).nativePtr, url);
+	}
+
+	public long getNativePtr() {
+		return nativePtr;
+	}
+
+	private native void unref(long ptr);
+	protected void finalize() {
+		unref(nativePtr);
+	}
+
+	private native void setListener(long ptr, LinphoneAccountCreatorListener listener);
+	@Override
+	public void setListener(LinphoneAccountCreatorListener listener) {
+		setListener(nativePtr, listener);
+	}
+
+	private native int setUsername(long ptr, String username);
+	@Override
+	public Status setUsername(String username) {
+		return Status.fromInt(setUsername(nativePtr, username));
+	}
+
+	private native String getUsername(long ptr);
+	@Override
+	public String getUsername() {
+		return getUsername(nativePtr);
+	}
+
+	private native int setPhoneNumber(long ptr, String phoneNumber, String countryCode);
+	@Override
+	public Status setPhoneNumber(String phoneNumber, String countryCode) {
+		return Status.fromInt(setPhoneNumber(nativePtr, phoneNumber, countryCode));
+	}
+
+	private native String getPhoneNumber(long ptr);
+	@Override
+	public String getPhoneNumber() {
+		return getPhoneNumber(nativePtr);
+	}
+
+	private native int setPassword(long ptr, String password);
+	@Override
+	public Status setPassword(String password) {
+		return Status.fromInt(setPassword(nativePtr, password));
+	}
+
+	private native String getPassword(long ptr);
+	@Override
+	public String getPassword() {
+		return getPassword(nativePtr);
+	}
+
+	private native int setHa1(long ptr, String ha1);
+	@Override
+	public Status setHa1(String ha1) {
+		return Status.fromInt(setHa1(nativePtr, ha1));
+	}
+
+	private native String getHa1(long ptr);
+	@Override
+	public String getHa1() {
+		return getHa1(nativePtr);
+	}
+
+	private native int setActivationCode(long ptr, String activationCode);
+	@Override
+	public Status setActivationCode(String activationCode) {
+		return Status.fromInt(setActivationCode(nativePtr, activationCode));
+	}
+
+	private native int setLanguage(long ptr, String lang);
+	@Override
+	public Status setLanguage(String lang) {
+		return Status.fromInt(setLanguage(nativePtr, lang));
+	}
+
+	private native int setTransport(long ptr, int transport);
+	@Override
+	public Status setTransport(TransportType transport) {
+		return Status.fromInt(setTransport(nativePtr, transport.toInt()));
+	}
+
+	private native int getTransport(long ptr);
+	@Override
+	public TransportType getTransport() {
+		return TransportType.fromInt(getTransport(nativePtr));
+	}
+
+	private native int setDomain(long ptr, String domain);
+	@Override
+	public Status setDomain(String domain) {
+		return Status.fromInt(setDomain(nativePtr, domain));
+	}
+
+	private native String getDomain(long ptr);
+	@Override
+	public String getDomain() {
+		return getDomain(nativePtr);
+	}
+
+	private native int setRoute(long ptr, String route);
+	@Override
+	public Status setRoute(String route) {
+		return Status.fromInt(setRoute(nativePtr, route));
+	}
+
+	private native String getRoute(long ptr);
+	@Override
+	public String getRoute() {
+		return getRoute(nativePtr);
+	}
+
+	private native int setDisplayName(long ptr, String displayName);
+	@Override
+	public Status setDisplayName(String displayName) {
+		return Status.fromInt(setDisplayName(nativePtr, displayName));
+	}
+
+	private native String getDisplayName(long ptr);
+	@Override
+	public String getDisplayName() {
+		return getDisplayName(nativePtr);
+	}
+
+	private native int setEmail(long ptr, String email);
+	@Override
+	public Status setEmail(String email) {
+		return Status.fromInt(setEmail(nativePtr, email));
+	}
+
+	private native String getEmail(long ptr);
+	@Override
+	public String getEmail() {
+		return getEmail(nativePtr);
+	}
+
+	private native String getPrefix(long ptr, String s);
+	@Override
+	public String getPrefix(String phone) {
+		return getPrefix(nativePtr, phone);
+	}
+
+	private native int isAccountUsed(long ptr);
+	@Override
+	public Status isAccountUsed() {
+		return Status.fromInt(isAccountUsed(nativePtr));
+	}
+
+	private native int createAccount(long ptr);
+	@Override
+	public Status createAccount() {
+		return Status.fromInt(createAccount(nativePtr));
+	}
+
+	private native int activateAccount(long ptr);
+	@Override
+	public Status activateAccount() {
+		return Status.fromInt(activateAccount(nativePtr));
+	}
+
+	private native int isAccountLinked(long ptr);
+	@Override
+	public Status isAccountLinked() {
+		return Status.fromInt(isAccountLinked(nativePtr));
+	}
+
+	private native int isPhoneNumberUsed(long ptr);
+	@Override
+	public Status isPhoneNumberUsed() {
+		return Status.fromInt(isPhoneNumberUsed(nativePtr));
+	}
+
+	private native int isAccountActivated(long ptr);
+	@Override
+	public Status isAccountActivated() {
+		return Status.fromInt(isAccountActivated(nativePtr));
+	}
+
+	private native int linkPhoneNumberWithAccount(long ptr);
+	@Override
+	public Status linkPhoneNumberWithAccount() {
+		return Status.fromInt(linkPhoneNumberWithAccount(nativePtr));
+	}
+
+	private native int activatePhoneNumberLink(long ptr);
+	@Override
+	public Status activatePhoneNumberLink() {
+		return Status.fromInt(activatePhoneNumberLink(nativePtr));
+	}
+
+	private native int recoverPhoneAccount(long ptr);
+	@Override
+	public Status recoverPhoneAccount() {
+		return Status.fromInt(recoverPhoneAccount(nativePtr));
+	}
+
+	private native LinphoneProxyConfig configure(long ptr);
+	@Override
+	public LinphoneProxyConfig configure() {
+		return configure(nativePtr);
+	}
+}
diff --git a/java/impl/org/linphone/core/LinphoneAuthInfoImpl.java b/java/impl/org/linphone/core/LinphoneAuthInfoImpl.java
index f67aa4c94..26a416915 100644
--- a/java/impl/org/linphone/core/LinphoneAuthInfoImpl.java
+++ b/java/impl/org/linphone/core/LinphoneAuthInfoImpl.java
@@ -30,10 +30,18 @@ class LinphoneAuthInfoImpl implements LinphoneAuthInfo {
 	private native void setUsername(long ptr, String username);
 	private native void setUserId(long ptr, String username);
 	private native void setHa1(long ptr, String ha1);
+	private native void setDomain(long ptr, String domain);
+	private native void setTlsCertificate(long ptr, String cert);
+	private native void setTlsKey(long ptr, String key);
+	private native void setTlsCertificatePath(long ptr, String path);
+	private native void setTlsKeyPath(long ptr, String path);
 	private native String getUserId(long ptr);
 	private native String getHa1(long ptr);
 	private native String getDomain(long ptr);
-	private native void setDomain(long ptr, String domain);
+	private native String getTlsCertificate(long ptr);
+	private native String getTlsKey(long ptr);
+	private native String getTlsCertificatePath(long ptr);
+	private native String getTlsKeyPath(long ptr);
 	
 	boolean ownPtr = false;
 	protected LinphoneAuthInfoImpl(String username,String password, String realm, String domain)  {
@@ -111,4 +119,44 @@ class LinphoneAuthInfoImpl implements LinphoneAuthInfo {
 				getDomain());
 		return clone;
 	}
+	
+	@Override
+	public String getTlsCertificate() {
+		return getTlsCertificate(nativePtr);
+	}
+	
+	@Override
+	public String getTlsKey() {
+		return getTlsKey(nativePtr);
+	}
+	
+	@Override
+	public String getTlsCertificatePath() {
+		return getTlsCertificatePath(nativePtr);
+	}
+	
+	@Override
+	public String getTlsKeyPath() {
+		return getTlsKeyPath(nativePtr);
+	}
+	
+	@Override
+	public void setTlsCertificate(String cert) {
+		setTlsCertificate(nativePtr, cert);
+	}
+	
+	@Override
+	public void setTlsKey(String key) {
+		setTlsKey(nativePtr, key);
+	}
+	
+	@Override
+	public void setTlsCertificatePath(String path) {
+		setTlsCertificatePath(nativePtr, path);
+	}
+	
+	@Override
+	public void setTlsKeyPath(String path) {
+		setTlsKeyPath(nativePtr, path);
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneCallImpl.java b/java/impl/org/linphone/core/LinphoneCallImpl.java
index 131ec6c47..a1e5f5118 100644
--- a/java/impl/org/linphone/core/LinphoneCallImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCallImpl.java
@@ -44,6 +44,8 @@ class LinphoneCallImpl implements LinphoneCall {
 	private native float getCurrentQuality(long nativePtr);
 	private native float getAverageQuality(long nativePtr);
 	private native boolean mediaInProgress(long nativePtr);
+	private native void setListener(long ptr, LinphoneCallListener listener);
+	native private long getDiversionAddress(long nativePtr);
 	
 	/*
 	 * This method must always be called from JNI, nothing else.
@@ -164,8 +166,11 @@ class LinphoneCallImpl implements LinphoneCall {
 	}
 
 	public boolean isInConference() {
-		LinphoneCallParamsImpl params = new LinphoneCallParamsImpl(getCurrentParamsCopy(nativePtr));
-		return params.localConferenceMode();
+		return getConference() != null;
+	}
+	public native LinphoneConference getConference(long nativePtr);
+	public LinphoneConference getConference() {
+		return getConference(nativePtr);
 	}
 
 	public boolean mediaInProgress() { return mediaInProgress(nativePtr);}
@@ -254,5 +259,25 @@ class LinphoneCallImpl implements LinphoneCall {
 	public LinphonePlayer getPlayer() {
 		return new LinphonePlayerImpl(getPlayer(nativePtr));
 	}
+	
+	private native Object getChatRoom(long nativePtr);
+	@Override
+	public LinphoneChatRoom getChatRoom() {
+		return (LinphoneChatRoom)(getChatRoom(nativePtr));
+	}
+
+	@Override
+	public void setListener(LinphoneCallListener listener) {
+		setListener(nativePtr, listener);
+	}
+    
+	public LinphoneAddress getDiversionAddress() {
+        long lNativePtr = getDiversionAddress(nativePtr);
+        if (lNativePtr!=0) {
+            return new LinphoneAddressImpl(lNativePtr,LinphoneAddressImpl.WrapMode.FromConst);
+        } else {
+            return null;
+        }
+    }
 
 }
diff --git a/java/impl/org/linphone/core/LinphoneCallLogImpl.java b/java/impl/org/linphone/core/LinphoneCallLogImpl.java
index 0a78e9147..40108721e 100644
--- a/java/impl/org/linphone/core/LinphoneCallLogImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCallLogImpl.java
@@ -29,8 +29,9 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
 	private native int getStatus(long nativePtr);
 	private native String getStartDate(long nativePtr);
 	private native int getCallDuration(long nativePtr);
-	private native int getCallId(long nativePtr);
+	private native String getCallId(long nativePtr);
 	private native long getTimestamp(long nativePtr);
+	private native boolean wasConference(long nativePtr);
 	
 	LinphoneCallLogImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
@@ -62,11 +63,14 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
 	public int getCallDuration() {
 		return getCallDuration(nativePtr);
 	}
-	public int getCallId() {
+	public String getCallId() {
 		return getCallId(nativePtr);
 	}
 	
 	public long getTimestamp() {
 		return getTimestamp(nativePtr) * 1000;  // Need milliseconds, not seconds
 	}
+	public boolean wasConference() {
+		return wasConference(nativePtr);
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneCallParamsImpl.java b/java/impl/org/linphone/core/LinphoneCallParamsImpl.java
index b70d43aaa..3fc57257f 100644
--- a/java/impl/org/linphone/core/LinphoneCallParamsImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCallParamsImpl.java
@@ -18,7 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 package org.linphone.core;
 
+import org.linphone.core.LinphoneCore.MediaDirection;
 import org.linphone.core.LinphoneCore.MediaEncryption;
+import org.linphone.core.LinphoneCore.StreamType;
 
 public class LinphoneCallParamsImpl implements LinphoneCallParams {
 	protected final long nativePtr;
@@ -107,6 +109,42 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams {
 		return getCustomHeader(nativePtr,name);
 	}
 
+	private native void addCustomSdpAttribute(long nativePtr, String name, String value); 
+	@Override
+	public void addCustomSdpAttribute(String name, String value) {
+		addCustomSdpAttribute(nativePtr, name, value);
+	}
+
+	private native void addCustomSdpMediaAttribute(long nativePtr, int type, String name, String value); 
+	@Override
+	public void addCustomSdpMediaAttribute(StreamType type, String name, String value) {
+		addCustomSdpMediaAttribute(nativePtr, type.mValue, name, value);
+	}
+
+	private native String getCustomSdpAttribute(long nativePtr, String name);
+	@Override
+	public String getCustomSdpAttribute(String name) {
+		return getCustomSdpAttribute(nativePtr, name);
+	}
+
+	private native String getCustomSdpMediaAttribute(long nativePtr, int type, String name);
+	@Override
+	public String getCustomSdpMediaAttribute(StreamType type, String name) {
+		return getCustomSdpMediaAttribute(nativePtr, type.mValue, name);
+	}
+
+	private native void clearCustomSdpAttributes(long nativePtr);
+	@Override
+	public void clearCustomSdpAttributes() {
+		clearCustomSdpAttributes(nativePtr);
+	}
+
+	private native void clearCustomSdpMediaAttributes(long nativePtr, int type);
+	@Override
+	public void clearCustomSdpMediaAttributes(StreamType type) {
+		clearCustomSdpMediaAttributes(nativePtr, type.mValue);
+	}
+
 	private native void setPrivacy(long nativePtr, int mask);
 	@Override
 	public void setPrivacy(int privacy_mask) {
@@ -171,4 +209,40 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams {
 	public boolean videoMulticastEnabled() {
 		return videoMulticastEnabled(nativePtr);
 	}
+
+	private native void enableRealTimeText(long nativePtr, boolean yesno);
+	@Override
+	public void enableRealTimeText(boolean yesno) {
+		enableRealTimeText(nativePtr, yesno);
+	}
+
+	private native boolean realTimeTextEnabled(long nativePtr);
+	@Override
+	public boolean realTimeTextEnabled() {
+		return realTimeTextEnabled(nativePtr);
+	}
+
+	private native int getAudioDirection(long nativePtr);
+	@Override
+	public MediaDirection getAudioDirection() {
+		return MediaDirection.fromInt(getAudioDirection(nativePtr));
+	}
+
+	private native int getVideoDirection(long nativePtr);
+	@Override
+	public MediaDirection getVideoDirection() {
+		return MediaDirection.fromInt(getVideoDirection(nativePtr));
+	}
+
+	private native void setAudioDirection(long nativePtr, int direction);
+	@Override
+	public void setAudioDirection(MediaDirection direction) {
+		setAudioDirection(nativePtr, direction.mValue);
+	}
+
+	private native void setVideoDirection(long nativePtr, int direction);
+	@Override
+	public void setVideoDirection(MediaDirection direction) {
+		setVideoDirection(nativePtr, direction.mValue);
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneCallStatsImpl.java b/java/impl/org/linphone/core/LinphoneCallStatsImpl.java
index 3897c03f6..add4f982b 100644
--- a/java/impl/org/linphone/core/LinphoneCallStatsImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCallStatsImpl.java
@@ -34,6 +34,7 @@ class LinphoneCallStatsImpl implements LinphoneCallStats {
 	private float localLossRate;
 	private float localLateRate;
 	private long nativePtr;
+	private long nativeCPtr;
 
 	private native int getMediaType(long nativeStatsPtr);
 	private native int getIceState(long nativeStatsPtr);
@@ -48,10 +49,14 @@ class LinphoneCallStatsImpl implements LinphoneCallStats {
 	private native float getJitterBufferSize(long nativeStatsPtr);
 	private native float getLocalLossRate(long nativeStatsPtr);
 	private native float getLocalLateRate(long nativeStatsPtr);
+	private native String getEncoderName(long nativeStatsPtr, long nativeCallPtr, long payloadPtr);
+	private native String getDecoderName(long nativeStatsPtr, long nativeCallPtr, long payloadPtr);
 	private native void updateStats(long nativeCallPtr, int mediaType);
+	private native int getIpFamilyOfRemote(long nativeStatsPtr);
 
 	protected LinphoneCallStatsImpl(long nativeCallPtr, long nativeStatsPtr) {
-		nativePtr=nativeStatsPtr;
+		nativePtr = nativeStatsPtr;
+		nativeCPtr = nativeCallPtr;
 		mediaType = getMediaType(nativeStatsPtr);
 		iceState = getIceState(nativeStatsPtr);
 		downloadBandwidth = getDownloadBandwidth(nativeStatsPtr);
@@ -63,7 +68,7 @@ class LinphoneCallStatsImpl implements LinphoneCallStats {
 		roundTripDelay = getRoundTripDelay(nativeStatsPtr);
 		latePacketsCumulativeNumber = getLatePacketsCumulativeNumber(nativeStatsPtr, nativeCallPtr);
 		jitterBufferSize = getJitterBufferSize(nativeStatsPtr);
-		
+
 	}
 
 	protected void updateRealTimeStats(LinphoneCall call){
@@ -123,4 +128,20 @@ class LinphoneCallStatsImpl implements LinphoneCallStats {
 	public float getLocalLateRate(){
 		return localLateRate;
 	}
+
+	public String getEncoderName(PayloadType pl) {
+		if (pl == null)
+			return "";
+		return getEncoderName(nativePtr, nativeCPtr, ((PayloadTypeImpl)pl).nativePtr);
+	}
+
+	public String getDecoderName(PayloadType pl) {
+		if (pl == null)
+			return "";
+		return getDecoderName(nativePtr, nativeCPtr, ((PayloadTypeImpl)pl).nativePtr);
+	}
+
+	public int getIpFamilyOfRemote() {
+		return getIpFamilyOfRemote(nativePtr);
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
index 8665e4049..d36446737 100644
--- a/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
+++ b/java/impl/org/linphone/core/LinphoneChatMessageImpl.java
@@ -3,7 +3,7 @@ package org.linphone.core;
 import java.io.UnsupportedEncodingException;
 
 public class LinphoneChatMessageImpl implements LinphoneChatMessage {
-	protected final long nativePtr;
+	protected long nativePtr;
 	private native byte[] getText(long ptr);
 	private native long getPeerAddress(long ptr);
 	private native String getExternalBodyUrl(long ptr);
@@ -16,7 +16,7 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	private native void store(long ptr);
 	private native int getStorageId(long ptr);
 	private native void setFileTransferFilepath(long ptr, String path);
-	private native void downloadFile(long ptr);
+	private native int downloadFile(long ptr);
 	private native void setListener(long ptr, LinphoneChatMessageListener listener);
 	private native void unref(long ptr);
 	
@@ -112,7 +112,7 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 		return new ErrorInfoImpl(getErrorInfo(nativePtr));
 	}
 	protected void finalize() throws Throwable{
-		unref(nativePtr);
+		destroy();
 		super.finalize();
 	}
 	
@@ -146,12 +146,24 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
 	}
 	
 	@Override
-	public void downloadFile() {
-		downloadFile(nativePtr);
+	public int downloadFile() {
+		return downloadFile(nativePtr);
 	}
 	
 	@Override
 	public void setListener(LinphoneChatMessageListener listener) {
 		setListener(nativePtr, listener);
 	}
+	
+	private native void putChar(long nativePtr, long character);
+	@Override
+	public void putChar(long character) throws LinphoneCoreException {
+		putChar(nativePtr, character);
+	}
+	public void destroy(){
+		if (nativePtr != 0) {
+			unref(nativePtr);
+			nativePtr = 0;
+		}
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneChatRoomImpl.java b/java/impl/org/linphone/core/LinphoneChatRoomImpl.java
index c19a9ae8b..2c4b27635 100644
--- a/java/impl/org/linphone/core/LinphoneChatRoomImpl.java
+++ b/java/impl/org/linphone/core/LinphoneChatRoomImpl.java
@@ -20,6 +20,7 @@ package org.linphone.core;
 
 import org.linphone.core.LinphoneChatMessage.State;
 import org.linphone.core.LinphoneChatMessage.StateListener;
+import org.linphone.core.LinphoneCall;
 
 @SuppressWarnings("deprecation")
 class LinphoneChatRoomImpl implements LinphoneChatRoom {
@@ -28,8 +29,8 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
 	private native long getPeerAddress(long ptr);
 	private native void sendMessage(long ptr, String message);
 	private native void sendMessage2(long ptr, Object msg, long messagePtr, StateListener listener);
-	private native long[] getHistoryRange(long ptr, int begin, int end);
-	private native long[] getHistory(long ptr, int limit);
+	private native Object[] getHistoryRange(long ptr, int begin, int end);
+	private native Object[] getHistory(long ptr, int limit);
 	private native void destroy(long ptr);
 	private native int getUnreadMessagesCount(long ptr);
 	private native int getHistorySize(long ptr);
@@ -42,7 +43,15 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
 			String url, int state, long timestamp, boolean isRead,
 			boolean isIncoming);
 	private native void sendChatMessage(long ptr, Object message, long messagePtr);
-
+	private native void finalize(long nativePtr);
+	
+	protected void finalize() throws Throwable {
+		if (nativePtr != 0) {
+			finalize(nativePtr);
+		}
+		super.finalize();
+	}
+	
 	protected LinphoneChatRoomImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
 	}
@@ -79,22 +88,18 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
 
 	public LinphoneChatMessage[] getHistoryRange(int begin, int end) {
 		synchronized(getCore()){
-			long[] typesPtr = getHistoryRange(nativePtr, begin, end);
+			Object[] typesPtr = getHistoryRange(nativePtr, begin, end);
 			return getHistoryPrivate(typesPtr);
 		}
 	}
 
 	public LinphoneChatMessage[] getHistory(int limit) {
 		synchronized(getCore()){
-			long[] typesPtr = getHistory(nativePtr, limit);
+			Object[] typesPtr = getHistory(nativePtr, limit);
 			return getHistoryPrivate(typesPtr);
 		}
 	}
 
-	public void destroy() {
-		destroy(nativePtr);
-	}
-
 	public int getUnreadMessagesCount() {
 		synchronized(getCore()){
 			return getUnreadMessagesCount(nativePtr);
@@ -152,15 +157,8 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
 	public synchronized LinphoneCore getCore() {
 		return (LinphoneCore)getCore(nativePtr);
 	}
-	private LinphoneChatMessage[] getHistoryPrivate(long[] typesPtr) {
-		if (typesPtr == null) return null;
-
-		LinphoneChatMessage[] messages = new LinphoneChatMessage[typesPtr.length];
-		for (int i=0; i < messages.length; i++) {
-			messages[i] = new LinphoneChatMessageImpl(typesPtr[i]);
-		}
-
-		return messages;
+	private LinphoneChatMessage[] getHistoryPrivate(Object[] typesPtr) {
+		return (LinphoneChatMessage[]) typesPtr;
 	}
 	
 	private native long createFileTransferMessage(long ptr, String name, String type, String subtype, int size);
@@ -174,4 +172,16 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
 	public void sendChatMessage(LinphoneChatMessage message) {
 		sendChatMessage(nativePtr, message, ((LinphoneChatMessageImpl)message).getNativePtr());
 	}
+	
+	private native Object getCall(long nativePtr);
+	@Override
+	public LinphoneCall getCall() {
+		return (LinphoneCall) getCall(nativePtr);
+	}
+	
+	private native long getChar(long nativePtr);
+	@Override
+	public long getChar() {
+		return getChar(nativePtr);
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneConferenceImpl.java b/java/impl/org/linphone/core/LinphoneConferenceImpl.java
new file mode 100644
index 000000000..7404b878d
--- /dev/null
+++ b/java/impl/org/linphone/core/LinphoneConferenceImpl.java
@@ -0,0 +1,41 @@
+/*
+LinphoneConferenceImpl.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+package org.linphone.core;
+
+import org.linphone.core.LinphoneConference;
+
+public class LinphoneConferenceImpl implements LinphoneConference {
+	private final long nativePtr;
+	
+	
+	private LinphoneConferenceImpl(long nativePtr) {
+		this.nativePtr = nativePtr;
+	}
+	
+	private native LinphoneAddress[] getParticipants(long nativePtr);
+	public LinphoneAddress[] getParticipants() {
+		return getParticipants(nativePtr);
+	}
+	
+	private native int removeParticipant(long nativePtr, LinphoneAddress uri);
+	public int removeParticipant(LinphoneAddress uri) {
+		return removeParticipant(nativePtr, uri);
+	}
+}
diff --git a/java/impl/org/linphone/core/LinphoneConferenceParamsImpl.java b/java/impl/org/linphone/core/LinphoneConferenceParamsImpl.java
new file mode 100644
index 000000000..12fe5f3db
--- /dev/null
+++ b/java/impl/org/linphone/core/LinphoneConferenceParamsImpl.java
@@ -0,0 +1,51 @@
+/*
+LinphoneConferenceParamsImpl.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+package org.linphone.core;
+
+public class LinphoneConferenceParamsImpl implements LinphoneConferenceParams {
+	private long nativePtr = 0;
+	
+	private native long createInstance(LinphoneCoreImpl core);
+	public LinphoneConferenceParamsImpl(LinphoneCore core) {
+		this.nativePtr = createInstance((LinphoneCoreImpl)core);
+	}
+
+	private native long copyInstance(long paramsPtr);
+	public LinphoneConferenceParamsImpl(LinphoneConferenceParamsImpl params) {
+		nativePtr = copyInstance(params.nativePtr);
+	}
+
+	private native void destroyInstance(long nativePtr);
+	public void finalize() {
+		destroyInstance(this.nativePtr);
+	}
+
+	private native void enableVideo(long paramsPtr, boolean enable);
+	@Override
+	public void enableVideo(boolean enable) {
+		enableVideo(this.nativePtr, enable);
+	}
+
+	private native boolean isVideoRequested(long paramsPtr);
+	@Override
+	public boolean isVideoRequested() {
+		return isVideoRequested(this.nativePtr);
+	}
+}
\ No newline at end of file
diff --git a/java/impl/org/linphone/core/LinphoneContentImpl.java b/java/impl/org/linphone/core/LinphoneContentImpl.java
index 0231fd539..34b95e37f 100644
--- a/java/impl/org/linphone/core/LinphoneContentImpl.java
+++ b/java/impl/org/linphone/core/LinphoneContentImpl.java
@@ -1,3 +1,22 @@
+/*
+LinphoneContentImpl.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 package org.linphone.core;
 
 public class LinphoneContentImpl implements LinphoneContent {
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 2e36ba62e..4fbb4de04 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -10,7 +10,7 @@ of the License, or (at your option) any later version.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU General Public License fo r more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
@@ -18,54 +18,57 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 package org.linphone.core;
 
+import android.content.Context;
+
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
+import org.linphone.mediastream.Log;
 import org.linphone.mediastream.MediastreamerAndroidContext;
 import org.linphone.mediastream.Version;
-
-import android.util.Log;
+import org.linphone.tools.OpenH264DownloadHelper;
 
 public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
+	public static String ABI;
 
 	private static boolean loadOptionalLibrary(String s) {
 		try {
 			System.loadLibrary(s);
 			return true;
 		} catch (Throwable e) {
-			Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library lib" + s);
+			android.util.Log.w("LinphoneCoreFactoryImpl", "Unable to load optional library " + s + ": " +e.getMessage());
 		}
 		return false;
 	}
 
 	static {
-		List<String> cpuabis=Version.getCpuAbis();
-		String ffmpegAbi;
-		boolean libLoaded=false;
-		Throwable firstException=null;
-		for (String abi : cpuabis){
-			Log.i("LinphoneCoreFactoryImpl","Trying to load liblinphone for " + abi);
-			ffmpegAbi=abi;
-			// FFMPEG (audio/video)
-			if (abi.startsWith("armeabi")) {
-				ffmpegAbi="arm";
-			}
-			loadOptionalLibrary("ffmpeg-linphone-"+ffmpegAbi);
+		List<String> cpuabis = Version.getCpuAbis();
+		boolean libLoaded = false;
+		Throwable firstException = null;
+		System.loadLibrary("gnustl_shared");
+		for (String abi : cpuabis) {
+			android.util.Log.i("LinphoneCoreFactoryImpl", "Trying to load liblinphone for " + abi);
+			loadOptionalLibrary("ffmpeg-linphone-" + abi);
 			//Main library
 			try {
+				System.loadLibrary("bctoolbox-" + abi);
+				System.loadLibrary("ortp-" + abi);
+				System.loadLibrary("mediastreamer_base-" + abi);
+				System.loadLibrary("mediastreamer_voip-" + abi);
 				System.loadLibrary("linphone-" + abi);
-				Log.i("LinphoneCoreFactoryImpl","Loading done with " + abi);
-				libLoaded=true;
+				ABI = abi;
+				libLoaded = true;
 				break;
-			}catch(Throwable e) {
-				if (firstException == null) firstException=e;
+			} catch(Throwable e) {
+				if (firstException == null) firstException = e;
 			}
 		}
-		
+
 		if (!libLoaded){
 			throw new RuntimeException(firstException);
-			
+
 		}else{
 			Version.dumpCapabilities();
 		}
@@ -86,10 +89,33 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	public LinphoneAddress createLinphoneAddress(String identity) throws LinphoneCoreException {
 		return new LinphoneAddressImpl(identity);
 	}
-	
+
 	@Override
 	public LpConfig createLpConfig(String file) {
-		return new LpConfigImpl(file);
+		return LpConfigImpl.fromFile(file);
+	}
+
+	public LpConfig createLpConfigFromString(String buffer) {
+		return LpConfigImpl.fromBuffer(buffer);
+	}
+
+	private boolean loadOpenH264(Context context) {
+		File file = new File(context.getFilesDir()+"/../lib/libmsopenh264.so");
+
+		if (!file.exists()) {
+			Log.i("LinphoneCoreFactoryImpl"," Openh264 disabled on the project");
+			return false;
+		}
+
+		OpenH264DownloadHelper downloadHelper = new OpenH264DownloadHelper(context);
+		if (downloadHelper.isCodecFound()) {
+			org.linphone.mediastream.Log.i("LinphoneCoreFactoryImpl"," Loading OpenH264 plugin:" + downloadHelper.getFullPathLib());
+			System.load(downloadHelper.getFullPathLib());
+		} else {
+			org.linphone.mediastream.Log.i("LinphoneCoreFactoryImpl"," Cannot load OpenH264 plugin");
+		}
+
+		return true;
 	}
 
 	@Override
@@ -97,10 +123,13 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 			String userConfig, String factoryConfig, Object userdata, Object context)
 			throws LinphoneCoreException {
 		try {
+			fcontext = (Context)context;
+			boolean openh264Enabled = loadOpenH264(fcontext);
 			MediastreamerAndroidContext.setContext(context);
 			File user = userConfig == null ? null : new File(userConfig);
 			File factory = factoryConfig == null ? null : new File(factoryConfig);
 			LinphoneCore lc = new LinphoneCoreImpl(listener, user, factory, userdata);
+			lc.enableOpenH264(openh264Enabled);
 			if(context!=null) lc.setContext(context);
 			return lc;
 		} catch (IOException e) {
@@ -111,8 +140,11 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	@Override
 	public LinphoneCore createLinphoneCore(LinphoneCoreListener listener, Object context) throws LinphoneCoreException {
 		try {
+			fcontext = (Context)context;
+			boolean openh264Enabled = loadOpenH264(fcontext);
 			MediastreamerAndroidContext.setContext(context);
 			LinphoneCore lc = new LinphoneCoreImpl(listener);
+			lc.enableOpenH264(openh264Enabled);
 			if(context!=null) lc.setContext(context);
 			return lc;
 		} catch (IOException e) {
@@ -123,13 +155,22 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	@Override
 	public native void setDebugMode(boolean enable, String tag);
 
-	
+
 	private native void _setLogHandler(Object handler);
 	@Override
 	public void setLogHandler(LinphoneLogHandler handler) {
 		_setLogHandler(handler);
 	}
 
+	@Override
+	public OpenH264DownloadHelper createOpenH264DownloadHelper() {
+		if (fcontext == null) {
+			new LinphoneCoreException("Cannot create OpenH264DownloadHelper");
+			return null;//exception
+		}
+		return new OpenH264DownloadHelper(fcontext);
+	}
+
 	@Override
 	public LinphoneFriend createLinphoneFriend(String friendUri) {
 		return new LinphoneFriendImpl(friendUri);
@@ -139,7 +180,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	public LinphoneFriend createLinphoneFriend() {
 		return createLinphoneFriend(null);
 	}
-	
+
 	@Override
 	public native void enableLogCollection(boolean enable);
 
@@ -162,7 +203,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 			byte [] data, String encoding) {
 		return new LinphoneContentImpl(type,subType,data,encoding);
 	}
-	
+
 	@Override
 	public LinphoneContent createLinphoneContent(String type, String subType,
 			String data) {
@@ -193,4 +234,21 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 	public PresenceModel createPresenceModel(PresenceActivityType type, String description, String note, String lang) {
 		return new PresenceModelImpl(type, description, note, lang);
 	}
+
+	private native Object _createTunnelConfig();
+	@Override
+	public TunnelConfig createTunnelConfig() {
+		return (TunnelConfig)_createTunnelConfig();
+	}
+
+	@Override
+	public LinphoneAccountCreator createAccountCreator(LinphoneCore lc, String url) {
+		return new LinphoneAccountCreatorImpl(lc, url);
+	}
+
+	private native DialPlan[] getAllDialPlanNative();
+	@Override
+	public DialPlan[] getAllDialPlan(){
+		return getAllDialPlanNative();
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index f7d727506..40cbf5416 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -25,12 +25,15 @@ import java.io.IOException;
 
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCoreListener;
+import org.linphone.core.LinphoneProxyConfigImpl;
+
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.media.AudioManager;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.MulticastLock;
@@ -42,6 +45,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	protected long nativePtr = 0;
 	private Context mContext = null;
 	private AudioManager mAudioManager = null;
+	private boolean openh264Enabled = false;
 	private boolean mSpeakerEnabled = false;
 	private native long newLinphoneCore(LinphoneCoreListener listener,String userConfig,String factoryConfig,Object  userdata);
 	private native void iterate(long nativePtr);
@@ -62,7 +66,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native boolean isInComingInvitePending(long nativePtr);
 	private native void acceptCall(long nativePtr, long call);
 	private native long getCallLog(long nativePtr,int position);
+	native private long[] getCallLogs(long nativePtr);
 	private native int getNumberOfCallLogs(long nativePtr);
+	private native long getLastOutgoingCallLog(long nativePtr);
 	private native void delete(long nativePtr);
 	private native void setNetworkStateReachable(long nativePtr,boolean isReachable);
 	private native boolean isNetworkStateReachable(long nativePtr);
@@ -72,6 +78,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native long interpretUrl(long nativePtr,String destination);
 	private native Object inviteAddress(long nativePtr,long to);
 	private native Object inviteAddressWithParams(long nativePtrLc,long to, long nativePtrParam);
+	private native int sendDtmfs(long nativePtr,String dtmf);
 	private native void sendDtmf(long nativePtr,char dtmf);
 	private native void clearCallLogs(long nativePtr);
 	private native boolean isMicMuted(long nativePtr);
@@ -92,20 +99,26 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setPreviewWindowId(long nativePtr, Object wid);
 	private native void setDeviceRotation(long nativePtr, int rotation);
 	private native void addFriend(long nativePtr,long friend);
+	private native void addFriendList(long nativePtr,long friendList);
+	private native void removeFriendList(long nativePtr,long friendList);
 	private native LinphoneFriend[] getFriendList(long nativePtr);
 	private native void setPresenceInfo(long nativePtr, int minutes_away, String alternative_contact, int status);
 	private native int getPresenceInfo(long nativePtr);
 	private native void setPresenceModel(long nativePtr, long presencePtr);
 	private native Object getPresenceModel(long nativePtr);
-	private native long getOrCreateChatRoom(long nativePtr,String to);
+	private native Object getOrCreateChatRoom(long nativePtr,String to);
+	private native Object getChatRoom(long nativePtr,long to);
 	private native void enableVideo(long nativePtr,boolean vcap_enabled,boolean display_enabled);
 	private native boolean isVideoEnabled(long nativePtr);
 	private native boolean isVideoSupported(long nativePtr);
+	private native boolean isVCardSupported(long nativePtr);
 	private native void setFirewallPolicy(long nativePtr, int enum_value);
 	private native int getFirewallPolicy(long nativePtr);
+	private native Object createNatPolicy(long nativePtr);
+	private native void setNatPolicy(long nativePtr, long policyPtr);
+	private native Object getNatPolicy(long nativePtr);
 	private native void setStunServer(long nativePtr, String stun_server);
 	private native String getStunServer(long nativePtr);
-	private native long createDefaultCallParams(long nativePtr);
 	private native int updateCall(long ptrLc, long ptrCall, long ptrParams);
 	private native int getUploadBandwidth(long nativePtr);
 	private native void setUploadBandwidth(long nativePtr, int bw);
@@ -117,6 +130,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setRing(long nativePtr, String path);
 	private native String getRing(long nativePtr);
 	private native void setRootCA(long nativePtr, String path);
+	private native void setRootCAData(long nativePtr, String data);
 	private native void setRingback(long nativePtr, String path);
 	private native long[] listVideoPayloadTypes(long nativePtr);
 	private native void setVideoCodecs(long nativePtr, long[] codecs);
@@ -128,6 +142,8 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void enableKeepAlive(long nativePtr,boolean enable);
 	private native boolean isKeepAliveEnabled(long nativePtr);
 	private native int startEchoCalibration(long nativePtr,Object data);
+	private native int startEchoTester(long nativePtr, int rate);
+	private native int stopEchoTester(long nativePtr);
 	private native int getSignalingTransportPort(long nativePtr, int code);
 	private native void setSignalingTransportPorts(long nativePtr, int udp, int tcp, int tls);
 	private native void enableIpv6(long nativePtr,boolean enable);
@@ -161,8 +177,11 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native String getPrimaryContactUsername(long nativePtr);
 	private native String getPrimaryContactDisplayName(long nativePtr);
 	private native void setChatDatabasePath(long nativePtr, String path);
-	private native long[] getChatRooms(long nativePtr);
+	private native void setCallLogsDatabasePath(long nativePtr, String path);
+	private native void setFriendsDatabasePath(long nativePtr, String path);
+	private native Object[] getChatRooms(long nativePtr);
 	private native int migrateToMultiTransport(long nativePtr);
+	private native void migrateCallLogs(long nativePtr);
 	private native void setCallErrorTone(long nativePtr, int reason, String path);
 	private native void enableSdp200Ack(long nativePtr,boolean enable);
 	private native boolean isSdp200AckEnabled(long nativePtr);
@@ -170,6 +189,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native static void setAndroidPowerManager(Object pm);
 	private native void setAndroidWifiLock(long nativePtr,Object wifi_lock);
 	private native void setAndroidMulticastLock(long nativePtr,Object multicast_lock);
+	private native void reloadMsPlugins(long nativePtr, String path);
+	private native void reloadSoundDevices(long nativePtr);
+	private native void setDefaultSoundDevices(long nativePtr);
 
 	LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig, File factoryConfig, Object userdata) throws IOException {
 		mListener = listener;
@@ -195,6 +217,8 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 	public void setContext(Object context) {
 		mContext = (Context)context;
+		ApplicationInfo info = mContext.getApplicationInfo();
+		reloadMsPlugins(info.nativeLibraryDir);
 		mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
 		setAndroidPowerManager(mContext.getSystemService(Context.POWER_SERVICE));
 		if (Version.sdkAboveOrEqual(Version.API12_HONEYCOMB_MR1_31X)) {
@@ -207,10 +231,14 @@ class LinphoneCoreImpl implements LinphoneCore {
 			WifiManager wifiManager=(WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); 
 			MulticastLock lock = wifiManager.createMulticastLock("linphonecore ["+ nativePtr+"] multicast-lock");
 			lock.setReferenceCounted(true);
-			setAndroidMulticastLock(nativePtr,lock);
+			setAndroidMulticastLock(nativePtr, lock);
 		}
 	}
 
+	public Context getContext() {
+		return mContext;
+	}
+
 	public synchronized void addAuthInfo(LinphoneAuthInfo info) {
 		isValid();
 		addAuthInfo(nativePtr,((LinphoneAuthInfoImpl)info).nativePtr);
@@ -218,7 +246,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 	public synchronized void removeAuthInfo(LinphoneAuthInfo info) {
 		isValid();
-		removeAuthInfo(nativePtr,((LinphoneAuthInfoImpl)info).nativePtr);
+		removeAuthInfo(nativePtr, ((LinphoneAuthInfoImpl) info).nativePtr);
 	}
 
 	public synchronized LinphoneProxyConfig getDefaultProxyConfig() {
@@ -250,7 +278,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 	public synchronized void removeProxyConfig(LinphoneProxyConfig proxyCfg) {
 		isValid();
-		removeProxyConfig(nativePtr, ((LinphoneProxyConfigImpl)proxyCfg).nativePtr);
+		removeProxyConfig(nativePtr, ((LinphoneProxyConfigImpl) proxyCfg).nativePtr);
 	}
 	public synchronized void clearAuthInfos() {
 		isValid();
@@ -283,16 +311,23 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 	public synchronized void acceptCall(LinphoneCall aCall) {
 		isValid();
-		acceptCall(nativePtr,((LinphoneCallImpl)aCall).nativePtr);
+		acceptCall(nativePtr, ((LinphoneCallImpl) aCall).nativePtr);
 	}
 	public synchronized LinphoneCallLog[] getCallLogs() {
-		isValid();
-		LinphoneCallLog[] logs = new LinphoneCallLog[getNumberOfCallLogs(nativePtr)];
-		for (int i=0;i < getNumberOfCallLogs(nativePtr);i++) {
-			logs[i] = new LinphoneCallLogImpl(getCallLog(nativePtr, i));
+		long[] typesPtr = getCallLogs(nativePtr);
+		if (typesPtr == null) return null;
+ 		isValid();
+		LinphoneCallLog[] logs = new LinphoneCallLog[typesPtr.length];
+		for (int i=0;i < logs.length; i++) {
+			logs[i] = new LinphoneCallLogImpl(typesPtr[i]);
 		}
 		return logs;
 	}
+	public synchronized LinphoneCallLog getLastOutgoingCallLog(){
+		isValid();
+		long callLog = getLastOutgoingCallLog(nativePtr);
+		return new LinphoneCallLogImpl(callLog);
+	}
 	public synchronized void destroy() {
 		setAndroidPowerManager(null);
 		delete(nativePtr);
@@ -305,17 +340,17 @@ class LinphoneCoreImpl implements LinphoneCore {
 		}
 	}
 	public synchronized void setNetworkReachable(boolean isReachable) {
-		setNetworkStateReachable(nativePtr,isReachable);
+		setNetworkStateReachable(nativePtr, isReachable);
 	}
 	public synchronized void setPlaybackGain(float gain) {
-		setPlaybackGain(nativePtr,gain);
+		setPlaybackGain(nativePtr, gain);
 
 	}
 	public synchronized float getPlaybackGain() {
 		return getPlaybackGain(nativePtr);
 	}
 	public synchronized void muteMic(boolean isMuted) {
-		muteMic(nativePtr,isMuted);
+		muteMic(nativePtr, isMuted);
 	}
 
 	public synchronized LinphoneAddress interpretUrl(String destination) throws LinphoneCoreException {
@@ -335,8 +370,12 @@ class LinphoneCoreImpl implements LinphoneCore {
 		}
 	}
 
+	public synchronized void sendDtmfs(String dtmf) {
+		sendDtmfs(nativePtr, dtmf);
+	}
+
 	public synchronized void sendDtmf(char number) {
-		sendDtmf(nativePtr,number);
+		sendDtmf(nativePtr, number);
 	}
 	public synchronized void clearCallLogs() {
 		clearCallLogs(nativePtr);
@@ -368,7 +407,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 	public synchronized boolean payloadTypeIsVbr(PayloadType pt) {
 		isValid();
-		return payloadTypeIsVbr(nativePtr, ((PayloadTypeImpl)pt).nativePtr);
+		return payloadTypeIsVbr(nativePtr, ((PayloadTypeImpl) pt).nativePtr);
 	}
 
 	public synchronized void enableEchoCancellation(boolean enable) {
@@ -435,16 +474,35 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 
 	public synchronized void addFriend(LinphoneFriend lf) throws LinphoneCoreException {
-		addFriend(nativePtr,((LinphoneFriendImpl)lf).nativePtr);
+		addFriend(nativePtr, ((LinphoneFriendImpl) lf).nativePtr);
+	}
+	
+
+	public synchronized LinphoneFriendList createLinphoneFriendList() {
+		return new LinphoneFriendListImpl(this);
+	}
+	
+
+	public synchronized void addFriendList(LinphoneFriendList friendList) throws LinphoneCoreException {
+		addFriendList(nativePtr,((LinphoneFriendListImpl)friendList).nativePtr);
+	}
+	
+	public synchronized void removeFriendList(LinphoneFriendList friendList) throws LinphoneCoreException {
+		removeFriendList(nativePtr,((LinphoneFriendListImpl)friendList).nativePtr);
 	}
 
 	public synchronized LinphoneFriend[] getFriendList() {
 		return getFriendList(nativePtr);
 	}
+	
+	private native LinphoneFriendList[] getFriendLists(long nativePtr);
+	public synchronized LinphoneFriendList[] getFriendLists() {
+		return getFriendLists(nativePtr);
+	}
 
 	@SuppressWarnings("deprecation")
 	public synchronized void setPresenceInfo(int minutes_away, String alternative_contact, OnlineStatus status) {
-		setPresenceInfo(nativePtr,minutes_away,alternative_contact,status.mValue);
+		setPresenceInfo(nativePtr, minutes_away, alternative_contact, status.mValue);
 
 	}
 	@SuppressWarnings("deprecation")
@@ -452,16 +510,19 @@ class LinphoneCoreImpl implements LinphoneCore {
 		return OnlineStatus.fromInt(getPresenceInfo(nativePtr));
 	}
 	public synchronized void setPresenceModel(PresenceModel presence) {
-		setPresenceModel(nativePtr, ((PresenceModelImpl)presence).getNativePtr());
+		setPresenceModel(nativePtr, ((PresenceModelImpl) presence).getNativePtr());
 	}
 	public synchronized PresenceModel getPresenceModel() {
 		return (PresenceModel)getPresenceModel(nativePtr);
 	}
 	public synchronized LinphoneChatRoom getOrCreateChatRoom(String to) {
-		return new LinphoneChatRoomImpl(getOrCreateChatRoom(nativePtr,to));
+		return (LinphoneChatRoom)(getOrCreateChatRoom(nativePtr,to));
+	}
+	public synchronized LinphoneChatRoom getChatRoom(LinphoneAddress to) {
+		return (LinphoneChatRoom)(getChatRoom(nativePtr, ((LinphoneAddressImpl) to).nativePtr));
 	}
 	public synchronized void setPreviewWindow(Object w) {
-		setPreviewWindowId(nativePtr,w);
+		setPreviewWindowId(nativePtr, w);
 	}
 	public synchronized void setVideoWindow(Object w) {
 		setVideoWindowId(nativePtr, w);
@@ -471,7 +532,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 
 	public synchronized void enableVideo(boolean vcap_enabled, boolean display_enabled) {
-		enableVideo(nativePtr,vcap_enabled, display_enabled);
+		enableVideo(nativePtr, vcap_enabled, display_enabled);
 	}
 	public synchronized boolean isVideoEnabled() {
 		return isVideoEnabled(nativePtr);
@@ -479,21 +540,29 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized boolean isVideoSupported() {
 		return isVideoSupported(nativePtr);
 	}
+	public synchronized boolean isVCardSupported() {
+		return isVCardSupported(nativePtr);
+	}
 	public synchronized FirewallPolicy getFirewallPolicy() {
 		return FirewallPolicy.fromInt(getFirewallPolicy(nativePtr));
 	}
-	public synchronized String getStunServer() {
-		return getStunServer(nativePtr);
-	}
 	public synchronized void setFirewallPolicy(FirewallPolicy pol) {
 		setFirewallPolicy(nativePtr,pol.value());
 	}
-	public synchronized void setStunServer(String stunServer) {
-		setStunServer(nativePtr,stunServer);
+	public synchronized LinphoneNatPolicy createNatPolicy() {
+		return (LinphoneNatPolicy)createNatPolicy(nativePtr);
 	}
-
-	public synchronized LinphoneCallParams createDefaultCallParameters() {
-		return new LinphoneCallParamsImpl(createDefaultCallParams(nativePtr));
+	public synchronized void setNatPolicy(LinphoneNatPolicy policy) {
+		setNatPolicy(nativePtr, ((LinphoneNatPolicyImpl)policy).mNativePtr);
+	}
+	public synchronized LinphoneNatPolicy getNatPolicy() {
+		return (LinphoneNatPolicy)getNatPolicy(nativePtr);
+	}
+	public synchronized String getStunServer() {
+		return getStunServer(nativePtr);
+	}
+	public synchronized void setStunServer(String stunServer) {
+		setStunServer(nativePtr, stunServer);
 	}
 
 	public synchronized LinphoneCall inviteAddressWithParams(LinphoneAddress to, LinphoneCallParams params) throws LinphoneCoreException {
@@ -558,6 +627,10 @@ class LinphoneCoreImpl implements LinphoneCore {
 		setRootCA(nativePtr, path);
 	}
 
+	public synchronized void setRootCAData(String data) {
+		setRootCAData(nativePtr, data);
+	}
+
 	public synchronized void setRingback(String path) {
 		setRingback(nativePtr, path);
 	}
@@ -609,7 +682,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 
 	public synchronized void enableKeepAlive(boolean enable) {
-		enableKeepAlive(nativePtr,enable);
+		enableKeepAlive(nativePtr, enable);
 
 	}
 	public synchronized boolean isKeepAliveEnabled() {
@@ -619,6 +692,14 @@ class LinphoneCoreImpl implements LinphoneCore {
 		startEchoCalibration(nativePtr, listener);
 	}
 
+	public synchronized int startEchoTester(int rate) {
+		return startEchoTester(nativePtr, rate);
+	}
+
+	public synchronized int stopEchoTester() {
+		return stopEchoTester(nativePtr);
+	}
+
 	public synchronized Transports getSignalingTransportPorts() {
 		Transports transports = new Transports();
 		transports.udp = getSignalingTransportPort(nativePtr, 0);
@@ -633,7 +714,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 
 	public synchronized void enableIpv6(boolean enable) {
-		enableIpv6(nativePtr,enable);
+		enableIpv6(nativePtr, enable);
 	}
 	public synchronized boolean isIpv6Enabled() {
 		return isIpv6Enabled(nativePtr);
@@ -656,14 +737,14 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 	}
 	public synchronized void setUploadPtime(int ptime) {
-		setUploadPtime(nativePtr,ptime);
+		setUploadPtime(nativePtr, ptime);
 	}
 
 	public synchronized void setZrtpSecretsCache(String file) {
-		setZrtpSecretsCache(nativePtr,file);
+		setZrtpSecretsCache(nativePtr, file);
 	}
 	public synchronized void enableEchoLimiter(boolean val) {
-		enableEchoLimiter(nativePtr,val);
+		enableEchoLimiter(nativePtr, val);
 	}
 	public synchronized void setVideoDevice(int id) {
 		Log.i("Setting camera id :", id);
@@ -699,6 +780,14 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized int getConferenceSize() {
 		return getConferenceSize(nativePtr);
 	}
+	private native LinphoneConference createConference(long corePtr, LinphoneConferenceParams params);
+	public synchronized LinphoneConference createConference(LinphoneConferenceParams params) {
+		return createConference(this.nativePtr, params);
+	}
+	private native LinphoneConference getConference(long nativePtr);
+	public synchronized LinphoneConference getConference() {
+		return getConference(nativePtr);
+	}
 	private native int getCallsNb(long nativePtr);
 	public synchronized int getCallsNb() {
 		return getCallsNb(nativePtr);
@@ -814,10 +903,10 @@ class LinphoneCoreImpl implements LinphoneCore {
 		tunnelAddServerAndMirror(nativePtr, host, port, mirror, ms);
 	}
 
-	private native void tunnelAddServer(long nativePtr, TunnelConfig config);
+	private native void tunnelAddServer(long nativePtr, long configPtr);
 	@Override
 	public synchronized void tunnelAddServer(TunnelConfig config) {
-		tunnelAddServer(nativePtr, config);
+		tunnelAddServer(nativePtr, ((TunnelConfigImpl)config).mNativePtr);
 	}
 
 	private native final TunnelConfig[] tunnelGetServers(long nativePtr);
@@ -917,10 +1006,10 @@ class LinphoneCoreImpl implements LinphoneCore {
 		setUserAgent(nativePtr,name,version);
 	}
 
-	private native void setCpuCountNative(int count);
+	private native void setCpuCountNative(long nativePtr, int count);
 	public synchronized void setCpuCount(int count)
 	{
-		setCpuCountNative(count);
+		setCpuCountNative(nativePtr, count);
 	}
 
 	public synchronized int getMissedCallsCount() {
@@ -1062,6 +1151,11 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public synchronized boolean hasBuiltInEchoCanceler() {
 		return hasBuiltInEchoCanceler(nativePtr);
 	}
+	private native boolean hasCrappyOpenGL(long ptr);
+	@Override
+	public synchronized boolean hasCrappyOpenGL() {
+		return hasCrappyOpenGL(nativePtr);
+	}
 	private native void declineCall(long coreptr, long callptr, int reason);
 	@Override
 	public synchronized void declineCall(LinphoneCall aCall, Reason reason) {
@@ -1101,7 +1195,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setSipDscp(long nativePtr, int dscp);
 	@Override
 	public synchronized void setSipDscp(int dscp) {
-		setSipDscp(nativePtr,dscp);
+		setSipDscp(nativePtr, dscp);
 	}
 
 	private native int getSipDscp(long nativePtr);
@@ -1151,36 +1245,44 @@ class LinphoneCoreImpl implements LinphoneCore {
 	@Override
 	public synchronized LinphoneEvent publish(LinphoneAddress resource, String eventname,
 			int expires, LinphoneContent content) {
-		return (LinphoneEvent)publish(nativePtr, ((LinphoneAddressImpl)resource).nativePtr, eventname, expires,
-				content!=null ? content.getType() : null, content!=null ? content.getSubtype() : null, content!=null ? content.getData() : null,
-						content!=null ? content.getEncoding() : null);
+		return (LinphoneEvent)publish(nativePtr, ((LinphoneAddressImpl) resource).nativePtr, eventname, expires,
+				content != null ? content.getType() : null, content != null ? content.getSubtype() : null, content != null ? content.getData() : null,
+				content != null ? content.getEncoding() : null);
 	}
 
 	private native Object createSubscribe(long core, long addr, String event, int expires);
 	@Override
 	public synchronized LinphoneEvent createSubscribe(LinphoneAddress resource,
 			String event, int expires) {
-		return (LinphoneEvent)createSubscribe(nativePtr, ((LinphoneAddressImpl)resource).nativePtr, event, expires);
+		return (LinphoneEvent)createSubscribe(nativePtr, ((LinphoneAddressImpl) resource).nativePtr, event, expires);
 	}
 	private native Object createPublish(long core, long addr, String event, int expires);
 	@Override
 	public synchronized LinphoneEvent createPublish(LinphoneAddress resource,
 			String event, int expires) {
-		return (LinphoneEvent)createPublish(nativePtr, ((LinphoneAddressImpl)resource).nativePtr, event, expires);
+		return (LinphoneEvent)createPublish(nativePtr, ((LinphoneAddressImpl) resource).nativePtr, event, expires);
 	}
 
 	public synchronized void setChatDatabasePath(String path) {
 		setChatDatabasePath(nativePtr, path);
 	}
 
+	public synchronized void setCallLogsDatabasePath(String path) {
+		setCallLogsDatabasePath(nativePtr, path);
+	}
+	
+	public synchronized void setFriendsDatabasePath(String path) {
+		setFriendsDatabasePath(nativePtr, path);
+	}
+
 	public synchronized LinphoneChatRoom[] getChatRooms() {
-		long[] typesPtr = getChatRooms(nativePtr);
+		Object[] typesPtr = getChatRooms(nativePtr);
 		if (typesPtr == null) return null;
 
 		LinphoneChatRoom[] proxies = new LinphoneChatRoom[typesPtr.length];
 
 		for (int i=0; i < proxies.length; i++) {
-			proxies[i] = new LinphoneChatRoomImpl(typesPtr[i]);
+			proxies[i] = (LinphoneChatRoom)(typesPtr[i]);
 		}
 
 		return proxies;
@@ -1224,6 +1326,11 @@ class LinphoneCoreImpl implements LinphoneCore {
 		return migrateToMultiTransport(nativePtr);
 	}
 
+	@Override
+	public synchronized void migrateCallLogs() {
+		migrateCallLogs(nativePtr);
+	}
+
 	private native boolean acceptEarlyMedia(long lc, long call);
 	@Override
 	public synchronized boolean acceptEarlyMedia(LinphoneCall call) {
@@ -1257,7 +1364,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setMtu(long nativePtr, int mtu);
 	@Override
 	public synchronized void setMtu(int mtu) {
-		setMtu(nativePtr,mtu);
+		setMtu(nativePtr, mtu);
 	}
 	private native int getMtu(long nativePtr);
 	@Override
@@ -1266,7 +1373,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	}
 	@Override
 	public synchronized void enableSdp200Ack(boolean enable) {
-		enableSdp200Ack(nativePtr,enable);
+		enableSdp200Ack(nativePtr, enable);
 	}
 	@Override
 	public synchronized boolean isSdp200AckEnabled() {
@@ -1280,7 +1387,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void disableChat(long ptr, int denycode);
 	@Override
 	public synchronized void disableChat(Reason denycode) {
-		disableChat(nativePtr,denycode.mValue);
+		disableChat(nativePtr, denycode.mValue);
 	}
 	private native void enableChat(long ptr);
 	@Override
@@ -1300,7 +1407,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setPayloadTypeBitrate(long coreptr, long payload_ptr, int bitrate);
 	@Override
 	public synchronized void setPayloadTypeBitrate(PayloadType pt, int bitrate) {
-		setPayloadTypeBitrate(nativePtr, ((PayloadTypeImpl)pt).nativePtr, bitrate);
+		setPayloadTypeBitrate(nativePtr, ((PayloadTypeImpl) pt).nativePtr, bitrate);
 	}
 	private native int getPayloadTypeBitrate(long coreptr, long payload_ptr);
 	@Override
@@ -1321,7 +1428,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 	@Override
 	public synchronized void enableAdaptiveRateControl(boolean enable) {
-		enableAdaptiveRateControl(nativePtr,enable);
+		enableAdaptiveRateControl(nativePtr, enable);
 
 	}
 	@Override
@@ -1339,12 +1446,12 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setAudioJittcomp(long ptr, int value);
 	@Override
 	public synchronized void setAudioJittcomp(int value) {
-		setAudioJittcomp(nativePtr,value);
+		setAudioJittcomp(nativePtr, value);
 	}
 	private native void setVideoJittcomp(long ptr, int value);
 	@Override
 	public synchronized void setVideoJittcomp(int value) {
-		setVideoJittcomp(nativePtr,value);
+		setVideoJittcomp(nativePtr, value);
 	}
 	
 	private native void setFileTransferServer(long ptr, String serverUrl);
@@ -1384,7 +1491,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setRemoteRingbackTone(long nativePtr, String file);
 	@Override
 	public void setRemoteRingbackTone(String file) {
-		setRemoteRingbackTone(nativePtr,file);
+		setRemoteRingbackTone(nativePtr, file);
 	}
 	private native String getRemoteRingbackTone(long nativePtr);
 	@Override
@@ -1404,7 +1511,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setPreferredFramerate(long nativePtr, float fps);
 	@Override
 	public void setPreferredFramerate(float fps) {
-		setPreferredFramerate(nativePtr,fps);
+		setPreferredFramerate(nativePtr, fps);
 	}
 	private native float getPreferredFramerate(long nativePtr);
 	@Override
@@ -1502,4 +1609,183 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public String getVideoPreset() {
 		return getVideoPreset(nativePtr);
 	}
+	private native long createCallParams(long nativePtr, long callPtr);
+	@Override
+	public LinphoneCallParams createCallParams(LinphoneCall call) {
+		long callptr = 0;
+		if (call!=null) callptr = ((LinphoneCallImpl)call).nativePtr;
+		long ptr = createCallParams(nativePtr, callptr);
+		return new LinphoneCallParamsImpl(ptr);
+	}
+	private native void setProvisioningUri(long nativePtr, String uri);
+	@Override
+	public void setProvisioningUri(String uri){
+		setProvisioningUri(nativePtr, uri);
+	}
+
+	private native String getProvisioningUri(long nativePtr);
+	@Override
+	public String getProvisioningUri(){
+		return getProvisioningUri(nativePtr);
+	}
+	private native int getGlobalState(long nativePtr);
+	public GlobalState getGlobalState(){
+		return GlobalState.fromInt(getGlobalState(nativePtr));
+	}
+	private native void setHttpProxyHost(long nativePtr, String host);
+	@Override
+	public void setHttpProxyHost(String host){
+		setHttpProxyHost(nativePtr, host);
+	}
+
+	private native void setHttpProxyPort(long nativePtr, int port);
+	@Override
+	public void setHttpProxyPort(int port){
+		setHttpProxyPort(nativePtr, port);
+	}
+
+	private native String getHttpProxyHost(long nativePtr);
+	@Override
+	public String getHttpProxyHost(){
+		return getHttpProxyHost(nativePtr);
+	}
+
+	private native int getHttpProxyPort(long nativePtr);
+	@Override
+	public int getHttpProxyPort(){
+		return getHttpProxyPort(nativePtr);
+	}
+	private native void setSipTransportTimeout(long nativePtr, int timeout_ms);
+	@Override
+	public void setSipTransportTimeout(int timeout_ms){
+		setSipTransportTimeout(nativePtr, timeout_ms);
+	}
+
+	private native int getSipTransportTimeout(long nativePtr);
+	@Override
+	public int getSipTransportTimeout(){
+		return getSipTransportTimeout(nativePtr);
+	}
+	private native void setNortpTimeout(long nativePtr, int timeout);
+	@Override
+	public void setNortpTimeout(int timeout){
+		setNortpTimeout(nativePtr, timeout);
+	}
+
+	private native int getNortpTimeout(long nativePtr);
+	@Override
+	public int getNortpTimeout(){
+		return getNortpTimeout(nativePtr);
+	}
+
+	private native void setSipNetworkReachable(long nativePtr, boolean isReachable);
+	@Override
+	public void setSipNetworkReachable(boolean isReachable) {
+		setSipNetworkReachable(nativePtr, isReachable);
+	}
+	
+	private native void setMediaNetworkReachable(long nativePtr, boolean isReachable);
+	@Override
+	public void setMediaNetworkReachable(boolean isReachable) {
+		setMediaNetworkReachable(nativePtr, isReachable);
+	}
+	private native Object getMSFactory(long nativePtr);
+	@Override
+	public org.linphone.mediastream.Factory getMSFactory(){
+		return (org.linphone.mediastream.Factory) getMSFactory(nativePtr);
+	}
+	private native void setDnsServers(long nativePtr, String servers[]);
+	@Override
+	public void setDnsServers(String servers[]){
+		setDnsServers(nativePtr, servers);
+	}
+
+	private native void setUserCertificatesPath(long nativePtr, String path);
+	@Override
+	public void setUserCertificatesPath(String path) {
+		setUserCertificatesPath(nativePtr, path);
+	}
+
+	public void reloadMsPlugins(String path) {
+		reloadMsPlugins(nativePtr, path);
+	}
+
+	public void reloadSoundDevices() {
+		reloadSoundDevices(nativePtr);
+	}
+
+	public void setDefaultSoundDevices() {
+		setDefaultSoundDevices(nativePtr);
+	}
+	
+	private native boolean isLimeEncryptionAvailable(long nativePtr);
+	public synchronized boolean isLimeEncryptionAvailable() {
+		return isLimeEncryptionAvailable(nativePtr);
+	}
+	
+	private native void setLimeEncryption(long nativePtr, int value);
+	public synchronized void setLimeEncryption(LinphoneLimeState lime) {
+		setLimeEncryption(nativePtr, lime.mValue);
+	}
+	
+	private native int getLimeEncryption(long nativePtr);
+	public synchronized LinphoneLimeState getLimeEncryption() {
+		return LinphoneLimeState.fromInt(getLimeEncryption(nativePtr));
+	}
+
+	private native String getTlsCertificate(long ptr);
+	@Override
+	public String getTlsCertificate() {
+		return getTlsCertificate(nativePtr);
+	}
+
+	private native String getTlsKey(long ptr);
+	@Override
+	public String getTlsKey() {
+		return getTlsKey(nativePtr);
+	}
+
+	private native String getTlsCertificatePath(long ptr);
+	@Override
+	public String getTlsCertificatePath() {
+		return getTlsCertificatePath(nativePtr);
+	}
+
+	private native String getTlsKeyPath(long ptr);
+	@Override
+	public String getTlsKeyPath() {
+		return getTlsKeyPath(nativePtr);
+	}
+
+	private native void setTlsCertificate(long ptr, String cert);
+	@Override
+	public void setTlsCertificate(String cert) {
+		setTlsCertificate(nativePtr, cert);
+	}
+
+	private native void setTlsKey(long ptr, String key);
+	@Override
+	public void setTlsKey(String key) {
+		setTlsKey(nativePtr, key);
+	}
+
+	private native void setTlsCertificatePath(long ptr, String path);
+	@Override
+	public void setTlsCertificatePath(String path) {
+		setTlsCertificatePath(nativePtr, path);
+	}
+
+	private native void setTlsKeyPath(long ptr, String path);
+	@Override
+	public void setTlsKeyPath(String path) {
+		setTlsKeyPath(nativePtr, path);
+	}
+
+	public void enableOpenH264(boolean enable) {
+		openh264Enabled = enable;
+	}
+
+	public boolean openH264Enabled() {
+		return openh264Enabled;
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneFriendImpl.java b/java/impl/org/linphone/core/LinphoneFriendImpl.java
index 2495f72a4..72b4ac420 100644
--- a/java/impl/org/linphone/core/LinphoneFriendImpl.java
+++ b/java/impl/org/linphone/core/LinphoneFriendImpl.java
@@ -30,8 +30,10 @@ class LinphoneFriendImpl implements LinphoneFriend, Serializable {
 	private native int  getIncSubscribePolicy(long nativePtr);
 	private native void enableSubscribes(long nativePtr,boolean value);
 	private native boolean isSubscribesEnabled(long nativePtr);
+	private native boolean isPresenceReceived(long nativePtr);
 	private native int getStatus(long nativePtr);
 	private native Object getPresenceModel(long nativePtr);
+	private native Object getPresenceModelForUri(long nativePtr, String uri);
 	private native void setPresenceModel(long nativePtr, long presencePtr);
 	private native void edit(long nativePtr);
 	private native void done(long nativePtr);
@@ -60,7 +62,11 @@ class LinphoneFriendImpl implements LinphoneFriend, Serializable {
 		this.setAddress(nativePtr, ((LinphoneAddressImpl)anAddress).nativePtr);
 	}
 	public LinphoneAddress getAddress() {
-		return new LinphoneAddressImpl(getAddress(nativePtr),LinphoneAddressImpl.WrapMode.FromConst);
+		long ptr = getAddress(nativePtr);
+		if (ptr != 0) {
+			return new LinphoneAddressImpl(ptr, LinphoneAddressImpl.WrapMode.FromConst);
+		}
+		return null;
 	}
 	public void setIncSubscribePolicy(SubscribePolicy policy) {
 		synchronized(getSyncObject()){
@@ -78,12 +84,21 @@ class LinphoneFriendImpl implements LinphoneFriend, Serializable {
 	public boolean isSubscribesEnabled() {
 		return isSubscribesEnabled(nativePtr);
 	}
+	public boolean isPresenceReceived() {
+		return isPresenceReceived(nativePtr);
+	}
 	public OnlineStatus getStatus() {
 		return OnlineStatus.fromInt(getStatus(nativePtr));
 	}
 	public PresenceModel getPresenceModel() {
 		return (PresenceModel)getPresenceModel(nativePtr);
 	}
+	public PresenceModel getPresenceModelForUri(String uri) {
+		return (PresenceModel)getPresenceModelForUri(nativePtr, uri);
+	}
+	public void setPresenceModel(PresenceModel presenceModel) {
+		setPresenceModel(nativePtr, ((PresenceModelImpl)presenceModel).getNativePtr());
+	}
 	public void edit() {
 		synchronized(getSyncObject()){
 			edit(nativePtr);
@@ -118,4 +133,106 @@ class LinphoneFriendImpl implements LinphoneFriend, Serializable {
 	public String getRefKey(){
 		return getRefKey(nativePtr);
 	}
+	
+	private native void setName(long nativePtr, String name);
+	@Override
+	public void setName(String name) {
+		setName(nativePtr, name);
+	}
+	
+	private native String getName(long nativePtr);
+	@Override
+	public String getName() {
+		return getName(nativePtr);
+	}
+	
+	private native void setFamilyName(long nativePtr, String name);
+	@Override
+	public void setFamilyName(String name) {
+		setFamilyName(nativePtr, name);
+	}
+
+	private native String getFamilyName(long nativePtr);
+	public String getFamilyName() {
+		return getFamilyName(nativePtr);
+	}
+
+	private native void setGivenName(long nativePtr, String name);
+	@Override
+	public void setGivenName(String name) {
+		setGivenName(nativePtr, name);
+	}
+
+	private native String getGivenName(long nativePtr);
+	public String getGivenName() {
+		return getGivenName(nativePtr);
+	}
+	
+	private native void setOrganization(long nativePtr, String organization);
+	@Override
+	public void setOrganization(String organization) {
+		setOrganization(nativePtr, organization);
+	}
+	
+	private native String getOrganization(long nativePtr);
+	@Override
+	public String getOrganization() {
+		return getOrganization(nativePtr);
+	}
+	
+	private native long[] getAddresses(long nativePtr);
+	@Override
+	public LinphoneAddress[] getAddresses() {
+		long[] ptrs = getAddresses(nativePtr);
+		if (ptrs == null) return null;
+
+		LinphoneAddress[] addresses = new LinphoneAddress[ptrs.length];
+		for (int i = 0; i < addresses.length; i++) {
+			addresses[i] = new LinphoneAddressImpl(ptrs[i], LinphoneAddressImpl.WrapMode.FromConst);
+		}
+		return addresses;
+	}
+	
+	private native void addAddress(long nativePtr, long addr);
+	@Override
+	public void addAddress(LinphoneAddress addr) {
+		addAddress(nativePtr, ((LinphoneAddressImpl)addr).nativePtr);
+	}
+	
+	private native void removeAddress(long nativePtr, long addr);
+	@Override
+	public void removeAddress(LinphoneAddress addr) {
+		removeAddress(nativePtr, ((LinphoneAddressImpl)addr).nativePtr);
+	}
+	
+	private native Object[] getPhoneNumbers(long nativePtr);
+	@Override
+	public String[] getPhoneNumbers() {
+		Object[] phones = getPhoneNumbers(nativePtr);
+		if (phones == null) return null;
+		
+		String[] phoneNumbers = new String[phones.length];
+		for (int i = 0; i < phones.length; i++) {
+			phoneNumbers[i] = phones[i].toString();
+		}
+		return phoneNumbers;
+	}
+	
+	private native void addPhoneNumber(long nativePtr, String phone);
+	@Override
+	public void addPhoneNumber(String phone) {
+		addPhoneNumber(nativePtr, phone);
+	}
+	
+	private native void removePhoneNumber(long nativePtr, String phone);
+	@Override
+	public void removePhoneNumber(String phone) {
+		removePhoneNumber(nativePtr, phone);
+	}
+	
+	private native boolean isAlreadyPresentInFriendList(long nativePtr);
+	@Override
+	public boolean isAlreadyPresentInFriendList() {
+		return isAlreadyPresentInFriendList(nativePtr);
+	}
 }
diff --git a/java/impl/org/linphone/core/LinphoneFriendListImpl.java b/java/impl/org/linphone/core/LinphoneFriendListImpl.java
new file mode 100644
index 000000000..42172b607
--- /dev/null
+++ b/java/impl/org/linphone/core/LinphoneFriendListImpl.java
@@ -0,0 +1,159 @@
+/*
+LinphoneFriendImpl.java
+Copyright (C) 2010  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+import java.io.Serializable;
+
+class LinphoneFriendListImpl implements LinphoneFriendList, Serializable {
+	
+	protected final long nativePtr;
+	private native void finalize(long nativePtr);
+	private native long newLinphoneFriendList(long corePtr);
+	private native void setRLSAddress(long nativePtr, long addrPtr);
+	private native void setRLSUri(long nativePtr, String uri);
+	private native void addFriend(long nativePtr, long friendPtr);
+	private native void addLocalFriend(long nativePtr, long friendPtr);
+	private native LinphoneFriend[] getFriendList(long nativePtr);
+	private native void updateSubscriptions(long nativePtr);
+	private native void enableSubscriptions(long nativePtr, boolean enable);
+	private native Object getCore(long ptr);
+	private native LinphoneFriend findFriendByUri(long nativePtr, String uri);
+	private native void setListener(long ptr, LinphoneFriendListListener listener);
+
+	protected LinphoneFriendListImpl(LinphoneCoreImpl core)  {
+		nativePtr = newLinphoneFriendList(core.nativePtr);
+	}
+
+	@Override
+	public void setRLSAddress(LinphoneAddress addr){
+		synchronized(getSyncObject()){
+			setRLSAddress(nativePtr, ((LinphoneAddressImpl)addr).nativePtr);
+		}
+	}
+
+	@Override
+	public void  setRLSUri(String uri) {
+		synchronized(getSyncObject()){
+			setRLSUri(nativePtr, uri);
+		}
+	}
+	
+	@Override
+	public void addFriend(LinphoneFriend friend) {	
+		synchronized(getSyncObject()){
+			addFriend(nativePtr, friend.getNativePtr());
+		}
+	}
+	
+	@Override
+	public void addLocalFriend(LinphoneFriend friend) {	
+		synchronized(getSyncObject()){
+			addLocalFriend(nativePtr, friend.getNativePtr());
+		}
+	}
+	
+	@Override
+	public LinphoneFriend[] getFriendList() {
+		synchronized(getSyncObject()){
+			return getFriendList(nativePtr);
+		}
+	}
+	
+	@Override
+	public void updateSubscriptions() {
+		synchronized(getSyncObject()){
+			updateSubscriptions(nativePtr);
+		}
+	}
+	
+	@Override
+	public void enableSubscriptions(boolean enable) {
+		synchronized(getSyncObject()) {
+			enableSubscriptions(nativePtr, enable);
+		}
+	}
+	
+	@Override
+	public LinphoneFriend findFriendByUri(String uri) {
+		synchronized(getSyncObject()){
+			return findFriendByUri(nativePtr,uri);
+		}
+	}
+	
+	private native void setUri(long nativePtr, String uri);
+	@Override
+	public void setUri(String uri) {
+		synchronized(getSyncObject()) {
+			setUri(nativePtr, uri);
+		}
+	}
+	
+	private native void synchronizeFriendsFromServer(long nativePtr);
+	@Override
+	public void synchronizeFriendsFromServer() {
+		synchronized(getSyncObject()) {
+			synchronizeFriendsFromServer(nativePtr);
+		}
+	}
+	
+	private native int importFriendsFromVCardFile(long nativePtr, String file);
+	@Override
+	public int importFriendsFromVCardFile(String file) {
+		return importFriendsFromVCardFile(nativePtr, file);
+	}
+	
+	private native int importFriendsFromVCardBuffer(long nativePtr, String buffer);
+	@Override
+	public int importFriendsFromVCardBuffer(String buffer) {
+		return importFriendsFromVCardBuffer(nativePtr, buffer);
+	}
+	
+	private native void exportFriendsToVCardFile(long nativePtr, String file);
+	@Override
+	public void exportFriendsToVCardFile(String file) {
+		exportFriendsToVCardFile(nativePtr, file);
+	}
+	
+	@Override
+	public void setListener(LinphoneFriendListListener listener) {
+		setListener(nativePtr, listener);
+	}
+	
+
+	/*reserved for JNI */
+	protected LinphoneFriendListImpl(long aNativePtr)  {
+		nativePtr = aNativePtr;
+	}
+	@Override
+	protected void finalize() throws Throwable {
+		if (nativePtr != 0) {
+			finalize(nativePtr);
+		}
+		super.finalize();
+	}
+
+	@Override
+	public long getNativePtr() {
+		return nativePtr;
+	}
+	private Object getSyncObject(){
+		 return this;
+	}	
+}
+
diff --git a/java/impl/org/linphone/core/LinphoneNatPolicyImpl.java b/java/impl/org/linphone/core/LinphoneNatPolicyImpl.java
new file mode 100644
index 000000000..59527da80
--- /dev/null
+++ b/java/impl/org/linphone/core/LinphoneNatPolicyImpl.java
@@ -0,0 +1,125 @@
+/*
+LinphoneNatPolicyImpl.java
+Copyright (C) 2015  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+package org.linphone.core;
+
+public class LinphoneNatPolicyImpl implements LinphoneNatPolicy {
+	protected final long mNativePtr;
+
+	private native Object getCore(long nativePtr);
+	private native void clear(long nativePtr);
+	private native boolean stunEnabled(long nativePtr);
+	private native void enableStun(long nativePtr, boolean enable);
+	private native boolean turnEnabled(long nativePtr);
+	private native void enableTurn(long nativePtr, boolean enable);
+	private native boolean iceEnabled(long nativePtr);
+	private native void enableIce(long nativePtr, boolean enable);
+	private native boolean upnpEnabled(long nativePtr);
+	private native void enableUpnp(long nativePtr, boolean enable);
+	private native String getStunServer(long nativePtr);
+	private native void setStunServer(long nativePtr, String stun_server);
+	private native String getStunServerUsername(long nativePtr);
+	private native void setStunServerUsername(long nativePtr, String username);
+
+	protected LinphoneNatPolicyImpl(long nativePtr)  {
+		mNativePtr = nativePtr;
+	}
+
+	private synchronized LinphoneCore getCore() {
+		return (LinphoneCore)getCore(mNativePtr);
+	}
+
+	public void clear() {
+		synchronized(getCore()) {
+			clear(mNativePtr);
+		}
+	}
+
+	public boolean stunEnabled() {
+		synchronized(getCore()) {
+			return stunEnabled(mNativePtr);
+		}
+	}
+
+	public void enableStun(boolean enable) {
+		synchronized(getCore()) {
+			enableStun(mNativePtr, enable);
+		}
+	}
+
+	public boolean turnEnabled() {
+		synchronized(getCore()) {
+			return turnEnabled(mNativePtr);
+		}
+	}
+
+	public void enableTurn(boolean enable) {
+		synchronized(getCore()) {
+			enableTurn(mNativePtr, enable);
+		}
+	}
+
+	public boolean iceEnabled() {
+		synchronized(getCore()) {
+			return iceEnabled(mNativePtr);
+		}
+	}
+
+	public void enableIce(boolean enable) {
+		synchronized(getCore()) {
+			enableIce(mNativePtr, enable);
+		}
+	}
+
+	public boolean upnpEnabled() {
+		synchronized(getCore()) {
+			return upnpEnabled(mNativePtr);
+		}
+	}
+
+	public void enableUpnp(boolean enable) {
+		synchronized(getCore()) {
+			enableUpnp(mNativePtr, enable);
+		}
+	}
+
+	public String getStunServer() {
+		synchronized(getCore()) {
+			return getStunServer(mNativePtr);
+		}
+	}
+
+	public void setStunServer(String stun_server) {
+		synchronized(getCore()) {
+			setStunServer(mNativePtr, stun_server);
+		}
+	}
+
+	public String getStunServerUsername() {
+		synchronized(getCore()) {
+			return getStunServerUsername(mNativePtr);
+		}
+	}
+
+	public void setStunServerUsername(String username) {
+		synchronized(getCore()) {
+			setStunServerUsername(mNativePtr, username);
+		}
+	}
+}
diff --git a/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java b/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java
index 918d55989..c19f6d54b 100644
--- a/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java
+++ b/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java
@@ -70,6 +70,8 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 
 	private native void setIdentity(long ptr,String identity);
 	private native String getIdentity(long ptr);
+	private native void setAddress(long ptr, long address);
+	private native long getAddress(long ptr);
 	private native int setProxy(long ptr,String proxy);
 	private native String getProxy(long ptr);
 
@@ -82,6 +84,7 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 	private native String getDialPrefix(long ptr);
 
 	private native String normalizePhoneNumber(long ptr,String number);
+	private native long normalizeSipUri(long ptr,String username);
 
 	private native String getDomain(long ptr);
 
@@ -96,7 +99,8 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 
 	private native int lookupCCCFromIso(long nativePtr, String iso);
 	private native int lookupCCCFromE164(long nativePtr, String e164);
-
+		
+	
 	public LinphoneProxyConfig enableRegister(boolean value) {
 		isValid();
 		enableRegister(nativePtr,value);
@@ -125,6 +129,11 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 		setIdentity(nativePtr,identity);
 	}
 
+	public void setAddress(LinphoneAddress address) throws LinphoneCoreException {
+		isValid();
+		setAddress(nativePtr,((LinphoneAddressImpl)address).nativePtr);
+	}
+
 	public void setProxy(String proxyUri) throws LinphoneCoreException {
 		isValid();
 		if (setProxy(nativePtr,proxyUri)!=0) {
@@ -135,6 +144,15 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 		isValid();
 		return normalizePhoneNumber(nativePtr,number);
 	}
+	public LinphoneAddress normalizeSipUri(String username) {
+		isValid();
+		long ptr = normalizeSipUri(nativePtr,username);
+		if (ptr==0) {
+			return null;
+		} else {
+			return new LinphoneAddressImpl(ptr,LinphoneAddressImpl.WrapMode.FromConst);
+		}
+	}
 	public void setDialPrefix(String prefix) {
 		isValid();
 		setDialPrefix(nativePtr, prefix);
@@ -159,6 +177,15 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 		isValid();
 		return getIdentity(nativePtr);
 	}
+	public LinphoneAddress getAddress() {
+		isValid();
+		long ptr = getAddress(nativePtr);
+		if (ptr==0) {
+			return null;
+		} else {
+			return new LinphoneAddressImpl(ptr,LinphoneAddressImpl.WrapMode.FromConst);
+		}
+	}
 	public String getProxy() {
 		isValid();
 		return getProxy(nativePtr);
@@ -376,4 +403,22 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 	public Object getUserData() {
 		return userData;
 	}
+	
+	
+	private native void setCustomHeader(long ptr, String name, String value);
+	@Override
+	public void setCustomHeader(String name, String value){
+		setCustomHeader(nativePtr, name, value);
+	}
+	
+	
+	private native String getCustomHeader(long ptr, String name);
+	@Override
+	public String getCustomHeader(String name){
+		return getCustomHeader(nativePtr, name);
+	}
+	
+	
+	
+	
 }
diff --git a/java/impl/org/linphone/core/LinphoneXmlRpcRequestImpl.java b/java/impl/org/linphone/core/LinphoneXmlRpcRequestImpl.java
new file mode 100644
index 000000000..456790432
--- /dev/null
+++ b/java/impl/org/linphone/core/LinphoneXmlRpcRequestImpl.java
@@ -0,0 +1,84 @@
+/*
+LinphoneXmlRpcRequestImpl.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+
+public class LinphoneXmlRpcRequestImpl implements LinphoneXmlRpcRequest {
+	protected long nativePtr;
+	
+	protected LinphoneXmlRpcRequestImpl(long aNativePtr)  {
+		nativePtr = aNativePtr;
+	}
+	
+	private native long newLinphoneXmlRpcRequest(String methodName, int returnType);
+	public LinphoneXmlRpcRequestImpl(String methodName, ArgType returnType) {
+		nativePtr = newLinphoneXmlRpcRequest(methodName, returnType.value());
+	}
+	
+	public long getNativePtr() {
+		return nativePtr;
+	}
+
+	private native void unref(long ptr);
+	protected void finalize(){
+		unref(nativePtr);
+	}
+	
+	private native void addIntArg(long ptr, int arg);
+	@Override
+	public void addIntArg(int arg) {
+		addIntArg(nativePtr, arg);
+	}
+	
+	private native void addStringArg(long ptr, String arg);
+	@Override
+	public void addStringArg(String arg) {
+		addStringArg(nativePtr, arg);
+	}
+	
+	private native String getContent(long ptr);
+	@Override
+	public String getContent() {
+		return getContent(nativePtr);
+	}
+	
+	private native int getStatus(long ptr);
+	@Override
+	public Status getStatus() {
+		return Status.fromInt(getStatus(nativePtr));
+	}
+	
+	private native int getIntResponse(long ptr);
+	@Override
+	public int getIntResponse() {
+		return getIntResponse(nativePtr);
+	}
+	
+	private native String getStringResponse(long ptr);
+	@Override
+	public String getStringResponse() {
+		return getStringResponse(nativePtr);
+	}
+
+	private native void setListener(long ptr, LinphoneXmlRpcRequestListener listener);
+	@Override
+	public void setListener(LinphoneXmlRpcRequestListener listener) {
+		setListener(nativePtr, listener);
+	}
+}
diff --git a/java/impl/org/linphone/core/LinphoneXmlRpcSessionImpl.java b/java/impl/org/linphone/core/LinphoneXmlRpcSessionImpl.java
new file mode 100644
index 000000000..808270d2a
--- /dev/null
+++ b/java/impl/org/linphone/core/LinphoneXmlRpcSessionImpl.java
@@ -0,0 +1,43 @@
+/*
+LinphoneXmlRpcSessionImpl.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+package org.linphone.core;
+
+public class LinphoneXmlRpcSessionImpl implements LinphoneXmlRpcSession {
+	protected long nativePtr;
+	
+	private native long newLinphoneXmlRpcSession(long nativePtr, String url);
+	public LinphoneXmlRpcSessionImpl(LinphoneCore lc, String url) {
+		nativePtr = newLinphoneXmlRpcSession(((LinphoneCoreImpl)lc).nativePtr, url);
+	}
+	
+	public long getNativePtr() {
+		return nativePtr;
+	}
+
+	private native void unref(long ptr);
+	protected void finalize(){
+		unref(nativePtr);
+	}
+
+	private native void sendRequest(long ptr, long requestPtr);
+	@Override
+	public void sendRequest(LinphoneXmlRpcRequest request) {
+		sendRequest(nativePtr, ((LinphoneXmlRpcRequestImpl)request).getNativePtr());
+	}
+}
diff --git a/java/impl/org/linphone/core/LpConfigImpl.java b/java/impl/org/linphone/core/LpConfigImpl.java
index 29b44ec22..a8d6d6b04 100644
--- a/java/impl/org/linphone/core/LpConfigImpl.java
+++ b/java/impl/org/linphone/core/LpConfigImpl.java
@@ -18,11 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 package org.linphone.core;
 
-
-
 class LpConfigImpl implements LpConfig {
 
-	private final long nativePtr;
+	private long nativePtr;
 	boolean ownPtr = false;
 	
 	public LpConfigImpl(long ptr) {
@@ -30,13 +28,34 @@ class LpConfigImpl implements LpConfig {
 	}
 	
 	private native long newLpConfigImpl(String file);
+	private native long newLpConfigImplFromBuffer(String buffer);
 	private native void delete(long ptr);
 	
+	@Deprecated
 	public LpConfigImpl(String file) {
 		nativePtr = newLpConfigImpl(file);
 		ownPtr = true;
 	}
 	
+	private LpConfigImpl() {
+		nativePtr = -1;
+		ownPtr = false;
+	}
+	
+	public static LpConfigImpl fromFile(String file) {
+		LpConfigImpl impl = new LpConfigImpl();
+		impl.nativePtr = impl.newLpConfigImpl(file);
+		impl.ownPtr = true;
+		return impl;
+	}
+	
+	public static LpConfigImpl fromBuffer(String buffer) {
+		LpConfigImpl impl = new LpConfigImpl();
+		impl.nativePtr = impl.newLpConfigImplFromBuffer(buffer);
+		impl.ownPtr = true;
+		return impl;
+	}
+	
 	protected void finalize() throws Throwable {
 		if(ownPtr) {
 			delete(nativePtr);
diff --git a/java/impl/org/linphone/core/TunnelConfig.java b/java/impl/org/linphone/core/TunnelConfig.java
deleted file mode 100644
index 9801f0fbd..000000000
--- a/java/impl/org/linphone/core/TunnelConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.linphone.core;
-
-public class TunnelConfig {
-	private String host = null;
-	private int port = 443;
-	private int remoteUdpMirrorPort = 12345;
-	private int delay = 1000;
-	
-	public String getHost() {
-		return host;
-	}
-	
-	public void setHost(String host) {
-		this.host = host;
-	}
-	
-	public int getPort() {
-		return port;
-	}
-	
-	public void setPort(int port) {
-		this.port = port;
-	}
-	
-	public int getRemoteUdpMirrorPort() {
-		return remoteUdpMirrorPort;
-	}
-	
-	public void setRemoteUdpMirrorPort(int remoteUdpMirrorPort) {
-		this.remoteUdpMirrorPort = remoteUdpMirrorPort;
-	}
-	
-	public int getDelay() {
-		return delay;
-	}
-	
-	public void setDelay(int delay) {
-		this.delay = delay;
-	}
-}
diff --git a/java/impl/org/linphone/core/TunnelConfigImpl.java b/java/impl/org/linphone/core/TunnelConfigImpl.java
new file mode 100644
index 000000000..d7fd0c873
--- /dev/null
+++ b/java/impl/org/linphone/core/TunnelConfigImpl.java
@@ -0,0 +1,53 @@
+package org.linphone.core;
+
+public class TunnelConfigImpl implements TunnelConfig{
+	long mNativePtr;
+	protected TunnelConfigImpl(long nativePtr){
+		mNativePtr = nativePtr;
+	}
+	private native String getHost(long nativePtr);
+	@Override
+	public String getHost() {
+		return getHost(mNativePtr);
+	}
+	private native void setHost(long nativePtr, String host);
+	@Override
+	public void setHost(String host) {
+		setHost(mNativePtr, host);
+	}
+	private native int getPort(long nativePtr);
+	@Override
+	public int getPort() {
+		return getPort(mNativePtr);
+	}
+	private native void setPort(long nativePtr, int port);
+	@Override
+	public void setPort(int port) {
+		setPort(mNativePtr, port);
+	}
+	private native int getRemoteUdpMirrorPort(long nativePtr);
+	@Override
+	public int getRemoteUdpMirrorPort() {
+		return getRemoteUdpMirrorPort(mNativePtr);
+	}
+	private native void setRemoteUdpMirrorPort(long nativePtr, int remoteUdpMirrorPort);
+	@Override
+	public void setRemoteUdpMirrorPort(int remoteUdpMirrorPort) {
+		setRemoteUdpMirrorPort(mNativePtr, remoteUdpMirrorPort);
+	}
+	private native int getDelay(long nativePtr);
+	@Override
+	public int getDelay() {
+		return getDelay(mNativePtr);
+	}
+	private native void setDelay(long nativePtr, int delay);
+	@Override
+	public void setDelay(int delay) {
+		setDelay(mNativePtr, delay);
+	}
+	private native void enableSip(long nativePtr, boolean enabled);
+	private native void destroy(long nativePtr);
+	protected void finalize() throws Throwable {
+		if (mNativePtr!=0) destroy(mNativePtr);
+	}
+}
diff --git a/java/impl/org/linphone/tools/OpenH264DownloadHelper.java b/java/impl/org/linphone/tools/OpenH264DownloadHelper.java
new file mode 100644
index 000000000..9e8d50876
--- /dev/null
+++ b/java/impl/org/linphone/tools/OpenH264DownloadHelper.java
@@ -0,0 +1,240 @@
+package org.linphone.tools;
+/*
+CodecDownloader.java
+Copyright (C) 2016  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+import android.content.Context;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+
+import org.apache.commons.compress.compressors.bzip2.*;
+import org.linphone.core.OpenH264DownloadHelperListener;
+import org.linphone.mediastream.Log;
+
+/**
+ * @author Erwan Croze
+ */
+public class OpenH264DownloadHelper {
+    private OpenH264DownloadHelperListener openH264DownloadHelperListener;
+    private ArrayList<Object> userData;
+    private String fileDirection;
+    private String nameLib;
+    private String urlDownload;
+    private String nameFileDownload;
+    private String licenseMessage;
+
+	/**
+     * Default values
+     * nameLib = "libopenh264-1.5.so"
+     * urlDownload = "http://ciscobinary.openh264.org/libopenh264-1.5.0-android19.so.bz2"
+     * nameFileDownload = "libopenh264-1.5.0-android19.so.bz2"
+     */
+    public OpenH264DownloadHelper(Context context) {
+        userData = new ArrayList<Object>();
+        licenseMessage = "OpenH264 Video Codec provided by Cisco Systems, Inc.";
+        nameLib = "libopenh264-1.5.so";
+        urlDownload = "http://ciscobinary.openh264.org/libopenh264-1.5.0-android19.so.bz2";
+        nameFileDownload = "libopenh264-1.5.0-android19.so.bz2";
+        if(context.getFilesDir() != null) {
+            fileDirection = context.getFilesDir().toString();
+        }
+    }
+
+	/**
+     * Set OpenH264DownloadHelperListener
+     * @param h264Listener
+     */
+    public void setOpenH264HelperListener(OpenH264DownloadHelperListener h264Listener) {
+        openH264DownloadHelperListener = h264Listener;
+    }
+
+	/**
+     * @return OpenH264DownloadHelperListener
+     */
+    public OpenH264DownloadHelperListener getOpenH264DownloadHelperListener() {
+        return openH264DownloadHelperListener;
+    }
+
+	/**
+     * @param index of object in UserData list
+     * @constraints (index >= 0 && index < userData.size())
+     * @return object if constraints are met
+     */
+    public Object getUserData(int index) {
+        if (index < 0 || index >= userData.size()) return null;
+        return userData.get(index);
+    }
+
+	/**
+     * Adding of object into UserData list
+     * @param object
+     * @return index of object in UserData list
+     */
+    public int setUserData(Object object) {
+        this.userData.add(object);
+        return this.userData.indexOf(object);
+    }
+
+	/**
+     * @param index
+     * @param object
+     * @constraints (index >= 0 && index < userData.size())
+     */
+    public void setUserData(int index, Object object) {
+        if (index < 0 || index > userData.size()) return;
+        this.userData.add(index,object);
+    }
+
+	/**
+     * @return size of UserData list
+     */
+    public int getUserDataSize() {
+        return this.userData.size();
+    }
+
+	/**
+     * @return OpenH264 license message
+     */
+    public String getLicenseMessage() {
+        return licenseMessage;
+    }
+
+	/**
+     * Set filename to storage for OpenH264 codec
+     * @param name
+     */
+    public void setNameLib(String name) {
+        nameLib = name;
+    }
+
+	/**
+     * @return filename of OpenH264 codec
+     */
+    public String getNameLib() {
+        return nameLib;
+    }
+
+	/**
+     * @return path of the lib
+     */
+    public String getFullPathLib() {
+        return this.fileDirection + "/" + this.getNameLib();
+    }
+
+	/**
+     * Set name download file
+     * @param name : must be the same name relative to the url
+     */
+    public void setNameFileDownload(String name) {
+        nameFileDownload = name;
+    }
+
+	/**
+     * Set new url
+     * @param url : must be a Cisco Url to OpenH264 and .bzip2 file
+     */
+    public void setUrlDownload(String url) {
+        urlDownload = url;
+    }
+
+	/**
+     * Indicates whether the lib exists
+     * Requirements : fileDirection and nameLib init
+     * @return file exists ?
+     */
+    public boolean isCodecFound() {
+        return new File(fileDirection+"/" + nameLib).exists();
+    }
+
+	/**
+     * Try to download and load codec
+     * Requirements :
+     *  fileDirection
+     *  nameFileDownload
+     *  urlDownload
+     *  nameLib
+     *  codecDownListener
+     */
+    public void downloadCodec() {
+        Thread thread = new Thread(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                try {
+                    String path = fileDirection+"/" + nameLib;
+                    URL url = new URL(urlDownload);
+                    HttpURLConnection urlConnection = (HttpURLConnection)url.openConnection();
+                    urlConnection.connect();
+                    Log.i("OpenH264Downloader"," ");
+                    InputStream inputStream = urlConnection.getInputStream();
+                    FileOutputStream fileOutputStream = new FileOutputStream(fileDirection+"/"+nameFileDownload);
+                    int totalSize = urlConnection.getContentLength();
+                    openH264DownloadHelperListener.OnProgress(0,totalSize);
+
+                    Log.i("OpenH264Downloader"," Download file:" + nameFileDownload);
+
+                    byte[] buffer = new byte[4096];
+                    int bufferLength;
+                    int total = 0;
+                    while((bufferLength = inputStream.read(buffer))>0 ){
+                        total += bufferLength;
+                        fileOutputStream.write(buffer, 0, bufferLength);
+                        openH264DownloadHelperListener.OnProgress(total, totalSize);
+                    }
+
+                    fileOutputStream.close();
+                    inputStream.close();
+
+                    Log.i("OpenH264Downloader"," Uncompress file:" + nameFileDownload);
+
+                    FileInputStream in = new FileInputStream(fileDirection+"/"+nameFileDownload);
+                    FileOutputStream out = new FileOutputStream(path);
+                    BZip2CompressorInputStream bzIn = new BZip2CompressorInputStream(in);
+
+                    while ((bufferLength = bzIn.read(buffer))>0) {
+                        out.write(buffer, 0, bufferLength);
+                    }
+                    in.close();
+                    out.close();
+                    bzIn.close();
+
+                    Log.i("OpenH264Downloader"," Remove file:" + nameFileDownload);
+                    new File(fileDirection+"/"+nameFileDownload).delete();
+
+                    Log.i("OpenH264Downloader"," Loading plugin:" + path);
+                    System.load(path);
+                    openH264DownloadHelperListener.OnProgress(2,1);
+                } catch (FileNotFoundException e) {
+                    openH264DownloadHelperListener.OnError(e.getLocalizedMessage());
+                } catch (IOException e) {
+                    openH264DownloadHelperListener.OnError(e.getLocalizedMessage());
+                }
+            }
+        });
+        thread.start();
+    }
+}
diff --git a/linphone.spec.in b/linphone.spec.in
index f9e954945..ca4d43a62 100644
--- a/linphone.spec.in
+++ b/linphone.spec.in
@@ -80,7 +80,13 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{_bindir}/*
+%{_bindir}/linphone
+%{_bindir}/linphonec
+%{_bindir}/linphonecsh
+%{_bindir}/linphone-daemon
+%{_bindir}/linphone-daemon-pipetest
+%{_bindir}/lp-autoanswer
+%{_bindir}/lp-test-ecc
 %{_libdir}/*.so.*
 %{_mandir}/*
 %{_datadir}/applications/%{name}.desktop
@@ -93,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/lpc2xml_test
+%{_bindir}/xml2lpc_test
+%{_bindir}/lp-gen-wrappers
+%{_bindir}/lp-sendmsg
 %{_includedir}/linphone
 %{_libdir}/*.a
 %{_libdir}/*.la
diff --git a/mediastreamer2 b/mediastreamer2
index 203c5bbca..3e5e374d4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 203c5bbca581db81abc6d6e64e3e0cd0c948c3d3
+Subproject commit 3e5e374d4e5cb1a0b39e2dfa2c926180b5de35fa
diff --git a/oRTP b/oRTP
index 7e89236af..b1b2c1c27 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 7e89236af6552140d0d6fa3b6878bc13addd8f7d
+Subproject commit b1b2c1c2729400762050cdb247a466cd2636d92c
diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt
index d5238f389..68a33b22e 100644
--- a/pixmaps/CMakeLists.txt
+++ b/pixmaps/CMakeLists.txt
@@ -22,29 +22,111 @@
 
 set(ICONS_INSTALL_DIR ${PACKAGE_DATA_DIR}/icons/hicolor)
 
-file(GLOB PIXMAPS "*.png" "linphone.icns")
-
-install(FILES ${PIXMAPS}
+install(FILES "linphone.icns" "linphone-banner.png"
 	DESTINATION ${PACKAGE_DATA_DIR}/pixmaps/linphone
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
 )
 
-install(FILES svg/linphone-micro-muted.svg
+install(FILES
+	svg/linphone-micro-muted.svg
 	svg/linphone-speaker-muted.svg
 	svg/linphone-micro-enabled.svg
 	svg/linphone-speaker-enabled.svg
+	svg/linphone-status-online.svg
+	svg/linphone-status-away.svg
+	svg/linphone-status-donotdisturb.svg
+	svg/linphone-status-offline.svg
+	svg/linphone-call-status-incoming.svg
+	svg/linphone-call-status-missed.svg
+	svg/linphone-call-status-outgoing.svg
+	svg/linphone-chat-new-message-and-writing.svg
+	svg/linphone-chat-new-message.svg
+	svg/linphone-chat-nothing.svg
+	svg/linphone-chat-writing.svg
+	svg/linphone-ok.svg
+	svg/linphone-inprogress.svg
+	svg/linphone-failed.svg
+	svg/linphone-camera-enabled.svg
+	svg/linphone-camera-disabled.svg
+	svg/linphone-security-ok.svg
+	svg/linphone-security-pending.svg
+	svg/linphone-media-play.svg
+	svg/linphone-media-pause.svg
+	svg/linphone-warning.svg
 	DESTINATION ${ICONS_INSTALL_DIR}/scalable/status
 	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
 )
 
-install(FILES linphone-micro-muted.png
+install(FILES
+	svg/linphone-start-call.svg
+	svg/linphone-add-call.svg
+	svg/linphone-hold-off.svg
+	svg/linphone-hold-on.svg
+	svg/linphone-start-call2.svg
+	svg/linphone-start-chat.svg
+	svg/linphone-history.svg
+	svg/linphone-edit.svg
+	svg/linphone-delete.svg
+	svg/linphone-contact-add.svg
+	svg/linphone-conference-start.svg
+	svg/linphone-call-transfer.svg
+	svg/linphone-record.svg
+	svg/linphone-chat-send.svg
+	DESTINATION ${ICONS_INSTALL_DIR}/scalable/actions
+	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+)
+
+install(FILES
+	linphone-micro-muted.png
 	linphone-speaker-muted.png
 	linphone-micro-enabled.png
 	linphone-speaker-enabled.png
+	linphone-status-online.png
+	linphone-status-away.png
+	linphone-status-donotdisturb.png
+	linphone-status-offline.png
+	linphone-chat-nothing.png
+	linphone-chat-new-message.png
+	linphone-chat-writing.png
+	linphone-chat-new-message-and-writing.png
+	linphone-call-status-incoming.png
+	linphone-call-status-outgoing.png
+	linphone-call-status-missed.png
+	linphone-ok.png
+	linphone-inprogress.png
+	linphone-failed.png
+	linphone-camera-enabled.png
+	linphone-camera-disabled.png
+	linphone-security-ok.png
+	linphone-security-pending.png
+	linphone-media-play.png
+	linphone-media-pause.png
+	linphone-warning.png
 	DESTINATION ${ICONS_INSTALL_DIR}/48x48/status
 	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
 )
 
+install(FILES
+	linphone-start-call2.png
+	linphone-add-call.png
+	linphone-start-call.png
+	linphone-start-chat.png
+	linphone-stop-call.png
+	linphone-hold-on.png
+	linphone-hold-off.png
+	linphone-history.png
+	linphone-edit.png
+	linphone-delete.png
+	linphone-contact-add.png
+	linphone-conference-start.png
+	linphone-call-transfer.png
+	linphone-record.png
+	linphone-chat-send.png
+	linphone-take-screenshot.png
+	DESTINATION ${ICONS_INSTALL_DIR}/48x48/actions
+	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
+)
+
 install(FILES linphone.png
 	DESTINATION ${ICONS_INSTALL_DIR}/48x48/apps
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index afa9f411f..18dab92fa 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,21 +1,7 @@
 pixmapdir=$(datadir)/pixmaps/linphone
 dist_pixmap_DATA= \
-	hold_on.png hold_off.png \
-	linphone.png linphone-banner.png \
-	status-green.png \
-	status-orange.png \
-	status-red.png \
-	status-offline.png \
-	call.png \
-	chat.png chat_start.png active_chat.png composing_chat.png composing_active_chat.png\
-	chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\
-	contact-orange.png history-orange.png\
-	call_start.png startcall-small.png stopcall-red.png stopcall-small.png call_add.png linphone.icns \
-	contact_starred.png contact_unstarred.png \
-	call_status_incoming.png call_status_outgoing.png \
-	ok.png \
-	dialer.png \
-	notok.png
+	linphone-banner.png \
+	linphone.icns
 
 iconsdir=$(datadir)/icons/hicolor
 if BUILD_WIN32
@@ -30,12 +16,89 @@ dist_status48icons_DATA= \
 	linphone-micro-muted.png \
 	linphone-speaker-muted.png \
 	linphone-micro-enabled.png \
-	linphone-speaker-enabled.png
+	linphone-speaker-enabled.png \
+	linphone-status-online.png \
+	linphone-status-away.png \
+	linphone-status-donotdisturb.png \
+	linphone-status-offline.png \
+	linphone-chat-nothing.png \
+	linphone-chat-new-message.png \
+	linphone-chat-writing.png \
+	linphone-chat-new-message-and-writing.png \
+	linphone-call-status-incoming.png \
+	linphone-call-status-outgoing.png \
+	linphone-call-status-missed.png \
+	linphone-ok.png \
+	linphone-inprogress.png \
+	linphone-failed.png \
+	linphone-camera-enabled.png \
+	linphone-camera-disabled.png \
+	linphone-security-ok.png \
+	linphone-security-pending.png \
+	linphone-media-play.png \
+	linphone-media-pause.png \
+	linphone-warning.png \
+	linphone-take-screenshot.png
 
 statussvgiconsdir=$(iconsdir)/scalable/status
 dist_statussvgicons_DATA= \
 	svg/linphone-micro-muted.svg \
 	svg/linphone-speaker-muted.svg \
 	svg/linphone-micro-enabled.svg \
-	svg/linphone-speaker-enabled.svg
+	svg/linphone-speaker-enabled.svg \
+	svg/linphone-status-online.svg \
+	svg/linphone-status-away.svg \
+	svg/linphone-status-donotdisturb.svg \
+	svg/linphone-status-offline.svg \
+	svg/linphone-call-status-incoming.svg \
+	svg/linphone-call-status-missed.svg \
+	svg/linphone-call-status-outgoing.svg \
+	svg/linphone-chat-new-message-and-writing.svg \
+	svg/linphone-chat-new-message.svg \
+	svg/linphone-chat-nothing.svg \
+	svg/linphone-chat-writing.svg \
+	svg/linphone-ok.svg \
+	svg/linphone-inprogress.svg \
+	svg/linphone-failed.svg \
+	svg/linphone-camera-enabled.svg \
+	svg/linphone-camera-disabled.svg \
+	svg/linphone-security-ok.svg \
+	svg/linphone-security-pending.svg \
+	svg/linphone-media-play.svg \
+	svg/linphone-media-pause.svg \
+	svg/linphone-warning.svg
 
+actions48iconsdir=$(iconsdir)/48x48/actions
+dist_actions48icons_DATA= \
+	linphone-start-call2.png \
+	linphone-add-call.png \
+	linphone-start-call.png \
+	linphone-start-chat.png \
+	linphone-stop-call.png \
+	linphone-hold-on.png \
+	linphone-hold-off.png \
+	linphone-history.png \
+	linphone-edit.png \
+	linphone-delete.png \
+	linphone-contact-add.png \
+	linphone-conference-start.png \
+	linphone-call-transfer.png \
+	linphone-record.png \
+	linphone-chat-send.png
+
+actionssvgiconsdir=$(iconsdir)/scalable/actions
+dist_actionssvgicons_DATA= \
+	svg/linphone-start-call.svg \
+	svg/linphone-add-call.svg \
+	svg/linphone-hold-off.svg \
+	svg/linphone-hold-on.svg \
+	svg/linphone-start-call2.svg \
+	svg/linphone-start-chat.svg \
+	svg/linphone-history.svg \
+	svg/linphone-edit.svg \
+	svg/linphone-delete.svg \
+	svg/linphone-contact-add.svg \
+	svg/linphone-conference-start.svg \
+	svg/linphone-call-transfer.svg \
+	svg/linphone-record.svg \
+	svg/linphone-chat-send.svg
diff --git a/pixmaps/active_chat.png b/pixmaps/active_chat.png
deleted file mode 100644
index ef3cedd1d..000000000
Binary files a/pixmaps/active_chat.png and /dev/null differ
diff --git a/pixmaps/call.png b/pixmaps/call.png
deleted file mode 100644
index 7edf53556..000000000
Binary files a/pixmaps/call.png and /dev/null differ
diff --git a/pixmaps/call_add.png b/pixmaps/call_add.png
deleted file mode 100644
index 9e2cbb18e..000000000
Binary files a/pixmaps/call_add.png and /dev/null differ
diff --git a/pixmaps/call_start.png b/pixmaps/call_start.png
deleted file mode 100644
index 77b264d72..000000000
Binary files a/pixmaps/call_start.png and /dev/null differ
diff --git a/pixmaps/call_status_incoming.png b/pixmaps/call_status_incoming.png
deleted file mode 100644
index 72ca1330e..000000000
Binary files a/pixmaps/call_status_incoming.png and /dev/null differ
diff --git a/pixmaps/call_status_outgoing.png b/pixmaps/call_status_outgoing.png
deleted file mode 100644
index aa15b3bea..000000000
Binary files a/pixmaps/call_status_outgoing.png and /dev/null differ
diff --git a/pixmaps/chat.png b/pixmaps/chat.png
deleted file mode 100644
index 50a23af57..000000000
Binary files a/pixmaps/chat.png and /dev/null differ
diff --git a/pixmaps/chat_message_delivered.png b/pixmaps/chat_message_delivered.png
deleted file mode 100644
index 5cb746551..000000000
Binary files a/pixmaps/chat_message_delivered.png and /dev/null differ
diff --git a/pixmaps/chat_message_inprogress.png b/pixmaps/chat_message_inprogress.png
deleted file mode 100644
index 2ffcbca35..000000000
Binary files a/pixmaps/chat_message_inprogress.png and /dev/null differ
diff --git a/pixmaps/chat_message_not_delivered.png b/pixmaps/chat_message_not_delivered.png
deleted file mode 100644
index cf9c610c0..000000000
Binary files a/pixmaps/chat_message_not_delivered.png and /dev/null differ
diff --git a/pixmaps/chat_start.png b/pixmaps/chat_start.png
deleted file mode 100644
index 3de673211..000000000
Binary files a/pixmaps/chat_start.png and /dev/null differ
diff --git a/pixmaps/composing_active_chat.png b/pixmaps/composing_active_chat.png
deleted file mode 100644
index 77da9e37f..000000000
Binary files a/pixmaps/composing_active_chat.png and /dev/null differ
diff --git a/pixmaps/composing_chat.png b/pixmaps/composing_chat.png
deleted file mode 100644
index 2d329ed21..000000000
Binary files a/pixmaps/composing_chat.png and /dev/null differ
diff --git a/pixmaps/contact-orange.png b/pixmaps/contact-orange.png
deleted file mode 100644
index 53ba07ed8..000000000
Binary files a/pixmaps/contact-orange.png and /dev/null differ
diff --git a/pixmaps/contact_starred.png b/pixmaps/contact_starred.png
deleted file mode 100644
index 45b5d6206..000000000
Binary files a/pixmaps/contact_starred.png and /dev/null differ
diff --git a/pixmaps/contact_unstarred.png b/pixmaps/contact_unstarred.png
deleted file mode 100644
index 38fdbbb77..000000000
Binary files a/pixmaps/contact_unstarred.png and /dev/null differ
diff --git a/pixmaps/dialer.png b/pixmaps/dialer.png
deleted file mode 100644
index bb9747a90..000000000
Binary files a/pixmaps/dialer.png and /dev/null differ
diff --git a/pixmaps/history-orange.png b/pixmaps/history-orange.png
deleted file mode 100644
index dc9bbf60a..000000000
Binary files a/pixmaps/history-orange.png and /dev/null differ
diff --git a/pixmaps/hold_off.png b/pixmaps/hold_off.png
deleted file mode 100644
index 3ba6746fb..000000000
Binary files a/pixmaps/hold_off.png and /dev/null differ
diff --git a/pixmaps/hold_on.png b/pixmaps/hold_on.png
deleted file mode 100644
index 776d5ddd4..000000000
Binary files a/pixmaps/hold_on.png and /dev/null differ
diff --git a/pixmaps/linphone-add-call.png b/pixmaps/linphone-add-call.png
new file mode 100644
index 000000000..9c9edeef8
Binary files /dev/null and b/pixmaps/linphone-add-call.png differ
diff --git a/pixmaps/linphone-call-status-incoming.png b/pixmaps/linphone-call-status-incoming.png
new file mode 100644
index 000000000..58bf8633c
Binary files /dev/null and b/pixmaps/linphone-call-status-incoming.png differ
diff --git a/pixmaps/linphone-call-status-missed.png b/pixmaps/linphone-call-status-missed.png
new file mode 100644
index 000000000..ba6bee6ee
Binary files /dev/null and b/pixmaps/linphone-call-status-missed.png differ
diff --git a/pixmaps/linphone-call-status-outgoing.png b/pixmaps/linphone-call-status-outgoing.png
new file mode 100644
index 000000000..73587dc7a
Binary files /dev/null and b/pixmaps/linphone-call-status-outgoing.png differ
diff --git a/pixmaps/linphone-call-transfer.png b/pixmaps/linphone-call-transfer.png
new file mode 100644
index 000000000..4dc24ce42
Binary files /dev/null and b/pixmaps/linphone-call-transfer.png differ
diff --git a/pixmaps/linphone-camera-disabled.png b/pixmaps/linphone-camera-disabled.png
new file mode 100644
index 000000000..dfcc711cd
Binary files /dev/null and b/pixmaps/linphone-camera-disabled.png differ
diff --git a/pixmaps/linphone-camera-enabled.png b/pixmaps/linphone-camera-enabled.png
new file mode 100644
index 000000000..4c929b52b
Binary files /dev/null and b/pixmaps/linphone-camera-enabled.png differ
diff --git a/pixmaps/linphone-chat-new-message-and-writing.png b/pixmaps/linphone-chat-new-message-and-writing.png
new file mode 100644
index 000000000..f64f525bb
Binary files /dev/null and b/pixmaps/linphone-chat-new-message-and-writing.png differ
diff --git a/pixmaps/linphone-chat-new-message.png b/pixmaps/linphone-chat-new-message.png
new file mode 100644
index 000000000..61341af11
Binary files /dev/null and b/pixmaps/linphone-chat-new-message.png differ
diff --git a/pixmaps/linphone-chat-nothing.png b/pixmaps/linphone-chat-nothing.png
new file mode 100644
index 000000000..9f6e1adc2
Binary files /dev/null and b/pixmaps/linphone-chat-nothing.png differ
diff --git a/pixmaps/linphone-chat-send.png b/pixmaps/linphone-chat-send.png
new file mode 100644
index 000000000..9a9f9d731
Binary files /dev/null and b/pixmaps/linphone-chat-send.png differ
diff --git a/pixmaps/linphone-chat-writing.png b/pixmaps/linphone-chat-writing.png
new file mode 100644
index 000000000..74c1a8269
Binary files /dev/null and b/pixmaps/linphone-chat-writing.png differ
diff --git a/pixmaps/linphone-conference-start.png b/pixmaps/linphone-conference-start.png
new file mode 100644
index 000000000..23dabbc35
Binary files /dev/null and b/pixmaps/linphone-conference-start.png differ
diff --git a/pixmaps/linphone-contact-add.png b/pixmaps/linphone-contact-add.png
new file mode 100644
index 000000000..f78852d01
Binary files /dev/null and b/pixmaps/linphone-contact-add.png differ
diff --git a/pixmaps/linphone-delete.png b/pixmaps/linphone-delete.png
new file mode 100644
index 000000000..d8ff8da4a
Binary files /dev/null and b/pixmaps/linphone-delete.png differ
diff --git a/pixmaps/linphone-edit.png b/pixmaps/linphone-edit.png
new file mode 100644
index 000000000..772770988
Binary files /dev/null and b/pixmaps/linphone-edit.png differ
diff --git a/pixmaps/linphone-failed.png b/pixmaps/linphone-failed.png
new file mode 100644
index 000000000..f72412139
Binary files /dev/null and b/pixmaps/linphone-failed.png differ
diff --git a/pixmaps/linphone-history.png b/pixmaps/linphone-history.png
new file mode 100644
index 000000000..825bdeb68
Binary files /dev/null and b/pixmaps/linphone-history.png differ
diff --git a/pixmaps/linphone-hold-off.png b/pixmaps/linphone-hold-off.png
new file mode 100644
index 000000000..b008a6896
Binary files /dev/null and b/pixmaps/linphone-hold-off.png differ
diff --git a/pixmaps/linphone-hold-on.png b/pixmaps/linphone-hold-on.png
new file mode 100644
index 000000000..1590a63b0
Binary files /dev/null and b/pixmaps/linphone-hold-on.png differ
diff --git a/pixmaps/linphone-inprogress.png b/pixmaps/linphone-inprogress.png
new file mode 100644
index 000000000..4a4371430
Binary files /dev/null and b/pixmaps/linphone-inprogress.png differ
diff --git a/pixmaps/linphone-media-pause.png b/pixmaps/linphone-media-pause.png
new file mode 100644
index 000000000..f9e062f38
Binary files /dev/null and b/pixmaps/linphone-media-pause.png differ
diff --git a/pixmaps/linphone-media-play.png b/pixmaps/linphone-media-play.png
new file mode 100644
index 000000000..382d07760
Binary files /dev/null and b/pixmaps/linphone-media-play.png differ
diff --git a/pixmaps/linphone-ok.png b/pixmaps/linphone-ok.png
new file mode 100644
index 000000000..4bcd6f634
Binary files /dev/null and b/pixmaps/linphone-ok.png differ
diff --git a/pixmaps/linphone-record.png b/pixmaps/linphone-record.png
new file mode 100644
index 000000000..4ef4b064d
Binary files /dev/null and b/pixmaps/linphone-record.png differ
diff --git a/pixmaps/linphone-security-ok.png b/pixmaps/linphone-security-ok.png
new file mode 100644
index 000000000..38d2ec61c
Binary files /dev/null and b/pixmaps/linphone-security-ok.png differ
diff --git a/pixmaps/linphone-security-pending.png b/pixmaps/linphone-security-pending.png
new file mode 100644
index 000000000..d61faa39a
Binary files /dev/null and b/pixmaps/linphone-security-pending.png differ
diff --git a/pixmaps/linphone-start-call.png b/pixmaps/linphone-start-call.png
new file mode 100644
index 000000000..ade0e15a4
Binary files /dev/null and b/pixmaps/linphone-start-call.png differ
diff --git a/pixmaps/linphone-start-call2.png b/pixmaps/linphone-start-call2.png
new file mode 100644
index 000000000..097271ce2
Binary files /dev/null and b/pixmaps/linphone-start-call2.png differ
diff --git a/pixmaps/linphone-start-chat.png b/pixmaps/linphone-start-chat.png
new file mode 100644
index 000000000..15b050f6f
Binary files /dev/null and b/pixmaps/linphone-start-chat.png differ
diff --git a/pixmaps/linphone-status-away.png b/pixmaps/linphone-status-away.png
new file mode 100644
index 000000000..56c7fb367
Binary files /dev/null and b/pixmaps/linphone-status-away.png differ
diff --git a/pixmaps/linphone-status-donotdisturb.png b/pixmaps/linphone-status-donotdisturb.png
new file mode 100644
index 000000000..d5a1391de
Binary files /dev/null and b/pixmaps/linphone-status-donotdisturb.png differ
diff --git a/pixmaps/linphone-status-offline.png b/pixmaps/linphone-status-offline.png
new file mode 100644
index 000000000..c4f236f55
Binary files /dev/null and b/pixmaps/linphone-status-offline.png differ
diff --git a/pixmaps/linphone-status-online.png b/pixmaps/linphone-status-online.png
new file mode 100644
index 000000000..7fb4a1276
Binary files /dev/null and b/pixmaps/linphone-status-online.png differ
diff --git a/pixmaps/linphone-stop-call.png b/pixmaps/linphone-stop-call.png
new file mode 100644
index 000000000..da1a2eab5
Binary files /dev/null and b/pixmaps/linphone-stop-call.png differ
diff --git a/pixmaps/linphone-take-screenshot.png b/pixmaps/linphone-take-screenshot.png
new file mode 100644
index 000000000..7a54a9928
Binary files /dev/null and b/pixmaps/linphone-take-screenshot.png differ
diff --git a/pixmaps/linphone-warning.png b/pixmaps/linphone-warning.png
new file mode 100644
index 000000000..044bcd8f0
Binary files /dev/null and b/pixmaps/linphone-warning.png differ
diff --git a/pixmaps/linphone.icns b/pixmaps/linphone.icns
index 056461b38..3b8f1bd0a 100644
Binary files a/pixmaps/linphone.icns and b/pixmaps/linphone.icns differ
diff --git a/pixmaps/notok.png b/pixmaps/notok.png
deleted file mode 100644
index 84813bc2d..000000000
Binary files a/pixmaps/notok.png and /dev/null differ
diff --git a/pixmaps/ok.png b/pixmaps/ok.png
deleted file mode 100644
index 769986fb7..000000000
Binary files a/pixmaps/ok.png and /dev/null differ
diff --git a/pixmaps/pausecall.png b/pixmaps/pausecall.png
deleted file mode 100644
index 9ab5bae92..000000000
Binary files a/pixmaps/pausecall.png and /dev/null differ
diff --git a/pixmaps/resumecall.png b/pixmaps/resumecall.png
deleted file mode 100644
index b8a2d50cd..000000000
Binary files a/pixmaps/resumecall.png and /dev/null differ
diff --git a/pixmaps/startcall-green.png b/pixmaps/startcall-green.png
deleted file mode 100644
index 56cf6e136..000000000
Binary files a/pixmaps/startcall-green.png and /dev/null differ
diff --git a/pixmaps/startcall-small.png b/pixmaps/startcall-small.png
deleted file mode 100644
index d5726e12c..000000000
Binary files a/pixmaps/startcall-small.png and /dev/null differ
diff --git a/pixmaps/status-green.png b/pixmaps/status-green.png
deleted file mode 100644
index 1a39a4242..000000000
Binary files a/pixmaps/status-green.png and /dev/null differ
diff --git a/pixmaps/status-offline.png b/pixmaps/status-offline.png
deleted file mode 100644
index 243c5c069..000000000
Binary files a/pixmaps/status-offline.png and /dev/null differ
diff --git a/pixmaps/status-orange.png b/pixmaps/status-orange.png
deleted file mode 100644
index f2e66d34d..000000000
Binary files a/pixmaps/status-orange.png and /dev/null differ
diff --git a/pixmaps/status-red.png b/pixmaps/status-red.png
deleted file mode 100644
index e7a0ec98a..000000000
Binary files a/pixmaps/status-red.png and /dev/null differ
diff --git a/pixmaps/stopcall-red.png b/pixmaps/stopcall-red.png
deleted file mode 100644
index 8bd957935..000000000
Binary files a/pixmaps/stopcall-red.png and /dev/null differ
diff --git a/pixmaps/stopcall-small.png b/pixmaps/stopcall-small.png
deleted file mode 100644
index de77592c7..000000000
Binary files a/pixmaps/stopcall-small.png and /dev/null differ
diff --git a/pixmaps/svg/callkeybackground.svg b/pixmaps/svg/callkeybackground.svg
deleted file mode 100644
index 4d86f7fd4..000000000
--- a/pixmaps/svg/callkeybackground.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="378.2998" y1="390.9453" x2="378.2998" y2="450.9448">
-	<stop  offset="0.0184" style="stop-color:#CFCFD1"/>
-	<stop  offset="0.4294" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.6171" style="stop-color:#FBFBFC"/>
-	<stop  offset="0.7928" style="stop-color:#F0F0F1"/>
-	<stop  offset="0.9634" style="stop-color:#DDDEE0"/>
-	<stop  offset="1" style="stop-color:#D8D9DB"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" stroke="#636566" stroke-width="0.25" d="M456.8,440.944c0,5.521-4.393,10-9.812,10H309.612
-	c-5.42,0-9.812-4.479-9.812-10v-39.999c0-5.523,4.393-10,9.812-10h137.375c5.42,0,9.812,4.477,9.812,10V440.944z"/>
-</svg>
diff --git a/pixmaps/svg/contact.svg b/pixmaps/svg/contact.svg
deleted file mode 100644
index f094b7a0a..000000000
--- a/pixmaps/svg/contact.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<path fill="#969696" d="M395.103,419.955c0-2.225-13.979-6.076-14.99-6.887c-1.013-0.809-3.041-3.442-3.041-4.05
-	c0-0.609,2.436-6.077,2.436-7.291c0-1.214,0.605-1.825,0.605-7.696c0-5.875-5.669-9.115-9.111-9.116l0,0h-0.003l0,0
-	c-3.441,0.001-9.112,3.242-9.112,9.116c0,5.872,0.607,6.481,0.607,7.696c0,1.215,2.433,6.683,2.433,7.291
-	c0,0.606-2.027,3.241-3.04,4.05c-1.014,0.812-14.989,4.662-14.989,6.887c0,2.229-0.404,7.091-0.404,7.091h49.02
-	C395.511,427.045,395.103,422.183,395.103,419.955z"/>
-<path fill="#FFFFFF" d="M394.122,417.014c0-2.226-13.979-6.076-14.99-6.887c-1.013-0.809-3.041-3.442-3.041-4.05
-	c0-0.609,2.436-6.077,2.436-7.292c0-1.214,0.605-1.825,0.605-7.696c0-5.875-5.668-9.115-9.111-9.117l0,0h-0.003l0,0
-	c-3.441,0.001-9.112,3.242-9.112,9.117c0,5.871,0.607,6.481,0.607,7.696c0,1.216,2.433,6.684,2.433,7.292
-	c0,0.606-2.027,3.241-3.04,4.05c-1.014,0.812-14.989,4.662-14.989,6.887c0,2.228-0.404,7.09-0.404,7.09h49.02
-	C394.531,424.104,394.122,419.242,394.122,417.014z"/>
-</svg>
diff --git a/pixmaps/svg/dialer.svg b/pixmaps/svg/dialer.svg
deleted file mode 100644
index fef344bc3..000000000
--- a/pixmaps/svg/dialer.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<path fill="#969696" d="M286.498,434.42c4.559,3.653,9.804,6.589,14.792,7.49c9.402,1.716,13.399,0.105,16.132-7.211
-		c0,0,1.682-3.361-5.614-6.452c-1.62-0.686-6.091-1.651-7.458-0.151c-1.361,1.503-1.277,3.678-1.616,4.564
-		c-0.337,0.882-3.245,0.99-4.293,0.643c-1.357-0.451-4.558-2.122-7.51-4.416l-0.13-0.102c-2.877-2.393-5.192-5.152-5.925-6.384
-		c-0.565-0.948-1.092-3.814-0.303-4.332c0.793-0.521,2.939-0.906,4.112-2.56c1.178-1.657-0.738-5.82-1.753-7.251
-		c-4.588-6.462-7.51-4.09-7.51-4.09c-6.554,4.239-7.27,8.487-3.574,17.304c1.961,4.678,5.95,9.17,10.502,12.829L286.498,434.42z"/>
-	<g>
-		<path fill="#969696" d="M320.779,413.026c-0.12,1.753,0.417,2.49,1.237,1.128c0.691-1.223,0.919-3.176,0.103-5.597
-			c-1.512-5.152-8.312-10.048-14.974-9.817c-3.53,0.197-2.936,0.61,0.522,0.972c6.191,0.844,11.23,5.292,12.592,9.775
-			C320.682,410.765,320.826,411.971,320.779,413.026z"/>
-		<path fill="#969696" d="M314.836,412.663c0.271,1.751,0.419,3.086,1.102,3.218c0.657,0.119,1.937-0.814,2.1-2.613
-			c0.096-1.174-0.081-2.533-0.672-3.977c-1.681-4.528-7.676-8.517-14.134-8.04c-3.33,0.159-6.052,1.718-6.255,2.069
-			c-0.245,0.373,2.155-0.401,5.133-0.345c3.972,0.021,7.9,1.818,10.237,4.55C313.846,409.232,314.602,411.068,314.836,412.663z"/>
-		<path fill="#969696" d="M300.954,405.212c-2.627-0.119-5,1.161-4.875,1.609c0.098,0.449,1.605,0.432,3.1,0.466
-			c0.889,0.008,1.748,0.121,2.565,0.328c2.638,0.676,4.356,2.175,5.243,3.652c0.848,1.323,1.616,2.738,2.504,3.001
-			c0.868,0.265,1.9-0.68,1.501-2.231c-0.463-1.619-1.626-3.437-3.732-4.851C305.516,406.021,303.299,405.291,300.954,405.212z"/>
-	</g>
-</g>
-<g>
-	<path fill="#FFFFFF" d="M285.517,431.291c4.559,3.652,9.805,6.588,14.792,7.49c9.402,1.715,13.399,0.104,16.132-7.21
-		c0,0,1.682-3.361-5.614-6.454c-1.62-0.686-6.091-1.65-7.458-0.15c-1.361,1.502-1.277,3.678-1.616,4.564
-		c-0.337,0.882-3.245,0.99-4.292,0.643c-1.357-0.451-4.558-2.122-7.511-4.417l-0.13-0.102c-2.877-2.392-5.193-5.151-5.925-6.384
-		c-0.565-0.948-1.091-3.812-0.303-4.33c0.793-0.521,2.939-0.906,4.112-2.56c1.177-1.658-0.738-5.82-1.753-7.251
-		c-4.589-6.462-7.511-4.09-7.511-4.09c-6.554,4.239-7.27,8.487-3.574,17.303c1.96,4.678,5.95,9.17,10.502,12.83L285.517,431.291z"/>
-	<g>
-		<path fill="#FFFFFF" d="M319.798,409.896c-0.12,1.753,0.417,2.49,1.238,1.129c0.69-1.224,0.918-3.177,0.102-5.597
-			c-1.512-5.153-8.312-10.049-14.974-9.817c-3.53,0.197-2.936,0.61,0.522,0.972c6.191,0.843,11.23,5.291,12.593,9.774
-			C319.701,407.636,319.846,408.841,319.798,409.896z"/>
-		<path fill="#FFFFFF" d="M313.856,409.533c0.271,1.751,0.419,3.086,1.102,3.219c0.657,0.119,1.937-0.815,2.1-2.615
-			c0.096-1.173-0.081-2.532-0.672-3.976c-1.681-4.528-7.675-8.517-14.134-8.04c-3.33,0.158-6.051,1.717-6.255,2.068
-			c-0.245,0.372,2.155-0.401,5.133-0.345c3.972,0.02,7.9,1.817,10.237,4.549C312.865,406.103,313.621,407.938,313.856,409.533z"/>
-		<path fill="#FFFFFF" d="M299.974,402.083c-2.627-0.119-5,1.16-4.875,1.609c0.098,0.449,1.605,0.431,3.1,0.467
-			c0.889,0.006,1.748,0.121,2.565,0.326c2.638,0.677,4.356,2.176,5.243,3.653c0.849,1.323,1.616,2.738,2.505,3.001
-			c0.867,0.266,1.9-0.679,1.5-2.23c-0.463-1.619-1.626-3.436-3.732-4.851C304.535,402.891,302.319,402.161,299.974,402.083z"/>
-	</g>
-</g>
-</svg>
diff --git a/pixmaps/svg/history.svg b/pixmaps/svg/history.svg
deleted file mode 100644
index 11ba3a203..000000000
--- a/pixmaps/svg/history.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#969696" d="M80.256,431.196c-11.801,0-21.397-9.601-21.397-21.399c0-3.965,1.095-7.839,3.169-11.209
-			c1.337-2.169,3.03-4.066,5.033-5.642l2.175,2.766c-1.676,1.318-3.094,2.907-4.213,4.721c-1.73,2.812-2.646,6.052-2.646,9.364
-			c0,9.861,8.022,17.884,17.881,17.884c9.865,0,17.887-8.021,17.887-17.884c0-9.862-8.025-17.884-17.888-17.884v-3.518
-			c11.803,0,21.405,9.6,21.405,21.401C101.662,421.595,92.059,431.196,80.256,431.196L80.256,431.196z"/>
-	</g>
-	<g>
-		<polygon fill="#969696" points="66.492,403.217 67.496,394.839 59.115,393.838 63.095,390.709 71.473,391.712 70.47,400.087 		"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M79.06,428.085c-11.801,0-21.397-9.6-21.397-21.399c0-3.965,1.095-7.84,3.169-11.209
-			c1.337-2.169,3.03-4.067,5.033-5.642l2.175,2.766c-1.676,1.318-3.094,2.907-4.213,4.721c-1.73,2.812-2.646,6.052-2.646,9.364
-			c0,9.861,8.022,17.884,17.881,17.884c9.865,0,17.887-8.021,17.887-17.884s-8.025-17.884-17.888-17.884v-3.518
-			c11.803,0,21.405,9.6,21.405,21.401S90.863,428.085,79.06,428.085L79.06,428.085z"/>
-	</g>
-	<g>
-		<polygon fill="#FFFFFF" points="65.296,400.106 66.3,391.729 57.919,390.728 61.899,387.598 70.277,388.601 69.274,396.977 		"/>
-	</g>
-</g>
-</svg>
diff --git a/pixmaps/svg/linphone-add-call.svg b/pixmaps/svg/linphone-add-call.svg
new file mode 100644
index 000000000..ed8da23bc
--- /dev/null
+++ b/pixmaps/svg/linphone-add-call.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="89"
+   height="89"
+   viewBox="0 0 89 89"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-add-call.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-add-call.png"
+   inkscape:export-xdpi="48.540001"
+   inkscape:export-ydpi="48.540001">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>options_add_call + Rectangle 250 Copy 19</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="2.6516854"
+     inkscape:cx="-129.59746"
+     inkscape:cy="44.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">options_add_call + Rectangle 250 Copy 19</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <g
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     sketch:type="MSShapeGroup"
+     transform="translate(3.014283,2.268892)"
+     id="options_add_call">
+    <path
+       inkscape:connector-curvature="0"
+       id="Stroke-1"
+       d="M 2.2654515,29.559846 C -2.1317829,42.299035 4.0305678,60.502124 14.005238,70.710039 l 0.207416,0.214478 C 24.18525,81.132432 41.96916,87.441506 54.405866,82.939575 L 63.839179,70.276834 50.991787,57.123552 39.235407,67.301738 28.491222,56.303861 28.283805,56.091506 17.543767,45.093629 27.483176,33.053089 14.635785,19.90193 2.2654515,29.559846 l 0,0 z"
+       style="stroke:#444444;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="Stroke-3"
+       d="m 77.004581,32.862025 c 7.354958,-7.357095 7.354958,-19.276132 0,-26.6290552 -7.352873,-7.3529232 -19.271827,-7.3550092 -26.626785,0 -7.352873,7.3508372 -7.352873,19.2740462 0,26.6290552 7.354958,7.352923 19.273912,7.348751 26.626785,0 z"
+       style="stroke:#444444;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="Stroke-4"
+       d="m 63.694387,28.465243 0,-17.837838 m 8.916502,8.921335 -17.837838,-0.0032"
+       style="stroke:#444444;stroke-opacity:1" />
+  </g>
+  <rect
+     style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1"
+     height="109.14064"
+     width="109.14064"
+     y="-9.6230001"
+     x="-9.8685999"
+     sketch:type="MSShapeGroup"
+     id="Rectangle-250-Copy-19" />
+</svg>
diff --git a/pixmaps/svg/linphone-call-status-incoming.svg b/pixmaps/svg/linphone-call-status-incoming.svg
new file mode 100644
index 000000000..af9dd9bf6
--- /dev/null
+++ b/pixmaps/svg/linphone-call-status-incoming.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="85px"
+   height="85px"
+   viewBox="0 0 85 85"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-call-status-incoming.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-call-status-incoming.png"
+   inkscape:export-xdpi="50.82"
+   inkscape:export-ydpi="50.82">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="2.7764706"
+     inkscape:cx="-40.158898"
+     inkscape:cy="42.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">call_status_incoming</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <g
+     id="g4165">
+    <path
+       d="m 51.149956,4.222906 0,27.705641 0.0024,1.931282 -0.0024,-29.636923 z m 29.617778,29.646496 -29.615385,-0.0096 29.615385,0.0096 z M 52.672007,32.337778 82.012178,3 52.672007,32.337778 Z"
+       id="Imported-Layers"
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-rule:evenodd;stroke:#96c11f;stroke-width:5;stroke-linecap:round;stroke-linejoin:round" />
+    <path
+       d="m 4.6651697,19.998632 c -5.0782906,14.354188 2.034188,34.87077 13.5429063,46.374701 l 0.239316,0.24171 C 29.953717,78.121368 50.470298,85.22906 64.8197,80.155556 L 75.706195,65.885128 60.882947,51.06188 47.31611,62.532308 22.290811,37.504615 33.756452,23.935385 18.933204,9.1145299 4.6651697,19.998632 l 0,0 z"
+       id="Path"
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+  <rect
+     style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1"
+     height="110"
+     width="110"
+     y="-13"
+     x="-12"
+     sketch:type="MSShapeGroup"
+     id="Rectangle-232-Copy-19" />
+</svg>
diff --git a/pixmaps/svg/linphone-call-status-missed.svg b/pixmaps/svg/linphone-call-status-missed.svg
new file mode 100644
index 000000000..abb146cf1
--- /dev/null
+++ b/pixmaps/svg/linphone-call-status-missed.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="84"
+   height="84"
+   viewBox="0 0 84 84"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-call-status-missed.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-call-status-missed.png"
+   inkscape:export-xdpi="51.43"
+   inkscape:export-ydpi="51.43">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>call_status_missed</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="2.9135802"
+     inkscape:cx="-82.760594"
+     inkscape:cy="40.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">call_status_missed</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <g
+     id="g4163">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+       inkscape:connector-curvature="0"
+       id="Imported-Layers"
+       d="M 80.490124,5.229215 51.149953,34.566992 80.490124,5.229215 Z" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+       inkscape:connector-curvature="0"
+       id="Imported-Layers-Copy"
+       d="M 80.48893,34.568189 51.151153,5.228018 80.48893,34.568189 Z" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       id="Path"
+       d="m 4.6651697,18.312632 c -5.0782906,14.354188 2.034188,34.87077 13.5429063,46.374701 l 0.239316,0.24171 C 29.953717,76.435368 50.470298,83.54306 64.8197,78.469556 L 75.706195,64.199128 60.882947,49.37588 47.31611,60.846308 22.290811,35.818615 33.756452,22.249385 18.933204,7.4285299 4.6651697,18.312632 l 0,0 z" />
+  </g>
+  <rect
+     style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1"
+     height="110"
+     width="110"
+     y="-12.686"
+     x="-13"
+     sketch:type="MSShapeGroup"
+     id="Rectangle-232-Copy-50" />
+</svg>
diff --git a/pixmaps/svg/linphone-call-status-outgoing.svg b/pixmaps/svg/linphone-call-status-outgoing.svg
new file mode 100644
index 000000000..cc8c66efb
--- /dev/null
+++ b/pixmaps/svg/linphone-call-status-outgoing.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="85"
+   height="85"
+   viewBox="0 0 85 85"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-call-status-outgoing.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-call-status-outgoing.png"
+   inkscape:export-xdpi="50.82"
+   inkscape:export-ydpi="50.82">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>call_status_outgoing</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="5.862558"
+     inkscape:cx="8.7248173"
+     inkscape:cy="36.080998"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">call_status_outgoing</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     d="m 82.012174,35.030086 0,-27.705641 -0.0024,-1.931282 0.0024,29.636923 z M 52.394396,5.38359 82.009781,5.39319 52.394396,5.38359 Z M 80.490123,6.915214 51.149952,36.252992 80.490123,6.915214 Z"
+     id="Imported-Layers"
+     inkscape:connector-curvature="0"
+     style="fill:none;fill-rule:evenodd;stroke:#3eb5c0;stroke-width:5;stroke-linecap:round;stroke-linejoin:round" />
+  <path
+     d="m 4.6651697,19.998632 c -5.0782906,14.354188 2.034188,34.87077 13.5429063,46.374701 l 0.239316,0.24171 C 29.953717,78.121368 50.470298,85.22906 64.8197,80.155556 L 75.706195,65.885128 60.882947,51.06188 47.31611,62.532308 22.290811,37.504615 33.756452,23.935385 18.933204,9.1145299 4.6651697,19.998632 l 0,0 z"
+     id="Path"
+     inkscape:connector-curvature="0"
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  <rect
+     style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1"
+     height="110"
+     width="110"
+     y="-13"
+     x="-12"
+     sketch:type="MSShapeGroup"
+     id="Rectangle-232-Copy-49" />
+</svg>
diff --git a/pixmaps/svg/linphone-call-transfer.svg b/pixmaps/svg/linphone-call-transfer.svg
new file mode 100644
index 000000000..357ccfad7
--- /dev/null
+++ b/pixmaps/svg/linphone-call-transfer.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="118"
+   height="118"
+   viewBox="0 0 118 118"
+   version="1.1"
+   id="svg4359"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-call-transfer.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-call-transfer.png"
+   inkscape:export-xdpi="36.610001"
+   inkscape:export-ydpi="36.610001">
+  <metadata
+     id="metadata4383">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>call_transfer</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4381"
+     showgrid="false"
+     inkscape:zoom="6.4168288"
+     inkscape:cx="59"
+     inkscape:cy="53.444902"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4359" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4361">call_transfer</title>
+  <desc
+     id="desc4363">Created with Sketch.</desc>
+  <defs
+     id="defs4365" />
+  <g
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     sketch:type="MSShapeGroup"
+     transform="translate(2,7)"
+     id="transfer_call-copy">
+    <g
+       id="Stroke-1-+-Stroke-3-+-Stroke-4-+-Stroke-4-Copy-2-+-Stroke-3-+-Stroke-4-Copy-2"
+       style="stroke:#444444;stroke-opacity:1">
+      <g
+         transform="translate(0.501758,13.339236)"
+         id="Stroke-1-+-Stroke-3-+-Stroke-4-+-Stroke-4-Copy-2"
+         style="stroke:#444444;stroke-opacity:1">
+        <g
+           id="Stroke-1-+-Stroke-3-+-Stroke-4"
+           transform="translate(0,0.839236)"
+           style="stroke:#444444;stroke-opacity:1">
+          <g
+             id="g4374"
+             style="stroke:#444444;stroke-opacity:1">
+            <path
+               inkscape:connector-curvature="0"
+               id="Stroke-1"
+               d="m 18.06252,69.243389 0.282315,0.291927 C 31.918529,83.429302 56.124197,92.016578 73.05179,85.889003 L 85.891466,68.653754 68.404889,50.750831 52.403288,64.604352 37.779384,49.635149 37.497069,49.346113 22.87881,34.37691 36.407334,17.988538 18.920757,0.08850498 2.0835046,13.233887 C -3.9015684,30.573189 4.4860032,55.349402 18.06252,69.243389 Z"
+               style="stroke:#444444;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
+      <g
+         transform="translate(61.360775,0.339236)"
+         id="Stroke-3-+-Stroke-4-Copy-2"
+         style="stroke:#444444;stroke-opacity:1">
+        <path
+           inkscape:connector-curvature="0"
+           id="Stroke-3"
+           d="m 43.810886,44.728481 c 10.010829,-10.013738 10.010829,-26.236731 0,-36.2447897 -10.00799,-10.0080592 -26.230871,-10.0108983 -36.2416999,0 -10.00799,10.0052197 -10.00799,26.2338917 0,36.2447897 10.0108289,10.008059 26.2337099,10.002381 36.2416999,0 z"
+           style="stroke:#444444;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="Stroke-4-Copy"
+           d="M 26.171789,38.744024 37.830635,26.604489 M 26.181574,14.464954 37.830635,26.604489 m -1.196218,0 -23.082851,0"
+           style="stroke:#444444;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-camera-disabled.svg b/pixmaps/svg/linphone-camera-disabled.svg
new file mode 100644
index 000000000..f5ddde244
--- /dev/null
+++ b/pixmaps/svg/linphone-camera-disabled.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   viewBox="0 0 96 96"
+   version="1.1"
+   id="svg4226"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-camera-disabled.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-camera-disabled.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <metadata
+     id="metadata4241">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>camera_default</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4239"
+     showgrid="false"
+     inkscape:zoom="5.3069837"
+     inkscape:cx="48"
+     inkscape:cy="27.872475"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4226" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4228">camera_default</title>
+  <desc
+     id="desc4230">Created with Sketch.</desc>
+  <defs
+     id="defs4232" />
+  <g
+     id="OUTILS"
+     sketch:type="MSPage"
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="translate(0,20)">
+    <g
+       id="linphone_v2.0_icones_buttons"
+       sketch:type="MSArtboardGroup"
+       transform="translate(-1679,-19208)">
+      <g
+         id="camera_default"
+         sketch:type="MSLayerGroup"
+         transform="translate(1650,19159)">
+        <path
+           d="m 97.906763,102 0,-19.523979 L 122,100.6521 122,53.346529 97.906763,71.525352 97.906763,52 32,52 32,101.38919 32.723837,102 l 65.182926,0 z"
+           id="camera_on"
+           sketch:type="MSShapeGroup"
+           inkscape:connector-curvature="0"
+           style="stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round" />
+        <rect
+           id="Rectangle-250-Copy-3"
+           sketch:type="MSShapeGroup"
+           x="0"
+           y="0"
+           width="154"
+           height="154"
+           style="fill:#ffffff;fill-opacity:0" />
+      </g>
+    </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5.50442791;stroke-linecap:round;stroke-linejoin:round"
+     d="M 3.97555,91.823823 92.2434,4.2745089 Z"
+     id="micro_off" />
+</svg>
diff --git a/pixmaps/svg/linphone-camera-enabled.svg b/pixmaps/svg/linphone-camera-enabled.svg
new file mode 100644
index 000000000..5138510e3
--- /dev/null
+++ b/pixmaps/svg/linphone-camera-enabled.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   viewBox="0 0 96 96"
+   version="1.1"
+   id="svg4226"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-camera-enabled.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-camera-enabled.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <metadata
+     id="metadata4241">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>camera_default</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4239"
+     showgrid="false"
+     inkscape:zoom="5.3069837"
+     inkscape:cx="48"
+     inkscape:cy="27.872475"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4226" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4228">camera_default</title>
+  <desc
+     id="desc4230">Created with Sketch.</desc>
+  <defs
+     id="defs4232" />
+  <g
+     id="OUTILS"
+     sketch:type="MSPage"
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="translate(0,20)">
+    <g
+       id="linphone_v2.0_icones_buttons"
+       sketch:type="MSArtboardGroup"
+       transform="translate(-1679,-19208)">
+      <g
+         id="camera_default"
+         sketch:type="MSLayerGroup"
+         transform="translate(1650,19159)">
+        <path
+           d="m 97.906763,102 0,-19.523979 L 122,100.6521 122,53.346529 97.906763,71.525352 97.906763,52 32,52 32,101.38919 32.723837,102 l 65.182926,0 z"
+           id="camera_on"
+           sketch:type="MSShapeGroup"
+           inkscape:connector-curvature="0"
+           style="stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round" />
+        <rect
+           id="Rectangle-250-Copy-3"
+           sketch:type="MSShapeGroup"
+           x="0"
+           y="0"
+           width="154"
+           height="154"
+           style="fill:#ffffff;fill-opacity:0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-chat-new-message-and-writing.svg b/pixmaps/svg/linphone-chat-new-message-and-writing.svg
new file mode 100644
index 000000000..9cd538ea3
--- /dev/null
+++ b/pixmaps/svg/linphone-chat-new-message-and-writing.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150px"
+   height="150px"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-chat-new-message-and-writing.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-chat-new-message-and-writing.png"
+   inkscape:export-xdpi="28.799999"
+   inkscape:export-ydpi="28.799999">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="2.2250293"
+     inkscape:cx="66.701282"
+     inkscape:cy="119.88471"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">chat_start_body_over</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <circle
+     id="Oval-1-Copy"
+     cx="74.822746"
+     cy="74.829407"
+     r="74.503311"
+     style="fill:#ff5e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
+     inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-chat-new-message-and-writing.png"
+     inkscape:export-xdpi="28"
+     inkscape:export-ydpi="28" />
+  <g
+     id="Chat-icon-Copy"
+     transform="matrix(1.3250402,0,0,1.3250402,31.392175,31.399019)"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round">
+    <path
+       d="m 23.561239,60.789504 c -8.66e-4,0 -10.358559,10.96065 -23.561239,8.012571 0,0 12.928057,-3.775412 9.9947058,-15.196942 L 9.9002772,53.076679 C 3.7762783,47.443016 0,39.731923 0,31.223818 0,13.979767 15.51748,0 34.653569,0 c 19.136955,0 34.652703,13.979767 34.652703,31.223818 0,17.244051 -15.515748,31.222952 -34.652703,31.222952 -3.881103,0 -7.6106,-0.572636 -11.094063,-1.633009 l 0.0017,-0.02426 0,0 z m -5.041968,-35.091926 32.1785,0 -32.1785,0 z m 0,11.05248 32.1785,0 -32.1785,0 z"
+       id="path16"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-chat-new-message.svg b/pixmaps/svg/linphone-chat-new-message.svg
new file mode 100644
index 000000000..8ad456ca2
--- /dev/null
+++ b/pixmaps/svg/linphone-chat-new-message.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150px"
+   height="150px"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-chat-new-message.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-chat-new-message.png"
+   inkscape:export-xdpi="28.799999"
+   inkscape:export-ydpi="28.799999">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="1.5733333"
+     inkscape:cx="-155.27643"
+     inkscape:cy="109.10267"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">chat_start_body_over</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <circle
+     id="Oval-1-Copy"
+     cx="74.822746"
+     cy="74.829407"
+     r="74.503311"
+     style="fill:#ff5e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:6.62520123;stroke-linecap:round;stroke-linejoin:round"
+     d="m 77.308594,31.398438 c -25.356087,-10e-7 -45.916016,18.523985 -45.916016,41.373046 0,11.273581 5.002644,21.492204 13.117188,28.957036 l 0.125,0.69921 c 3.886808,15.13398 -13.242188,20.13672 -13.242188,20.13672 17.494082,3.90633 31.21765,-10.61718 31.21875,-10.61718 l -0.002,0.0332 c 4.615728,1.40503 9.556602,2.16211 14.699219,2.16211 25.357233,0 45.917963,-18.522035 45.917963,-41.371096 0,-22.849061 -20.56073,-41.373046 -45.917963,-41.373046 z"
+     id="path16" />
+</svg>
diff --git a/pixmaps/svg/linphone-chat-nothing.svg b/pixmaps/svg/linphone-chat-nothing.svg
new file mode 100644
index 000000000..4835b5255
--- /dev/null
+++ b/pixmaps/svg/linphone-chat-nothing.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150px"
+   height="150px"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-chat-nothing.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-chat-nothing.png"
+   inkscape:export-xdpi="28.799999"
+   inkscape:export-ydpi="28.799999">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="2.2250293"
+     inkscape:cx="-93.112832"
+     inkscape:cy="106.07448"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">chat_start_body_over</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <circle
+     id="Oval-1-Copy"
+     cx="74.822746"
+     cy="74.829407"
+     r="74.503311"
+     style="fill:#a1a1a1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:6.62520123;stroke-linecap:round;stroke-linejoin:round"
+     d="m 77.308594,31.398438 c -25.356087,-10e-7 -45.916016,18.523985 -45.916016,41.373046 0,11.273581 5.002644,21.492204 13.117188,28.957036 l 0.125,0.69921 c 3.886808,15.13398 -13.242188,20.13672 -13.242188,20.13672 17.494082,3.90633 31.21765,-10.61718 31.21875,-10.61718 l -0.002,0.0332 c 4.615728,1.40503 9.556602,2.16211 14.699219,2.16211 25.357233,0 45.917963,-18.522035 45.917963,-41.371096 0,-22.849061 -20.56073,-41.373046 -45.917963,-41.373046 z"
+     id="path16" />
+</svg>
diff --git a/pixmaps/svg/linphone-chat-send.svg b/pixmaps/svg/linphone-chat-send.svg
new file mode 100644
index 000000000..4f0924ab7
--- /dev/null
+++ b/pixmaps/svg/linphone-chat-send.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="70"
+   height="70"
+   viewBox="0 0 70 70"
+   version="1.1"
+   id="svg4229"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-chat-send.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-chat-send.png"
+   inkscape:export-xdpi="61.709999"
+   inkscape:export-ydpi="61.709999">
+  <metadata
+     id="metadata4247">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>chat_send</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4245"
+     showgrid="false"
+     inkscape:zoom="5.7216724"
+     inkscape:cx="60"
+     inkscape:cy="59.938208"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4229" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4231">chat_send</title>
+  <desc
+     id="desc4233">Created with Sketch.</desc>
+  <defs
+     id="defs4235" />
+  <circle
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     id="Oval-17-Copy-5"
+     cx="60.40823"
+     cy="10.465309"
+     r="59.504131" />
+  <path
+     d="m 29.872382,40.129203 11.624063,27.1212 25.828022,-64.5748995 -0.0032,-0.0048 -64.5716699,25.8296375 27.1179709,11.625677 0.0048,0.0032 0,0 z M 67.103287,2.8902255 30.33573,39.659398 67.103287,2.8902255 Z"
+     id="Imported-Layers-Copy-55"
+     inkscape:connector-curvature="0"
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round" />
+</svg>
diff --git a/pixmaps/svg/linphone-chat-writing.svg b/pixmaps/svg/linphone-chat-writing.svg
new file mode 100644
index 000000000..7183818a1
--- /dev/null
+++ b/pixmaps/svg/linphone-chat-writing.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150px"
+   height="150px"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-chat-writing.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-chat-writing.png"
+   inkscape:export-xdpi="28.799999"
+   inkscape:export-ydpi="28.799999">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="1.5733333"
+     inkscape:cx="-38.503645"
+     inkscape:cy="131.19171"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">chat_start_body_over</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <circle
+     id="Oval-1-Copy"
+     cx="74.822746"
+     cy="74.829407"
+     r="74.503311"
+     style="fill:#a1a1a1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" />
+  <g
+     id="Chat-icon-Copy"
+     transform="matrix(1.3250402,0,0,1.3250402,31.392175,31.399019)"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round">
+    <path
+       d="m 23.561239,60.789504 c -8.66e-4,0 -10.358559,10.96065 -23.561239,8.012571 0,0 12.928057,-3.775412 9.9947058,-15.196942 L 9.9002772,53.076679 C 3.7762783,47.443016 0,39.731923 0,31.223818 0,13.979767 15.51748,0 34.653569,0 c 19.136955,0 34.652703,13.979767 34.652703,31.223818 0,17.244051 -15.515748,31.222952 -34.652703,31.222952 -3.881103,0 -7.6106,-0.572636 -11.094063,-1.633009 l 0.0017,-0.02426 0,0 z m -5.041968,-35.091926 32.1785,0 -32.1785,0 z m 0,11.05248 32.1785,0 -32.1785,0 z"
+       id="path16"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-conference-start.svg b/pixmaps/svg/linphone-conference-start.svg
new file mode 100644
index 000000000..eedb7136b
--- /dev/null
+++ b/pixmaps/svg/linphone-conference-start.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="99px"
+   height="99px"
+   viewBox="0 0 99 99"
+   version="1.1"
+   id="svg4226"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-conference-start.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-conference-start.png"
+   inkscape:export-xdpi="43.639999"
+   inkscape:export-ydpi="43.639999">
+  <metadata
+     id="metadata4241">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>conference_start</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4239"
+     showgrid="false"
+     inkscape:zoom="6.9353605"
+     inkscape:cx="49.5"
+     inkscape:cy="49.449022"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4226" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4228">conference_start</title>
+  <desc
+     id="desc4230">Created with Sketch.</desc>
+  <defs
+     id="defs4232" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="start_conference_top"
+     d="m 23.446512,44.616279 c 4.548837,0 8.237209,3.695349 8.237209,8.248837 0,2.17907 -0.844186,4.162791 -2.223256,5.63721 -0.195349,0.206976 -0.118604,0.172093 -0.332558,0.358139 l 0.344186,0.232558 c 12.47907,5.441861 9.281395,14.590698 9.281395,14.590698 -8.039534,2.553488 -15.293023,2.158139 -15.293023,2.158139 l -0.183721,0 c 0,0 -7.253488,0.395349 -15.290698,-2.158139 0,0 -3.2,-9.148837 9.281396,-14.590698 l 0.34186,-0.232558 C 17.395349,58.674419 17.472093,58.709302 17.27907,58.502326 15.9,57.027907 15.055814,55.044186 15.055814,52.865116 c 0,-4.553488 3.686047,-8.248837 8.234884,-8.248837 l 0.155814,0 0,0 z m 48.202325,0 c 4.548837,0 8.234884,3.695349 8.234884,8.248837 0,2.17907 -0.846512,4.162791 -2.223256,5.63721 -0.193023,0.206976 -0.118605,0.172093 -0.332558,0.358139 l 0.344186,0.232558 c 12.481397,5.441861 9.281395,14.590698 9.281395,14.590698 -8.037209,2.553488 -15.293023,2.158139 -15.293023,2.158139 l -0.183721,0 c 0,0 -7.253488,0.395349 -15.288372,-2.158139 0,0 -3.202326,-9.148837 9.27907,-14.590698 l 0.34186,-0.232558 C 65.595349,58.674419 65.674419,58.709302 65.47907,58.502326 64.1,57.027907 63.255814,55.044186 63.255814,52.865116 c 0,-4.553488 3.688372,-8.248837 8.234884,-8.248837 l 0.158139,0 0,0 z M 47.546512,3 c 4.548837,0 8.234883,3.693023 8.234883,8.248837 0,2.17907 -0.844186,4.162791 -2.223255,5.637209 -0.193024,0.206977 -0.11628,0.174419 -0.330233,0.35814 l 0.344186,0.230233 c 12.47907,5.44186 9.27907,14.593023 9.27907,14.593023 -8.03721,2.553488 -15.290698,2.158139 -15.290698,2.158139 l -0.186046,0 c 0,0 -7.253489,0.395349 -15.288372,-2.158139 0,0 -3.202326,-9.151163 9.279069,-14.593023 l 0.344186,-0.230233 C 41.493023,17.060465 41.572093,17.093023 41.376744,16.886046 39.997674,15.411628 39.153488,13.427907 39.153488,11.248837 39.153488,6.693023 42.841861,3 47.388372,3 l 0.15814,0 0,0 z m 13.188372,84.706977 c -7.888372,7.865113 -20.67907,7.865113 -28.567442,0 m 1.744186,8.316283 -1.744186,-8.316283 8.339535,-1.739535 -6.595349,10.055818 z M 3,37.306977 C 3,26.181395 12.04186,17.165116 23.2,17.165116 M 16.067442,12.513953 23.2,17.165116 18.534884,24.274419 16.067442,12.513953 Z m 55.090698,4.651163 c 11.155813,0 20.2,9.018605 20.2,20.141861 m 4.66512,-7.111628 -4.66512,7.111628 -7.130233,-4.651163 11.795353,-2.460465 z" />
+</svg>
diff --git a/pixmaps/svg/linphone-contact-add.svg b/pixmaps/svg/linphone-contact-add.svg
new file mode 100644
index 000000000..08882723a
--- /dev/null
+++ b/pixmaps/svg/linphone-contact-add.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="100px" height="86px" viewBox="0 0 100 86" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>contact_add</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="OUTILS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="linphone_v2.0_icones_buttons" sketch:type="MSArtboardGroup" transform="translate(-1436.000000, -8040.000000)">
+            <g id="contact_add" sketch:type="MSLayerGroup" transform="translate(1426.000000, 8023.000000)">
+                <g id="add_contact" transform="translate(12.000000, 19.000000)" stroke="#444444" stroke-width="5" sketch:type="MSShapeGroup" stroke-linecap="round" stroke-linejoin="round">
+                    <path d="M64.4082749,62.4977661 C71.4592749,69.5867661 82.8872749,69.5827661 89.9382749,62.4977661 C96.9902749,55.4087661 96.9902749,43.9247661 89.9382749,36.8367661 C82.8872749,29.7527661 71.4592749,29.7487661 64.4082749,36.8367661 C57.3582749,43.9217661 57.3582749,55.4127661 64.4082749,62.4977661 L64.4082749,62.4977661 Z M77.1442749,57.5577661 L77.1442749,41.7397661 L77.1442749,57.5577661 Z M85.0032749,49.6527661 L69.2772749,49.6497661 L85.0032749,49.6527661 Z M81.1602749,67.5947661 C81.3382749,72.2657661 80.2402749,75.4137661 80.2402749,75.4137661 C59.7252749,81.9487661 41.2112749,80.9447661 41.2112749,80.9447661 L40.7402749,80.9447661 C40.7402749,80.9447661 22.2272749,81.9487661 1.71127485,75.4137661 C1.71127485,75.4137661 -6.45672515,51.9927661 25.3992749,38.0597661 L26.2762749,37.4667661 C25.7292749,36.9887661 25.9242749,37.0817661 25.4302749,36.5507661 C21.9122749,32.7737661 19.7562749,27.6987661 19.7562749,22.1177661 C19.7562749,10.4547661 29.1662749,0.99976614 40.7742749,0.99976614 L41.1782749,0.99976614 C52.7852749,0.99976614 62.1952749,10.4547661 62.1952749,22.1177661 C62.1952749,27.6987661 60.0412749,32.7737661 56.5222749,36.5507661 C56.0282749,37.0817661 56.2212749,36.9887661 55.6762749,37.4667661 L56.5532749,38.0597661 C57.187901,38.3379988 61.6047564,40.9939068 61.6047564,40.9939068" id="Add-contact-ICON"></path>
+                </g>
+                <rect id="Rectangle-232-Copy-31" opacity="0" fill-opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="120" height="120"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pixmaps/svg/linphone-delete.svg b/pixmaps/svg/linphone-delete.svg
new file mode 100644
index 000000000..51b051ac0
--- /dev/null
+++ b/pixmaps/svg/linphone-delete.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="63px" height="82px" viewBox="0 0 63 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>delete</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="OUTILS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="linphone_v2.0_icones_buttons" sketch:type="MSArtboardGroup" transform="translate(-1451.000000, -7131.000000)">
+            <g id="delete" sketch:type="MSLayerGroup" transform="translate(1426.000000, 7115.000000)">
+                <g transform="translate(27.000000, 19.000000)" stroke="#444444" id="Delete-icon" stroke-width="5" sketch:type="MSShapeGroup" stroke-linecap="round" stroke-linejoin="round">
+                    <path d="M29.5231579,75.5263158 L34.8768421,75.5263158 C46.4010526,75.5263158 48.46,64.9796053 48.46,64.9796053 L58.3389474,10.9707368 L0.5,10.9707368 L10.38,64.9796053 C10.38,64.9796053 12.4410526,75.5263158 23.9652632,75.5263158 L29.5231579,75.5263158 L29.5231579,75.5263158 Z M22.7305263,24.4726842 L22.7305263,75.5263158 L22.7305263,24.4726842 Z M36.1094737,24.4726842 L36.1094737,75.5263158 L36.1094737,24.4726842 Z M17.5852632,9.09494702e-13 L41.2568421,9.09494702e-13 L17.5852632,9.09494702e-13 Z"></path>
+                </g>
+                <rect id="Rectangle-232-Copy-27" opacity="0" fill-opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="120" height="120"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pixmaps/svg/linphone-edit.svg b/pixmaps/svg/linphone-edit.svg
new file mode 100644
index 000000000..21d72cfbc
--- /dev/null
+++ b/pixmaps/svg/linphone-edit.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="85px" height="85px" viewBox="0 0 85 85" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>edit</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="OUTILS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="linphone_v2.0_icones_buttons" sketch:type="MSArtboardGroup" transform="translate(-1443.000000, -7813.000000)">
+            <g id="edit" sketch:type="MSLayerGroup" transform="translate(1426.000000, 7796.000000)">
+                <path d="M31.6469767,91.3387209 L45.9368605,90.1823256 L98.6467442,33.3786047 L91.5443023,26.7861628 L91.330814,26.5865116 L84.2303488,20 L31.5204651,76.8017442 L31.4315116,91.1351163 L31.6469767,91.3387209 L31.6469767,91.3387209 Z M73.4472093,31.6173256 L87.9367442,45.0611628 L73.4472093,31.6173256 Z M20,99.0697674 L45.8597674,99.0697674 L20,99.0697674 Z" id="edit_detail" stroke="#444444" stroke-width="5" stroke-linecap="round" stroke-linejoin="round" sketch:type="MSShapeGroup"></path>
+                <rect id="Rectangle-232-Copy-30" opacity="0" fill-opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="120" height="120"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pixmaps/svg/linphone-failed.svg b/pixmaps/svg/linphone-failed.svg
new file mode 100644
index 000000000..98e3fc67f
--- /dev/null
+++ b/pixmaps/svg/linphone-failed.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32px"
+   height="32px"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg4478"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-failed.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-failed.png"
+   inkscape:export-xdpi="135"
+   inkscape:export-ydpi="135">
+  <metadata
+     id="metadata4495">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>call_missed</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4493"
+     showgrid="false"
+     inkscape:zoom="30.34375"
+     inkscape:cx="16"
+     inkscape:cy="15.983522"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4478" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4480">call_missed</title>
+  <desc
+     id="desc4482">Created with Sketch.</desc>
+  <defs
+     id="defs4484" />
+  <g
+     id="g4514"
+     transform="translate(0.19953343,0)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="Imported-Layers"
+       d="M 28.555495,2.818876 2.976885,29.068467 28.555495,2.818876 Z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="Imported-Layers-Copy"
+       d="M 28.890985,28.732976 2.6413944,3.154366 28.890985,28.732976 Z" />
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-history.svg b/pixmaps/svg/linphone-history.svg
new file mode 100644
index 000000000..c4b4f4936
--- /dev/null
+++ b/pixmaps/svg/linphone-history.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="86px"
+   height="86px"
+   viewBox="0 0 86 86"
+   version="1.1"
+   id="svg3446"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-history.svg">
+  <metadata
+     id="metadata3462">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview3460"
+     showgrid="false"
+     inkscape:zoom="11.290698"
+     inkscape:cx="28.873326"
+     inkscape:cy="42.955716"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3446" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title3448">footer_history</title>
+  <desc
+     id="desc3450">Created with Sketch.</desc>
+  <defs
+     id="defs3452" />
+  <g
+     id="OUTILS"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     sketch:type="MSPage"
+     style="stroke:#444444;stroke-opacity:1">
+    <g
+       id="linphone_v2.0_icones_buttons"
+       sketch:type="MSArtboardGroup"
+       transform="translate(-1888.000000, -16901.000000)"
+       style="stroke:#444444;stroke-opacity:1">
+      <g
+         id="footer_history"
+         sketch:type="MSLayerGroup"
+         transform="translate(1886.000000, 16899.000000)"
+         style="stroke:#444444;stroke-opacity:1">
+        <path
+           d="M85,45 C85,67.09 67.094,85 45,85 C22.91,85 5,67.09 5,45 C5,22.909 22.91,5 45,5 C67.094,5 85,22.909 85,45 L85,45 Z M44.99,14.493 L44.99,45.311 L67.939,45.311"
+           stroke="#FFFFFF"
+           stroke-width="5"
+           stroke-linecap="round"
+           stroke-linejoin="round"
+           sketch:type="MSShapeGroup"
+           id="path3457"
+           style="stroke:#444444;stroke-opacity:1" />
+        <rect
+           id="Rectangle-250-Copy-8"
+           fill-opacity="0"
+           fill="#FFFFFF"
+           sketch:type="MSShapeGroup"
+           x="0"
+           y="0"
+           width="90"
+           height="90"
+           style="stroke:#444444;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-hold-off.svg b/pixmaps/svg/linphone-hold-off.svg
new file mode 100644
index 000000000..bd44bbf3a
--- /dev/null
+++ b/pixmaps/svg/linphone-hold-off.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="151"
+   height="151"
+   viewBox="0 0 151 151"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-hold-off.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-hold-off.png"
+   inkscape:export-xdpi="28.799999"
+   inkscape:export-ydpi="28.799999">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>pause_big_default</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="1.5838926"
+     inkscape:cx="-9.1016949"
+     inkscape:cy="74.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">pause_big_default</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Imported-Layers"
+     d="m 63.306767,47.088776 0,59.210524 m 23.177529,-59.210524 0,59.210524" />
+</svg>
diff --git a/pixmaps/svg/linphone-hold-on.svg b/pixmaps/svg/linphone-hold-on.svg
new file mode 100644
index 000000000..b25a411fd
--- /dev/null
+++ b/pixmaps/svg/linphone-hold-on.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="101px"
+   height="100px"
+   viewBox="0 0 101 100"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-hold-on.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-hold-on.png"
+   inkscape:export-xdpi="43.200001"
+   inkscape:export-ydpi="43.200001">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="-6.279661"
+     inkscape:cy="50"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">pause_small_over_selected</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#ff5e00;stroke-width:7;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Imported-Layers"
+     d="m 42.672311,30.833184 0,39.473684 m 15.451686,-39.473684 0,39.473684" />
+</svg>
diff --git a/pixmaps/svg/linphone-inprogress.svg b/pixmaps/svg/linphone-inprogress.svg
new file mode 100644
index 000000000..871be13b5
--- /dev/null
+++ b/pixmaps/svg/linphone-inprogress.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="38"
+   height="38"
+   viewBox="0 0 38 38"
+   version="1.1"
+   id="svg4345"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-inprogress.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-inprogress.png"
+   inkscape:export-xdpi="113.68"
+   inkscape:export-ydpi="113.68">
+  <metadata
+     id="metadata4360">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>chat_message_inprogress</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4358"
+     showgrid="false"
+     inkscape:zoom="19.072241"
+     inkscape:cx="18.440059"
+     inkscape:cy="21.038331"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4345" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4347">chat_message_inprogress</title>
+  <desc
+     id="desc4349">Created with Sketch.</desc>
+  <defs
+     id="defs4351" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:1;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Imported-Layers-Copy-12"
+     d="m 12.967496,29.603196 c 0,0.884475 -0.313251,1.636279 -0.939755,2.255412 -0.626503,0.619133 -1.374622,0.9287 -2.2443564,0.9287 -0.8844755,0 -1.6362797,-0.309567 -2.2554126,-0.9287 -0.6191328,-0.619133 -0.9286993,-1.370937 -0.9286993,-2.255412 0,-0.884476 0.3095665,-1.63628 0.9286993,-2.255413 0.6191329,-0.619133 1.3709371,-0.928699 2.2554126,-0.928699 0.8697344,0 1.6178534,0.309566 2.2443564,0.928699 0.626504,0.619133 0.939755,1.370937 0.939755,2.255413 l 0,0 z m 9.552336,4.245482 c 0,0.781287 -0.276398,1.448329 -0.829196,2.001126 -0.552797,0.552837 -1.219839,0.829196 -2.001126,0.829196 -0.781286,0 -1.448328,-0.276399 -2.001125,-0.829196 -0.552798,-0.552797 -0.829196,-1.219839 -0.829196,-2.001126 0,-0.781326 0.276398,-1.448328 0.829196,-2.001126 0.552797,-0.552797 1.219839,-0.829195 2.001125,-0.829195 0.781287,0 1.448329,0.276398 2.001126,0.829195 0.552798,0.552837 0.829196,1.2198 0.829196,2.001126 l 0,0 z M 9.0758042,19.69707 c 0,0.972923 -0.3464196,1.805804 -1.0392587,2.498643 -0.6928392,0.692839 -1.5257203,1.039299 -2.4986434,1.039299 -0.9729231,0 -1.8058042,-0.34646 -2.4986434,-1.039299 C 2.3464196,21.502874 2,20.669993 2,19.69707 c 0,-0.972923 0.3464196,-1.805804 1.0392587,-2.498643 0.6928392,-0.69284 1.5257203,-1.039259 2.4986434,-1.039259 0.9729231,0 1.8058042,0.346419 2.4986434,1.039259 0.6928391,0.692839 1.0392587,1.52572 1.0392587,2.498643 l 0,0 z m 22.9963638,9.906126 c 0,0.678098 -0.243231,1.260377 -0.729693,1.746839 -0.486461,0.486461 -1.068741,0.729692 -1.746839,0.729692 -0.678058,0 -1.260377,-0.243231 -1.746839,-0.729692 -0.486461,-0.486462 -0.729692,-1.068741 -0.729692,-1.746839 0,-0.678098 0.243231,-1.260378 0.729692,-1.746839 0.486462,-0.486462 1.068741,-0.729693 1.746839,-0.729693 0.678098,0 1.260378,0.243231 1.746839,0.729693 0.486462,0.486461 0.729693,1.068741 0.729693,1.746839 l 0,0 z M 13.675077,9.790944 c 0,1.076112 -0.379587,1.993755 -1.138762,2.75293 -0.759175,0.759175 -1.676818,1.138762 -2.7529304,1.138762 -1.0761119,0 -1.9937552,-0.379587 -2.7529301,-1.138762 -0.7591748,-0.759175 -1.1387622,-1.676818 -1.1387622,-2.75293 0,-1.0761118 0.3795874,-1.9937552 1.1387622,-2.75293 0.7591749,-0.7591749 1.6768182,-1.1387623 2.7529301,-1.1387623 1.0761124,0 1.9937554,0.3795874 2.7529304,1.1387623 0.759175,0.7591748 1.138762,1.6768182 1.138762,2.75293 l 0,0 z M 23.934993,5.5454615 c 0,1.1793007 -0.412755,2.1817063 -1.238266,3.0072168 -0.82551,0.8255107 -1.827916,1.2382657 -3.007217,1.2382657 -1.1793,0 -2.181706,-0.412755 -3.007216,-1.2382657 -0.825511,-0.8255105 -1.238266,-1.8279161 -1.238266,-3.0072168 0,-1.1793007 0.412755,-2.1817063 1.238266,-3.0072168 0.82551,-0.8255105 1.827916,-1.2382657 3.007216,-1.2382657 1.179301,0 2.181707,0.4127552 3.007217,1.2382657 0.825511,0.8255105 1.238266,1.8279161 1.238266,3.0072168 l 0,0 z M 35.96386,19.69707 c 0,0.58965 -0.206377,1.090853 -0.619133,1.503608 -0.412755,0.412755 -0.913958,0.619133 -1.503608,0.619133 -0.58965,0 -1.090853,-0.206378 -1.503609,-0.619133 -0.412755,-0.412755 -0.619132,-0.913958 -0.619132,-1.503608 0,-0.58965 0.206377,-1.090853 0.619132,-1.503609 0.412756,-0.412755 0.913959,-0.619132 1.503609,-0.619132 0.58965,0 1.090853,0.206377 1.503608,0.619132 0.412756,0.412756 0.619133,0.913959 0.619133,1.503609 l 0,0 z M 31.364587,9.790944 c 0,0.486462 -0.173209,0.902902 -0.519629,1.249322 -0.34642,0.346419 -0.76286,0.519629 -1.249322,0.519629 -0.486461,0 -0.902902,-0.17321 -1.249321,-0.519629 -0.34642,-0.34642 -0.51963,-0.76286 -0.51963,-1.249322 0,-0.486462 0.17321,-0.9029021 0.51963,-1.2493216 0.346419,-0.3464196 0.76286,-0.5196294 1.249321,-0.5196294 0.486462,0 0.902902,0.1732098 1.249322,0.5196294 0.34642,0.3464195 0.519629,0.7628596 0.519629,1.2493216 l 0,0 z" />
+</svg>
diff --git a/pixmaps/svg/linphone-media-pause.svg b/pixmaps/svg/linphone-media-pause.svg
new file mode 100644
index 000000000..0e8ed0de7
--- /dev/null
+++ b/pixmaps/svg/linphone-media-pause.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="120"
+   viewBox="0 0 120 120"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-media-pause.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-media-pause.png"
+   inkscape:export-xdpi="36"
+   inkscape:export-ydpi="36">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>pause_big_default</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="1.5838926"
+     inkscape:cx="-9.1016949"
+     inkscape:cy="74.184322"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">pause_big_default</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Imported-Layers"
+     d="m 48.306767,32.08877 0,59.210524 m 23.177529,-59.210524 0,59.210524" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Stroke-2-6"
+     d="M 112.92098,60.39048 C 112.92098,89.999684 89.20792,114 59.957182,114 30.70644,114 7,89.999684 7,60.39048 7,30.784624 30.70644,6.7809643 59.957182,6.7809643 c 29.250738,0 52.963798,24.0036597 52.963798,53.6095157 l 0,0 z" />
+</svg>
diff --git a/pixmaps/svg/linphone-media-play.svg b/pixmaps/svg/linphone-media-play.svg
new file mode 100644
index 000000000..3eb7f0066
--- /dev/null
+++ b/pixmaps/svg/linphone-media-play.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="120"
+   height="120"
+   viewBox="0 0 120 120"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-media-play.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-media-play.png"
+   inkscape:export-xdpi="36"
+   inkscape:export-ydpi="36">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>pause_big_default</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="3.1677852"
+     inkscape:cx="29.600633"
+     inkscape:cy="74.184322"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">pause_big_default</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7;stroke-linecap:round;stroke-linejoin:round"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Imported-Layers"
+     d="M 48.306767,32.08877 47.991089,90.983616 78.113534,61.941243 48.439804,32.08877"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Stroke-2-6"
+     d="M 112.92098,60.39048 C 112.92098,89.999684 89.20792,114 59.957182,114 30.70644,114 7,89.999684 7,60.39048 7,30.784624 30.70644,6.7809643 59.957182,6.7809643 c 29.250738,0 52.963798,24.0036597 52.963798,53.6095157 l 0,0 z" />
+</svg>
diff --git a/pixmaps/svg/linphone-ok.svg b/pixmaps/svg/linphone-ok.svg
new file mode 100644
index 000000000..db08198f7
--- /dev/null
+++ b/pixmaps/svg/linphone-ok.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="82"
+   height="82"
+   viewBox="0 0 82 82"
+   version="1.1"
+   id="svg4228"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-ok.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-ok.png"
+   inkscape:export-xdpi="52.68"
+   inkscape:export-ydpi="52.68">
+  <metadata
+     id="metadata4245">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>valid</dc:title>
+        <dc:title>valid</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4243"
+     showgrid="false"
+     inkscape:zoom="1"
+     inkscape:cx="37.5"
+     inkscape:cy="27.971164"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4228" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4230">valid</title>
+  <desc
+     id="desc4232">Created with Sketch.</desc>
+  <defs
+     id="defs4234" />
+  <g
+     id="OUTILS"
+     sketch:type="MSPage"
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="translate(0,16)">
+    <g
+       id="linphone_v2.0_icones_buttons"
+       sketch:type="MSArtboardGroup"
+       transform="translate(-1444,-7601)">
+      <g
+         id="valid"
+         sketch:type="MSLayerGroup"
+         transform="translate(1426,7569)">
+        <g
+           transform="translate(21,35)"
+           id="Stroke-3"
+           sketch:type="MSShapeGroup"
+           style="stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round">
+          <path
+             d="M 0.4395,19.69312 32.836996,49.765883 76.2135,0.0261167"
+             id="path4240"
+             inkscape:connector-curvature="0" />
+        </g>
+        <rect
+           id="Rectangle-232-Copy-29"
+           sketch:type="MSShapeGroup"
+           x="0"
+           y="0"
+           width="120"
+           height="120"
+           style="opacity:0;fill:#ffffff;fill-opacity:0.7" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-record.svg b/pixmaps/svg/linphone-record.svg
new file mode 100644
index 000000000..8709e9509
--- /dev/null
+++ b/pixmaps/svg/linphone-record.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="130"
+   height="130"
+   viewBox="0 0 130 130"
+   version="1.1"
+   id="svg5402"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-record.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-record.png"
+   inkscape:export-xdpi="33.23"
+   inkscape:export-ydpi="33.23">
+  <metadata
+     id="metadata5417">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>status_busy</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview5415"
+     showgrid="false"
+     inkscape:zoom="2.8433735"
+     inkscape:cx="41"
+     inkscape:cy="41.324153"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5402" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title5404">status_busy</title>
+  <desc
+     id="desc5406">Created with Sketch.</desc>
+  <defs
+     id="defs5408" />
+  <path
+     style="fill:#ff0000;fill-rule:evenodd;stroke:none;stroke-width:1"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Fill-1"
+     d="m 100.44184,64.938426 c 0,19.29648 -15.453925,34.937606 -34.516791,34.937606 -19.062866,0 -34.512481,-15.641126 -34.512481,-34.937606 0,-19.294296 15.449615,-34.937611 34.512481,-34.937611 19.062866,0 34.516791,15.643315 34.516791,34.937611 l 0,0 z" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:12"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Stroke-2"
+     d="m 100.44184,64.938426 c 0,19.29648 -15.453925,34.937606 -34.516791,34.937606 -19.062866,0 -34.512481,-15.641126 -34.512481,-34.937606 0,-19.294296 15.449615,-34.937611 34.512481,-34.937611 19.062866,0 34.516791,15.643315 34.516791,34.937611 l 0,0 z" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:10;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Stroke-2-6"
+     d="m 118.3276,64.883872 c 0,29.609205 -23.713064,53.609518 -52.963804,53.609518 -29.250742,0 -52.957182,-24.000313 -52.957182,-53.609518 0,-29.605856 23.70644,-53.609516 52.957182,-53.609516 29.25074,0 52.963804,24.00366 52.963804,53.609516 l 0,0 z" />
+</svg>
diff --git a/pixmaps/svg/linphone-security-ok.svg b/pixmaps/svg/linphone-security-ok.svg
new file mode 100644
index 000000000..83e518e9b
--- /dev/null
+++ b/pixmaps/svg/linphone-security-ok.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="53"
+   height="53"
+   viewBox="0 0 53 53"
+   version="1.1"
+   id="svg4228"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-security-ok.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-security-ok.png"
+   inkscape:export-xdpi="33.23"
+   inkscape:export-ydpi="33.23">
+  <metadata
+     id="metadata4245">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>security_ok</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4243"
+     showgrid="false"
+     inkscape:zoom="9.1603774"
+     inkscape:cx="20.5"
+     inkscape:cy="26.472709"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4228" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4230">security_ok</title>
+  <desc
+     id="desc4232">Created with Sketch.</desc>
+  <defs
+     id="defs4234" />
+  <g
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     sketch:type="MSShapeGroup"
+     transform="translate(7,2)"
+     id="security_ok-copy">
+    <path
+       inkscape:connector-curvature="0"
+       style="stroke:#444444;stroke-opacity:1"
+       id="Imported-Layers"
+       d="m 1.0857143,17.193966 36.9142857,0 0,31.719077 -36.9142857,0 0,-31.719077 z m 31.3912567,-0.06233 0,-3.873067 C 32.476971,5.9353628 26.685771,0 19.540686,0 12.399943,0 6.6076571,5.9353628 6.6076571,13.258574 l 0,3.873067 25.8693139,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="stroke:#444444;stroke-opacity:1"
+       id="Path"
+       d="M 9.7714286,31.96087 17.999514,39.279348 29.023265,27.173913" />
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-security-pending.svg b/pixmaps/svg/linphone-security-pending.svg
new file mode 100644
index 000000000..084755a29
--- /dev/null
+++ b/pixmaps/svg/linphone-security-pending.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="54"
+   height="54"
+   viewBox="0 0 54 54"
+   version="1.1"
+   id="svg4362"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-security-pending.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/security_pending.png"
+   inkscape:export-xdpi="33.23"
+   inkscape:export-ydpi="33.23">
+  <metadata
+     id="metadata4379">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>security_pending</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4377"
+     showgrid="false"
+     inkscape:zoom="8.9907407"
+     inkscape:cx="23.5"
+     inkscape:cy="26.972194"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4362" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4364">security_pending</title>
+  <desc
+     id="desc4366">Created with Sketch.</desc>
+  <defs
+     id="defs4368" />
+  <g
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:1;stroke-opacity:1"
+     sketch:type="MSShapeGroup"
+     transform="translate(6,2)"
+     id="security_pending-copy">
+    <path
+       inkscape:connector-curvature="0"
+       style="stroke:#444444;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="Imported-Layers"
+       d="m 0,17.576054 42.222222,0 0,32.423946 L 0,50 0,17.576054 Z m 35.905033,-0.06371 0,-3.959135 C 35.905033,6.0672598 29.281111,0 21.108627,0 12.941111,0 6.3159477,6.0672598 6.3159477,13.553209 l 0,3.959135 29.5890853,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke:#444444;stroke-opacity:1"
+       id="?"
+       d="m 28.111928,28.930556 c 0,1.240746 -0.17075,2.185182 -0.512255,2.833333 -0.341505,0.648151 -1.040027,1.342589 -2.095588,2.083333 -1.055561,0.740745 -1.754083,1.328702 -2.095588,1.763889 -0.341505,0.435187 -0.512255,0.902775 -0.512255,1.402778 l 0,0.916667 -2.732026,0 c -0.496735,-0.574077 -0.745098,-1.296292 -0.745098,-2.166667 0,-0.462965 0.196621,-0.925924 0.589869,-1.388889 0.393248,-0.462965 1.096945,-1.069441 2.111111,-1.819444 1.014166,-0.750004 1.686818,-1.333332 2.017974,-1.75 0.331156,-0.416669 0.496732,-0.96759 0.496732,-1.652778 0,-1.351859 -1.096939,-2.027778 -3.29085,-2.027778 -1.241836,0 -2.545745,0.129628 -3.911765,0.388889 l -0.714052,0.138889 -0.186274,-2.305556 c 1.924846,-0.611114 3.673739,-0.916666 5.246732,-0.916666 2.173213,0 3.772053,0.356477 4.796568,1.069444 1.024515,0.712966 1.536765,1.856474 1.536765,3.430556 l 0,0 z m -8.47549,14.833333 0,-3.888889 3.601307,0 0,3.888889 -3.601307,0 z" />
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-start-call.svg b/pixmaps/svg/linphone-start-call.svg
new file mode 100644
index 000000000..b7783041a
--- /dev/null
+++ b/pixmaps/svg/linphone-start-call.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="86px"
+   height="86px"
+   viewBox="0 0 86 86"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-start-call.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-start-call.png"
+   inkscape:export-xdpi="50.23"
+   inkscape:export-ydpi="50.23">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview15"
+     showgrid="false"
+     inkscape:zoom="2.744186"
+     inkscape:cx="-124.26271"
+     inkscape:cy="42.999998"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">call_alt_start</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="start_call_top"
+     d="m 4.582549,24.174568 c -4.828038,13.659309 1.937616,33.180264 12.887303,44.129951 l 0.229602,0.228002 C 28.646741,79.479808 48.172496,86.24546 61.827005,81.417423 L 72.184687,67.839716 58.076575,53.733203 45.170072,64.64769 33.374778,52.853996 33.148376,52.625995 21.354683,40.832301 32.26677,27.920998 18.164257,13.816086 4.582549,24.174568 l 0,0 z M 49.753309,3 C 68.115855,3 83.000773,17.884118 83.000773,36.249064 M 49.753309,13.738485 c 12.432898,0 22.510578,10.07928 22.510578,22.510579 M 49.753309,24.052967 c 6.734453,0 12.192097,5.462444 12.192097,12.196097" />
+  <rect
+     style="opacity:0;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke:none;stroke-width:1"
+     height="120"
+     width="120"
+     y="-17"
+     x="-16"
+     sketch:type="MSShapeGroup"
+     id="Rectangle-232-Copy-26" />
+</svg>
diff --git a/pixmaps/svg/linphone-start-call2.svg b/pixmaps/svg/linphone-start-call2.svg
new file mode 100644
index 000000000..4e6f22d9a
--- /dev/null
+++ b/pixmaps/svg/linphone-start-call2.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150px"
+   height="150px"
+   viewBox="0 0 150 150"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-start-call2.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-start-call2.png"
+   inkscape:export-xdpi="28.799999"
+   inkscape:export-ydpi="28.799999">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="1.5733333"
+     inkscape:cx="-216.73729"
+     inkscape:cy="74.999996"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">call_start_body_over</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <circle
+     id="Oval-1"
+     cx="74.822746"
+     cy="74.829407"
+     r="74.503311"
+     style="fill:#a1a1a1;fill-rule:evenodd;stroke:none;stroke-width:1;fill-opacity:1" />
+  <path
+     d="m 23.053615,49.440661 c -6.507682,18.411294 2.6117,44.723466 17.370713,59.482479 l 0.309478,0.30732 c 14.75578,14.75577 41.07442,23.87516 59.479244,17.36748 L 114.1741,108.29663 95.157872,89.282556 77.761279,103.99412 61.862477,88.097479 61.557311,87.790157 45.660667,71.893513 60.368999,54.49045 41.360313,35.478528 23.053615,49.440661 l 0,0 z M 83.938993,20.899595 c 24.750757,0 44.814047,20.062208 44.814047,44.816202 M 83.938993,35.373931 c 16.758227,0 30.341867,13.585797 30.341867,30.341866 M 83.938993,49.276756 c 9.077328,0 16.433647,7.362793 16.433647,16.439041"
+     id="Imported-Layers-Copy-2"
+     inkscape:connector-curvature="0"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.236691;stroke-linecap:round;stroke-linejoin:round" />
+</svg>
diff --git a/pixmaps/svg/linphone-start-chat.svg b/pixmaps/svg/linphone-start-chat.svg
new file mode 100644
index 000000000..aa71e6c0f
--- /dev/null
+++ b/pixmaps/svg/linphone-start-chat.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80px"
+   height="80px"
+   viewBox="0 0 80 80"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-start-chat.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-start-chat.png"
+   inkscape:export-xdpi="54"
+   inkscape:export-ydpi="54">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>footer_chat</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="2.95"
+     inkscape:cx="-5.4237288"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">footer_chat</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <g
+     id="g4159">
+    <path
+       d="m 28.299535,68.274419 c -9.3e-4,0 -11.122791,11.769302 -25.299535,8.603721 0,0 13.88186,-4.053954 10.732093,-16.31814 L 13.630698,59.992558 C 7.054884,53.943256 3,45.663256 3,36.527442 3,18.011163 19.662326,3 40.210233,3 60.75907,3 77.419535,18.011163 77.419535,36.527442 c 0,18.516279 -16.660465,33.526512 -37.209302,33.526512 -4.167442,0 -8.172094,-0.614884 -11.912559,-1.753489 l 0.0019,-0.02605 0,0 z m -5.413954,-37.680931 34.552558,0 -34.552558,0 z m 0,11.867907 34.552558,0 -34.552558,0 z"
+       sketch:type="MSShapeGroup"
+       id="path13"
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <rect
+       id="Rectangle-250-Copy-11"
+       sketch:type="MSShapeGroup"
+       x="-6"
+       y="-5"
+       width="90"
+       height="90"
+       style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1" />
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-status-away.svg b/pixmaps/svg/linphone-status-away.svg
new file mode 100644
index 000000000..46beec033
--- /dev/null
+++ b/pixmaps/svg/linphone-status-away.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="82"
+   height="82"
+   viewBox="0 0 82 82"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-status-away.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-status-away.png"
+   inkscape:export-xdpi="52.68"
+   inkscape:export-ydpi="52.68">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>statut_absent</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview15"
+     showgrid="false"
+     inkscape:zoom="2.8433735"
+     inkscape:cx="-6.1271186"
+     inkscape:cy="41.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">statut_absent</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:#ffa645;fill-rule:evenodd;stroke:none;stroke-width:1"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Fill-1"
+     d="m 75.871349,40.202859 c 0,19.29648 -15.453929,34.937612 -34.516795,34.937612 -19.062866,0 -34.512481,-15.641132 -34.512481,-34.937612 0,-19.294296 15.449615,-34.9376112 34.512481,-34.9376112 19.062866,0 34.516795,15.6433152 34.516795,34.9376112 l 0,0 z" />
+</svg>
diff --git a/pixmaps/svg/linphone-status-donotdisturb.svg b/pixmaps/svg/linphone-status-donotdisturb.svg
new file mode 100644
index 000000000..54e2ef8fe
--- /dev/null
+++ b/pixmaps/svg/linphone-status-donotdisturb.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="35px"
+   height="35px"
+   viewBox="0 0 35 35"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-status-donotdisturb.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-status-donotdisturb.png"
+   inkscape:export-xdpi="123.43"
+   inkscape:export-ydpi="123.43">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="6.7428571"
+     inkscape:cx="-2.3728814"
+     inkscape:cy="17.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">led_error</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <rect
+     style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1"
+     height="90"
+     width="90"
+     y="-27"
+     x="-28"
+     sketch:type="MSShapeGroup"
+     id="Rectangle-232-Copy-7" />
+  <path
+     d="m 31.657273,17.974546 c 0,8.033636 -6.512728,14.545454 -14.546364,14.545454 -8.0336363,0 -14.5445454,-6.511818 -14.5445454,-14.545454 0,-8.0327278 6.5109091,-14.5454551 14.5445454,-14.5454551 8.033636,0 14.546364,6.5127273 14.546364,14.5454551 l 0,0 z"
+     id="Fill-1"
+     inkscape:connector-curvature="0"
+     style="fill:#ff0000;fill-rule:evenodd;stroke:none;stroke-width:1" />
+</svg>
diff --git a/pixmaps/svg/linphone-status-offline.svg b/pixmaps/svg/linphone-status-offline.svg
new file mode 100644
index 000000000..890ee2f7f
--- /dev/null
+++ b/pixmaps/svg/linphone-status-offline.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="35px"
+   height="35px"
+   viewBox="0 0 35 35"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-status-offline.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-status-offline.png"
+   inkscape:export-xdpi="123.43"
+   inkscape:export-ydpi="123.43">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="6.7428571"
+     inkscape:cx="-36.408898"
+     inkscape:cy="17.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">led_disconnected</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <rect
+     style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1"
+     height="90"
+     width="90"
+     y="-27"
+     x="-28"
+     sketch:type="MSShapeGroup"
+     id="Rectangle-232-Copy-5" />
+  <path
+     d="m 31.657273,17.974546 c 0,8.033636 -6.512728,14.545454 -14.546364,14.545454 -8.0336363,0 -14.5445454,-6.511818 -14.5445454,-14.545454 0,-8.0327278 6.5109091,-14.5454551 14.5445454,-14.5454551 8.033636,0 14.546364,6.5127273 14.546364,14.5454551 l 0,0 z"
+     id="Fill-1"
+     inkscape:connector-curvature="0"
+     style="fill:#e1e1e1;fill-rule:evenodd;stroke:none;stroke-width:1" />
+</svg>
diff --git a/pixmaps/svg/linphone-status-online.svg b/pixmaps/svg/linphone-status-online.svg
new file mode 100644
index 000000000..5f7149e4d
--- /dev/null
+++ b/pixmaps/svg/linphone-status-online.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="82"
+   height="82"
+   viewBox="0 0 82 82"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-status-online.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-status-online.png"
+   inkscape:export-xdpi="52.68"
+   inkscape:export-ydpi="52.68">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>status_available</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview15"
+     showgrid="false"
+     inkscape:zoom="2.8433735"
+     inkscape:cx="-6.1271186"
+     inkscape:cy="41.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">status_available</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:#96c11f;fill-rule:evenodd;stroke:none;stroke-width:1"
+     inkscape:connector-curvature="0"
+     sketch:type="MSShapeGroup"
+     id="Fill-1"
+     d="m 41.354554,75.140471 c -19.062866,0 -34.512481,-15.641132 -34.512481,-34.937612 0,-19.294296 15.449615,-34.9376112 34.512481,-34.9376112 19.062866,0 34.516795,15.6433152 34.516795,34.9376112 0,19.29648 -15.453929,34.937612 -34.516795,34.937612 z" />
+</svg>
diff --git a/pixmaps/svg/linphone-stop-call.svg b/pixmaps/svg/linphone-stop-call.svg
new file mode 100644
index 000000000..ab4fa3b28
--- /dev/null
+++ b/pixmaps/svg/linphone-stop-call.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="122"
+   height="122"
+   viewBox="0 0 122 122"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-stop-call.svg"
+   inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-stop-call.png"
+   inkscape:export-xdpi="35.41"
+   inkscape:export-ydpi="35.41">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>call_hangup</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1133"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="2.2264151"
+     inkscape:cx="0.81355932"
+     inkscape:cy="53"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4">call_hangup</title>
+  <desc
+     id="desc6">Created with Sketch.</desc>
+  <defs
+     id="defs8" />
+  <g
+     id="g4152"
+     transform="translate(-0.44915254,7.952437)">
+    <path
+       d="M 119.2936,34.487 C 110.3456,15.761 83.7116,2.844 61.5266,2.844 l -0.462,0 c -22.188,0 -48.828,12.924 -57.771,31.645 l 3.263,24.246 28.585,0 2.023,-24.131 48.263,0 2.018,24.131 28.585,0 3.263,-24.248 0,0 z m -78.211,48.151 18.896,18.892 1.317,1.314 -20.213,-20.206 z m 40.425,0.019 -20.212,20.187 20.212,-20.187 z m -20.212,18.112 0,-40.01 0,40.01 z"
+       id="Page-1"
+       sketch:type="MSShapeGroup"
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/pixmaps/svg/linphone-warning.svg b/pixmaps/svg/linphone-warning.svg
new file mode 100644
index 000000000..e1cbb91d9
--- /dev/null
+++ b/pixmaps/svg/linphone-warning.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="34"
+   height="34"
+   viewBox="0 0 34 34"
+   version="1.1"
+   id="svg4229"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="linphone-warning.svg"
+   inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-warning.png"
+   inkscape:export-xdpi="127.06"
+   inkscape:export-ydpi="127.06">
+  <metadata
+     id="metadata4247">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>chat_message_not_delivered</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     id="namedview4245"
+     showgrid="false"
+     inkscape:zoom="23.675886"
+     inkscape:cx="17"
+     inkscape:cy="16.669388"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4229" />
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title4231">chat_message_not_delivered</title>
+  <desc
+     id="desc4233">Created with Sketch.</desc>
+  <defs
+     id="defs4235" />
+  <g
+     id="OUTILS"
+     sketch:type="MSPage"
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="translate(0.04223707,2.5776293)">
+    <g
+       id="linphone_v2.0_icones_buttons"
+       sketch:type="MSArtboardGroup"
+       transform="translate(-4749,-15298)">
+      <g
+         id="chat_message_not_delivered"
+         sketch:type="MSLayerGroup"
+         transform="translate(4747,15295)">
+        <path
+           d="M 19.140723,3.4160156 2.1543948,32 35.845605,32 19.140723,3.4160156 Z"
+           id="Path-1067"
+           sketch:type="MSShapeGroup"
+           inkscape:connector-curvature="0"
+           style="fill:#ff0000" />
+        <g
+           id="chat_message_not_delivered-copy-2"
+           sketch:type="MSShapeGroup"
+           style="fill:#ffffff;fill-opacity:0">
+          <rect
+             id="Rectangle-232-Copy-22"
+             x="0"
+             y="0"
+             width="38"
+             height="38" />
+        </g>
+        <path
+           d="m 19.017716,19.516561 0,-7.030643"
+           id="chat_message_delivered-copy-4"
+           sketch:type="MSShapeGroup"
+           inkscape:connector-curvature="0"
+           style="stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round" />
+        <circle
+           id="Oval-51"
+           sketch:type="MSShapeGroup"
+           cx="19"
+           cy="27"
+           r="3"
+           style="fill:#ffffff" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/pixmaps/svg/more.svg b/pixmaps/svg/more.svg
deleted file mode 100644
index a9d1c50c3..000000000
--- a/pixmaps/svg/more.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<circle fill="#969696" cx="503.477" cy="416.145" r="5.338"/>
-	<circle fill="#969696" cx="519.491" cy="416.144" r="5.337"/>
-	<circle fill="#969696" cx="535.507" cy="416.145" r="5.336"/>
-</g>
-<g>
-	<circle fill="#FFFFFF" cx="502.183" cy="413.232" r="5.338"/>
-	<circle fill="#FFFFFF" cx="518.198" cy="413.233" r="5.338"/>
-	<circle fill="#FFFFFF" cx="534.213" cy="413.233" r="5.337"/>
-</g>
-</svg>
diff --git a/pixmaps/svg/startcall-green.svg b/pixmaps/svg/startcall-green.svg
deleted file mode 100644
index dac2c713b..000000000
--- a/pixmaps/svg/startcall-green.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<g>
-				
-					<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="190.6316" y1="411.1187" x2="247.7873" y2="426.4333" gradientTransform="matrix(1 0 0 1 0.5605 -0.2207)">
-					<stop  offset="0.15" style="stop-color:#3BCB09"/>
-					<stop  offset="0.35" style="stop-color:#F4F7EE"/>
-					<stop  offset="0.55" style="stop-color:#3BCB09"/>
-				</linearGradient>
-				<path fill="url(#SVGID_1_)" d="M203.045,443.109c1.845,0.869,4.011,1.834,7.209,2.609c3.387,0.74,6.767,1.26,10.441,1.162
-					c3.874-0.195,5.806-0.584,8.905-1.355c2.808-0.871,4.157-1.355,6.379-2.516c0.974-0.482,1.745-0.967,3.675-2.322
-					c1.266-0.973,2.714-2.131,4.103-4.088c1.171-1.359,2.338-3.693,3.111-5.639c0.875-1.943,1.359-4.082,1.359-6.41
-					c-0.102-4.088-1.074-7.787-3.109-10.99c-1.756-2.722-3.995-5.152-6.615-7.096l4.275-11.469l-14.771,6.025
-					c-0.389-0.097-0.773-0.195-1.069-0.294c-3.8-1.165-7.391-1.65-10.891-1.747c-4.571,0.097-8.747,0.777-12.443,2.138
-					c-3.501,1.459-6.416,3.406-8.747,5.93c-2.333,2.625-4.738,6.675-5.321,10.277c-0.865,4.496-0.634,7.5,0.048,10.216
-					c0.776,2.721,1.637,4.873,3.537,7.633c2.064,2.369,2.995,3.383,4.738,4.74C199.997,441.462,201.393,442.228,203.045,443.109z
-					 M210.904,440.878c-2.717-0.773-4.858-1.557-6.416-2.436c-1.363-0.777-2.918-1.846-4.476-3.111
-					c-1.456-1.258-2.819-2.717-3.986-4.562c-1.261-1.75-2.039-3.797-2.43-6.125c-0.486-3.408-0.292-6.319,0.677-8.657
-					c0.975-2.333,2.327-4.282,4.083-5.643c1.851-1.458,3.793-2.522,5.835-3.306c2.041-0.68,3.988-1.159,5.83-1.455
-					c1.75-0.193,3.111-0.389,3.988-0.389c3.208,0,6.416,0.486,9.522,1.353c3.213,0.88,6.229,2.237,8.946,3.991
-					c2.625,1.842,4.861,4.083,6.52,6.804c0.973,1.653,1.646,3.116,2.13,4.675c0.486,1.459,0.775,2.912,0.775,4.273
-					c-0.097,2.721-0.973,5.346-2.717,7.68c-1.646,2.438-4.18,4.281-7.479,5.734c-3.213,1.561-7.003,2.242-11.375,2.242
-					C216.737,441.953,213.629,441.558,210.904,440.878z"/>
-			</g>
-		</g>
-	</g>
-	<path fill="#3BCB09" d="M214.437,435.634c4.198,1.105,8.646,1.508,12.292,0.615c6.897-1.672,9.124-3.973,8.765-9.754
-		c0,0,0.129-2.787-5.756-2.689c-1.305,0.023-4.629,0.732-5.101,2.148c-0.472,1.434,0.24,2.885,0.282,3.582
-		c0.042,0.709-1.902,1.664-2.717,1.736c-1.062,0.102-3.732-0.061-6.431-0.727l-0.121-0.031c-2.673-0.75-5.081-1.922-5.949-2.547
-		c-0.667-0.467-1.889-2.254-1.506-2.844c0.382-0.596,1.722-1.502,2.018-2.98c0.296-1.479-2.261-3.723-3.376-4.386
-		c-5.064-2.999-6.333-0.514-6.333-0.514c-3.16,4.855-2.368,7.949,2.798,12.808c2.75,2.588,6.807,4.422,10.998,5.527L214.437,435.634
-		z"/>
-</g>
-</svg>
diff --git a/pixmaps/svg/status-green.svg b/pixmaps/svg/status-green.svg
deleted file mode 100644
index d875488b8..000000000
--- a/pixmaps/svg/status-green.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<g>
-				
-					<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="148.6731" y1="423.5444" x2="172.7882" y2="430.006" gradientTransform="matrix(1 0 0 1 0.2803 -0.1104)">
-					<stop  offset="0.15" style="stop-color:#3BCB09"/>
-					<stop  offset="0.35" style="stop-color:#F4F7EE"/>
-					<stop  offset="0.55" style="stop-color:#3BCB09"/>
-				</linearGradient>
-				<path fill="url(#SVGID_1_)" d="M153.954,437.025c0.778,0.367,1.692,0.773,3.042,1.102c1.429,0.312,2.855,0.531,4.406,0.49
-					c1.635-0.082,2.449-0.246,3.757-0.572c1.184-0.367,1.755-0.572,2.692-1.061c0.41-0.205,0.735-0.408,1.551-0.98
-					c0.533-0.41,1.145-0.898,1.729-1.725c0.494-0.574,0.986-1.559,1.312-2.379c0.369-0.82,0.574-1.723,0.574-2.705
-					c-0.042-1.725-0.452-3.285-1.312-4.637c-0.74-1.148-1.686-2.174-2.791-2.994l1.804-4.839l-6.231,2.542
-					c-0.164-0.041-0.327-0.082-0.452-0.124c-1.603-0.491-3.118-0.696-4.595-0.737c-1.929,0.041-3.69,0.328-5.25,0.902
-					c-1.478,0.616-2.707,1.437-3.69,2.502c-0.984,1.107-2,2.816-2.246,4.336c-0.365,1.896-0.267,3.164,0.021,4.311
-					c0.328,1.148,0.69,2.057,1.492,3.221c0.872,1,1.264,1.428,2,2C152.668,436.33,153.257,436.654,153.954,437.025z
-					 M157.271,436.083c-1.146-0.326-2.051-0.656-2.707-1.027c-0.576-0.328-1.231-0.777-1.889-1.312
-					c-0.614-0.531-1.189-1.146-1.682-1.926c-0.532-0.738-0.86-1.602-1.025-2.584c-0.205-1.438-0.123-2.666,0.286-3.652
-					c0.41-0.984,0.981-1.807,1.723-2.381c0.78-0.615,1.601-1.064,2.462-1.395c0.861-0.287,1.683-0.489,2.46-0.614
-					c0.738-0.081,1.312-0.164,1.683-0.164c1.354,0,2.707,0.205,4.019,0.571c1.355,0.371,2.628,0.943,3.775,1.684
-					c1.106,0.777,2.051,1.723,2.749,2.871c0.41,0.697,0.695,1.314,0.899,1.973c0.205,0.615,0.328,1.229,0.328,1.803
-					c-0.042,1.148-0.41,2.256-1.146,3.24c-0.696,1.027-1.765,1.807-3.157,2.42c-1.354,0.658-2.954,0.945-4.799,0.945
-					C159.732,436.537,158.42,436.371,157.271,436.083z"/>
-			</g>
-		</g>
-	</g>
-	<path fill="#3BCB09" d="M158.761,433.871c1.771,0.467,3.646,0.637,5.186,0.26c2.91-0.705,3.85-1.676,3.697-4.115
-		c0,0,0.056-1.176-2.427-1.133c-0.551,0.01-1.954,0.309-2.153,0.906c-0.198,0.605,0.103,1.217,0.119,1.512
-		c0.018,0.299-0.803,0.701-1.146,0.732c-0.447,0.043-1.575-0.025-2.713-0.307l-0.051-0.014c-1.128-0.316-2.144-0.811-2.511-1.074
-		c-0.281-0.197-0.796-0.951-0.635-1.199c0.16-0.252,0.726-0.635,0.851-1.258s-0.954-1.57-1.425-1.85
-		c-2.137-1.266-2.672-0.217-2.672-0.217c-1.333,2.049-0.999,3.354,1.181,5.404c1.16,1.092,2.872,1.865,4.641,2.332L158.761,433.871z
-		"/>
-</g>
-</svg>
diff --git a/pixmaps/svg/status-offline.svg b/pixmaps/svg/status-offline.svg
deleted file mode 100644
index 1576f034c..000000000
--- a/pixmaps/svg/status-offline.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<g>
-				<path fill="#9B9C9E" d="M335.215,428.953c0-0.83,0.577-1.451,1.385-1.451c0.809,0,1.361,0.598,1.361,1.451
-					c0,0.832-0.552,1.455-1.407,1.455C335.77,430.408,335.215,429.785,335.215,428.953z"/>
-				<path fill="#9B9C9E" d="M339.993,428.953c0-0.83,0.577-1.451,1.384-1.451c0.808,0,1.362,0.598,1.362,1.451
-					c0,0.832-0.554,1.455-1.408,1.455C340.547,430.408,339.993,429.785,339.993,428.953z"/>
-				<path fill="#9B9C9E" d="M344.772,428.953c0-0.83,0.576-1.451,1.385-1.451c0.808,0,1.36,0.598,1.36,1.451
-					c0,0.832-0.552,1.455-1.406,1.455C345.325,430.408,344.772,429.785,344.772,428.953z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		
-			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="330.1477" y1="418.4004" x2="354.2633" y2="411.9386" gradientTransform="matrix(1 0 0 -1 0.1401 841.835)">
-			<stop  offset="0.15" style="stop-color:#9B9C9E"/>
-			<stop  offset="0.35" style="stop-color:#F4F7EE"/>
-			<stop  offset="0.55" style="stop-color:#9B9C9E"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" d="M335.287,437.025c0.779,0.367,1.694,0.773,3.041,1.102c1.43,0.311,2.856,0.531,4.409,0.49
-			c1.632-0.082,2.448-0.246,3.755-0.572c1.184-0.367,1.755-0.572,2.693-1.061c0.409-0.205,0.734-0.408,1.552-0.98
-			c0.532-0.41,1.143-0.898,1.729-1.725c0.493-0.574,0.985-1.559,1.313-2.381c0.369-0.818,0.573-1.721,0.573-2.703
-			c-0.042-1.725-0.451-3.285-1.312-4.637c-0.741-1.148-1.686-2.174-2.791-2.994l1.805-4.839l-6.231,2.542
-			c-0.165-0.041-0.328-0.082-0.452-0.124c-1.602-0.491-3.118-0.696-4.594-0.738c-1.93,0.042-3.691,0.329-5.25,0.902
-			c-1.479,0.616-2.707,1.437-3.692,2.501c-0.983,1.107-2,2.816-2.245,4.336c-0.364,1.896-0.266,3.164,0.021,4.311
-			c0.329,1.15,0.689,2.059,1.491,3.221c0.872,1.002,1.264,1.426,1.999,2C334.001,436.33,334.59,436.654,335.287,437.025z
-			 M338.604,436.083c-1.146-0.328-2.051-0.656-2.705-1.027c-0.576-0.328-1.233-0.777-1.89-1.312
-			c-0.614-0.531-1.188-1.146-1.682-1.926c-0.532-0.738-0.86-1.602-1.024-2.584c-0.205-1.438-0.123-2.666,0.286-3.652
-			c0.409-0.984,0.983-1.807,1.724-2.381c0.778-0.615,1.599-1.064,2.463-1.395c0.859-0.287,1.681-0.489,2.46-0.614
-			c0.737-0.082,1.312-0.164,1.682-0.164c1.354,0,2.706,0.205,4.019,0.571c1.354,0.369,2.629,0.943,3.775,1.684
-			c1.107,0.777,2.051,1.723,2.748,2.871c0.41,0.697,0.698,1.314,0.901,1.973c0.205,0.615,0.328,1.229,0.328,1.803
-			c-0.041,1.148-0.409,2.256-1.147,3.24c-0.696,1.027-1.764,1.807-3.157,2.42c-1.354,0.658-2.953,0.945-4.799,0.945
-			C341.066,436.537,339.753,436.371,338.604,436.083z"/>
-	</g>
-</g>
-</svg>
diff --git a/pixmaps/svg/status-orange.svg b/pixmaps/svg/status-orange.svg
deleted file mode 100644
index 9fbd47226..000000000
--- a/pixmaps/svg/status-orange.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<g>
-				
-					<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="210.8152" y1="418.4014" x2="234.9313" y2="411.9395" gradientTransform="matrix(1 0 0 -1 0.1401 841.835)">
-					<stop  offset="0.15" style="stop-color:#D57E1C"/>
-					<stop  offset="0.35" style="stop-color:#F4F7EE"/>
-					<stop  offset="0.55" style="stop-color:#D57E1C"/>
-				</linearGradient>
-				<path fill="url(#SVGID_1_)" d="M215.954,437.025c0.779,0.367,1.693,0.773,3.042,1.102c1.429,0.312,2.856,0.531,4.407,0.49
-					c1.634-0.082,2.449-0.246,3.756-0.572c1.184-0.367,1.755-0.572,2.693-1.061c0.41-0.205,0.735-0.408,1.551-0.98
-					c0.533-0.41,1.144-0.898,1.729-1.725c0.494-0.574,0.986-1.559,1.313-2.379c0.369-0.82,0.574-1.723,0.574-2.705
-					c-0.042-1.725-0.451-3.285-1.312-4.637c-0.74-1.148-1.685-2.174-2.791-2.994l1.804-4.839l-6.231,2.542
-					c-0.165-0.041-0.328-0.082-0.453-0.124c-1.602-0.491-3.118-0.696-4.594-0.737c-1.929,0.041-3.691,0.328-5.25,0.902
-					c-1.478,0.616-2.707,1.437-3.691,2.502c-0.984,1.107-2,2.816-2.246,4.336c-0.364,1.896-0.266,3.164,0.021,4.311
-					c0.328,1.148,0.69,2.057,1.492,3.221c0.872,1,1.263,1.426,2,2C214.668,436.33,215.257,436.654,215.954,437.025z
-					 M219.271,436.083c-1.147-0.326-2.051-0.656-2.707-1.027c-0.576-0.328-1.232-0.777-1.889-1.312
-					c-0.614-0.531-1.189-1.146-1.682-1.926c-0.532-0.738-0.86-1.602-1.025-2.584c-0.205-1.438-0.123-2.666,0.286-3.652
-					c0.41-0.984,0.982-1.807,1.723-2.381c0.78-0.615,1.6-1.064,2.462-1.395c0.861-0.287,1.682-0.489,2.461-0.614
-					c0.737-0.081,1.312-0.164,1.682-0.164c1.354,0,2.707,0.205,4.019,0.571c1.355,0.371,2.628,0.943,3.775,1.684
-					c1.107,0.777,2.051,1.723,2.749,2.871c0.41,0.697,0.696,1.314,0.9,1.973c0.205,0.615,0.328,1.229,0.328,1.803
-					c-0.042,1.148-0.41,2.256-1.147,3.24c-0.696,1.027-1.764,1.807-3.157,2.42c-1.354,0.658-2.954,0.945-4.799,0.945
-					C221.732,436.537,220.42,436.371,219.271,436.083z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<path fill="#D57E1C" d="M223.042,423.992c-1.77-0.465-3.644-0.635-5.187-0.26c-2.907,0.705-3.846,1.676-3.694,4.117
-			c0,0-0.057,1.176,2.427,1.131c0.551-0.012,1.954-0.307,2.153-0.908s-0.103-1.213-0.119-1.514
-			c-0.017-0.295,0.803-0.695,1.146-0.729c0.447-0.045,1.575,0.025,2.712,0.307l0.05,0.014c1.127,0.318,2.143,0.811,2.51,1.074
-			c0.282,0.197,0.798,0.953,0.637,1.201c-0.16,0.248-0.726,0.631-0.851,1.256c-0.125,0.623,0.951,1.57,1.425,1.852
-			c2.135,1.266,2.67,0.215,2.67,0.215c1.335-2.049,1-3.354-1.182-5.406c-1.157-1.088-2.869-1.865-4.637-2.334L223.042,423.992z"/>
-	</g>
-</g>
-</svg>
diff --git a/pixmaps/svg/status-red.svg b/pixmaps/svg/status-red.svg
deleted file mode 100644
index eb47308a2..000000000
--- a/pixmaps/svg/status-red.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<g>
-				
-					<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="270.4812" y1="418.4019" x2="294.5982" y2="411.9398" gradientTransform="matrix(1 0 0 -1 0.1401 841.835)">
-					<stop  offset="0.15" style="stop-color:#C1001F"/>
-					<stop  offset="0.35" style="stop-color:#F4F7EE"/>
-					<stop  offset="0.55" style="stop-color:#C1001F"/>
-				</linearGradient>
-				<path fill="url(#SVGID_1_)" d="M275.621,437.025c0.779,0.367,1.693,0.773,3.042,1.102c1.429,0.312,2.856,0.531,4.407,0.49
-					c1.634-0.082,2.449-0.246,3.756-0.572c1.184-0.367,1.755-0.572,2.693-1.061c0.41-0.205,0.735-0.408,1.551-0.98
-					c0.533-0.41,1.144-0.898,1.729-1.725c0.494-0.574,0.986-1.559,1.313-2.379c0.369-0.82,0.574-1.723,0.574-2.705
-					c-0.042-1.725-0.452-3.285-1.312-4.637c-0.74-1.148-1.685-2.174-2.791-2.994l1.804-4.839l-6.231,2.542
-					c-0.165-0.041-0.328-0.082-0.453-0.124c-1.602-0.491-3.118-0.696-4.594-0.737c-1.929,0.041-3.691,0.328-5.25,0.902
-					c-1.478,0.616-2.707,1.437-3.691,2.502c-0.984,1.107-2,2.816-2.246,4.336c-0.365,1.896-0.266,3.164,0.021,4.311
-					c0.328,1.148,0.69,2.059,1.492,3.221c0.872,1.002,1.263,1.426,2,2C274.335,436.33,274.923,436.656,275.621,437.025z
-					 M278.938,436.083c-1.147-0.326-2.051-0.656-2.707-1.027c-0.576-0.328-1.232-0.777-1.889-1.312
-					c-0.614-0.531-1.189-1.146-1.682-1.926c-0.532-0.738-0.86-1.602-1.025-2.584c-0.205-1.438-0.123-2.666,0.286-3.652
-					c0.41-0.984,0.982-1.807,1.723-2.381c0.78-0.615,1.6-1.064,2.462-1.395c0.861-0.287,1.682-0.489,2.461-0.614
-					c0.737-0.081,1.312-0.164,1.682-0.164c1.354,0,2.707,0.205,4.019,0.571c1.355,0.371,2.628,0.943,3.775,1.684
-					c1.107,0.777,2.051,1.723,2.749,2.871c0.41,0.697,0.696,1.314,0.9,1.973c0.205,0.615,0.328,1.229,0.328,1.803
-					c-0.041,1.148-0.41,2.256-1.147,3.24c-0.697,1.027-1.764,1.807-3.157,2.42c-1.354,0.658-2.954,0.945-4.799,0.945
-					C281.398,436.537,280.087,436.373,278.938,436.083z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<g>
-				<path fill="#C1001F" d="M278.634,424.73l1.763,1.768c0.483,0.463,0.867,0.867,1.274,1.326h0.051
-					c0.407-0.473,0.816-0.898,1.25-1.34l1.709-1.75h2.449l-4.21,3.979l4.312,4.252h-2.525l-1.836-1.854
-					c-0.486-0.479-0.895-0.938-1.326-1.428h-0.054c-0.408,0.49-0.816,0.936-1.3,1.428l-1.784,1.854h-2.477l4.388-4.201l-4.185-4.027
-					h2.502L278.634,424.73L278.634,424.73z"/>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/pixmaps/svg/stopcall-red.svg b/pixmaps/svg/stopcall-red.svg
deleted file mode 100644
index c3616ae7c..000000000
--- a/pixmaps/svg/stopcall-red.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
-<g>
-	<path fill="#C1001F" d="M382.281,405.372c-4.424-1.164-9.108-1.593-12.965-0.649c-7.273,1.766-9.62,4.19-9.244,10.293
-		c0,0-0.134,2.94,6.068,2.83c1.377-0.025,4.886-0.758,5.386-2.268c0.496-1.508-0.259-3.038-0.298-3.778
-		c-0.04-0.739,2.005-1.743,2.865-1.827c1.115-0.11,3.937,0.068,6.78,0.769l0.122,0.032c2.82,0.796,5.355,2.032,6.271,2.681
-		c0.706,0.498,1.995,2.381,1.596,3.001c-0.402,0.625-1.812,1.584-2.127,3.141c-0.312,1.561,2.381,3.928,3.562,4.629
-		c5.34,3.162,6.675,0.535,6.675,0.535c3.341-5.12,2.498-8.385-2.95-13.515c-2.896-2.723-7.178-4.665-11.6-5.834L382.281,405.372z"/>
-	<g>
-		<g>
-			<g>
-				
-					<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="348.4768" y1="587.9087" x2="406.7347" y2="572.2986" gradientTransform="matrix(-1 0 0 1 753.3428 -156.7246)">
-					<stop  offset="0.15" style="stop-color:#C1001F"/>
-					<stop  offset="0.35" style="stop-color:#F4F7EE"/>
-					<stop  offset="0.55" style="stop-color:#C1001F"/>
-				</linearGradient>
-				<path fill="url(#SVGID_1_)" d="M392.784,398.354c-1.882-0.887-4.09-1.869-7.353-2.662c-3.447-0.755-6.896-1.283-10.644-1.184
-					c-3.949,0.198-5.917,0.594-9.073,1.383c-2.858,0.886-4.242,1.382-6.507,2.562c-0.99,0.496-1.774,0.986-3.745,2.368
-					c-1.289,0.991-2.766,2.17-4.177,4.167c-1.193,1.387-2.382,3.765-3.171,5.747c-0.893,1.982-1.387,4.162-1.387,6.535
-					c0.1,4.167,1.091,7.937,3.166,11.202c1.788,2.773,4.071,5.252,6.741,7.232l-4.354,11.689l15.052-6.143
-					c0.396,0.1,0.792,0.199,1.095,0.301c3.868,1.188,7.529,1.682,11.098,1.781c4.661-0.1,8.918-0.793,12.683-2.18
-					c3.571-1.488,6.539-3.473,8.917-6.045c2.379-2.676,4.832-6.805,5.427-10.475c0.882-4.582,0.643-7.644-0.052-10.414
-					c-0.793-2.774-1.666-4.973-3.604-7.78c-2.105-2.421-3.055-3.449-4.832-4.832C395.89,400.034,394.469,399.245,392.784,398.354z
-					 M384.774,400.628c2.77,0.788,4.953,1.585,6.54,2.481c1.391,0.793,2.972,1.878,4.562,3.171c1.482,1.283,2.873,2.77,4.062,4.653
-					c1.283,1.783,2.075,3.869,2.477,6.242c0.496,3.473,0.298,6.44-0.693,8.825c-0.989,2.377-2.367,4.363-4.161,5.75
-					c-1.883,1.486-3.863,2.572-5.943,3.369c-2.082,0.693-4.068,1.182-5.946,1.482c-1.782,0.197-3.171,0.396-4.066,0.396
-					c-3.271,0-6.538-0.494-9.705-1.379c-3.274-0.898-6.351-2.279-9.12-4.068c-2.677-1.877-4.954-4.16-6.645-6.936
-					c-0.991-1.686-1.679-3.176-2.17-4.766c-0.496-1.486-0.792-2.968-0.792-4.355c0.098-2.774,0.989-5.45,2.771-7.827
-					c1.684-2.482,4.26-4.365,7.624-5.846c3.273-1.59,7.139-2.284,11.593-2.284C378.828,399.533,381.994,399.93,384.774,400.628z"/>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ebfa3dff3..c44eab3a2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,29 +14,30 @@ gtk/incall_view.c
 gtk/loginframe.c
 gtk/config-fetching.c
 gtk/audio_assistant.c
-[type: gettext/glade]gtk/main.ui
 [type: gettext/glade]gtk/about.ui
-[type: gettext/glade]gtk/contact.ui
-[type: gettext/glade]gtk/log.ui
-[type: gettext/glade]gtk/password.ui
-[type: gettext/glade]gtk/call_logs.ui
-[type: gettext/glade]gtk/main.ui
-[type: gettext/glade]gtk/sip_account.ui
-[type: gettext/glade]gtk/parameters.ui
+[type: gettext/glade]gtk/audio_assistant.ui
 [type: gettext/glade]gtk/buddylookup.ui
-[type: gettext/glade]gtk/waiting.ui
-[type: gettext/glade]gtk/dscp_settings.ui
+[type: gettext/glade]gtk/callee_frame.ui
+[type: gettext/glade]gtk/call_logs.ui
 [type: gettext/glade]gtk/call_statistics.ui
-[type: gettext/glade]gtk/tunnel_config.ui
+[type: gettext/glade]gtk/chatroom_frame.ui
+[type: gettext/glade]gtk/conf_frame.ui
+[type: gettext/glade]gtk/config-uri.ui
+[type: gettext/glade]gtk/contact.ui
+[type: gettext/glade]gtk/dscp_settings.ui
+[type: gettext/glade]gtk/in_call_frame.ui
 [type: gettext/glade]gtk/keypad.ui
 [type: gettext/glade]gtk/ldap.ui
-[type: gettext/glade]gtk/config-uri.ui
-[type: gettext/glade]gtk/provisioning-fetch.ui
-[type: gettext/glade]gtk/chatroom_frame.ui
-[type: gettext/glade]gtk/callee_frame.ui
-[type: gettext/glade]gtk/conf_frame.ui
-[type: gettext/glade]gtk/in_call_frame.ui
 [type: gettext/glade]gtk/login_frame.ui
+[type: gettext/glade]gtk/log.ui
+[type: gettext/glade]gtk/main.ui
+[type: gettext/glade]gtk/parameters.ui
+[type: gettext/glade]gtk/password.ui
+[type: gettext/glade]gtk/provisioning-fetch.ui
+[type: gettext/glade]gtk/setup_wizard.ui
+[type: gettext/glade]gtk/sip_account.ui
+[type: gettext/glade]gtk/tunnel_config.ui
+[type: gettext/glade]gtk/waiting.ui
 coreapi/linphonecore.c
 coreapi/misc.c
 coreapi/presence.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 32dcd19f2..b31466bd0 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -10,6 +10,7 @@ mediastreamer2/src/audiofilters/dtmfgen.c
 mediastreamer2/src/audiofilters/equalizer.c
 mediastreamer2/src/audiofilters/gsm.c
 mediastreamer2/src/audiofilters/genericplc.c
+mediastreamer2/src/audiofilters/msgenericplc.c
 mediastreamer2/src/audiofilters/macsnd.c
 mediastreamer2/src/audiofilters/msconf.c
 mediastreamer2/src/audiofilters/msfileplayer.c
@@ -46,6 +47,7 @@ mediastreamer2/src/videofilters/winvideo.c
 mediastreamer2/src/videofilters/winvideods.c
 mediastreamer2/src/videofilters/winvideo2.c
 mediastreamer2/src/videofilters/x11video.c
+mediastreamer2/src/videofilters/msdscap.cc
 mediastreamer2/src/voip/ice.c
 build/vsx/LibLinphoneTester-wp8/LibLinphoneTester-wp8/Resources/AppResources.Designer.cs
 build/wp8/LibLinphoneTester-wp8/Resources/AppResources.Designer.cs
diff --git a/po/ar.po b/po/ar.po
index 182dc5b2b..6fff00113 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,58 +1,65 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # محيي الدين <tx99h4@hotmail.com>, 2014
-# محيي الدين <tx99h4@hotmail.com>, 2014-2015
+# محيي الدين <tx99h4@hotmail.com>, 2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-21 23:38+0000\n"
-"Last-Translator: محيي الدين <tx99h4@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/ar/)\n"
-"Language: ar\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/belledonne-communications/linphone-gtk/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "اتصل بـ %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "أرسل رسالة إلى %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "إضافة %s إلى قائمة جهات اتصالك"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "المكالمات السابقة"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>المكالمات الفائتة (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "—"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "أُلغيت"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "فائتة"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "مرفوضة"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -63,7 +70,7 @@ msgstr[3] "%i دقائق"
 msgstr[4] "%i دقيقة"
 msgstr[5] "%i دقيقة"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -74,16 +81,14 @@ msgstr[3] "%i ثوان"
 msgstr[4] "%i ثانية"
 msgstr[5] "%i ثانية"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>الجودة : %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>الجودة : %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -101,50 +106,57 @@ msgstr "أنا"
 msgid "Couldn't find pixmap file: %s"
 msgstr "أيقونة غير موجودة : %s"
 
-#: ../gtk/chat.c:493
-msgid "Copy"
-msgstr ""
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "يجري الإرسال...‏"
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "لم تُرسَل الرسالة"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "نسخ"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "أظهِرْ بعض معلومات التنقيح خلال التشغيل."
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr "عرض الإصدار ثم المغادرة"
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "الدليل إلى الملف الذي سيُكتَب فيه سجل الوقائع."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "ابدأ لِنْفُونْ لكن دون تفعيل الفيديو."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "شغِّله مُصغَّرا، ولا تُظهِر الواجهة الرئيسية."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "العنوان المُراد الاتصال به الآن"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "حدِّد مجلد العمل (الذي سيكون مجلد التثبيت، مثلا c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "ملف التهيئة"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "ابدأ مرشد الصوت"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr "شغِّل الاختبار الذاتي ثم اخرِجْ 0 إذا نجح"
 
@@ -152,271 +164,256 @@ msgstr "شغِّل الاختبار الذاتي ثم اخرِجْ 0 إذا نج
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"يود %s إضافتك إلى جهات اتصاله.\n"
-"هل تريد إضافته إلى جهات اتصالك والسماح له برؤية حالة حضورك ؟\n"
-"إن كان الجواب بالرفض، سوف يجري حظر هذا الشخص مؤقتا."
+msgstr "يود %s إضافتك إلى جهات اتصاله.\nهل تريد إضافته إلى جهات اتصالك والسماح له برؤية حالة حضورك ؟\nإن كان الجواب بالرفض، سوف يجري حظر هذا الشخص مؤقتا."
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"ادخل كلمة السر لـ  <i>%s</i>\n"
-" في نطاق <i>%s</i>:"
+msgstr "ادخل كلمة السر لـ  <i>%s</i>\n في نطاق <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "خطأ في المكالمة"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "إنتهت المكالمة"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "أجِبْ"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "ارفضْ"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "المكالمة متوقفة"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>بواسطة %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "يود %s تشغيل الفيديو. هل تقبل ذلك ؟"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "وصلة إلى الموقع وِبْ"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "لِنْفُونْ"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr "الهاتف المرئي عبر الإنترنت"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (افتراضي)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "التحويل إلى %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"لا وجود للوحة الصوت على هذا الحاسوب.\n"
-"لن تتمكن من تلقي أو إجراء أي مكالمة."
+msgstr "لا وجود للوحة الصوت على هذا الحاسوب.\nلن تتمكن من تلقي أو إجراء أي مكالمة."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "هاتف SIP المرئي الحر"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr "أهلا\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "أضف إلى دفتر العناوين"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "معلومة الحضور"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "الاسم"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "اتصل"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "محادثة"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "ابحث في دليل %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "جهة اتصال sip غير صالحة !"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "إضافة جهة الاتصال جديدة"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "حرر جهة الاتصال '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "احذف جهة الاتصال '%s'"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "احذف تاريخ دردشات '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "اضف جهة اتصال انطلاقا من الدليل %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "الاسم"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "التردد (هرتز)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "الحالة"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "صبيب IP (ك.بِتْ/ثانية)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "الإعدادات"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "مفعَّل"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "غير مفعَّل"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "الحساب"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "English"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Français"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Español"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Português do Brasil"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polski"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Deutsch"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Русский"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "简体中文"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Norsk bokmål"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Српски"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr "العربية"
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "يجب إعادة تشغيل لِنْفُونْ لكي تٌفعَّل اللغة المختارة."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "بدون"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr "DTLS"
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -425,9 +422,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"يوجد إصدار حديث من طرف %s.\n"
-"هل تريد فتح المتصفح لتنزيله ؟"
+msgstr "يوجد إصدار حديث من طرف %s.\nهل تريد فتح المتصفح لتنزيله ؟"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -464,349 +459,199 @@ msgstr[3] "عُثِر على %i جهات اتصال"
 msgstr[4] "عُثِر على %i جهة اتصال"
 msgstr[5] "عُثِر على %i جهة اتصال"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"مرحبا !\n"
-"سيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "إن اسم المستخدم يُستخدَم مسبقا !"
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "إنشاء حساب في linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "فشل التحقق من إمكانية إتاحة  اسم المستخدم. يُرجى الإعادة لاحقا."
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "أتوفر مسبقا على حساب في linphone.org وأريد فقط استخدامه"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "أتوفر مسبقا على حساب sip وأريد فقط استخدامه"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr "أريد تحديد عنوان التهيئة عن بعد"
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr "ادخل معلومات حسابك"
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "اسم المستخدم*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "كلمة السر*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "النطاق*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "الوكيل"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "أدخِل اسم المستخدم في linphone.org"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "اسم المستخدم :"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "كلمة السر :"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) حقول ضرورية"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "اسم المستخدم* : (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "كلمة السر* : (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "البريد الالكتروني : (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "أكِّد كلمة السر : (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "أحطني علما بتحديثات لِنْفُونْ"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr "يُرجى الانتظار، يجري الآن إنشاء حسابك."
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"يُرجى تأكيد حسابك وذلك بالضغط على الوصلة التي أرسلناها لك بالبريد "
-"الإلكتروني.\n"
-"ثم ارجع إلى هنا واضغط على زر التالي."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr "يُرجى الانتظار، يجري الآن فحص التحقق من صحة حسابك."
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"خطأ، لم يتم تأكيد الحساب، سبق استخدام اسم المستخدم أو تعذر الوصول للخادم.\n"
-"يُرجى إعادة المحاولة لاحقا."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "شكرا لك، لقد جرت تهيئة حسابك وهو الآن قابل للاستخدام."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "مرشد تهيئة حساب SIP"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "مرحبا بك في مرشد إعداد الحساب"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "مرشد تهيئة الحساب"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "تهيئة حسابك (المرحلة 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "أدخل اسم المستخدم SIP (المرحلة 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "أدخل معلومات حسابك (المرحلة 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr "إنشاء الحساب في تقدم"
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "تأكيد (المرحلة 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr "التحقق من الحساب في تقدم"
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "خطأ"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "في طور الإنهاء"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "مكالمة #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "حوِّل إلى المكالمة  #%i مع %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "غير مستخدَم"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE غير مفعَّل"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "فَشِل ICE"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "تجري مساومة ICE"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "المرور عبد واحد أو عدة NAT"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "مباشر"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "عبر خادم بديل"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnP غير مفعَّل"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "يجري uPnP"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnP غير متوفر"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP مشغَّل"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "فَشِل uPnP"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "مباشرة أو عبر خادم"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"التنزيل % f\n"
-"الرفع : %f (ك.بِتْ/الثانية)"
+msgstr "التنزيل % f\nالرفع : %f (ك.بِتْ/الثانية)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f fps"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f ثانية"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "ضع السماعة"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>يجري الاتصال...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>المكالمة الواردة</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "جيدة"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "متوسطة"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "ضعيفة"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "ضعيفة جدا"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "سيِّئة جيدا"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "غير متاحة"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "آمن بواسطة SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr "مُؤمَّن بواسطة DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "آمن بواسطة ZRTP - [شارة الهوية : %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "أكِّدْ عدم تحقُّقك"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "أكِّدْ تحقُّقَك"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "في اجتماع"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>المكالمة جارية</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>المكالمة متوقفة مؤقتا</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>إنتهت المكالمة.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "يجري الإرسال"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "انتهى الإرسال."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "فَشِل الإرسال."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "استأنِفْ"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "إيقاف مؤقت"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>يسجل في\n"
-"%s %s</i></small>"
+msgstr "<small><i>يسجل في\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(متوقف)"
 
@@ -845,177 +690,88 @@ msgstr "صاخب"
 msgid "Did you hear three beeps ?"
 msgstr "هل سمعت ثلاث رنات ؟"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "لم يعثر على تفضيلات الصوت"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "لم يتمكن من تشغيل التحكم في الصوت للنظام"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"مرحبا !\n"
-"سيمكنك هذا المرشد من تهيئة إعدادات الصوت من أجل لِنْفُونْ"
+msgstr "مرحبا !\nسيمكنك هذا المرشد من تهيئة إعدادات الصوت من أجل لِنْفُونْ"
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "جهاز الالتقاط"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "الحجم المسجَّل"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "صامت"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "تفضيلات الصوت للنظام"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "جهاز السماع"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "شغِّل ثلاث رنَّات"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "اضغط على زر التسجيل وانطق ببعض الكلمات"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "استمع لصوتك المسجَّل"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "تسجيل"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "تشغيل"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "لنُشغِّل لِنْفُونْ الآن"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "مرشد الصوت"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "مرشد الصوت"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "معايرة كسب الميكروفون"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "معايرة شدة مكبر الصوت"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "سَجِّل واقرأ "
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "كل المستخدمين"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "المستخدمون المتصلون"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "قناة الألياف الضوئية"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "افتراضي"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "احذف"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "الخ_يارات"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr "عنوان URI للتهيئة"
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "شغِّل الفيديو دائما"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "فعِّل رؤية نفسي"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "ال_مساعدة"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "أظهِر نافذة التنقيح"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "موق_ع الوِبْ"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "تحقق من التح_ديثات"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "مرشد الحساب"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "عنوان SIP أو رقم الهاتف :"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "ابدأ مكالمة جديدة"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "جهات الاتصال"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "بحث"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>إضافة جهات الاتصال من الدليل</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "إضافة جهة الاتصال"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "المكالمات السابقة"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "هويتي الحالية :"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "في طور الإنهاء"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1043,500 +799,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-"ar: Muhiyeddine Cherik <tx99h4@hotmail.com>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "عنوان SIP"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "رؤية حالة حضور جهة الاتصال هذه"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "السماح لجهة الاتصال هذه برؤية حالة حضوري"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>معلومات جهة الاتصال</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "نافذة تنقيح لِنْفُونْ"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "مرِّر إلى الآخر"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "لِنْفُونْ - يجب التحقق من الهوية"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "أدخل كلمة سر النطاق"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "مُعرِّف المستخدم"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "تاريخ المكالمات"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "أفْرِغ الكل"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "إعادة الاتصال"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "لِنْفُونْ - تهيئة حساب SIP"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "هوية SIP لديك :"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "يشبه sip:<username>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "عنوان وكيل SIP :"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "يشبه sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "مدة التسجيل (بالثواني) :"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "إعدادات جهة الاتصال (اختيارية) :"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "مجال RTCP الاعتيادي ل AVPF (بالثواني) :"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "التوجيه (اختياري) :"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "النقل"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "التسجيل"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "انشر معلومات الحضور"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "فعِّل AVPF "
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "تهيئة حساب SIP"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "مجهول"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "لوحة الصوت الافتراضية"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "لوحة الصوت"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "الكاميرا الافتراضية"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "مرمازات الصوت"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "مرمازات الفيديو"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr "افتراضي"
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr "صبيب الإطارات مرتفع"
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr "مخصص"
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "الإعدادات"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "هذه الفقرة تحدد عنوانك SIP إن كنت لا تستخدم حساب SIP"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "اسمك المعروض (مثلا : زيد عمرو) :"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "اسم المستخدم :"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "عنوانك SIP :"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>الهوية الافتراضية</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "المرشد"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "إضافة"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "حرر"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "أزل"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>حسابات الوكيل</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "احذف جميع كلمات السر"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>الأمان</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr "الإجابة تلقائيا فور تلقي المكالمة"
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr "التأخير قبل الإجابة (ميلي ث,)"
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr "<b>الإجابة تلقائيا</b>"
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "إدارة حسابات SIP"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "صوت الجرس :"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "عتاد ALSA الخصوصي (اختياري) :"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "جهاز الالتقاط :"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "جهاز الرنين :"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "جهاز السمع :"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "فعِّل إزالة الصدى"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>الصوت</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "جهاز إدخال الفيديو :"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr "المقدار المُراد لدقة الفيديو :"
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "طريقة إخراج الفيديو :"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "اظهر معاينة الكاميرا"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr "الفيديو المُسبَق :"
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr "المقدار المُراد لمعدل إطارات الفيديو :"
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "حدِّد 0 لعدم وضع أي حد"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>الفيديو</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "حد سرعة الرفع بالكيلوبِتْ/الثانية :"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "حد سرعة التنزيل بالكيلوبِتْ/الثانية :"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "فعِّل التحكم المتكيف مع الصبيب"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة "
-"قناة الاتصال المتاحة خلال المكالمة.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>إدارة سعة القناة</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "إعدادات الوسائط المتعددة"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "حدِّد Maximum Transmission Unit :"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "أرسِل الأرقام الهاتفية على هيئة SIP INFO"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr "السماح باستخدام IPv6"
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>النقل</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "منفذ SIP/UDP"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "عشوائي"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "منفذ SIP/TCP"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "صوت RTP/UDP :"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "ثابت"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "فيديو RTP/UDP :"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "نوع وسيط التعمية"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "وسيط التعمية إجباري"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "النفق"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "حقول DSCP"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>بروتوكول الشبكة والمنافذ</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "الاتصال مباشر بالإنترنت"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "وراء جدار ناري (حدِّد عنوان IP البوابة)"
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "وراء جدار ناري (استخدم STUN)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "وراء جدار ناري (استخدم ICE)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "وراء جدار ناري (استخدم uPnP)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "عنوان IP العمومي :"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "خادم STUN :"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>إعدادات حول الجدار الناري</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "إعدادات الشبكة"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "فعِّل"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "إلغاء التفعيل"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr "<b>مرمازات الصوت</b>"
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr "<b>مرمازات الفيديو</b>"
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "المراميز"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>اللغة</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "أظهر الإعدادات المتقدمة"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>المستوى</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "واجهة المستخدم"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "عنوان الخادم :"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "طريقة التحقق من الهوية :"
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr "<b>تهيئة LDAP</b>"
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "أغلق"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\nar: Muhiyeddine Cherik <tx99h4@hotmail.com>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1550,29 +813,21 @@ msgstr "الإضافة إلى قائمتي"
 msgid "<b>Search somebody</b>"
 msgstr "<b>البحث عن شخص</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "يُرجى الانتظار"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>اسم المنادَى</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "إعدادات DSCP"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "تاريخ المكالمات"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "أفْرِغ الكل"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "تدفق RTP الصوتي"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "تدفق RTP المرئي"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>حدد قيم DSCP (بالنظام الست-عشري)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "إعادة الاتصال"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1622,38 +877,112 @@ msgstr "تشكيلة RTP"
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>إحصاء المكالمات والمعلومات</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "تهيئة نفق VoIP"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "أرسِلْ"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "المضيف"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "أنْهِ الاجتماع"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "المنفذ"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "تحديد عنوان URI التهيئة عن بعد"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>تهيئة النفق</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "يسمح لك مربع الحوار هذا بإعداد عنوان http أو https الذي من خلاله تود جلب التهيئة عند بدء البرنامج.\nأدخل العنوان أسفله. بعد تأكيد الأمر، ستجري إعادة تشغيل لِنْفُونْ تلقائيا من أجل جلب والأخذ بعين الاعتبار الإعدادات الحديثة."
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "اسم المستخدم"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "عنوان SIP"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "كلمة السر"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "رؤية حالة حضور جهة الاتصال هذه"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>تهيئة وكيل http (اختياري)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "السماح لجهة الاتصال هذه برؤية حالة حضوري"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>معلومات جهة الاتصال</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "إعدادات DSCP"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "تدفق RTP الصوتي"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "تدفق RTP المرئي"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>حدد قيم DSCP (بالنظام الست-عشري)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "اضغط هنا لتحديد شدة مكبر الصوت"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "سَجِّل هذه المكالمة في ملف صوتي"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "مرئي"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "اصمُتْ"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "إرسال"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "المكالمة جارية"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "المدة"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "تقييم جودة المكالمة"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "إعدادات LDAP"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "عنوان الخادم :"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "طريقة التحقق من الهوية :"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "اسم المستخدم :"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "كلمة السر :"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "استخدم TLS"
@@ -1739,74 +1068,13 @@ msgstr "DIGEST-MD5"
 msgid "NTLM"
 msgstr "NTLM"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr "تحديد عنوان URI التهيئة عن بعد"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "اسم المستخدم"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"يسمح لك مربع الحوار هذا بإعداد عنوان http أو https الذي من خلاله تود جلب "
-"التهيئة عند بدء البرنامج.\n"
-"أدخل العنوان أسفله. بعد تأكيد الأمر، ستجري إعادة تشغيل لِنْفُونْ تلقائيا من أجل "
-"جلب والأخذ بعين الاعتبار الإعدادات الحديثة."
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "تجري التهيئة..."
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr "رجاءً انتظر ريثما ينتهي من جلب الإعدادات من الخادم..."
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "أرسِلْ"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>اسم المنادَى</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "أنْهِ الاجتماع"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "سَجِّل هذه المكالمة في ملف صوتي"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "مرئي"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "اصمُتْ"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "إرسال"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "المكالمة جارية"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "المدة"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "تقييم جودة المكالمة"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "كلمة السر"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1816,6 +1084,10 @@ msgstr "الاتصال بالإنترنت :"
 msgid "Automatically log me in"
 msgstr "سَجِّل دخولي تلقائيا"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "مُعرِّف المستخدم"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "معلومات الولوج"
@@ -1824,268 +1096,967 @@ msgstr "معلومات الولوج"
 msgid "<b>Welcome!</b>"
 msgstr "<b>مرحبا !</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "قناة الألياف الضوئية"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "نافذة تنقيح لِنْفُونْ"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "مرِّر إلى الآخر"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "افتراضي"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "احذف"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "الخ_يارات"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "عنوان URI للتهيئة"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "شغِّل الفيديو دائما"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "فعِّل رؤية نفسي"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "إظهار لوحة الأرقام"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr "استورد جهات الاتصال من أنساق vCard"
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr "صدِّر جهات الاتصال بنسق vCard"
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "ال_مساعدة"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "أظهِر نافذة التنقيح"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "موق_ع الوِبْ"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "تحقق من التح_ديثات"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "مرشد الحساب"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "عنوان SIP أو رقم الهاتف :"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "ابدأ مكالمة جديدة"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "جهات الاتصال"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "بحث"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>إضافة جهات الاتصال من الدليل</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "إضافة جهة الاتصال"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "محو تاريخ المكالمات"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "هويتي الحالية :"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "الإجابة التلقائية مُفعَّلة"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "مجهول"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "لوحة الصوت الافتراضية"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "لوحة الصوت"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "الكاميرا الافتراضية"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "مرمازات الصوت"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "مرمازات الفيديو"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "الإعدادات"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "هذه الفقرة تحدد عنوانك SIP إن كنت لا تستخدم حساب SIP"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "اسمك المعروض (مثلا : زيد عمرو) :"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "اسم المستخدم :"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "عنوانك SIP :"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>الهوية الافتراضية</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "المرشد"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "إضافة"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "حرر"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "أزل"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>حسابات الوكيل</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "احذف جميع كلمات السر"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>الأمان</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "الإجابة تلقائيا فور تلقي المكالمة"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "التأخير قبل الإجابة (ميلي ث,)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>الإجابة تلقائيا</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "إدارة حسابات SIP"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "صوت الجرس :"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "عتاد ALSA الخصوصي (اختياري) :"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "جهاز الالتقاط :"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "جهاز الرنين :"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "جهاز السمع :"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "فعِّل إزالة الصدى"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>الصوت</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "جهاز إدخال الفيديو :"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "المقدار المُراد لدقة الفيديو :"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "طريقة إخراج الفيديو :"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "اظهر معاينة الكاميرا"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "الفيديو المُسبَق :"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "المقدار المُراد لمعدل إطارات الفيديو :"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "حدِّد 0 لعدم وضع أي حد"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>الفيديو</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "حد سرعة الرفع بالكيلوبِتْ/الثانية :"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "حد سرعة التنزيل بالكيلوبِتْ/الثانية :"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "فعِّل التحكم المتكيف مع الصبيب"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>التحكم المتكيف مع الصبيب هو تقنية لملائمة جودة الصوت والصورة بناءً على سعة قناة الاتصال المتاحة خلال المكالمة.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>إدارة سعة القناة</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "إعدادات الوسائط المتعددة"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "حدِّد Maximum Transmission Unit :"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "أرسِل الأرقام الهاتفية على هيئة SIP INFO"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "السماح باستخدام IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>النقل</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "منفذ SIP/UDP"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "عشوائي"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "منفذ SIP/TCP"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "صوت RTP/UDP :"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "ثابت"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "فيديو RTP/UDP :"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "النفق"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "حقول DSCP"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>بروتوكول الشبكة والمنافذ</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "الاتصال مباشر بالإنترنت"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "وراء جدار ناري (حدِّد عنوان IP البوابة)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "وراء جدار ناري (استخدم STUN)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "وراء جدار ناري (استخدم ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "وراء جدار ناري (استخدم uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "عنوان IP العمومي :"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "خادم STUN :"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>إعدادات حول الجدار الناري</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "نوع وسيط التعمية"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "‫استخدم Lime لرسائل المحادثات الصادرة‬"
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "وسيط التعمية إجباري"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr "واجب"
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr "مستحب"
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>التعمية</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "إعدادات الشبكة"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "فعِّل"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "إلغاء التفعيل"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>مرمازات الصوت</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>مرمازات الفيديو</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "المراميز"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>اللغة</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "أظهر الإعدادات المتقدمة"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>المستوى</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "واجهة المستخدم"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>تهيئة LDAP</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "أغلق"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "لِنْفُونْ - يجب التحقق من الهوية"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "أدخل كلمة سر النطاق"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "تجري التهيئة..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "رجاءً انتظر ريثما ينتهي من جلب الإعدادات من الخادم..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "مرشد تهيئة حساب SIP"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "مرحبا !\nسيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "مرحبا بك في مرشد إعداد الحساب"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "إنشاء حساب في linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "أتوفر مسبقا على حساب في linphone.org وأريد فقط استخدامه"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "أتوفر مسبقا على حساب sip وأريد فقط استخدامه"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "أريد تحديد عنوان التهيئة عن بعد"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "مرشد تهيئة الحساب"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "ادخل معلومات حسابك"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "اسم المستخدم*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "كلمة السر*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "النطاق*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "الوكيل"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "تهيئة حسابك (المرحلة 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "أدخِل اسم المستخدم في linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "أدخل اسم المستخدم SIP (المرحلة 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) حقول ضرورية"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "البريد الالكتروني : (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "اسم المستخدم* : (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "كلمة السر* : (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "أكِّد كلمة السر : (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "أحطني علما بتحديثات لِنْفُونْ"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "أدخل معلومات حسابك (المرحلة 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "يُرجى الانتظار، يجري الآن إنشاء حسابك."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "إنشاء الحساب في تقدم"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "يُرجى تأكيد حسابك وذلك بالضغط على الوصلة التي أرسلناها لك بالبريد الإلكتروني.\nثم ارجع إلى هنا واضغط على زر التالي."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "تأكيد (المرحلة 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "يُرجى الانتظار، يجري الآن فحص التحقق من صحة حسابك."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "التحقق من الحساب في تقدم"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "خطأ، لم يتم تأكيد الحساب، سبق استخدام اسم المستخدم أو تعذر الوصول للخادم.\nيُرجى إعادة المحاولة لاحقا."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "خطأ"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "شكرا لك، لقد جرت تهيئة حسابك وهو الآن قابل للاستخدام."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "لِنْفُونْ - تهيئة حساب SIP"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "هوية SIP لديك :"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "يشبه sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "عنوان وكيل SIP :"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "يشبه sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "مدة التسجيل (بالثواني) :"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "إعدادات جهة الاتصال (اختيارية) :"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "مجال RTCP الاعتيادي ل AVPF (بالثواني) :"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "التوجيه (اختياري) :"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "النقل"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "التسجيل"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "انشر معلومات الحضور"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "فعِّل AVPF "
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "تهيئة حساب SIP"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "تهيئة نفق VoIP"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "المضيف"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "المنفذ"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>تهيئة النفق</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>تهيئة وكيل http (اختياري)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "يُرجى الانتظار"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "جاهز"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr "تجري التهيئة"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "يتصل ب"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "لم يتمكن من الاتصال"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "آسف، وصل عدد المكالمات الآنية إلى حده الأقصى"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "يتصل بك"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "ويطلب ردا تلقائيا."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "يجري تعديل إعدادات المكالمة..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "متصل."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "أُلغيت المكالمة"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "لم يتمكن من توقيف المكالمة مؤقتا"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "وضع المكالمة قيد الانتظار..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "يجري بحث STUN..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "يجري جلب مرشَّحي ICE المحلين..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "على الخط"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "سأعود"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "غائب"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "على الهاتف"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "أمام مائدة الطعام"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "لا تزعجني"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "ذهبتُ"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "أستخدم خدمة أخرى للتراسل الفوري"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "غير متصل"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "في عطلة"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "حالة مجهولة"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"إن عنوان SIP الذي أدخلت غير صحيح، يجب أن يبدأ بـ \"sip:‎\" متبوعا باسم المضيف."
+msgstr "إن عنوان SIP الذي أدخلت غير صحيح، يجب أن يبدأ بـ \"sip:‎\" متبوعا باسم المضيف."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"إن هوية SIP التي أدخلت غير صحيحة.\n"
-"يجب أن تكون بهذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
+msgstr "إن هوية SIP التي أدخلت غير صحيحة.\nيجب أن تكون بهذا النمط sip:username@proxydomain، مثلا sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "يجري البحث عن وجهة رقم الهاتف..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "لم يتمكن من إيجاد هذا الرقم."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "تعذر الولوج بالهوية %s"
 
-#: ../coreapi/proxy.c:1494
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1522
+#, c-format
 msgid "Refreshing on %s..."
-msgstr "يجلب من %s"
+msgstr "‫يجري إنعاش في %s...‬"
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "يرن الجرس عن بعد..."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "يرن الجرس عن بعد..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "أخذ المكالمة مبكرا."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "المكاملة مع %s متوقفة."
+msgid "Call answered by %s"
+msgstr "‫أجاب عن المكالمة %s‬"
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "يجيب %s عن المكالمة - في وضع الانتظار."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "استُعيدت المكالمة."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "أجاب عن المكالمة %s."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr "غير موائم، تحقق من المراميز أو إعدادات الأمان..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "إعدادات الوسائط غير موائمة."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "استُأنِفت المكالمة."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "وُقِّفت المكالمة مؤقتا من طرف آخر."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "حُدِّث الاتصال من البعيد."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "أُنهيت المكالمة."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "المستخدم مشغول."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "المستخدم غير متاح مؤقتا."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "لا يريد المستخدم أي إزعاج."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "تم تجاهل المكالمة."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "انتهت مهلة الطلب."
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "مُوجَّه"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "فشل الاتصال."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "تم التسجيل في %s بنجاح."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "أُلغي التسجيل في %s ."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "لا إجابة قبل انتهاء المهلة"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "فَشِل التسجيل في %s: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr "خدمة غير متاحة، تجري الإعادة"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "شارة التحقق من الهوية هي %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "‫لم تُعدَّل معاملات المكالمات : %s.‬"
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr "عُدِّلت معاملات المكالمات بنجاج."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -2096,23 +2067,23 @@ msgstr[3] "فاتتك %i مكالمات."
 msgstr[4] "فاتتك %i مكالمة."
 msgstr[5] "فاتتك %i مكالمة."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr "أُجهِضت"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr "اكتملت"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr "فاتت"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2120,18 +2091,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
-"%s في %s\n"
-"من : %s\n"
-"إلى : %s\n"
-"الحالة : %s\n"
-"المدة : %i دقيقة %i ثانية\n"
+msgstr "%s في %s\nمن : %s\nإلى : %s\nالحالة : %s\nالمدة : %i دقيقة %i ثانية\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr "المكالمة الصادرة"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr "لم يتمكن من تشغيل %s"
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 3b8d4b0f9..70d394fa7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Klara Cihlarova <koty@seznam.cz>, 2005
 # Petr Pisar <petr.pisar@atlas.cz>, 2006-2011,2013
@@ -9,50 +9,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Czech (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/cs/)\n"
-"Language: cs\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Czech (http://www.transifex.com/belledonne-communications/linphone-gtk/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Volat komu: %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Poslat text komu: %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Nedávné hovory"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>Nedávné hovory (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "–"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Přerušen"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Zmeškán"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Odmítnut"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -60,7 +67,7 @@ msgstr[0] "%i minuta"
 msgstr[1] "%i minuty"
 msgstr[2] "%i minut"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -68,16 +75,14 @@ msgstr[0] "%i sekunda"
 msgstr[1] "%i sekundy"
 msgstr[2] "%i sekund"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Kvalita: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Kvalita: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -95,51 +100,57 @@ msgstr "Já"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nelze najít soubor s obrázkem: %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "Za běhu vypisuje některé ladicí informace na standardní výstup."
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "Soubor, kam zapisovat protokol."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Spustí linphone se zakázaným obrazem."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Spustí se pouze do systémové oblasti, nezobrazí hlavní okno."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "Zavolá právě teď na tuto adresu"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Zadejte pracovní adresář (měl by být základní instalační adresář, například "
+"Specifiy a working directory (should be the base of the installation, eg: "
 "c:\\Program Files\\Linphone)"
+msgstr "Zadejte pracovní adresář (měl by být základní instalační adresář, například c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -147,8 +158,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -159,254 +169,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Chyba hovoru"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Hovor ukončen"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Odpovědět"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Hovor odložen"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>kým: %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s navrhuje začít videohovor. Přijímáte?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Odkaz na webovou stránku"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Výchozí)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Byly jsme přepojeni na %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Na tomto počítači nebyla objevena žádná zvuková karta.\n"
-"Nebudete moci vytáčet a přijímat a zvukové hovory."
+msgstr "Na tomto počítači nebyla objevena žádná zvuková karta.\nNebudete moci vytáčet a přijímat a zvukové hovory."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Volný SIP videofon"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Přidat do adresáře"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Stav"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Jméno"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Zavolat"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Diskuze"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Hledat v adresáři %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Neplatný sipový kontakt!"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Upravit kontakt „%s“"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Odstranit kontakt „%s“"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "Odstranit historii diskuze u kontaktu „%s“"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Přidat nový kontakt z adresáře %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Jméno"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Kmitočet (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Stav"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parametry"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Účet"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "angličtina"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "francouzština"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "švédština"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "italština"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "španělština"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "brazilská portugalština"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "polština"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "němčina"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "ruština"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "japonština"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "dánština"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "maďarština"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "čeština"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "čínština"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "tradiční čínština"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "norština"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "hebrejština"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "srbština"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Aby se projevil výběr nového jazyka, je nutné znovu spustit linphone."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Žádné"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -415,9 +416,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Na %s je dostupná novější verze.\n"
-"Přejete si otevřít prohlížeč, abyste si ji mohli stáhnout?"
+msgstr "Na %s je dostupná novější verze.\nPřejete si otevřít prohlížeč, abyste si ji mohli stáhnout?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -451,349 +450,199 @@ msgstr[0] "Nalezen %i kontakt"
 msgstr[1] "Nalezeny %i kontakty"
 msgstr[2] "Nalezeno %i kontaktů"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Vytvořit účet na linphone.org"
-
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Účet na linphone.org již mám a chci jej použít"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "SIP účet již mám a chci jej použít"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Uživatelské jméno*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Heslo*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Doména*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Zadejte uživatelské jméno na linphone.org"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Uživatelské jméno:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Povinné položky"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Uživatelské jméno: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Heslo: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "E-mail: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Potvrďte heslo: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě "
-"zaslali e-mailem.\n"
-"Pak se sem vraťte a stiskněte tlačítko Další."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server "
-"není dostupný).\n"
-"Prosím, vraťte se a zkoste to znovu."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Děkujeme vám. Váš účet je nyní nastaven a připraven k použití."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Vítejte v průvodci nastavení účtu"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Průvodce nastavením účtu"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Nastavit účet (krok 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Zadejte vaše sipové uživatelské jméno (krok 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Zadejte údaje o účtu (krok 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Ověření (krok 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Chyba"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Ukončuje se"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "Hovor č. %i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Přepojit hovor č. %i s %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Nepoužito"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE není zapnuto"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ICE selhalo"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "Probíhá ICE"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Prochází se jedním nebo více NATy"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "Přímé"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Skrze relay server"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "UPnP není zapnuto"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "Probíhá UPnP"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "UPnP není nedostupné"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "UPnP běží"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "UPnP selhalo"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "Přímé nebo skrze server"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"příchozí: %f\n"
-"odchozí: %f (kb/s)"
+msgstr "příchozí: %f\nodchozí: %f (kb/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f sekund"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Zavěsit"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Volá se…</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
-#, fuzzy
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
-msgstr "00:00:00"
+msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Příchozí hovor</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "dobrá"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "průměrná"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "slabá"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "velmi slabá"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "příliš špatná"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "nedostupná"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Zabezpečeno pomocí SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr ""
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Zabezpečeno pomocí ZRTP – [ověřovací klíč: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Nastavit na neověřeno"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Nastavit na ověřeno"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "Probíhá konference"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>Probíhá hovor</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Odložený hovor</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hovor skončil.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Probíhá přepojení"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Přepojení dokončeno."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Přepojení selhalo."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Obnovit"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Odložit"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Nahrává se do\n"
-"%s %s</i></small>"
+msgstr "<small><i>Nahrává se do\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(Odloženo)"
 
@@ -832,175 +681,88 @@ msgstr ""
 msgid "Did you hear three beeps ?"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "všech uživatelích"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "připojených uživatelích"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Fiber Channel"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Výchozí"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Smazat"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "V_olby"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Vždy spustit obraz"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Zobrazovat sám sebe"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "Nápo_věda"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Zobrazit ladicí okno"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Domovská stránka"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Vyhledat akt_ualizace"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Průvodce účtem"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SIP adresa nebo telefonní číslo:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Zahájit nový hovor"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Hledat"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Přidat kontakty z adresáře</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Přidat kontakt"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Nedávné hovory"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Moje současná totožnost:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Ukončuje se"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1030,486 +792,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP adresa"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "U tohoto kontaktu zobrazovat stav přítomnosti"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Dovolit tomuto kontaktu, aby viděl můj stav přítomnosti"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Informace o kontaktu</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Ladicí okno Linphonu"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Přejít na konec"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone – Ověření totožnosti vyžadováno"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Prosím, zadejte heslo pro doménu"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "Identifikátor uživatele"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Historie volání"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Vše smazat"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Zavolat zpátky"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone – Nastav SIP účet"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Vaše SIP totožnost:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Vypadá jako sip:<uživatel>@<doména>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "Adresa SIP proxy:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Vypadá jako sip:<název proxy>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Registrační období (s):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Směrování (volitelné):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Zaregistrovat se"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Zveřejnit stav přítomnosti"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Nastavit SIP účet"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "implicitní zvuková karta"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "zvuková karta"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "implicitní kamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Kodeky zvuku"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Kodeky obrazu"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Nastavení"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Tento oddíl určuje vaši SIP adresu, když se nepoužívá žádný účet"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Vaše zobrazované jméno (např. Jan Novák):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Vaše uživatelské jméno:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Vaše výsledná SIP adresa:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Implicitní totožnost</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Průvodce"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Přidat"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Upravit"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Odstranit"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy účty</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Vymazat všechna hesla"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Soukromí</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "Nastavení SIP účtů"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Vyzvánění:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Zvláštní ALSA zařízení (volitelné):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Zařízení pro nahrávání:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Zařízení pro vyzvánění:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Zařízení pro přehrávání:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Zapnout potlačení ozvěny"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Zvuk</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Vstupní zařízení obrazu:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 znamená „neomezeno“"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Obraz</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Omezení odchozí rychlosti (kb/s):"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Omezení příchozí rychlosti (kb/s):"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Zapnout přizpůsobující se řízení rychlosti"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Přizpůsobující se řízení rychlosti je technika dynamického odhadu "
-"dostupného pásma během hovoru.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Využití šířky pásma</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Nastavení multimédií"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Nastavit MTU (největší přenositelná zpráva):"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Odesílat tóny DTMF jako SIP INFO zprávy"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Přenos</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Zvukový RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Stálý"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Obrazový RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Druh šifrování médií"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Šifrování médií je povinné"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Tunel"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "Položky DSCP"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Síťové protokoly a porty</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Přímé připojení do Internetu"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Za NAT/firewallem (adresu určí STUN)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Za NAT/firewallem (adresu určí ICE)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Za NAT/firewallem (adresu určí UPnP)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Veřejná IP adresa:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "STUN server:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT a firewall</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Nastavení sítě"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Povolit"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Zakázat"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Kodeky"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Jazyk</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Zobrazit podrobnější nastavení"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Úroveň</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Uživatelské rozhraní"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Hotovo"
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr "Hledat kontakty v adresáři"
@@ -1522,29 +804,21 @@ msgstr "Přidat na svůj seznam"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Hledat někoho</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Prosím, čekejte"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Jméno volaného</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr ""
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Historie volání"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Vše smazat"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "RTP proud zvuku"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "RTP proud obrazu"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>Nastavit hodnoty DSCP (šestnáctkově)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Zavolat zpátky"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1594,38 +868,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>Statistické a ostatní údaje o hovoru</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "Nastavit VoIP tunel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Odeslat"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Stroj"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Ukončit konferenci"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Port"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Nastavit tunel</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Uživatelské jméno"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP adresa"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Heslo"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "U tohoto kontaktu zobrazovat stav přítomnosti"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>Nastavit HTTP proxy (volitelné)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Dovolit tomuto kontaktu, aby viděl můj stav přítomnosti"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Informace o kontaktu</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "RTP proud zvuku"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "RTP proud obrazu"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>Nastavit hodnoty DSCP (šestnáctkově)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Nahrát tento hovor do zvukového souboru"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Obraz"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Ztišit"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Přepojit"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "Telefonuje se"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Délka"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Hodnocení kvality hovoru"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Heslo:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1711,70 +1059,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Uživatelské jméno"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Odeslat"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Jméno volaného</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Ukončit konferenci"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Nahrát tento hovor do zvukového souboru"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Obraz"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Ztišit"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Přepojit"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "Telefonuje se"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Délka"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Hodnocení kvality hovoru"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Heslo"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1784,6 +1075,10 @@ msgstr "Připojení k Internetu:"
 msgid "Automatically log me in"
 msgstr "Přihlašovat mě automaticky"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Identifikátor uživatele"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Informace o přihlášení"
@@ -1792,269 +1087,967 @@ msgstr "Informace o přihlášení"
 msgid "<b>Welcome!</b>"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fiber Channel"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Ladicí okno Linphonu"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Přejít na konec"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Smazat"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "V_olby"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Vždy spustit obraz"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Zobrazovat sám sebe"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "Nápo_věda"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Zobrazit ladicí okno"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Domovská stránka"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Vyhledat akt_ualizace"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Průvodce účtem"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP adresa nebo telefonní číslo:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Zahájit nový hovor"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Hledat"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Přidat kontakty z adresáře</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Přidat kontakt"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Moje současná totožnost:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "implicitní zvuková karta"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "zvuková karta"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "implicitní kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Kodeky zvuku"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Kodeky obrazu"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Nastavení"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Tento oddíl určuje vaši SIP adresu, když se nepoužívá žádný účet"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Vaše zobrazované jméno (např. Jan Novák):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Vaše uživatelské jméno:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Vaše výsledná SIP adresa:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Implicitní totožnost</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Průvodce"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Přidat"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Upravit"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Odstranit"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Proxy účty</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Vymazat všechna hesla"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Soukromí</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Nastavení SIP účtů"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Vyzvánění:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Zvláštní ALSA zařízení (volitelné):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Zařízení pro nahrávání:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Zařízení pro vyzvánění:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Zařízení pro přehrávání:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Zapnout potlačení ozvěny"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Zvuk</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Vstupní zařízení obrazu:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 znamená „neomezeno“"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Obraz</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Omezení odchozí rychlosti (kb/s):"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Omezení příchozí rychlosti (kb/s):"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Zapnout přizpůsobující se řízení rychlosti"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Přizpůsobující se řízení rychlosti je technika dynamického odhadu dostupného pásma během hovoru.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Využití šířky pásma</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Nastavení multimédií"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Nastavit MTU (největší přenositelná zpráva):"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Odesílat tóny DTMF jako SIP INFO zprávy"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Přenos</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Zvukový RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Stálý"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Obrazový RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "Položky DSCP"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Síťové protokoly a porty</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Přímé připojení do Internetu"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Za NAT/firewallem (adresu určí STUN)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Za NAT/firewallem (adresu určí ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Za NAT/firewallem (adresu určí UPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Veřejná IP adresa:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "STUN server:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT a firewall</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Druh šifrování médií"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Šifrování médií je povinné"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Nastavení sítě"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Povolit"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Zakázat"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Kodeky"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Jazyk</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Zobrazit podrobnější nastavení"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Úroveň</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Uživatelské rozhraní"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Hotovo"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone – Ověření totožnosti vyžadováno"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Prosím, zadejte heslo pro doménu"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Vítejte v průvodci nastavení účtu"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Vytvořit účet na linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Účet na linphone.org již mám a chci jej použít"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "SIP účet již mám a chci jej použít"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Průvodce nastavením účtu"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Uživatelské jméno*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Heslo*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Doména*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Nastavit účet (krok 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Zadejte uživatelské jméno na linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Zadejte vaše sipové uživatelské jméno (krok 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Povinné položky"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "E-mail: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Uživatelské jméno: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Heslo: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Potvrďte heslo: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Zadejte údaje o účtu (krok 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Prosím, ověřte svůj účet tak, že kliknete na odkaz, který jsme vám právě zaslali e-mailem.\nPak se sem vraťte a stiskněte tlačítko Další."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Ověření (krok 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Došlo k chybě (účet nebyl ověřen, uživatelské jméno již existuje nebo server není dostupný).\nProsím, vraťte se a zkoste to znovu."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Chyba"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Děkujeme vám. Váš účet je nyní nastaven a připraven k použití."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone – Nastav SIP účet"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Vaše SIP totožnost:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Vypadá jako sip:<uživatel>@<doména>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "Adresa SIP proxy:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Vypadá jako sip:<název proxy>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Registrační období (s):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Směrování (volitelné):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Zaregistrovat se"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Zveřejnit stav přítomnosti"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Nastavit SIP účet"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Nastavit VoIP tunel"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Stroj"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Port"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Nastavit tunel</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Nastavit HTTP proxy (volitelné)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Prosím, čekejte"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Připraven."
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Navazuje se spojení"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Nelze volat"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Je nám líto, ale byl dosažen maximální počet současných hovorů."
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "vás volá"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr " a požaduje automatickou zvednutí."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Upravují se parametry hovoru…"
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Připojeno."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Hovor přerušen"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "Hovor nebylo možné odložit"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Současný hovor se odkládá…"
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "Hledá se adresa pomocí STUN…"
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "Shromažďují se místní kandidáti ICE…"
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Připojen"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Za chvíli se vrátím"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Pryč"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "U telefonu"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "Na obědě"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Nerušit"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Přestěhoval jsem se"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Používám jinou službu přenosu zpráv"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Čekám"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a "
-"pak musí následovat jméno stroje."
+msgstr "Adresa SIP proxy, kterou jste zadali, není platná. Musí začínat na „sip:“ a pak musí následovat jméno stroje."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"SIP identita, kterou jste zadali, není platná.\n"
-"Měla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
+msgstr "SIP identita, kterou jste zadali, není platná.\nMěla by mít tvar sip:uživatel@proxydoména, například sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Vyhledává se umístění čísla…"
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Toto číslo nelze vyhledat."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nelze se přihlásit jako %s"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Vyzvání na druhé straně."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "Vyzvání na druhé straně…"
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Časná média."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "Hovor s %s je odložen."
+msgid "Call answered by %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Hovor přijat kým: %s – odložen."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Hovor obnoven."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "Hovor přijat kým: %s."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Není slučitelné. Zkontrolujte nastavení kodeků a zabezpečení…"
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "Neslučitelné parametry médií."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "Byli jsme obnoveni."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "Byli jsme odloženi protistranou."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "Hovor byl aktualizován protistranou."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Hovor ukončen."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Uživatel je zaneprázdněn."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Uživatel je dočasně nedostupný."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Uživatel si nepřeje být rušen."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Volání odmítnuto."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Přesměrováno"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Volání se nezdařilo."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrace na %s byla úspěšná."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Odregistrování z %s hotovo."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "odpověď nedorazila včas"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrace na %s selhala: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Klíč k ověření totožnosti je %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -2062,23 +2055,23 @@ msgstr[0] "Máte %i zmeškaný hovor."
 msgstr[1] "Máte %i zmeškané hovory."
 msgstr[2] "Máte %i zmeškaných hovorů."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2088,11 +2081,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/de.po b/po/de.po
index 9fd715fe7..50aef056b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,84 +1,89 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # andreas, 2014
 # andreas, 2014
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+# Ettore Atalan <atalanttore@googlemail.com>, 2015-2016
 # Gerhard Stengel <gstengel@gmx.net>, 2011-2012
 # Simon Morlat <linphone@free.fr>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: German (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/de/)\n"
-"Language: de\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: German (http://www.transifex.com/belledonne-communications/linphone-gtk/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "„%s“ anrufen"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Text zu „%s“ schicken"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "%s zu Ihrer Kontaktliste hinzufügen"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Letzte Gespräche"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>Letzte Anrufe (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "n/v"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Abgebrochen"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Verpasst"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Abgewiesen"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i Minute"
 msgstr[1] "%i Minuten"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i Sekunde"
 msgstr[1] "%i Sekunden"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Qualität: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Qualität: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -96,53 +101,57 @@ msgstr "Eigenes Telefon"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmapdatei %s kann nicht gefunden werden."
 
-#: ../gtk/chat.c:493
-msgid "Copy"
-msgstr ""
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Sendevorgang..."
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Nachricht nicht gesendet"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "Kopieren"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "Ausgabe von Debug-Informationen auf stdout während der Laufzeit"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr "Version anzeigen und beenden."
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "Pfad zu einer Datei, in die Protokolle geschrieben werden."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Linphone mit ausgeschaltetem Video starten."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
-msgstr ""
-"Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster "
-"nicht zeigen."
+msgstr "Nur im Systemabschnitt der Kontrollleiste starten, aber das Hauptfenster nicht zeigen."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "Im Moment anzurufende Adresse"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. "
-"C:\\Programme\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Geben Sie einen Arbeitsordner an (sollte der Installationsordner sein, z. B. C:\\Programme\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "Konfigurationsdatei"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "Starte den Audio-Assistent"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr "Selbsttest ausführen und mit 0 beenden, wenn erfolgreich"
 
@@ -150,8 +159,7 @@ msgstr "Selbsttest ausführen und mit 0 beenden, wenn erfolgreich"
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -160,260 +168,247 @@ msgstr ""
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n"
-" für  Bereich <i>%s</i> ein:"
+msgstr "Bitte geben Sie Ihr Passwort für den Benutzernamen <i>%s</i>\n für  Bereich <i>%s</i> ein:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Anruf fehlgeschlagen"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Anruf beendet"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Annehmen"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Abweisen"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Anruf wird gehalten"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>von %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s schlägt vor, eine Videoübertragung zu starten. Nehmen Sie an?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Website-Verknüpfung"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr "Ein Internet-Video-Telefon"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Vorgabe)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vermittlung nach %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Auf diesem Rechner können keine Soundkarten gefunden werden.\n"
-"Sie können keine Audio-Anrufe tätigen oder entgegennehmen."
+msgstr "Auf diesem Rechner können keine Soundkarten gefunden werden.\nSie können keine Audio-Anrufe tätigen oder entgegennehmen."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Ein freies SIP-Video-Telefon"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr "Hallo\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Zum Adressbuch hinzufügen"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Anwesenheitsstatus"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Name"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Anrufen"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Chat"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Im %s-Verzeichnis suchen"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Ungültiger SIP-Kontakt!"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Neuen Kontakt hinzufügen"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Kontakt „%s“ bearbeiten"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Kontakt „%s“ löschen"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "Lösche Gesprächshistorie von '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Einen neuen Kontakt aus dem %s-Verzeichnis hinzufügen"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Name"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Rate (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "IP Bit-Rate (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parameter"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Freigegeben"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Gesperrt"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Englisch"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Französisch"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Brasilianisches Portugiesisch"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Deutsch"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam "
-"wird."
+msgstr "Linphone muss neu gestartet werden, damit die neue Spracheinstellung wirksam wird."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Keinen"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr "DTLS"
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -422,9 +417,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Eine neuere Version ist von %s verfügbar.\n"
-"Möchten Sie einen Browser zum Herunterladen öffnen?"
+msgstr "Eine neuere Version ist von %s verfügbar.\nMöchten Sie einen Browser zum Herunterladen öffnen?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -457,352 +450,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] "%i Kontakt gefunden"
 msgstr[1] "%i Kontakte gefunden"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Willkommen!\n"
-"Dieser Assistent hilft Ihnen dabei ein SIP-Konto einzurichten."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Benutzername wird bereits verwendet!"
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Ein Konto bei linphone.org erstellen."
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Fehler beim Überprüfen der Benutzernamenverfügbarkeit. Bitte versuchen Sie es später erneut."
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-"Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "Ich habe bereits ein SIP-Konto und möchte es jetzt benutzen."
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr "Ich möchte eine URI zur Fernkonfiguration angeben"
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr "Geben Sie Ihre Zugangsdaten ein"
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Benutzername*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Passwort*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Domäne*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Geben Sie Ihren Benutzernamen bei linphone.org ein."
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Passwort:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) erforderliche Felder"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Benutzername: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Passwort: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "E-Mail: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Bestätigen Sie Ihr Passwort: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "Halte mich über linphone Aktualisierungen auf dem laufenden"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr "Ihr Konto wird erstellt, bitte warten."
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die "
-"wir Ihnen soeben per E-Mail geschickt haben.\n"
-"Danach gehen Sie hierher zurück und drücken auf „Vor“."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr "Es wird überprüft, ob Ihr Konto gültig ist, bitte warten."
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\n"
-"verwendet oder der Server ist unerreichbar.\n"
-"Bitte gehen Sie zurück und versuchen Sie es noch einmal."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-"Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "SIP-Konto-Einrichtungsassistent"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Willkommen zum Konto-Einrichtungsassistenten"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Konto-Einrichtungsassistent"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Konto einrichten (Schritt 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Geben Sie Ihren SIP-Benutzernamen ein (Schritt 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Geben Sie Ihre Zugangsdaten ein (Schritt 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr "Kontoerstellung läuft"
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Bestätigung (Schritt 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr "Kontogültigkeitsprüfung läuft"
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Fehler"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Fertigstellen"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "Anruf #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Vermittlung zum Anruf #%i mit %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Nicht verwendet"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE nicht aktiviert"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ICE fehlgeschlagen"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ICE läuft"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Ein oder mehrere NATs werden durchquert"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "Direkt"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Über einen Relay-Server"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnP nicht aktiviert"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "uPnP läuft"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnp nicht verfügbar"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP läuft"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "uPnP fehlgeschlagen"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "Direkt oder über Server"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"Herunterladen: %f\n"
-"Hochladen: %f (kbit/s)"
+msgstr "Herunterladen: %f\nHochladen: %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f bps"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f Sekunden"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Auflegen"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Verbindungsaufbau...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Eingehender Anruf</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "gut"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "durchschnittlich"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "schlecht"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "sehr schlecht"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "zu schlecht"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "nicht verfügbar"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Gesichert durch SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr "Gesichert durch DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Gesichert durch ZRTP - [Auth.-Token: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Auf „Ungeprüft“ setzen"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Auf „Geprüft“ setzen"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "In Konferenz"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>Im Gespräch</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Gehaltener Anruf</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Anruf beendet.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Vermittlung läuft"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Vermittlung abgeschlossen."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Vermittlung fehlgeschlagen."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Fortsetzen"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Halten"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Recording into\n"
-"%s %s</i></small>"
+msgstr "<small><i>Recording into\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(pausiert)"
 
@@ -841,178 +681,88 @@ msgstr "zu laut"
 msgid "Did you hear three beeps ?"
 msgstr "Haben Sie die drei Signaltöne gehört?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "Toneinstellungen nicht gefunden"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "Systemtonsteuerung kann nicht gestartet werden"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Willkommen!\n"
-"Dieser Assistent hilft Ihnen die Audioeinstellungen für Linphone "
-"einzurichten."
+msgstr "Willkommen!\nDieser Assistent hilft Ihnen die Audioeinstellungen für Linphone einzurichten."
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "Aufnahmegerät"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "aufgenommene Lautstärke"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "Keine Stimme"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "Systemtoneinstellungen"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "Wiedergabegerät"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "spiele drei Pieptöne ab"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "Drücken Sie den Aufnahmeknopf und sagen Sie etwas"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "Hören Sie das Aufgenommene"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "Aufnahme"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "Wiedergabe"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "Linphone jetzt starten"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "Audio-Assistant"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "Audio-Assistant"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "Einrichtung MIkrofonverstärker"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "Einrichtung Lautstärke"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "aufnehmen und abspielen"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Alle Teilnehmer"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Angemeldete Teilnehmer"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Glasfaserkabel"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Vorgabe"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Optionen"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr "Konfigurations URI angeben"
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Video immer starten"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Selbstansicht ein"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Debug-Fenster anzeigen"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Homepage"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Auf _Aktualisierungen überprüfen"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Konto-Einrichtungsassistent"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SIP-Adresse oder Telefonnummer:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Einen neuen Anruf beginnen"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Suchen"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Kontakte aus einem Verzeichnis hinzufügen</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Kontakt hinzufügen"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Letzte Gespräche"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Aktuelle Identität:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Fertigstellen"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1024,9 +774,7 @@ msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) "
-"verwendet."
+msgstr "Ein Internet-Video-Telefon, das das Standard-SIP-Protokoll (RFC3261) verwendet."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1042,501 +790,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP-Adresse"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Anwesenheitsstatus dieses Kontakts zeigen"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Diesem Kontakt erlauben, meinen Anwesenheitsstatus zu sehen"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Kontaktinformationen</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone Debug-Fenster"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Ans Ende rollen"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Authentifikation erforderlich"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Bitte das Passwort der Domäne eingeben"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "Benutzer-ID"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Anrufchronik"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Alle löschen"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Anrufen"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - SIP-Konto einrichten"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Ihre SIP-Identität:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Sieht aus wie sip:<benutzername>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP-Proxy-Adresse:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Sieht aus wie sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Registrierungsdauer (sec):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "Kontaktdetails (optional)"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "AVPF Standard RTCP Interval (sek):"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Route (optional):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Übertragung"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Registrieren"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Anwesenheitsstatus veröffentlichen"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "Aktiviere AVPF"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "SIP-Konto einrichten"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "Anonym"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "Standard-Soundkarte"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "eine Soundkarte"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "Standard-Kamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Audiocodecs"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Videocodecs"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr "Vorgabe"
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr "hohe-BpS"
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr "Benutzerdefiniert"
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto "
-"verwenden."
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Ihr angezeigter Name (z. B. Heinz Müller):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Ihr Benutzername:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Sich ergebende SIP-Adresse:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Standard-Identität</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Assistent"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy-Konten</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Alle Passwörter löschen"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Privatsphäre</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr "Automatisch antworten, wenn ein Anruf eingeht"
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr "Verzögerung vor der Beantwortung (ms)"
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr "<b>Automatische Antwort</b>"
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "SIP-Konten verwalten"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Klingelton:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Spezielles ALSA-Gerät (optional):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Aufnahmegerät:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Gerät für Klingelton:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Wiedergabegerät:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Echounterdrückung ein"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Video-Aufnahmegerät:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr "Bevorzugte Videoauflösung:"
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "Methode zur Videoausgabe"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "Kameravorschau anzeigen"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr "Videovoreinstellung:"
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr "Bevorzugte Videobildfrequenz:"
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 bedeutet „unbegrenzt“"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Upload-Bandbreite (kbit/sec):"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Download-Bandbreite (kbit/sec):"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Adaptive Ratenregelung ein"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der "
-"zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Bandbreiten-Einstellungen</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Multimedia-Einstellungen"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Maximum Transmission Unit setzen:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "DTMFs als SIP-Info senden"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr "IPv6 erlauben"
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Übertragung</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "SIP/UDP Port"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "Zufällig"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "SIP/TCP Port"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Fest"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Verschlüsselungstyp der Medien"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Medienverschlüsselung erzwingen"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Tunnel"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "DSCP-Felder"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Netzwerkprotokoll und Ports</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Direkte Verbindung ins Internet"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Hinter NAT / Firewall (Gateway IP angeben)"
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Hinter NAT / Firewall (STUN verwenden)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Hinter NAT / Firewall (ICE verwenden)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Hinter NAT / Firewall (uPnP verwenden)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Öffentliche IP-Adresse:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "STUN-Server:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT und Firewall</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Netzwerkeinstellungen"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Freigeben"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Sperren"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr "<b>Audiocodecs</b>"
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr "<b>Videocodecs</b>"
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Sprache</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Fortgeschrittene Einstellungen anzeigen"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Detaillierung</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Benutzeroberfläche"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "Server-Adresse"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "Authentifizierungsmethode"
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr "LDAP-Kontoeinrichtung"
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Fertig"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1550,29 +804,21 @@ msgstr "Zur Kontaktliste hinzufügen"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Kontaktsuche</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Bitte warten"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Name des Angerufenen</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "DSCP-Einstellungen"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Anrufchronik"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Alle löschen"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "Audio-RTP-Datenstrom"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "Video-RTP-Datenstrom"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>DSCP-Werte setzen (hexadezimal)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Anrufen"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1622,38 +868,112 @@ msgstr "RTP-Profil"
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>Anrufstatistik und -informationen</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "VoIP-Tunnel einrichten"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Senden"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Host"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Konferenz beenden"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Port"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Eine URI zur FErnkonfiguration angeben"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Tunnel einrichten</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart eine http- oder https-Adresse anzugeben.\nBitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen Einstellungen zu übernehmen."
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Benutzername"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP-Adresse"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Passwort"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Anwesenheitsstatus dieses Kontakts zeigen"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>Configure http proxy (optional)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Diesem Kontakt erlauben, meinen Anwesenheitsstatus zu sehen"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Kontaktinformationen</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "DSCP-Einstellungen"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Audio-RTP-Datenstrom"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Video-RTP-Datenstrom"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>DSCP-Werte setzen (hexadezimal)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Klicken Sie hier, um die Lautsprecherlautstärke festzulegen"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Speichere den Anruf in eine Audio-Datei"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Video"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Stumm"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Vermittlung"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "Im Gespräch"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Dauer"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Bewertung der Verbindungsqualität"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "LDAP-Einstellungen"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Server-Adresse"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Authentifizierungsmethode"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Passwort:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "TLS-Verbindung verwenden"
@@ -1739,76 +1059,13 @@ msgstr "DIGEST-MD5"
 msgid "NTLM"
 msgstr "NTLM"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr "Eine URI zur FErnkonfiguration angeben"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Benutzername"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"Diese Maske erlaubt Ihnen für das Laden der Konfiguration beim Programmstart "
-"eine http- oder https-Adresse anzugeben.\n"
-"Bitte geben Sie unten die Konfigurations-URI ein oder ändern diese. Nach dem "
-"Bestätigen mit OK wird Linphone automatisch neustarten, um die neuen "
-"Einstellungen zu übernehmen."
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "Einstellen..."
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-"Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Senden"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Name des Angerufenen</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Konferenz beenden"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Speichere den Anruf in eine Audio-Datei"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Video"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Stumm"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Vermittlung"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "Im Gespräch"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Dauer"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Bewertung der Verbindungsqualität"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Passwort"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1818,6 +1075,10 @@ msgstr "Internetverbindung:"
 msgid "Automatically log me in"
 msgstr "Automatisch anmelden"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Benutzer-ID"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Anmeldeinformationen"
@@ -1826,294 +1087,990 @@ msgstr "Anmeldeinformationen"
 msgid "<b>Welcome!</b>"
 msgstr "<b>Willkommen!</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Glasfaserkabel"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone Debug-Fenster"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Ans Ende rollen"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Vorgabe"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Optionen"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Konfigurations URI angeben"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Video immer starten"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Selbstansicht ein"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Tastatur anzeigen"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr "Kontakte aus vCards importieren"
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr "Kontakte als vCards exportieren"
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Debug-Fenster anzeigen"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Homepage"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Auf _Aktualisierungen überprüfen"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Konto-Einrichtungsassistent"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP-Adresse oder Telefonnummer:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Einen neuen Anruf beginnen"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Suchen"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Kontakte aus einem Verzeichnis hinzufügen</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Kontakt hinzufügen"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Anrufchronik löschen"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Aktuelle Identität:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Automatische Antwort ist aktiviert"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "Anonym"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "Standard-Soundkarte"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "eine Soundkarte"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "Standard-Kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Audiocodecs"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Videocodecs"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "In diesem Bereich legen Sie Ihre SIP-Adresse fest, wenn Sie kein SIP-Konto verwenden."
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Ihr angezeigter Name (z. B. Heinz Müller):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Ihr Benutzername:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Sich ergebende SIP-Adresse:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Standard-Identität</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Assistent"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Proxy-Konten</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Alle Passwörter löschen"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatsphäre</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Automatisch antworten, wenn ein Anruf eingeht"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Verzögerung vor der Beantwortung (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Automatische Antwort</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "SIP-Konten verwalten"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Klingelton:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Spezielles ALSA-Gerät (optional):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Aufnahmegerät:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Gerät für Klingelton:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Wiedergabegerät:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Echounterdrückung ein"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Video-Aufnahmegerät:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Bevorzugte Videoauflösung:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Methode zur Videoausgabe"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Kameravorschau anzeigen"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Videovoreinstellung:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Bevorzugte Videobildfrequenz:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 bedeutet „unbegrenzt“"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Upload-Bandbreite (kbit/sec):"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Download-Bandbreite (kbit/sec):"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Adaptive Ratenregelung ein"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Adaptive Ratenregelung ist eine Technik zur dynamischen Abschätzung der zur Verfügung stehenden Bandbreite während eines Anrufs.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Bandbreiten-Einstellungen</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Multimedia-Einstellungen"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Maximum Transmission Unit setzen:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "DTMFs als SIP-Info senden"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "IPv6 erlauben"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Übertragung</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "SIP/UDP Port"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Zufällig"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "SIP/TCP Port"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Fest"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP-Felder"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Netzwerkprotokoll und Ports</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Direkte Verbindung ins Internet"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Hinter NAT / Firewall (Gateway IP angeben)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Hinter NAT / Firewall (STUN verwenden)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Hinter NAT / Firewall (ICE verwenden)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Hinter NAT / Firewall (uPnP verwenden)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Öffentliche IP-Adresse:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "STUN-Server:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT und Firewall</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Verschlüsselungstyp der Medien"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "Lime für ausgehende Chatnachrichten verwenden"
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Medienverschlüsselung erzwingen"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr "Verbindlich"
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr "Bevorzugt"
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Verschlüsselung</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Netzwerkeinstellungen"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Freigeben"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Sperren"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Audiocodecs</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Videocodecs</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Sprache</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Fortgeschrittene Einstellungen anzeigen"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Detaillierung</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Benutzeroberfläche"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "LDAP-Kontoeinrichtung"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Fertig"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Authentifikation erforderlich"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Bitte das Passwort der Domäne eingeben"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Einstellen..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Bitte warten Sie während die Einstellungen vom Server abgerufen werden..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "SIP-Konto-Einrichtungsassistent"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Willkommen!\nDieser Assistent hilft Ihnen dabei ein SIP-Konto einzurichten."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Willkommen zum Konto-Einrichtungsassistenten"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Ein Konto bei linphone.org erstellen."
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Ich habe bereits ein Konto bei linphone.org und möchte es jetzt benutzen."
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Ich habe bereits ein SIP-Konto und möchte es jetzt benutzen."
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Ich möchte eine URI zur Fernkonfiguration angeben"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Konto-Einrichtungsassistent"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Geben Sie Ihre Zugangsdaten ein"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Benutzername*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Passwort*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Domäne*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Konto einrichten (Schritt 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Geben Sie Ihren Benutzernamen bei linphone.org ein."
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Geben Sie Ihren SIP-Benutzernamen ein (Schritt 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) erforderliche Felder"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "E-Mail: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Benutzername: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Passwort: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Bestätigen Sie Ihr Passwort: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Halte mich über linphone Aktualisierungen auf dem laufenden"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Geben Sie Ihre Zugangsdaten ein (Schritt 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Ihr Konto wird erstellt, bitte warten."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Kontoerstellung läuft"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Bitte bestätigen Sie Ihr Konto, indem Sie auf die Verknüpfung klicken, die wir Ihnen soeben per E-Mail geschickt haben.\nDanach gehen Sie hierher zurück und drücken auf „Vor“."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Bestätigung (Schritt 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Es wird überprüft, ob Ihr Konto gültig ist, bitte warten."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Kontogültigkeitsprüfung läuft"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Fehler, Konto kann nicht bestätigt werden. Der Benutzername wird bereits\nverwendet oder der Server ist unerreichbar.\nBitte gehen Sie zurück und versuchen Sie es noch einmal."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Fehler"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Danke. Ihr Konto ist nun fertig eingerichtet und kann verwendet werden."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - SIP-Konto einrichten"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Ihre SIP-Identität:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Sieht aus wie sip:<benutzername>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP-Proxy-Adresse:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Sieht aus wie sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Registrierungsdauer (sec):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Kontaktdetails (optional)"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF Standard RTCP Interval (sek):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Route (optional):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Übertragung"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Registrieren"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Anwesenheitsstatus veröffentlichen"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Aktiviere AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "SIP-Konto einrichten"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "VoIP-Tunnel einrichten"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Host"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Port"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Tunnel einrichten</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Configure http proxy (optional)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Bereit"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr "Einstellen"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Verbindungsaufbau"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Anruf kann nicht getätigt werden."
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Die maximale Anzahl der gleichzeitigen Anrufe ist erreicht."
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "ruft Sie an"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr " und fragt nach automatischer Antwort."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Die Anrufparameter werden verändert..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Verbunden."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Anruf abgebrochen"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "Anruf kann nicht gehalten werden"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Aktueller Anruf wird gehalten..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "STUN-Ermittlung läuft..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "Lokale Kandidaten für ICE werden zusammengestellt..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Angemeldet"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Besetzt"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Bald wieder da"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "Im Gespräch"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "Beim Essen"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Nicht stören"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Umgezogen"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Ein anderer Nachrichtendienst wird benutzt"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "Urlaub"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "Unbekannter Status"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit "
-"„sip:“ gefolgt vom Hostnamen beginnen."
+msgstr "Die von Ihnen eingegebene SIP-Proxy-Adresse ist ungültig, sie muss mit „sip:“ gefolgt vom Hostnamen beginnen."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Die von Ihnen eingegebene SIP-Identität ist ungültig.\n"
-"Sie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:"
-"alice@beispiel.net"
+msgstr "Die von Ihnen eingegebene SIP-Identität ist ungültig.\nSie sollte wie sip:benutzername@proxydomain aussehen, also z.B. sip:alice@beispiel.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Telefonnummernziel wird gesucht..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Diese Nummer kann nicht aufgelöst werden."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Anmeldung als %s fehlgeschlagen"
 
-#: ../coreapi/proxy.c:1494
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1522
+#, c-format
 msgid "Refreshing on %s..."
-msgstr "abrufen von %s"
+msgstr "Wird auf %s aktualisiert..."
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Klingeln bei der Gegenseite."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "Klingeln bei der Gegenseite..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "nicht kompatibel, prüfe Codecs oder Sicherheitseinstellungen..."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "Anruf mit %s wird gehalten."
+msgid "Call answered by %s"
+msgstr "Anruf wird von %s entgegengenommen"
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Der von %s entgegengenommene Anruf wird gehalten."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Anruf fortgesetzt."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "Anruf wird von %s entgegengenommen."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
-"Inkompatibel, überprüfen Sie die Codecs oder die Sicherheitseinstellungen..."
+msgstr "Inkompatibel, überprüfen Sie die Codecs oder die Sicherheitseinstellungen..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "Inkompatible Medienparameter."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "Anruf wird fortgesetzt."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "Anruf wird von der Gegenseite gehalten."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "Anruf ist von der Gegenseite aktualisiert worden."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Anruf beendet."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Teilnehmer ist besetzt."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Teilnehmer zur Zeit nicht verfügbar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Teilnehmer möchte nicht gestört werden."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Anruf abgewiesen"
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "Zeitüberschreitung bei der Anfrage"
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Umgeleitet"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Anruf fehlgeschlagen."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrierung auf %s erfolgreich."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Abmeldung von %s ist erfolgt."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "Zeitüberschreitung bei der Antwort"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrierung auf %s fehlgeschlagen: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr "Service nicht verfügbar, versuche erneut"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Authentifizierungs-Token ist %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Anrufparameter konnten nicht geändert werden: %s."
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr "Anrufparameter wurden erfolgreich geändert."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Sie haben %i Anruf in Abwesenheit."
 msgstr[1] "Sie haben %i Anrufe in Abwesenheit."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr "abgebrochen"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr "abgeschlossen"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr "verpasst"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2121,18 +2078,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
-"%s um %s\n"
-"Von: %s\n"
-"An: %s\n"
-"Status: %s\n"
-"Dauer: %i Min. %i Sek.\n"
+msgstr "%s um %s\nVon: %s\nAn: %s\nStatus: %s\nDauer: %i Min. %i Sek.\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr "Ausgehender Anruf"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr "Kann %s nicht wiedergeben."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 82a9efe16..d166e8cb1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,80 +1,88 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Daniel S <daniel@siptize.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/belledonne-communications/linphone-gtk/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Llamar a %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Enviar mensaje a %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Añadir %s a la lista de contactos"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Llamadas recientes"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr ""
+msgstr "<b>Llamadas recientes (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "n/a"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
-msgstr ""
+msgstr "Abortado"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
-msgstr ""
+msgstr "Perdida"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
-msgstr ""
+msgstr "Rechazado"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
+msgstr "<small><i>%s</i>⇥<i>Calidad: %s</i></small>\n%s⇥%s⇥"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>⇥%s"
 
 #: ../gtk/conference.c:38 ../gtk/in_call_frame.ui.h:11
 msgid "Conference"
@@ -89,52 +97,57 @@ msgstr "Yo"
 msgid "Couldn't find pixmap file: %s"
 msgstr "No se pudo encontrar el archivo pixmap: %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Enviando..."
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Mensaje no enviado"
+
+#: ../gtk/chat.c:498
 msgid "Copy"
-msgstr ""
+msgstr "Copiar"
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
-msgstr ""
-"registra a stdout cierta información de depuración durante la ejecución."
+msgstr "registra a stdout cierta información de depuración durante la ejecución."
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
-msgstr ""
+msgstr "mostrar versión y salir"
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "ruta a un fichero donde escribir logs."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
-msgstr ""
+msgstr "Iniciar linphone con el vídeo desactivado"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Iniciar sólo en la barra de tareas, no mostrar la interfaz principal."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "dirección a la que llamar inmediatamente"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Especifique un directorio de trabajo (debería ser la raíz de la instalación, "
-"ej: c:\\Archivos de Programa\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Especifique un directorio de trabajo (debería ser la raíz de la instalación, ej: c:\\Archivos de Programa\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
-msgstr ""
+msgstr "Fichero de configuración"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
-msgstr ""
+msgstr "Iniciar el asistente de audio"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -142,266 +155,256 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
+msgstr "%s quiere añadirle a su lista de contactos.\nQuieres añadirle a tu lista de contactos y permitirle que vea su estado de presencia?\nSi contesta no, esta persona será bloqueada temporalmente."
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
+msgstr "Por favor, introduzca la contraseña para el usuario <i>%s</i>\n en el dominio <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
-msgstr ""
+msgstr "Error en llamada"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
-msgstr ""
+msgstr "Llamada terminada"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Contestar"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
-msgstr ""
+msgstr "Rechazar"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
-msgstr ""
+msgstr "Llamada en pausa"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
-msgstr ""
+msgstr "<b>por %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
+msgstr "%s solicita iniciar vídeo. ¿Acepta?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Enlace a la Web"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
-msgstr ""
+msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Opción predeterminada)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Somos transferidos a %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"No se ha encontrado una tarjeta de sonido en este equipo.\n"
-"No será posible realizar o recibir llamadas de audio."
+msgstr "No se ha encontrado una tarjeta de sonido en este equipo.\nNo será posible realizar o recibir llamadas de audio."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Un video-teléfono SIP gratuito"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
-msgstr ""
+msgstr "Hola\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
-msgstr ""
+msgstr "Añadir a la agenda"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr ""
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Nombre"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Buscar en el directorio %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "¡Contacto SIP no válido!"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Añadir un contacto nuevo"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
-msgstr ""
+msgstr "Editar contacto '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Eliminar contacto '%s'"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
-msgstr ""
+msgstr "Eliminar histórico de '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Añadir nuevo contacto desde el directorio %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Nombre"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Frecuencia (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Estado"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parámetros"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Inglés"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Francés"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Español"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Portugués de Brasil"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Alemán"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Checo"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Chino"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Chino Tradicional"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../gtk/propertybox.c:1185
-msgid "Hebrew"
-msgstr ""
-
 #: ../gtk/propertybox.c:1186
-msgid "Serbian"
-msgstr ""
+msgid "Hebrew"
+msgstr "Hebreo"
 
 #: ../gtk/propertybox.c:1187
-msgid "Arabic"
-msgstr ""
+msgid "Serbian"
+msgstr "Serbio"
 
 #: ../gtk/propertybox.c:1188
-msgid "Turkish"
-msgstr ""
+msgid "Arabic"
+msgstr "Árabe"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Deberá reiniciar linphone para aplicar la nueva selección de lenguaje"
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
-msgstr ""
+msgstr "Ninguno."
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
-msgid "DTLS"
-msgstr ""
-
 #: ../gtk/propertybox.c:1342
+msgid "DTLS"
+msgstr "DTLS"
+
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -410,11 +413,11 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
+msgstr "Una nueva versión está disponible en %s.\n¿Desea abrir el navegador para descargarla?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
-msgstr ""
+msgstr "Ya está corriendo la última versión disponible."
 
 #: ../gtk/buddylookup.c:85
 msgid "Firstname, Lastname"
@@ -426,11 +429,11 @@ msgstr "Error al comunicar con el servidor."
 
 #: ../gtk/buddylookup.c:164
 msgid "Connecting..."
-msgstr ""
+msgstr "Conectando..."
 
 #: ../gtk/buddylookup.c:168
 msgid "Connected"
-msgstr ""
+msgstr "Conectado"
 
 #: ../gtk/buddylookup.c:172
 msgid "Receiving data..."
@@ -443,340 +446,201 @@ msgid_plural "Found %i contacts"
 msgstr[0] "Se encontró %i contacto"
 msgstr[1] "Se encontraron %i contactos"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Gracias. Su cuenta está configurada y lista para su utilización."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Bienvenido al asistente de configuración de cuenta"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Asistente de configuración de cuenta"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
-msgstr ""
+msgstr "Llamar a #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Transferir a llamada #%i con %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
-msgstr ""
+msgstr "Sin uso"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
-msgstr ""
+msgstr "ICE no activo"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
-msgstr ""
+msgstr "ICE ha fallado"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
-msgstr ""
+msgstr "ICE en progreso"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
-msgstr ""
+msgstr "Atravesando uno o más NATs"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
-msgstr ""
+msgstr "Directo"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
-msgstr ""
+msgstr "A través de un servidor de relay"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
-msgstr ""
+msgstr "uPnP no activado"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
-msgstr ""
+msgstr "uPnP en progreso"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
-msgstr ""
+msgstr "uPnp not disponible"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
-msgstr ""
+msgstr "uPnP en ejecución"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
-msgstr ""
+msgstr "uPnP ha fallado"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
-msgstr ""
+msgstr "Directo o a través del servidor"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
+msgstr "bajada: %f\nsubida: %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
-msgstr ""
+msgstr "%.3f segundos"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
-msgstr ""
+msgstr "Colgar"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
-msgstr ""
+msgstr "<b>Llamando...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
-msgstr ""
+msgstr "<b>Llamada entrante</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "buena"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "media"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "mala"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "muy mala"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "demasiado mala"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "no disponible"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Cifrada con SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
-msgstr ""
+msgstr "Cifrada con DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Cifrada con ZRTP - [token de autenticación: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Set sin verificar"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Set verificado"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "En conferencia"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
-msgstr ""
+msgstr "<b>En conversación</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
-msgstr ""
+msgstr "<b>Llamada en pausa</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
-msgstr ""
+msgstr "<b>Llamada finalizada.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
-msgstr ""
+msgstr "Transfiriendo llamada"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
-msgstr ""
+msgstr "Transferido correctamente"
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
-msgstr ""
+msgstr "Transferencia fallida"
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Reanudar"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
+msgstr "<small><i>Grabando en\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
-msgstr ""
+msgstr "(Pausada)"
 
 #: ../gtk/loginframe.c:75
 #, c-format
@@ -786,216 +650,127 @@ msgstr "Por favor, introduzca los datos de inicio de sesión para %s"
 #: ../gtk/config-fetching.c:57
 #, c-format
 msgid "fetching from %s"
-msgstr ""
+msgstr "cargando desde %s"
 
 #: ../gtk/config-fetching.c:73
 #, c-format
 msgid "Downloading of remote configuration from %s failed."
-msgstr ""
+msgstr "Descarga de la configuración remota desde %s fallida."
 
 #: ../gtk/audio_assistant.c:103
 msgid "No voice detected"
-msgstr ""
+msgstr "No se detectó voz"
 
 #: ../gtk/audio_assistant.c:104
 msgid "Too low"
-msgstr ""
+msgstr "Demasiado bajo"
 
 #: ../gtk/audio_assistant.c:105
 msgid "Good"
-msgstr ""
+msgstr "Buena"
 
 #: ../gtk/audio_assistant.c:106
 msgid "Too loud"
-msgstr ""
+msgstr "Demasiado alto"
 
 #: ../gtk/audio_assistant.c:188
 msgid "Did you hear three beeps ?"
-msgstr ""
+msgstr "¿Escuchaste los tres pitidos?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
-msgstr ""
+msgstr "Preferencias de sonido no encontradas"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
-msgstr ""
+msgstr "No se pudo arrancar el control de sonido del sistema"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
+msgstr "Bienvenido!\nEste asistente le ayudará a configurar el audio para Linphone."
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
-msgstr ""
+msgstr "Dispositivo de captura:"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
-msgstr ""
+msgstr "Volumen grabado"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
-msgstr ""
+msgstr "No hay voz"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
-msgstr ""
+msgstr "Preferencias de audio del sistema"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
-msgstr ""
+msgstr "Dispositivo de reproducción:"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:410
-msgid "Press the record button and say some words"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:411
-msgid "Listen to your record voice"
-msgstr ""
+msgstr "Reproducir tres pitidos"
 
 #: ../gtk/audio_assistant.c:412
-msgid "Record"
-msgstr ""
+msgid "Press the record button and say some words"
+msgstr "Use el botón de grabar y diga unas palabras"
 
 #: ../gtk/audio_assistant.c:413
+msgid "Listen to your record voice"
+msgstr "Escucha tu grabación de voz"
+
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
+msgid "Record"
+msgstr "Grabar"
+
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
-msgstr ""
+msgstr "Reproducir"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
-msgstr ""
+msgstr "Iniciar Linphone ahora"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
-msgstr ""
+msgstr "Asistente de sonido"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
-msgstr ""
+msgstr "Asistente de sonido"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
-msgstr ""
+msgstr "Calibración de ganancia de microfono"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
-msgstr ""
+msgstr "Calibración de volumen de altavoz"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
-msgstr ""
+msgstr "Grabar y reproducir"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Todos los usuarios"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr ""
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Canal de Fibra"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr ""
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr ""
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Opciones"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr ""
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr ""
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Pagina_de_Inicio"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Buscar_Actualizaciones"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr ""
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Iniciar nueva llamada"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr ""
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Buscar"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr ""
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr ""
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Finalizando"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
-msgstr ""
+msgstr "Sobre Linphone"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP "
-"(rfc3261)"
+msgstr "Un vídeo-teléfono a través de Internet que usa el protocolo estándar SIP (rfc3261)"
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1011,43 +786,23 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr ""
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr "Buscar contactos en directorio"
 
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Mostrar el estado de presencia de este contacto"
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr "Añadir a mi lista"
 
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Permitir que este contacto vea mi estado de presencia"
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
+msgstr "<b>Buscar a alguien</b>"
 
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr ""
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Por favor introduzca la contraseña del dominio"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "UserID"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Nombre del destinatario</b>"
 
 #: ../gtk/call_logs.ui.h:1
 msgid "Call history"
@@ -1061,485 +816,17 @@ msgstr "Borrar todos"
 msgid "Call back"
 msgstr "Devolver llamada"
 
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Configurar una cuenta SIP"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Del tipo sip:<username>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Del tipo sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Ruta (opcional):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Registrarse"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Configurar una cuenta SIP"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "tarjeta de sonido predeterminada"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "una tarjeta de sonido"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "cámara predeterminada"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Configuración"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Esta sección define su dirección SIP cuando no utiliza una cuenta SIP"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Su nombre a mostrar (x ej: Pepito Pérez):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Añadir"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Editar"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Borrar todas las contraseñas"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "Gestionar cuentas SIP"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Dispositivo especial ALSA (opcional):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Activar cancelación de eco"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 significa \"ilimitado\""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Velocidad límite de subida en Kbit/seg"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Velocidad límite de descarga en Kbit/seg:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Activar control de frecuencia adaptativo"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Control de frecuencia adaptativo es una técnica que estima dinámicamente "
-"el ancho de banda disponible durante la llamada.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Control de ancho de banda</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Configuración multimedia"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Fijar Unidad de Transmisión Máxima:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Enviar DTMFs como información SIP"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Vídeo RTP/UDP"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Tipo de cifrado de medios"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Protocolo de red y puertos</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Conexión directa a Internet"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Tras un NAT/Firewall (utilizar STUN para resolver)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Activar"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Desactivar"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Mostrar opciones avanzadas"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr ""
-
-#: ../gtk/buddylookup.ui.h:1
-msgid "Search contacts in directory"
-msgstr ""
-
-#: ../gtk/buddylookup.ui.h:2
-msgid "Add to my list"
-msgstr "Añadir a mi lista"
-
-#: ../gtk/buddylookup.ui.h:3
-msgid "<b>Search somebody</b>"
-msgstr ""
-
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Espere por favor"
-
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
-
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
-
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
-msgstr ""
+msgstr "Estadística de llamada"
 
 #: ../gtk/call_statistics.ui.h:2
 msgid "Audio codec"
-msgstr ""
+msgstr "Códec de Audio"
 
 #: ../gtk/call_statistics.ui.h:3
 msgid "Video codec"
-msgstr ""
+msgstr "Códec de vídeo"
 
 #: ../gtk/call_statistics.ui.h:4
 msgid "Audio IP bandwidth usage"
@@ -1563,63 +850,137 @@ msgstr ""
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
-msgstr ""
+msgstr "Resolución de vídeo recivida"
 
 #: ../gtk/call_statistics.ui.h:10
 msgid "Video resolution sent"
-msgstr ""
+msgstr "Resolución de vídeo enviada"
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
-msgstr ""
+msgstr "Perfil RTP"
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
+msgstr "<b>Estadísticas de llamada e información</b>"
+
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Enviar"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Terminar conferencia"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Especificando una URI remota de configuración"
+
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Esta ventana le permite fijar una dirección http o https para que la configuración sea cargada en el arranque.\nPor favor, introduzca o modifique la URI. Después de aceptar, Linphone se reiniciará automáticamente para cargar la configuración y la nueva cuenta."
+
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "Dirección SIP"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Mostrar el estado de presencia de este contacto"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Permitir que este contacto vea mi estado de presencia"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Información de contacto</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "Configuración DSCP"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr ""
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Volumen del altavoz"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr ""
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Graba esta llamada a un fichero de audio"
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr ""
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Vídeo"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr ""
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Silenciar"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr ""
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Transferir"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "En conversación"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Duración"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Calidad de la llamada"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
-msgstr ""
+msgstr "Configuración LDAP"
+
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Dirección del Servidor:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Método de autenticación:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Contraseña:"
 
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
-msgstr ""
+msgstr "Usar conexión TLS"
 
 #: ../gtk/ldap.ui.h:7
 msgid "Not yet available"
-msgstr ""
+msgstr "No disponible"
 
 #: ../gtk/ldap.ui.h:8
 msgid "<b>Connection</b>"
-msgstr ""
+msgstr "<b>Conexión</b>"
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1635,7 +996,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:12
 msgid "<b>SASL</b>"
-msgstr ""
+msgstr "<b>SASL</b>"
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
@@ -1660,7 +1021,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:19
 msgid "<b>Search</b>"
-msgstr ""
+msgstr "<b>Buscar</b>"
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
@@ -1676,88 +1037,31 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:23
 msgid "<b>Miscellaneous</b>"
-msgstr ""
+msgstr "<b>Otros</b>"
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
-msgstr ""
+msgstr "ANONIMO"
 
 #: ../gtk/ldap.ui.h:25
 msgid "SIMPLE"
-msgstr ""
+msgstr "SIMPLE"
 
 #: ../gtk/ldap.ui.h:26
 msgid "DIGEST-MD5"
-msgstr ""
+msgstr "DIGEST-MD5"
 
 #: ../gtk/ldap.ui.h:27
 msgid "NTLM"
-msgstr ""
+msgstr "NTLM"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Nombre de usuario"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr ""
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Transferir"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Calidad de la llamada"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Contraseña"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1767,301 +1071,1002 @@ msgstr "Conexión a Internet"
 msgid "Automatically log me in"
 msgstr "Iniciar sesión automáticamente"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "UserID"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
-msgstr ""
+msgstr "Datos de inicio de sesión"
 
 #: ../gtk/login_frame.ui.h:7
 msgid "<b>Welcome!</b>"
+msgstr "<b>Bienvenido/a!</b>"
+
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Canal de Fibra"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Ventana de depuración de linphone"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Ir al final"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Por defecto"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Opciones"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Especificar URI de configuración"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Siempre iniciar vídeo"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Activar vista propia"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Mostrar marcador"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Mostrar ventana de depuración"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Pagina_de_Inicio"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Buscar_Actualizaciones"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Asistente de configuración de cuenta"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "Dirección SIP o número de teléfono"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Iniciar nueva llamada"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Buscar"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Añadir contactos desde un directorio</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Añadir contacto"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Borrar registro de llamadas"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Mi identidad actual:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Autoanswer está activado"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "anónimo"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "tarjeta de sonido predeterminada"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "una tarjeta de sonido"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "cámara predeterminada"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Códecs de Audio"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Códecs de Vídeo"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Configuración"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Esta sección define su dirección SIP cuando no utiliza una cuenta SIP"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Su nombre a mostrar (x ej: Pepito Pérez):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Su nombre de usuario:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Su dirección SIP resultante:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Identidad predeterminada</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Asistente"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Añadir"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Editar"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Cuentas Proxy</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Borrar todas las contraseñas"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Privacidad</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "si está activo, responder a llamadas entrantes automáticamente"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Retraso antes de contestar (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Auto-answer</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Gestionar cuentas SIP"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Tono de llamada:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Dispositivo especial ALSA (opcional):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Dispositivo de captura:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Dispositivo de Ring:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Dispositivo de reproducción:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Activar cancelación de eco"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Dispositivo de entrada de vídeo:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Resolución de vídeo preferida:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Dispositivo de salida de vídeo:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Mostrar vista previa de la cámara"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Framerate de vídeo preferido:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 significa \"ilimitado\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Vídeo</b> "
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Velocidad límite de subida en Kbit/seg"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Velocidad límite de descarga en Kbit/seg:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Activar control de frecuencia adaptativo"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Control de frecuencia adaptativo es una técnica que estima dinámicamente el ancho de banda disponible durante la llamada.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Control de ancho de banda</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Configuración multimedia"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Fijar Unidad de Transmisión Máxima:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Enviar DTMFs como información SIP"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Soportar IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Transporte</b> "
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "Puerto SIP/UDP"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Aleatorio"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "Puerto SIP/TCP"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Fijo"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Vídeo RTP/UDP"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "Campos DSCP"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Protocolo de red y puertos</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Conexión directa a Internet"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Tras un NAT/Firewall (especificar la IP de la puerta de enlace)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Tras un NAT/Firewall (utilizar STUN para resolver)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Tras un NAT/Firewall (utilizar ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Tras un NAT/Firewall (utilizar uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Dirección IP pública:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Servidor STUN"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT y Firewall</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Tipo de cifrado de medios"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Es obligatorio el cifrado de medios"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Configuración de red"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Activar"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Desactivar"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Códecs de audio</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Códecs de vídeo</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Códecs"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Idioma</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Mostrar opciones avanzadas"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Nivel</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Interfaz de Usuario"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>Configuración de cuenta LDAP</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Hecho"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Autenticación necesaria"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Por favor introduzca la contraseña del dominio"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Configurando..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Por favor, espere mientras se carga la configuración del servidor..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "Asistente de configuración de cuenta"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "¡Bienvenido/a !\nEste asistente le ayudará a utilizar una cuenta SIP para sus llamadas."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Bienvenido al asistente de configuración de cuenta"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Crear una cuenta en linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Ya tengo una cuenta en linphone.org y quiero usarla"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Ya tengo una cuenta SIP y quiero usarla"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Quiero indicar una URI remota de configuración"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Asistente de configuración de cuenta"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Información de cuenta"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Nombre de usuario*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Contraseña*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Dominio*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Configurar una cuenta (paso 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Introduzca su nombre de usuario de linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Introduzca su nombre de usuario SIP (paso 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Campos obligatorios"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "Email: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Nombre de usuario: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Contraseña: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Confirme su contraseña: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Informame de las actualizaciones de linphone"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Introduzca la información de su cuenta (paso 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Su cuenta esta siendo creada, por favor espere."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Creando cuenta"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Por favor confirme su cuenta haciendo click en el link que la hemos enviado a su email.\nLuego vuelva y presione el botón Siguiente."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Validación (paso 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Comprobando si su cuenta ha sido validada, por favor espere."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Validación de cuenta en progreso"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Error, cuenta no validada, el nombre de usuario esta en uso o no se puede acceder al servidor.\nPor favor, vaya atrás y vuelva a intentarlo."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Error"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Gracias. Su cuenta está configurada y lista para su utilización."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Configurar una cuenta SIP"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Su identidad SIP"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Del tipo sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "Dirección del SIP Proxy"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Del tipo sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Duración del registro (seg):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Ruta (opcional):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Transporte"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Registrarse"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Publicar información de presencia"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Activar AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Configurar una cuenta SIP"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Configurar tunel VoIP"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Puerto"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Configurar tunel</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Configurara el proxy http (opcional)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Espere por favor"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
-msgstr ""
+msgstr "Preparado"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
-msgstr ""
+msgstr "Configurando"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
-msgstr ""
+msgstr "Contactando"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
-msgstr ""
+msgstr "No se pudo llamar"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Disculpe, se ha alcanzado el máximo número de llamadas simultáneas"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
-msgstr ""
+msgstr "le está llamando"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "y ha solicitado auto respuesta."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Modificando parámetros de llamada…"
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
-msgstr ""
+msgstr "Llamada abortada"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "No se pudo pausar la llamada"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Pausando la llamada actual..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "Búsqueda STUN en proceso…"
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
-msgstr ""
+msgstr "Recolección de candidatos ICE locales en progreso..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
-msgstr ""
+msgstr "Conectado"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Vuelvo enseguida"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Ausente"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
-msgstr ""
+msgstr "Al teléfono"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "A comer"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "No molestar"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
-msgstr ""
+msgstr "Fuera"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Utilizando otro servicio de mensajería"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
-msgstr ""
+msgstr "Desconectado"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Pendiente"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
-msgstr ""
+msgstr "Estado desconocido"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"La dirección del Proxy SIP que ha introducido no es válida, debe empezar con "
-"\"sip:\" seguido del hostname."
+msgstr "La dirección del Proxy SIP que ha introducido no es válida, debe empezar con \"sip:\" seguido del hostname."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"La identidad SIP que ha introducido no es válida.\n"
-"Debe ser del tipo sip:username@proxydomain, como por ejemplo sip:"
-"alice@example.net"
+msgstr "La identidad SIP que ha introducido no es válida.\nDebe ser del tipo sip:username@proxydomain, como por ejemplo sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Buscando el número de teléfono del destinatario…"
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "No se ha podido resolver este número."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
-msgstr ""
+msgstr "No se pudo iniciar sesión como %s"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
-msgstr ""
+msgstr "Cargando desde %s"
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
-msgstr ""
+msgstr "El destinatario está sonando..."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
-msgstr ""
+msgstr "El destinatario está sonando..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Medios iniciales."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "La llamada con %s está puesta en pausa."
+msgid "Call answered by %s"
+msgstr "Llamada respondida por %s"
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Llamada respondida por %s - en espera."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
-msgstr ""
+msgstr "Llamada reanudada."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
+msgstr "Incompatible, compruebe la configuración de códecs o de seguridad..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
-msgstr ""
+msgstr "Parámetros de media incompatibles"
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
-msgstr ""
+msgstr "Nos han reanudado..."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
-msgstr ""
+msgstr "Nos han pausado."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
-msgstr ""
+msgstr "La llamada ha sido actualizada por el destinatario."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
-msgstr ""
+msgstr "Llamada finalizada."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "El usuario está ocupado."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "El usuario no está disponible temporalmente."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "El usuario no quiere que le molesten."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Llamada rechazada."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
-msgstr ""
+msgstr "Petición caducada (timeout)"
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Redigirida"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
-msgstr ""
+msgstr "La llamada ha fallado."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
-msgstr ""
+msgstr "Se ha registrado con éxito en %s."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
-msgstr ""
+msgstr "Cancelación de registro en %s completada."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "timeout sin respuesta"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
-msgstr ""
+msgstr "El registro en %s ha fallado: %s."
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
-msgstr ""
+msgstr "Servicio no disponible, reintentando"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
-msgstr ""
+msgstr "El tóken de autenticación es%s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Parámetros de llamada no pudieron ser modificados: %s."
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
-msgstr ""
+msgstr "Parámetros de llamada modificados correctamente."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Tiene %i llamada perdida."
 msgstr[1] "Tiene %i llamadas perdidas."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
-msgstr ""
+msgstr "abortado"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
-msgstr ""
+msgstr "terminado"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
-msgstr ""
+msgstr "perdida"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
-msgstr ""
+msgstr "desconocido"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2069,13 +2074,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
+msgstr "%s a las %s\nDe: %s\nPara: %s\nEstado: %s\nDuración: %i mn %i sec\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
-msgstr ""
+msgstr "Llamada saliente"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
+msgstr "No se puede reproducir %s"
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 000000000..5f8ffbe18
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,2090 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Matti Koivunen <koivunen.matti@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: linphone-gtk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/belledonne-communications/linphone-gtk/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../gtk/calllogs.c:178
+#, c-format
+msgid "Call %s"
+msgstr "Soita %s:lle"
+
+#: ../gtk/calllogs.c:179
+#, c-format
+msgid "Send text to %s"
+msgstr "Lähetä tekstiviesti %s:lle"
+
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Lisää %s yhtestietoihin"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Viimeiset puhelut"
+
+#: ../gtk/calllogs.c:260
+#, c-format
+msgid "<b>Recent calls (%i)</b>"
+msgstr "Viimeiset puhelut (%i)"
+
+#: ../gtk/calllogs.c:334
+msgid "n/a"
+msgstr "tyhjä"
+
+#: ../gtk/calllogs.c:337
+msgid "Aborted"
+msgstr "Kesketetty"
+
+#: ../gtk/calllogs.c:340
+msgid "Missed"
+msgstr "Puuttuu"
+
+#: ../gtk/calllogs.c:343
+msgid "Declined"
+msgstr "Estetty"
+
+#: ../gtk/calllogs.c:349
+#, c-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i minuuttia"
+msgstr[1] "%i minuuttia"
+
+#: ../gtk/calllogs.c:352
+#, c-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] "%i sekunttia"
+msgstr[1] "%i sekunttia"
+
+#: ../gtk/calllogs.c:357
+#, c-format
+msgid ""
+"<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
+"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Laatu: %s</i></small>\n%s\t%s\t"
+
+#: ../gtk/calllogs.c:361
+#, c-format
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
+
+#: ../gtk/conference.c:38 ../gtk/in_call_frame.ui.h:11
+msgid "Conference"
+msgstr "Kokous"
+
+#: ../gtk/conference.c:46
+msgid "Me"
+msgstr "Minä"
+
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ei kyennyt lyötämään Pixmap kuvatiedostoa: %s"
+
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Lähetetään..."
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Viesti ei lähetetty"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "Kopio"
+
+#: ../gtk/main.c:134
+msgid "log to stdout some debug information while running."
+msgstr "Kirjaudu 'stadardi viestin palautukseen' 'stdout' saadaksesi tietoja virheestä käytön aikana."
+
+#: ../gtk/main.c:135
+msgid "display version and exit."
+msgstr "Näytä versio ja poistu."
+
+#: ../gtk/main.c:136
+msgid "path to a file to write logs into."
+msgstr "polku tiedostolle johon loki kirjoitetaan."
+
+#: ../gtk/main.c:137
+msgid "Start linphone with video disabled."
+msgstr "Aloita linphone ilman videota."
+
+#: ../gtk/main.c:138
+msgid "Start only in the system tray, do not show the main interface."
+msgstr "Käynnistä vain tehtäväpalkki, älä pääkäyttöliittymää."
+
+#: ../gtk/main.c:139
+msgid "address to call right now"
+msgstr "osoite mihin nyt soitetaan"
+
+#: ../gtk/main.c:140
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Määritä työkansio (eli mihin asennus tehdään, kuten: c:\\Program Files\\Linphone)"
+
+#: ../gtk/main.c:141
+msgid "Configuration file"
+msgstr "Kokoonpano tiedosto"
+
+#: ../gtk/main.c:142
+msgid "Run the audio assistant"
+msgstr "Käytä ääni avustajaa"
+
+#: ../gtk/main.c:143
+msgid "Run self test and exit 0 if succeed"
+msgstr "Käytä omaa testiä ja poistu 0 jo valmis"
+
+#: ../gtk/main.c:1058
+#, c-format
+msgid ""
+"%s would like to add you to his/her contact list.\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
+"If you answer no, this person will be temporarily blacklisted."
+msgstr "%s haluaa lisätä sinut yhteystitohinsa.\nHaluatko hänen näkevän sinun läsnäolosi?\nJos ei, niin hänet lisätään hetkeksi mustalle listalle."
+
+#: ../gtk/main.c:1135
+#, c-format
+msgid ""
+"Please enter your password for username <i>%s</i>\n"
+" at realm <i>%s</i>:"
+msgstr "Anna salasana käyttäjänimelle <i>%s</i>\nmaasta  <i>%s</i>:"
+
+#: ../gtk/main.c:1244
+msgid "Call error"
+msgstr "Virhe puhelussa"
+
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
+msgid "Call ended"
+msgstr "Puhelu päättyi"
+
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
+msgid "Incoming call"
+msgstr "Tuleva puhelu"
+
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
+msgid "Answer"
+msgstr "Vastaa"
+
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
+msgid "Decline"
+msgstr "Hylkää"
+
+#: ../gtk/main.c:1262
+msgid "Call paused"
+msgstr "Puhelu laitettu tauolle"
+
+#: ../gtk/main.c:1262
+#, c-format
+msgid "<b>by %s</b>"
+msgstr "<b>%s toimesta</b>"
+
+#: ../gtk/main.c:1336
+#, c-format
+msgid "%s proposed to start video. Do you accept ?"
+msgstr "%s pyytää video kuvaa. Sallitaanko?"
+
+#: ../gtk/main.c:1502
+msgid "Website link"
+msgstr "Internet linkki"
+
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
+msgid "Linphone"
+msgstr "Linphone"
+
+#: ../gtk/main.c:1562
+msgid "A video internet phone"
+msgstr "Internet video puhelu"
+
+#: ../gtk/main.c:1624
+#, c-format
+msgid "%s (Default)"
+msgstr "%s (Vakio)"
+
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
+#, c-format
+msgid "We are transferred to %s"
+msgstr "Olemme siirtyneet %s"
+
+#: ../gtk/main.c:2008
+msgid ""
+"No sound cards have been detected on this computer.\n"
+"You won't be able to send or receive audio calls."
+msgstr "Tähässä tietokeneessa ei ole havaittavissa ääni korttia.\nEt voi lähettää tai vastaanottaa äänellisiä puheluita."
+
+#: ../gtk/main.c:2173
+msgid "A free SIP video-phone"
+msgstr "Ilmainen SIP video puhelin."
+
+#: ../gtk/main.c:2292
+#, c-format
+msgid "Hello\n"
+msgstr "Hei\n"
+
+#: ../gtk/friendlist.c:460
+msgid "Add to addressbook"
+msgstr "Lisää osoitekirjaan"
+
+#: ../gtk/friendlist.c:626
+#, c-format
+msgid "Search in %s directory"
+msgstr "Etsi %s hakemistosta"
+
+#: ../gtk/friendlist.c:773
+msgid "Invalid sip contact !"
+msgstr "Kelvoton sip yhtyestieto !"
+
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Lisää uusi yhteystieto"
+
+#: ../gtk/friendlist.c:823
+#, c-format
+msgid "Edit contact '%s'"
+msgstr "Muokkaa yhteystietoa '%s'"
+
+#: ../gtk/friendlist.c:824
+#, c-format
+msgid "Delete contact '%s'"
+msgstr "Poista yhteysto '%s'"
+
+#: ../gtk/friendlist.c:825
+#, c-format
+msgid "Delete chat history of '%s'"
+msgstr "Poista '%s'n keskustelu historia"
+
+#: ../gtk/friendlist.c:862
+#, c-format
+msgid "Add new contact from %s directory"
+msgstr "Lisää uusi yhteystieto %s hakemistoon"
+
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Nimi"
+
+#: ../gtk/propertybox.c:598
+msgid "Rate (Hz)"
+msgstr "Laatutaso (Hz)"
+
+#: ../gtk/propertybox.c:604
+msgid "Status"
+msgstr "Tila"
+
+#: ../gtk/propertybox.c:617
+msgid "IP Bitrate (kbit/s)"
+msgstr "IP Siirtonopeus (kbit/s)"
+
+#: ../gtk/propertybox.c:628
+msgid "Parameters"
+msgstr "Raja-arvot"
+
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
+msgid "Enabled"
+msgstr "Sallittu"
+
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
+msgid "Disabled"
+msgstr "Kielletty"
+
+#: ../gtk/propertybox.c:902
+msgid "Account"
+msgstr "Tili"
+
+#: ../gtk/propertybox.c:1170
+msgid "English"
+msgstr "eglaniksi"
+
+#: ../gtk/propertybox.c:1171
+msgid "French"
+msgstr "French"
+
+#: ../gtk/propertybox.c:1172
+msgid "Swedish"
+msgstr "Swedish"
+
+#: ../gtk/propertybox.c:1173
+msgid "Italian"
+msgstr "Italian"
+
+#: ../gtk/propertybox.c:1174
+msgid "Spanish"
+msgstr "Spanish"
+
+#: ../gtk/propertybox.c:1175
+msgid "Brazilian Portugese"
+msgstr "Brazilian Portugese"
+
+#: ../gtk/propertybox.c:1176
+msgid "Polish"
+msgstr "Polish"
+
+#: ../gtk/propertybox.c:1177
+msgid "German"
+msgstr "German"
+
+#: ../gtk/propertybox.c:1178
+msgid "Russian"
+msgstr "Russian"
+
+#: ../gtk/propertybox.c:1179
+msgid "Japanese"
+msgstr "Japanese"
+
+#: ../gtk/propertybox.c:1180
+msgid "Dutch"
+msgstr "Dutch"
+
+#: ../gtk/propertybox.c:1181
+msgid "Hungarian"
+msgstr "Hungarian"
+
+#: ../gtk/propertybox.c:1182
+msgid "Czech"
+msgstr "Czech"
+
+#: ../gtk/propertybox.c:1183
+msgid "Chinese"
+msgstr "Chinese"
+
+#: ../gtk/propertybox.c:1184
+msgid "Traditional Chinese"
+msgstr "Traditional Chinese"
+
+#: ../gtk/propertybox.c:1185
+msgid "Norwegian"
+msgstr "Norwegian"
+
+#: ../gtk/propertybox.c:1186
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: ../gtk/propertybox.c:1187
+msgid "Serbian"
+msgstr "Serbian"
+
+#: ../gtk/propertybox.c:1188
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "Turkish"
+
+#: ../gtk/propertybox.c:1246
+msgid ""
+"You need to restart linphone for the new language selection to take effect."
+msgstr "Sinun tarvitsee uudelleen käynnistää linphone, että uudet kieliasetukset tulevat voimaan."
+
+#: ../gtk/propertybox.c:1332
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../gtk/propertybox.c:1336
+msgid "SRTP"
+msgstr "SRTP 'realiaikainen salaus'"
+
+#: ../gtk/propertybox.c:1342
+msgid "DTLS"
+msgstr "DTLS 'paketti kytketty salaus'"
+
+#: ../gtk/propertybox.c:1349
+msgid "ZRTP"
+msgstr "ZRTP 'tunnusteleva realiaikainen salaus'"
+
+#: ../gtk/update.c:80
+#, c-format
+msgid ""
+"A more recent version is availalble from %s.\n"
+"Would you like to open a browser to download it ?"
+msgstr "Uudempi versio on saatavilla: %s\nHaluatko avata selaimen ja ladata sen? "
+
+#: ../gtk/update.c:91
+msgid "You are running the lastest version."
+msgstr "Käytät viimeisintä versiota."
+
+#: ../gtk/buddylookup.c:85
+msgid "Firstname, Lastname"
+msgstr "Etunimi,Sukunimi"
+
+#: ../gtk/buddylookup.c:160
+msgid "Error communicating with server."
+msgstr "Virhe palvelimen yhteyden pidossa"
+
+#: ../gtk/buddylookup.c:164
+msgid "Connecting..."
+msgstr "Yhdistää..."
+
+#: ../gtk/buddylookup.c:168
+msgid "Connected"
+msgstr "Yhdistetty"
+
+#: ../gtk/buddylookup.c:172
+msgid "Receiving data..."
+msgstr "Vastaanottaa tietoa..."
+
+#: ../gtk/buddylookup.c:180
+#, c-format
+msgid "Found %i contact"
+msgid_plural "Found %i contacts"
+msgstr[0] "Lydetty %i yhteystietoa"
+msgstr[1] "Lydetty %i yhteystietoa"
+
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Käyttäjätunnus on jo käytössä!"
+
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Käyttäjätunnuksen saatavuuden tarkistus epäonnistui. Yritä uudelleen myöhemmin. "
+
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
+#, c-format
+msgid "Call #%i"
+msgstr "Puhelu #%i"
+
+#: ../gtk/incall_view.c:145
+#, c-format
+msgid "Transfer to call #%i with %s"
+msgstr "Siirrä puhelu #%i %s kanssa"
+
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
+msgid "Not used"
+msgstr "Ei ole käytössä"
+
+#: ../gtk/incall_view.c:212
+msgid "ICE not activated"
+msgstr "ICE 'vuorovaikutteinen yhteys' ei ole toiminnassa"
+
+#: ../gtk/incall_view.c:214
+msgid "ICE failed"
+msgstr "ICE 'vuorovaikutteinen yhteys' epäonnistui"
+
+#: ../gtk/incall_view.c:216
+msgid "ICE in progress"
+msgstr "ICE 'vuorovaikutteinen yhteys' toiminnassa"
+
+#: ../gtk/incall_view.c:218
+msgid "Going through one or more NATs"
+msgstr "Menee läpi yhden tai useamman NAT-ositemuutoksen"
+
+#: ../gtk/incall_view.c:220
+msgid "Direct"
+msgstr "Suoraan"
+
+#: ../gtk/incall_view.c:222
+msgid "Through a relay server"
+msgstr "Läpi välityspalvelimen"
+
+#: ../gtk/incall_view.c:230
+msgid "uPnP not activated"
+msgstr "uPnP 'laite tunnistus' ei ole toiminnassa"
+
+#: ../gtk/incall_view.c:232
+msgid "uPnP in progress"
+msgstr "uPnP 'laite tunnistus' on toiminnassa"
+
+#: ../gtk/incall_view.c:234
+msgid "uPnp not available"
+msgstr "uPnP 'laite tunnistus' ei ole saatavilla"
+
+#: ../gtk/incall_view.c:236
+msgid "uPnP is running"
+msgstr "uPnP 'laite tunnistus' on käytössä"
+
+#: ../gtk/incall_view.c:238
+msgid "uPnP failed"
+msgstr "uPnP 'laite tunnistus' epäonnistui"
+
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
+msgid "Direct or through server"
+msgstr "Suoraan tai palvelimen kautta"
+
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
+#, c-format
+msgid ""
+"download: %f\n"
+"upload: %f (kbit/s)"
+msgstr "lataa: %f\nlähettää: %f (kbit/s)"
+
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
+#, c-format
+msgid "%ix%i @ %f fps"
+msgstr "%ix%i @ %f fps"
+
+#: ../gtk/incall_view.c:295
+#, c-format
+msgid "%.3f seconds"
+msgstr "%.3f sekunttia"
+
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
+msgid "Hang up"
+msgstr "Katkaise puhelu"
+
+#: ../gtk/incall_view.c:558
+msgid "<b>Calling...</b>"
+msgstr "<b>Soittaa...</b>"
+
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../gtk/incall_view.c:572
+msgid "<b>Incoming call</b>"
+msgstr "<b>tuleva puhelu</b>"
+
+#: ../gtk/incall_view.c:609
+msgid "good"
+msgstr "hyvä"
+
+#: ../gtk/incall_view.c:611
+msgid "average"
+msgstr "keskiverto"
+
+#: ../gtk/incall_view.c:613
+msgid "poor"
+msgstr "heikko"
+
+#: ../gtk/incall_view.c:615
+msgid "very poor"
+msgstr "todella heikko"
+
+#: ../gtk/incall_view.c:617
+msgid "too bad"
+msgstr "liian huono"
+
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
+msgid "unavailable"
+msgstr "saavuttamattomissa"
+
+#: ../gtk/incall_view.c:732
+msgid "Secured by SRTP"
+msgstr "Käytä SRTP salausta"
+
+#: ../gtk/incall_view.c:738
+msgid "Secured by DTLS"
+msgstr "Käytä DTLS salausta"
+
+#: ../gtk/incall_view.c:744
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr "Käytä ZRTP salausta - [todennustunnus: %s]"
+
+#: ../gtk/incall_view.c:748
+msgid "Set unverified"
+msgstr "Aseta vahvistamattomaksi"
+
+#: ../gtk/incall_view.c:748
+msgid "Set verified"
+msgstr "Aseta vahvistetuksi"
+
+#: ../gtk/incall_view.c:788
+msgid "In conference"
+msgstr "Kokouksessa"
+
+#: ../gtk/incall_view.c:788
+msgid "<b>In call</b>"
+msgstr "<b>Puhuu puhelua</b>"
+
+#: ../gtk/incall_view.c:825
+msgid "<b>Paused call</b>"
+msgstr "<b>Puhelu laitettu tauolle</b>"
+
+#: ../gtk/incall_view.c:862
+msgid "<b>Call ended.</b>"
+msgstr "<b>Puhelu loppu.</b>"
+
+#: ../gtk/incall_view.c:893
+msgid "Transfer in progress"
+msgstr "Siirto käynnissä"
+
+#: ../gtk/incall_view.c:896
+msgid "Transfer done."
+msgstr "Siirto tehty."
+
+#: ../gtk/incall_view.c:899
+msgid "Transfer failed."
+msgstr "Siirto epäonnistui."
+
+#: ../gtk/incall_view.c:930
+msgid "Resume"
+msgstr "Yritä uudelleen"
+
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
+msgid "Pause"
+msgstr "Pysäytä"
+
+#: ../gtk/incall_view.c:996
+#, c-format
+msgid ""
+"<small><i>Recording into\n"
+"%s %s</i></small>"
+msgstr "<small><i>Nauhoita\n%s %s</i></small>"
+
+#: ../gtk/incall_view.c:996
+msgid "(Paused)"
+msgstr "(Pysäytetty)"
+
+#: ../gtk/loginframe.c:75
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "Anna kirjautumistiedot %s"
+
+#: ../gtk/config-fetching.c:57
+#, c-format
+msgid "fetching from %s"
+msgstr "hae: %s"
+
+#: ../gtk/config-fetching.c:73
+#, c-format
+msgid "Downloading of remote configuration from %s failed."
+msgstr "Etäsäätöjen lataus %s :stä epäonnistui."
+
+#: ../gtk/audio_assistant.c:103
+msgid "No voice detected"
+msgstr "Laitetta ei havaittu"
+
+#: ../gtk/audio_assistant.c:104
+msgid "Too low"
+msgstr "Liian hiljainen"
+
+#: ../gtk/audio_assistant.c:105
+msgid "Good"
+msgstr "Hyvä"
+
+#: ../gtk/audio_assistant.c:106
+msgid "Too loud"
+msgstr "Liian kova ääninen"
+
+#: ../gtk/audio_assistant.c:188
+msgid "Did you hear three beeps ?"
+msgstr "Kuulitko kolme piippausta ?"
+
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
+msgid "Sound preferences not found "
+msgstr "Toivottuja ääniasetuksia ei löytynyt"
+
+#: ../gtk/audio_assistant.c:315
+msgid "Cannot launch system sound control "
+msgstr "Ei voi käynnistää järjestelmän äänien hallintaa"
+
+#: ../gtk/audio_assistant.c:327
+msgid ""
+"Welcome!\n"
+"This assistant will help you to configure audio settings for Linphone"
+msgstr "Tervetuloa!\nTämä avustaja auttaa sinua Linphonen ääniasetuksissa"
+
+#: ../gtk/audio_assistant.c:337
+msgid "Capture device"
+msgstr "Tallennus laite"
+
+#: ../gtk/audio_assistant.c:338
+msgid "Recorded volume"
+msgstr "Tallennuksen äänen voimakkuus"
+
+#: ../gtk/audio_assistant.c:342
+msgid "No voice"
+msgstr "Äänetön"
+
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
+msgid "System sound preferences"
+msgstr "Järjestelmän toivotut ääni asetukset"
+
+#: ../gtk/audio_assistant.c:378
+msgid "Playback device"
+msgstr "Kaiutin laite"
+
+#: ../gtk/audio_assistant.c:379
+msgid "Play three beeps"
+msgstr "Anna kolme piippausta"
+
+#: ../gtk/audio_assistant.c:412
+msgid "Press the record button and say some words"
+msgstr "Paina nauhoita nappulaa ja sano muutamia sanoja"
+
+#: ../gtk/audio_assistant.c:413
+msgid "Listen to your record voice"
+msgstr "Kuuntele nauhoittamasi puhe"
+
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
+msgid "Record"
+msgstr "Nauhoita"
+
+#: ../gtk/audio_assistant.c:415
+msgid "Play"
+msgstr "Toista"
+
+#: ../gtk/audio_assistant.c:442
+msgid "Let's start Linphone now"
+msgstr "Käynnitetäänpä Linphone nyt"
+
+#: ../gtk/audio_assistant.c:513
+msgid "Audio Assistant"
+msgstr "Ääni avustaja"
+
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
+msgid "Audio assistant"
+msgstr "Ääni avustaja"
+
+#: ../gtk/audio_assistant.c:528
+msgid "Mic Gain calibration"
+msgstr "Mikrofooni tulon kalibrointi"
+
+#: ../gtk/audio_assistant.c:534
+msgid "Speaker volume calibration"
+msgstr "Kaiuttimen kalibrointi"
+
+#: ../gtk/audio_assistant.c:539
+msgid "Record and Play"
+msgstr "Nauhoita ja Toista"
+
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Lopeta"
+
+#: ../gtk/about.ui.h:1
+msgid "About Linphone"
+msgstr "Tietoja Linphonesta"
+
+#: ../gtk/about.ui.h:2
+msgid "(C) Belledonne Communications, 2010\n"
+msgstr "(C) Belledonne Communications, 2010\n"
+
+#: ../gtk/about.ui.h:4
+msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+msgstr "Internet video puhelin, joka kyttää SIP (rfc3261) protokollaa."
+
+#: ../gtk/about.ui.h:5
+msgid ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\nfi: Matti Koivunen\n"
+
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr "Etsi yhteystietoja hakemistosta"
+
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr "Lisää minun listaan"
+
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
+msgstr "<b>Etsi henkilöä</b>"
+
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Soitettu</b>"
+
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "<b>Soitetut</b>"
+
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Tyhjennä kaikki"
+
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Soita takaisin"
+
+#: ../gtk/call_statistics.ui.h:1
+msgid "Call statistics"
+msgstr "Soitto tilastot"
+
+#: ../gtk/call_statistics.ui.h:2
+msgid "Audio codec"
+msgstr "Äänen codec 'pakkaus'"
+
+#: ../gtk/call_statistics.ui.h:3
+msgid "Video codec"
+msgstr "Videon codec 'pakkaus'"
+
+#: ../gtk/call_statistics.ui.h:4
+msgid "Audio IP bandwidth usage"
+msgstr "Äänen käyttämä IP kaistaleveys "
+
+#: ../gtk/call_statistics.ui.h:5
+msgid "Audio Media connectivity"
+msgstr "Ääni tiedon yhdistettävyys"
+
+#: ../gtk/call_statistics.ui.h:6
+msgid "Video IP bandwidth usage"
+msgstr "Videon käyttämä IP kaistaleveys"
+
+#: ../gtk/call_statistics.ui.h:7
+msgid "Video Media connectivity"
+msgstr "Video tiedon yhdistettävyys"
+
+#: ../gtk/call_statistics.ui.h:8
+msgid "Round trip time"
+msgstr "Kierto aika"
+
+#: ../gtk/call_statistics.ui.h:9
+msgid "Video resolution received"
+msgstr "Saatu videon tarkkuus"
+
+#: ../gtk/call_statistics.ui.h:10
+msgid "Video resolution sent"
+msgstr "Lähetetty videon tarkkuus"
+
+#: ../gtk/call_statistics.ui.h:11
+msgid "RTP profile"
+msgstr "RTP 'realiaikaisen videon' profiili"
+
+#: ../gtk/call_statistics.ui.h:12
+msgid "<b>Call statistics and information</b>"
+msgstr "<b>Puhelu tilastot ja tiedot</b>"
+
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Lähetä"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Päätä kokous"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Määritetään etäsäätöjä, URI-osoite"
+
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Anna alapuolelle muokattu URI, eli http tai https. Kun olet painanut OK, Linphone uudelleen käynnistyy ja hakee  tilin uudet säädöt."
+
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP osoite"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Näytä henkilön läsnäolo"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Anna lupa tälle henkilölle nähdä läsnäoloni"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Yhteystiedot</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "DSCP 'pakettien erittely' asetukset"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Äänen RTP stream 'realiaikainen virta'"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Videon RTP stream 'realiaikainen virta'"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>Aseta DSCP 'pakettien erittely' arvot (heksadesimaaleina)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Paina tästä asettaaksesi kaiuttimien äänen voimakkuuden"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Nauhoita tämä puhelu äänitiedostoksi"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Video"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Mykkä"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Siirto"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "Puhelussa"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Pituus"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Puhelun laadun luokitus"
+
+#: ../gtk/ldap.ui.h:1
+msgid "LDAP Settings"
+msgstr "LDAP 'Käyttäjän tunnistus' asetukset"
+
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Palvelimen osoite:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Todennus menetelmä:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Käyttäjätunnus:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Salasana:"
+
+#: ../gtk/ldap.ui.h:6
+msgid "Use TLS Connection"
+msgstr "Käytä TLS 'lähetyksen salaus' yhteyttä"
+
+#: ../gtk/ldap.ui.h:7
+msgid "Not yet available"
+msgstr "Ei vielä saatavilla"
+
+#: ../gtk/ldap.ui.h:8
+msgid "<b>Connection</b>"
+msgstr "<b>Yhteys</b>"
+
+#: ../gtk/ldap.ui.h:9
+msgid "Bind DN"
+msgstr "Käyttäjän tunnistus: yhdistä DN nimeen"
+
+#: ../gtk/ldap.ui.h:10
+msgid "Authname"
+msgstr "Valtuutettu nimi"
+
+#: ../gtk/ldap.ui.h:11
+msgid "Realm"
+msgstr "Realm 'hallittu alue'"
+
+#: ../gtk/ldap.ui.h:12
+msgid "<b>SASL</b>"
+msgstr "<b>SASL 'yksinkertainen tunnistus ja salaus'</b>"
+
+#: ../gtk/ldap.ui.h:13
+msgid "Base object:"
+msgstr "Perus kohde:"
+
+#: ../gtk/ldap.ui.h:15
+#, no-c-format
+msgid "Filter (%s for name):"
+msgstr "Suodatin (%s nimelle)"
+
+#: ../gtk/ldap.ui.h:16
+msgid "Name Attribute:"
+msgstr "Nimen tuntomerkit"
+
+#: ../gtk/ldap.ui.h:17
+msgid "SIP address attribute:"
+msgstr "SIP osoitteen tuntomerkki:"
+
+#: ../gtk/ldap.ui.h:18
+msgid "Attributes to query:"
+msgstr "Tuntomerkkiä jonossa"
+
+#: ../gtk/ldap.ui.h:19
+msgid "<b>Search</b>"
+msgstr "<b>Hae</b>"
+
+#: ../gtk/ldap.ui.h:20
+msgid "Timeout for search:"
+msgstr "Haun aikakatkaisu:"
+
+#: ../gtk/ldap.ui.h:21
+msgid "Max results:"
+msgstr "Tulosten yläraja:"
+
+#: ../gtk/ldap.ui.h:22
+msgid "Follow Aliases"
+msgstr "Seuraa peitenimiä"
+
+#: ../gtk/ldap.ui.h:23
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Sekalaiset</b>"
+
+#: ../gtk/ldap.ui.h:24
+msgid "ANONYMOUS"
+msgstr "ANONYYMI"
+
+#: ../gtk/ldap.ui.h:25
+msgid "SIMPLE"
+msgstr "YKSINKERTAINEN"
+
+#: ../gtk/ldap.ui.h:26
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5 'tiivistetty käyttäjän tunnistus '"
+
+#: ../gtk/ldap.ui.h:27
+msgid "NTLM"
+msgstr "NTLM 'Microsoft käyttäjän tunnistus'"
+
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Salasana"
+
+#: ../gtk/login_frame.ui.h:3
+msgid "Internet connection:"
+msgstr "Internet yhteys:"
+
+#: ../gtk/login_frame.ui.h:4
+msgid "Automatically log me in"
+msgstr "Automaattisesti kirjaudu sisään"
+
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Käyttäjän tiedot"
+
+#: ../gtk/login_frame.ui.h:6
+msgid "Login information"
+msgstr "Kirjautumistiedot"
+
+#: ../gtk/login_frame.ui.h:7
+msgid "<b>Welcome!</b>"
+msgstr "<b>Tervetuloa!</b>"
+
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Kuitu kanava"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone virheen korjaus ikkuna"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Vieritä loppuun"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Vakio"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Poista"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Valinnat"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Aseta URI säädöt"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Aloita aina videon kanssa"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Näytä omakuva"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Näytä näppäimistö"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Apua"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Näytä virheen korjaus ikkuna"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Kotisivu"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Tarkista _Päivitykset"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Käyttäjätili avustaja"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP osoite tai puhelin numero"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Aloita uusi puhelu"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Hae"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Lisää yhteystiedot hakemistosta</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Lisää yhteystieto"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Tyhjennä puhelu historia"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Minun nykyinen henkilllisyys"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Automaattinen vastaaminen käytössä"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "anonyymi"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI 'tietoturva ohjelmointi käskypohja'"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL 'yksinkertainen salaus'"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "vakio äänikortti"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "äänikortti"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "vakio kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF 'keskimääräinen kuvan tarkkuus'"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Ääni pakkaukset 'codecs'"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Video pakkaukset 'codecs'"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP 'siirto ilman yhteyttä')"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP 'luotettu siirto tavuttain')"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS 'siirto SSL varmentimilla')"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Asetukset"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Tämä osio märittää sinun SIP osoitteen kun et käytä SIP tiliä"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Sinun näyttö nimi (esim: Matti Meikäläinen):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Sinun käyttäjänimi:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Tuloksena sinun SIP osoitteesi on:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Vakio henkilöllisyys</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Velho - automaattisäätö"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Lisää"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Poista"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Välityspalvelin tilit</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Poista kaikki salasanat"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Yksityisyys</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Automaattinen vastaus kun puhelu on saapunut"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Odota ennen vastaamista (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Automaattinen vastaaja</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Hallitse SIP tilejä"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Soittoääni:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "ALSA-'ääne parannus' erikoilaite  (valinnainen):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Tallennus laite:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Soittoäänen laite:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Äänentoistolaite:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Käytä kaiun poistoa"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Ääni</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Videokuvan lähde:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Toivottu videon tarkkuus:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Videon ulostulo:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Näytä kameran esikatselu"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Video esiasetus:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Toivottu videon kuvataajuus:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 tarkoittaa \"rajoittamaton\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Lähetys nopeus raja Kbit/sec:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Lataus raja Kbit/sec:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Käytä mukautuvaa tason säätöä"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Mukautuva tason säätö arvailee käytettävissä olevan kastaleveyden puheun aikana.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Kastaleveyden hallinta</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Multimedia asetukset"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Aseta suurin siirto yksikkö:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Lähetä DTMF:t SIP infona"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Salli IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Siirto</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "SIP/UDP portti"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Satunnainen"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "SIP/TCP portti"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Ääni RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Korjattu"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunneli"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP kentät"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Veskko protokolla ja portti</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Suora yhteys internettiin "
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "NAT / Palomuurin takaa (määritä yhdyskäytävä IP)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "NAT-osoitteenmuunnoksen / Palomuurin takaa (käytä STUN:nia)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "NAT-osoitteenmuunnoksen / Palomuurin takaa (käytä ICE:tä)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "NAT-osoitteenmuunnoksen / Palomuurin takaa (käytä uPnP:tä)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Julkinen IP osoite:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Stun-palvelin eli 'osoitteenmuunoksen takaisin haku'-palvelin:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT-osoitteenmuunos ja Palomuuri</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Median salaus tyyppi"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "Käytä Lime:ä lähteviin viesteihin "
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Median salaus on pakollinen"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Salaus</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Verkko asetukset:"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Käytössä"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Poissa käytöstä"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Ääni codecs</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Video codecs</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Kieli</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Näytä edistyneet asetukset"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Taso</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Käyttöliittymä"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>LDAP Tili asetukset</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Tehty"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linhone - Tunnistautuminen vaaditaan"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Anna domain/verkkotunnussen salasana"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Säädetään..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Odota, säätöjä noudetaan palvelimelta..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "SIP tilin säätö avustaja"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Tervetuoa!\nTämä avustaja auttaa sinua käyttämään SIP tiliä puheluissasi. "
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Tervetuloa tili asetusten avustajaan"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Luo linphone.org tili"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Minulla on jo linphone.org tili ja haluan kayttää sitä"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Minulla on jo sip tilli ja haluan käyttää sitä"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Haluan täsmentää etäsäätöjä; URI-osoite"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Tili asetusten avustaja"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Anna tili tietosi"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Käyttäjätunnus*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Salasana*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Domain/verkkotunnus*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Välitysavelin"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Muokkaa tiliäsi (osa 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Anna linphone.org käyttäjätunnus"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Anna sip käyttäjätunnus (osa 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Vaaditus kohdat"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "Sähköposti: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Käyttäjätunnus: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Salasana: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Vahvista salasana: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Ilmoita linphone päivityksistä"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Anna tili tiedot (osa 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Sinun tiliäsi luodaan, pyydän odota."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Tilin luominen edistyy"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Vahvista tilisi avaamala linkin, joka on juuri lähetetty sähköpostiisi.\nSitten palaa ja paina seuraava."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Vahvistus (osa 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Tarkistetaan että tilisi on vahvistettu, pyydän odota."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Tarkistetaan tilin vahvistusta "
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Virhe, tili ei ole vahvistettu, käyttäjätunnus oli jo käytössä tai palvelin tavoittamattomissa.\nPyydän palaa ja yritä uudelleen."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Virhe"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Kiitos. Tilisi on muokattu ja valmis käyttöön."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Muokkaa SIP tiliä"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Sinun SIP henkilöllisyys:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Näyttää seuraavalta sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP välityspalvelin osoite:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Näyttää seuraavalta sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Rekisteröinnin kesto (sekunttia):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Yhteystiedot (valinnainen):"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF-'media siirto' tahdistusväli RTCP-'realiaikaisen tiedonsiirron' kanssa (sekunttia):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Reitti (valinnainen):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Siirto"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Rekisteri"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Julkaise läsnäolo tiedot"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Käytä AVPF:ää"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Muokkaa SIP tiliä"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Muokkaa VoIP tunnelia"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Host eli Verkon solmu"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Portti"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Muokkaa tunnelia</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Muokkaa http välityspalinta (valinnainen)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Odota"
+
+#: ../coreapi/linphonecore.c:1594
+msgid "Ready"
+msgstr "Valmis"
+
+#: ../coreapi/linphonecore.c:2685
+msgid "Configuring"
+msgstr "Säädetään"
+
+#. must be known at that time
+#: ../coreapi/linphonecore.c:3084
+msgid "Contacting"
+msgstr "Yhdistetään"
+
+#: ../coreapi/linphonecore.c:3089
+msgid "Could not call"
+msgstr "Ei voinut soittaa"
+
+#: ../coreapi/linphonecore.c:3228
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr "Olen pahoillani, suurin yhtäaikaisten puheluiden määrä on saavutettu"
+
+#: ../coreapi/linphonecore.c:3388
+msgid "is contacting you"
+msgstr "on ottamassa yhteyttä sinuun"
+
+#: ../coreapi/linphonecore.c:3389
+msgid " and asked autoanswer."
+msgstr "ja pyytää automaattista vastausta."
+
+#: ../coreapi/linphonecore.c:3506
+msgid "Modifying call parameters..."
+msgstr "Maukataan soiton raja-arvoja..."
+
+#: ../coreapi/linphonecore.c:3898
+msgid "Connected."
+msgstr "Yhdistetty"
+
+#: ../coreapi/linphonecore.c:3923
+msgid "Call aborted"
+msgstr "Puhelu keskeytetty"
+
+#: ../coreapi/linphonecore.c:4125
+msgid "Could not pause the call"
+msgstr "Ei voinut laittaa puhelua tauolle"
+
+#: ../coreapi/linphonecore.c:4128
+msgid "Pausing the current call..."
+msgstr "Laitetaan tauolle nykyinen puhelu..."
+
+#: ../coreapi/misc.c:441
+msgid "Stun lookup in progress..."
+msgstr "Stun-'osoite haun' lukkiutuminen käynnissä..."
+
+#: ../coreapi/misc.c:657
+msgid "ICE local candidates gathering in progress..."
+msgstr "ICE paikallisia ehdokkaita kerätään..."
+
+#: ../coreapi/friend.c:48
+msgid "Online"
+msgstr "Verkossa"
+
+#: ../coreapi/friend.c:51
+msgid "Busy"
+msgstr "Kiireinen"
+
+#: ../coreapi/friend.c:54
+msgid "Be right back"
+msgstr "Palaan pian"
+
+#: ../coreapi/friend.c:57
+msgid "Away"
+msgstr "Poissa"
+
+#: ../coreapi/friend.c:60
+msgid "On the phone"
+msgstr "Puhuu puhelua"
+
+#: ../coreapi/friend.c:63
+msgid "Out to lunch"
+msgstr "Syömässä"
+
+#: ../coreapi/friend.c:66
+msgid "Do not disturb"
+msgstr "Älä häiritse"
+
+#: ../coreapi/friend.c:69
+msgid "Moved"
+msgstr "Siirtynyt"
+
+#: ../coreapi/friend.c:72
+msgid "Using another messaging service"
+msgstr "Käyttää toista yhteys ohjelmaa"
+
+#: ../coreapi/friend.c:75
+msgid "Offline"
+msgstr "Verkossa"
+
+#: ../coreapi/friend.c:78
+msgid "Pending"
+msgstr "Odottaa"
+
+#: ../coreapi/friend.c:81
+msgid "Vacation"
+msgstr "Lomalla"
+
+#: ../coreapi/friend.c:83
+msgid "Unknown status"
+msgstr "Tuntematon tila"
+
+#: ../coreapi/proxy.c:339
+msgid ""
+"The sip proxy address you entered is invalid, it must start with \"sip:\" "
+"followed by a hostname."
+msgstr "Antamasi välityspalvelin osoite on kelvoton. Se täytyy alkaa \"sip:\" minkä jälkeen tulee host-verkkosolmuntunnus."
+
+#: ../coreapi/proxy.c:345
+msgid ""
+"The sip identity you entered is invalid.\n"
+"It should look like sip:username@proxydomain, such as sip:alice@example.net"
+msgstr "Antamasi sip tiedot ovat kelvoton.\nSen pitäisi näyttää sip:käyttäjätunnus@välityspalvelin, kuten sip:alice@esimerkki.net"
+
+#: ../coreapi/proxy.c:979
+msgid "Looking for telephone number destination..."
+msgstr "Etsitään puhelinnumeron kohdetta..."
+
+#: ../coreapi/proxy.c:983
+msgid "Could not resolve this number."
+msgstr "Ei voi käsittää tätä numeroa."
+
+#: ../coreapi/proxy.c:1437
+#, c-format
+msgid "Could not login as %s"
+msgstr "%s ei pystynyt kirjautumaan"
+
+#: ../coreapi/proxy.c:1522
+#, c-format
+msgid "Refreshing on %s..."
+msgstr "%s on huilaamassa..."
+
+#: ../coreapi/callbacks.c:415
+msgid "Remote ringing."
+msgstr "vastapuoli pirisee"
+
+#: ../coreapi/callbacks.c:427
+msgid "Remote ringing..."
+msgstr "vastapuoli pirisee..."
+
+#: ../coreapi/callbacks.c:450
+msgid "Early media."
+msgstr "Aikainen media eli aloita puhelu ennen yhteyden lukittautumista"
+
+#: ../coreapi/callbacks.c:480
+#, c-format
+msgid "Call answered by %s"
+msgstr "Puheluun vastasi %s"
+
+#: ../coreapi/callbacks.c:522
+msgid "Call resumed."
+msgstr "Puhelu jaettiin."
+
+#: ../coreapi/callbacks.c:577
+msgid "Incompatible, check codecs or security settings..."
+msgstr "Yhteensopimaton, tarkista kodekit tai suojaus asetukset..."
+
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
+msgid "Incompatible media parameters."
+msgstr "Yhteensopimattomat media raja-arvot."
+
+#: ../coreapi/callbacks.c:607
+msgid "We have been resumed."
+msgstr "Meidän puhelu on jaettu."
+
+#. we are being paused
+#: ../coreapi/callbacks.c:615
+msgid "We are paused by other party."
+msgstr "Meidän puhelu on laitettu taauolle toisen osapuolen taholta."
+
+#: ../coreapi/callbacks.c:625
+msgid "Call is updated by remote."
+msgstr "Vastapuoli on päivittänyt puhelun."
+
+#: ../coreapi/callbacks.c:794
+msgid "Call terminated."
+msgstr "Puhelu keskeytetty."
+
+#: ../coreapi/callbacks.c:822
+msgid "User is busy."
+msgstr "Käyttäjä on kiireinen."
+
+#: ../coreapi/callbacks.c:823
+msgid "User is temporarily unavailable."
+msgstr "Käyttäjä hetkellisesti tavoittamattomissa."
+
+#. char *retrymsg=_("%s. Retry after %i minute(s).");
+#: ../coreapi/callbacks.c:825
+msgid "User does not want to be disturbed."
+msgstr "Käyttäjä ei halua tulla häirityksi."
+
+#: ../coreapi/callbacks.c:826
+msgid "Call declined."
+msgstr "Soitto evätty."
+
+#: ../coreapi/callbacks.c:841
+msgid "Request timeout."
+msgstr "Soitto yritys aikakatkaistiin."
+
+#: ../coreapi/callbacks.c:872
+msgid "Redirected"
+msgstr "Uudelleen ohjattu"
+
+#: ../coreapi/callbacks.c:922
+msgid "Call failed."
+msgstr "Puhelu epäonnistui."
+
+#: ../coreapi/callbacks.c:1000
+#, c-format
+msgid "Registration on %s successful."
+msgstr "Rekitöröityminen %sn onnistui."
+
+#: ../coreapi/callbacks.c:1001
+#, c-format
+msgid "Unregistration on %s done."
+msgstr "Rekisterin poisto %s:stä on tehty."
+
+#: ../coreapi/callbacks.c:1019
+msgid "no response timeout"
+msgstr "ei vastausta, aikakatkaistiin"
+
+#: ../coreapi/callbacks.c:1022
+#, c-format
+msgid "Registration on %s failed: %s"
+msgstr "Rekistöröityminen %sn epäonnistui: %s"
+
+#: ../coreapi/callbacks.c:1029
+msgid "Service unavailable, retrying"
+msgstr "Palvelin saavuttamattomissa, uudelleen yritetään"
+
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:204
+#, c-format
+msgid "Authentication token is %s"
+msgstr "Todennus merkki on %s"
+
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Soiton raja-arvoja ei voitu muokata: %s."
+
+#: ../coreapi/linphonecall.c:1665
+msgid "Call parameters were successfully modified."
+msgstr "Soiton raja-arvot ovat onnistuneesti muokattu."
+
+#: ../coreapi/linphonecall.c:4636
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Sinulla on %i vastaamaton puhelu."
+msgstr[1] "Sinulla on %i vastaamatonta puhelua."
+
+#: ../coreapi/call_log.c:223
+msgid "aborted"
+msgstr "keskeytetty"
+
+#: ../coreapi/call_log.c:226
+msgid "completed"
+msgstr "valmis"
+
+#: ../coreapi/call_log.c:229
+msgid "missed"
+msgstr "vastaamaton"
+
+#: ../coreapi/call_log.c:232
+msgid "unknown"
+msgstr "tuntematon"
+
+#: ../coreapi/call_log.c:234
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr "%s at %s\nMistä: %s\nMihin: %s\nTila: %s\nKasto: %i minuuttia %i sekunttia\n"
+
+#: ../coreapi/call_log.c:235
+msgid "Outgoing call"
+msgstr "Lähtevä puhelu"
+
+#: ../gtk/videowindow.c:72
+#, c-format
+msgid "Cannot play %s."
+msgstr "Ei voi toistaa %s."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index f15677f13..0b8c6ae59 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,83 +1,89 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Belledonne Communications <support@belledonne-communications.com>, 2015
-# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
-# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014
-# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2014-2015
+# Belledonne Communications <support@belledonne-communications.com>, 2015-2016
+# Gautier Pelloux <gautier.pelloux@gmail.com>, 2014
+# Gautier Pelloux <gautier.pelloux@gmail.com>, 2014
+# Gautier Pelloux <gautier.pelloux@gmail.com>, 2014-2016
 # Simon Morlat <simon.morlat@linphone.org>, 2001
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-08-23 09:28+0000\n"
-"Last-Translator: Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/fr/)\n"
-"Language: fr\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:59+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: French (http://www.transifex.com/belledonne-communications/linphone-gtk/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Appeler %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Chatter avec %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Ajouter %s à la liste de contacts"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Appels récents"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>Appels récents (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "inconnu"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Abandonné"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Manqué"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Refusé"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minute"
 msgstr[1] "%i minutes"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i seconde"
 msgstr[1] "%i secondes"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Qualité: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Qualité: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -95,51 +101,57 @@ msgstr "Moi"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Icone non trouvée: %s"
 
-#: ../gtk/chat.c:493
-msgid "Copy"
-msgstr ""
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Envoi en cours..."
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Message non envoyé"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "Copier"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "affiche des informations de debogage"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr "Afficher la version et quitter."
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "chemin vers le fichier de logs."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Démarrer linphone avec la vidéo désactivée."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Démarre iconifié, sans interface principale."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "adresse à appeler maintenant"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Spécifie un répertoire de travail (qui devrait être le répertoire "
-"d'installation, par exemple c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Spécifie un répertoire de travail (qui devrait être le répertoire d'installation, par exemple c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "Ficher de configuration"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "Démarre l'assistant audio"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr "Exécuter le test local et retourner 0 en cas de succès"
 
@@ -147,275 +159,256 @@ msgstr "Exécuter le test local et retourner 0 en cas de succès"
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s souhaite vous ajouter à sa liste de contact.\n"
-"Souhaitez vous l'ajouter à votre liste également et l'autoriser à voir votre "
-"information de présence  ?\n"
-"Si vous répondez non, cette personne sera mise temporairement sur liste "
-"noire."
+msgstr "%s souhaite vous ajouter à sa liste de contact.\nSouhaitez vous l'ajouter à votre liste également et l'autoriser à voir votre information de présence  ?\nSi vous répondez non, cette personne sera mise temporairement sur liste noire."
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Entrez le mot de passe pour <i>%s</i>\n"
-" sur le domaine <i>%s</i>:"
+msgstr "Entrez le mot de passe pour <i>%s</i>\n sur le domaine <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Erreur lors de l'appel"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Appel terminé."
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Répondre"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Appel en pause"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "b>par %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s propose de démarrer la vidéo. Acceptez-vous ?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Lien site web"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr "Appels vidéo via internet"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (par défaut)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Transfert vers %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Aucune carte son n'a été détectée sur cet ordinateur.\n"
-"Vous ne pourrez pas effectuer d'appels audio."
+msgstr "Aucune carte son n'a été détectée sur cet ordinateur.\nVous ne pourrez pas effectuer d'appels audio."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Un visiophone libre"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr "Bonjour\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Ajouter au carnet d'adresse"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Info de présence"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Nom"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Appeler"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Chat"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Rechercher dans l'annuaire de %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Contact sip invalide !"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Ajouter un nouveau contact"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Editer le contact '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Supprimer le contact '%s'"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "Supprimer l'historique de chat de '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Ajouter un contact depuis l'annuaire %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Nom"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Fréquence (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Etat"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "Débit IP (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Compte"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Anglais"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Français"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italien"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Portugais brésilien"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Allemand"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Russe"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Néérlandais"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "简体中文"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"La nouvelle selection de langue prendra effet au prochain démarrage de "
-"linphone."
+msgstr "La nouvelle selection de langue prendra effet au prochain démarrage de linphone."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Aucun"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr "DTLS"
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -424,10 +417,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Une version plus récente est disponible sur %s.\n"
-"Voulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière "
-"version ?"
+msgstr "Une version plus récente est disponible sur %s.\nVoulez vous ouvrir le navigateur afin de pouvoir télécharger la dernière version ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -460,350 +450,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] "%i contact trouvé."
 msgstr[1] "%i contacts trouvés."
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Bienvenue !\n"
-"Cet assistant va vous aider à utiliser un compte SIP pour vos appels."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Ce nom d'utilisateur est déjà pris."
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Créer un compte sur linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Impossible de vérifier la disponibilité de ce nom d'utilisateur. Veuillez réessayer plus tard."
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "J'ai déjà un compte linphone.org et je souhaite l'utiliser"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "J'ai déjà un compte Sip et je souhaite l'utiliser"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr "Je veux spécifier une URI de configuration"
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr "Entrez vos paramètres de compte"
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Nom d'utilisateur*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Mot de passe*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Domaine*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Entrez votre identifiant linphone.org"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Nom d'utilisateur:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Mot de passe:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Champs requis"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Nom d'utilisateur: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Mot de passe: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "Email : (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Confirmez votre mot de passe: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "Me tenir informé des mises à jour de Linphone "
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr "Votre compte est en cours de création. Veuillez patienter."
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Merci de valider votre compte en cliquant sur le lien que nous avons envoyé "
-"par email.\n"
-"Puis appuyez sur suivant."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr "Vérification que le compte a été validé. Veuillez patienter."
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le "
-"serveur n'est pas accessible.\n"
-"Merci d'essayer à nouveau."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Merci. Votre compte est maintenant configuré et prêt à être utilisé."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "Assistant de configuration de compte."
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Bienvenue dans l'assistant de configuration de compte."
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Assistant de configuration de compte."
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Configurez votre compte (étape 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Entrez votre identifiant sip (étape 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Entrez les informations concernant votre compte (étape 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr "Création du compte en cours"
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Validation (étape 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr "Vérification de la validité du compte en cours"
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Erreur"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "En cours d’arrêt."
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "Appel #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Transférer vers l'appel #%i avec %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Non utilisé"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE non activé"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "Erreur ICE"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "Négociation ICE en cours"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Via un ou plusieurs NATs"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "En direct"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Via un serveur relais"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnP non activé"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "uPnP en cours"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnP est indisponible"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP en cours d’exécution"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "uPnP a échoué."
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "Directe ou via un serveur"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"débit descendant : %f\n"
-"débit ascendant : %f (kbits/s)"
+msgstr "débit descendant : %f\ndébit ascendant : %f (kbits/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f fps"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f secondes"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Tentative d'appel...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Appel entrant</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "bon"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "moyen"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "faible"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "très faible"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "nulle"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "indisponible"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Sécurisé par SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr "Sécurisé par DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Sécurisé par ZRTP- [jeton: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Marquer comme non vérifié"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Marquer comme vérifié"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "En conférence"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>Appel en cours</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Appel en attente</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Appel terminé.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Transfert en cours"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Transfert terminé"
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Transfert échoué"
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Reprendre"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Enregistrement dans\n"
-"%s %s</i></small>"
+msgstr "<small><i>Enregistrement dans\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(en attente)"
 
@@ -842,178 +681,88 @@ msgstr "Trop bruyant"
 msgid "Did you hear three beeps ?"
 msgstr "Avez-vous entendu trois bips ?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "Préférences son non trouvé"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "Impossible de démarrer le contrôleur système du son"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Bienvenue !\n"
-"Cet assistant va vous aider à régler les paramètres audio de votre "
-"ordinateur pour une utilisation optimale avec Linphone."
+msgstr "Bienvenue !\nCet assistant va vous aider à régler les paramètres audio de votre ordinateur pour une utilisation optimale avec Linphone."
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "Périphérique de capture"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "Volume enregistré"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "Silencieux"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "Préférences son système"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "Périphérique d'écoute"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "Joue trois bips"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "Appuyer sur le bouton enregistrer et dites quelques mots"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "Ecoutez votre voix enregistrée"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "Enregistrer"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "Jouer"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "Démarrons Linphone maintenant"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "Assistant audio"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "Assistant audio"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "Calibration du gain du microphone"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "Calibration du volume du haut parleur"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "Enregistrer et joue"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Tous"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "En ligne"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Fibre optique"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Par défaut"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Supprimer"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Options"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr "URI de configuration"
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Toujours activer la vidéo"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Se voir"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Aide"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Fenêtre de débogage"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Site web"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "_Mises à jour"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Assistant de compte"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "Adresse SIP ou numéro"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Démarrer un nouvel appel"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Rechercher"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Ajouter un contact depuis l'annuaire</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Ajouter un contact."
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Appels récents"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Mon identité SIP :"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "En cours d’arrêt."
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1041,502 +790,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "Adresse SIP"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Voir l'état de présence de ce contact"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Autoriser ce contact à voir ma présence"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Information sur le contact</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Fenêtre de débogage de linphone"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Défiler jusqu'à la fin"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Authentification demandée"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Entrez votre mot de passe pour le domaine"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "ID utilisateur"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Historique des appels"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Tout vider"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Rappeler"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Configurer un compte SIP"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Votre identité SIP :"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "De la forme sip:<username>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "Adresse du proxy SIP:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "De la forme sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Période d'enregistrement (secondes):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "Paramètres de contact (optionnel):"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "Intervalle standard RTCP AVPF (sec) :"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Route (optionnel):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Transport"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "S'enregistrer"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Publier la présence"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "Activer AVPF"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Configurer un compte SIP"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "anonyme"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "Carte son par défaut"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "une carte son"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "camera par défaut"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Codecs audio"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Codecs vidéo"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr "Par défaut"
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr "Fréquence d'images élevée"
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr "Personnalisé"
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Réglages"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de "
-"compte SIP"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Votre nom d'affichage (ex: John Doe)"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Votre nom d'utilisateur:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Votre adresse SIP:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Identité par défaut</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Assistant"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Editer"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Enlever"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Comptes SIP via des proxy</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Effacer tous les mots de passe"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Sécurité</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr "Répondre automatiquement aux appels entrants"
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr "Temps d'attente avant réponse (ms)"
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr "<b>Décrochage automatique</b>"
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "Gérer mes comptes SIP"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Sonnerie:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Appareil ALSA spécifique (optionnel) :"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Périphérique de capture:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Périphérique de sonnerie:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Périphérique d'écoute:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Activer l'annulation d'écho"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Son</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Périphérique d'entrée vidéo"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr "Résolution vidéo préférée :"
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "Type de rendu video:"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "Afficher la vidéo"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr "Profile vidéo:"
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr "Fréquence d'images préférée"
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "Indiquez 0 pour ne pas mettre de limite"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Limite de débit montant en kbits/sec:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Limite de débit descendant en kbits/sec:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Activer le control de débit adaptatif."
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Le control de débit adaptatif est une technique pour adapter la qualité "
-"de l'audio et de la video en fonction de la bande passante disponible, "
-"durant l'appel.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Gestion de la bande passante</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Paramètres multimedia"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Spécifier la Maximum Transmission Unit"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Envoyer les digits en tant que SIP INFO"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr "Utiliser IPv6"
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Transport</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "Port SIP / UDP"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "Aléatoire"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "Port SIP / TCP"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP / UDP :"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Fixe"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Vidéo RTP / UDP :"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Type d'encryption media"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Le chiffrement media est obligatoire"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Tunnel"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "Champs DSCP"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Protocoles réseaux et ports</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Connexion directe à l'Internet"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)"
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Derrière un pare-feu (utiliser STUN)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Derrière un pare-feu (utiliser ICE)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Derrière un pare-feu (utiliser uPnP)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Adresse IP publique:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Serveur STUN:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>Paramètres liés au pare-feu</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Paramètres réseau"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Activer"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Désactiver"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr "<b>Codecs audio</b>"
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr "<b>Codecs vidéo</b>"
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Langue</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Montrer les réglages avancés"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Niveau</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Interface utilisateur"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "Adresse du serveur:"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "Méthode d'authentification:"
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Configuration LDAP</b>"
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Fermer"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1550,29 +804,21 @@ msgstr "Ajouter à ma liste"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Rechercher une personne</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "En attente"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Nom du correspondant</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "Réglages DSCP"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Historique des appels"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Tout vider"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "Flux RTP audio"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "Flux RTP vidéo"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>Indiquez les valeurs DSCP (en hexacdécimal)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Rappeler"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1622,38 +868,112 @@ msgstr "Profil RTP"
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>Statistiques de l'appel et informations</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "Configuer le mode tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Envoyer"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Hôte"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Fin de conférence"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Port"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Spécifier une URI de configuration"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Configuration du tunnel</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Cette boite de dialogue vous permet de spécifier une addresse http ou https où la configuration doit être téléchargée au démarrage.\nVeuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va redémarrer automatiquement pour charger et prendre en compte la nouvelle configuration."
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Nom d'utilisateur"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "Adresse SIP"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Mot de passe"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Voir l'état de présence de ce contact"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>Configuration d'un proxy http (optionel)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Autoriser ce contact à voir ma présence"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Information sur le contact</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "Réglages DSCP"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Flux RTP audio"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Flux RTP vidéo"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>Indiquez les valeurs DSCP (en hexacdécimal)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Cliquer ici pour modifier le volume des haut-parleurs"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Enregistrement de l'appel dans un fichier audio."
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Vidéo"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Couper le micro"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Transférer"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "Appel en cours"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Durée"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Qualité de l'appel"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "Paramètres LDAP"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Adresse du serveur:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Méthode d'authentification:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Nom d'utilisateur:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Mot de passe:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "Utiliser TLS"
@@ -1739,77 +1059,13 @@ msgstr "DIGEST-MD5"
 msgid "NTLM"
 msgstr "NTLM"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr "Spécifier une URI de configuration"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Nom d'utilisateur"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"Cette boite de dialogue vous permet de spécifier une addresse http ou https "
-"où la configuration doit être téléchargée au démarrage.\n"
-"Veuillez entrer l'URI http(s) ci dessous. Après avoir validé, Linphone va "
-"redémarrer automatiquement pour charger et prendre en compte la nouvelle "
-"configuration."
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "Configuration en cours"
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-"Veuillez patenter un instant pendant le chargement de la configuration "
-"distante..."
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Envoyer"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Nom du correspondant</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Fin de conférence"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Enregistrement de l'appel dans un fichier audio."
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Vidéo"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Couper le micro"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Transfert"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "Appel en cours"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Durée"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Qualité de l'appel"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Mot de passe"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1819,6 +1075,10 @@ msgstr "Connexion internet:"
 msgid "Automatically log me in"
 msgstr "Me connecter automatiquement"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "ID utilisateur"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Information de login"
@@ -1827,293 +1087,990 @@ msgstr "Information de login"
 msgid "<b>Welcome!</b>"
 msgstr "<b>Bienvenue !</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fibre optique"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Fenêtre de débogage de linphone"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Défiler jusqu'à la fin"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Options"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "URI de configuration"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Toujours activer la vidéo"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Se voir"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Afficher le pavé numérique"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr "Importer des contacts depuis des vCards"
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr "Exporter les contacts en vCards"
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Aide"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Fenêtre de débogage"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Site web"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "_Mises à jour"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Assistant de compte"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "Adresse SIP ou numéro"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Démarrer un nouvel appel"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Rechercher"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Ajouter un contact depuis l'annuaire</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Ajouter un contact."
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Effacer l'historique d'appel"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Mon identité SIP :"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Décrochage automatique activé"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "anonyme"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "Carte son par défaut"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "une carte son"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "camera par défaut"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Codecs audio"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Codecs vidéo"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Réglages"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Cette rubrique permet de définir son adresse SIP lorsqu'on ne possède pas de compte SIP"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Votre nom d'affichage (ex: John Doe)"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Votre nom d'utilisateur:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Votre adresse SIP:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Identité par défaut</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Assistant"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Editer"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Enlever"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Comptes SIP via des proxy</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Effacer tous les mots de passe"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Sécurité</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Répondre automatiquement aux appels entrants"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Temps d'attente avant réponse (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Décrochage automatique</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Gérer mes comptes SIP"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Sonnerie:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Appareil ALSA spécifique (optionnel) :"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Périphérique de capture:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Périphérique de sonnerie:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Périphérique d'écoute:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Activer l'annulation d'écho"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Son</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Périphérique d'entrée vidéo"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Résolution vidéo préférée :"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Type de rendu video:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Afficher la vidéo"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Profile vidéo:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Fréquence d'images préférée"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "Indiquez 0 pour ne pas mettre de limite"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Limite de débit montant en kbits/sec:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Limite de débit descendant en kbits/sec:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Activer le control de débit adaptatif."
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Gestion de la bande passante</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Paramètres multimedia"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Spécifier la Maximum Transmission Unit"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Envoyer les digits en tant que SIP INFO"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Utiliser IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Transport</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "Port SIP / UDP"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Aléatoire"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "Port SIP / TCP"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP / UDP :"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Fixe"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Vidéo RTP / UDP :"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "Champs DSCP"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Protocoles réseaux et ports</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Connexion directe à l'Internet"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Derrière un pare-feu (spécifier la passerelle ci dessous)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Derrière un pare-feu (utiliser STUN)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Derrière un pare-feu (utiliser ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Derrière un pare-feu (utiliser uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Adresse IP publique:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Serveur STUN:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>Paramètres liés au pare-feu</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Type d'encryption media"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "Utiliser Lime pour les messages de discussions sortants"
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Le chiffrement media est obligatoire"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr "Obligatoire"
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr "Privilégié"
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Chiffrement</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Paramètres réseau"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Activer"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Désactiver"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Codecs audio</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Codecs vidéo</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Codecs"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Langue</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Montrer les réglages avancés"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Niveau</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Interface utilisateur"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>Configuration LDAP</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Fermer"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Authentification demandée"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Entrez votre mot de passe pour le domaine"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Configuration en cours"
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Veuillez patenter un instant pendant le chargement de la configuration distante..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "Assistant de configuration de compte."
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Bienvenue !\nCet assistant va vous aider à utiliser un compte SIP pour vos appels."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Bienvenue dans l'assistant de configuration de compte."
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Créer un compte sur linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "J'ai déjà un compte linphone.org et je souhaite l'utiliser"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "J'ai déjà un compte Sip et je souhaite l'utiliser"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Je veux spécifier une URI de configuration"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Assistant de configuration de compte."
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Entrez vos paramètres de compte"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Nom d'utilisateur*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Mot de passe*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Domaine*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Configurez votre compte (étape 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Entrez votre identifiant linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Entrez votre identifiant sip (étape 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Champs requis"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "Email : (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Nom d'utilisateur: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Mot de passe: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Confirmez votre mot de passe: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Me tenir informé des mises à jour de Linphone "
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Entrez les informations concernant votre compte (étape 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Votre compte est en cours de création. Veuillez patienter."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Création du compte en cours"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Merci de valider votre compte en cliquant sur le lien que nous avons envoyé par email.\nPuis appuyez sur suivant."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Validation (étape 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Vérification que le compte a été validé. Veuillez patienter."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Vérification de la validité du compte en cours"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Erreur, le compte n'est pas validé, l'identifiant est déjà utilisé ou le serveur n'est pas accessible.\nMerci d'essayer à nouveau."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Erreur"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Merci. Votre compte est maintenant configuré et prêt à être utilisé."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Configurer un compte SIP"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Votre identité SIP :"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "De la forme sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "Adresse du proxy SIP:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "De la forme sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Période d'enregistrement (secondes):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Paramètres de contact (optionnel):"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "Intervalle standard RTCP AVPF (sec) :"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Route (optionnel):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Transport"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "S'enregistrer"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Publier la présence"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Activer AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Configurer un compte SIP"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Configuer le mode tunnel"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Hôte"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Port"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Configuration du tunnel</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Configuration d'un proxy http (optionel)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "En attente"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Prêt."
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr "Configuration en cours"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Appel de"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Echec de l'appel"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Désolé, le nombre maximum d'appels simultanés est atteint."
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "vous appelle"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "et sollicite un décrochage automatique."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Modifications des paramètres d'appels..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "En ligne."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Appel abandonné"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "La mise en attente a échoué"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Mise en attente de l'appel..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "Découverte STUN en cours"
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "Collection des candidats locaux ICE en cours..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Disponible"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "De retour"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Absent"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "Au téléphone"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "A table"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Ne pas déranger"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Parti"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Utilisation d'un autre service de messagerie"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Non connecté"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "En attente"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "En congé"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "Status inconnu"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie "
-"par un nom de domaine."
+msgstr "L'adresse SIP du proxy est invalide. Elle doit commencer par \"sip:\" suivie par un nom de domaine."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"L'identité SIP que vous avez fourni est invalide.\n"
-"Elle doit être de la forme sip:utilisateur@domaine, comme par exemple sip:"
-"alice@example.net"
+msgstr "L'identité SIP que vous avez fourni est invalide.\nElle doit être de la forme sip:utilisateur@domaine, comme par exemple sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Recherche de la destination du numéro de téléphone..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "La destination n'a pu être trouvée."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Echec de la connexion en tant que %s"
 
-#: ../coreapi/proxy.c:1494
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1522
+#, c-format
 msgid "Refreshing on %s..."
-msgstr "chargement depuis %s"
+msgstr "Rafraichissement de %s..."
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Sonnerie distante."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "Sonnerie distante..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Prise d'appel anticipée."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "%s est maintenant en attente."
+msgid "Call answered by %s"
+msgstr "Appel répondu par %s"
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Appel répondu par %s - en attente"
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Appel repris."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "Appel répondu par %s."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Incompatible, vérfiez les codecs ou les paramètres de sécurité..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "Paramètres media incompatibles."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "Appel repris."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "L'appel a été mis en attente."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "L'appel est modifié par la partie distante."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Appel terminé."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Occupé..."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "L'usager est temporairement indisponible."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "L'usager ne souhaite pas être dérangé"
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Appel décliné."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "Délai d'attente de la requête dépassé."
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Redirection"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "L'appel a échoué."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Enregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Désenregistrement sur %s effectué."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "Pas de réponse"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Echec de l'enregistrement sur %s: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr "Service indisponible, nouvelle tentative"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Le jeton d'authentification est %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Les paramètres d'appel n'ont pas pu être modifiés : %s."
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr "Les paramètres d'appel ont été modifiés avec succès."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Vous avez manqué %i appel"
 msgstr[1] "Vous avez manqué %i appels"
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr "interrompu"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr "terminé"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr "manqué"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2121,18 +2078,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
-"%s à %s\n"
-"De : %s\n"
-"Vers : %s\n"
-"Status : %s\n"
-"Durée : %i min %i sec\n"
+msgstr "%s à %s\nDe : %s\nVers : %s\nStatus : %s\nDurée : %i min %i sec\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr "Appel sortant"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
-msgstr "Impossibde de jouer %s."
+msgstr "Impossible de jouer %s."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr "Capture d'écran"
diff --git a/po/he.po b/po/he.po
index 540d02ee6..bb53d7e06 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,84 +1,89 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Eli Zaretskii <eliz@gnu.org>, 2012
-# Gautier Pelloux-Prayer <gautier.pelloux@gmail.com>, 2015
-# GenghisKhan <genghiskhan@gmx.ca>, 2014
+# Gautier Pelloux <gautier.pelloux@gmail.com>, 2015
 # GenghisKhan <genghiskhan@gmx.ca>, 2014
+# GenghisKhan <genghiskhan@gmx.ca>, 2014,2016
 # GenghisKhan <genghiskhan@gmx.ca>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Hebrew (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/he/)\n"
-"Language: he\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/belledonne-communications/linphone-gtk/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
-msgstr "התקשר אל %s"
+msgstr "התקשר %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "שלח טקסט אל %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "הוסף את %s לרשימת הקשר שלך"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "שיחות אחרונות"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>שיחות אחרונות (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "לא זמין (n/a)"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "ננטשה"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "הוחמצה"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "נדחתה"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "דקה %i"
 msgstr[1] "%i דקות"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "שניה %i"
 msgstr[1] "%i שניות"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>איכות: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>איכות: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
@@ -96,49 +101,57 @@ msgstr "אני"
 msgid "Couldn't find pixmap file: %s"
 msgstr "לא ניתן למצוא קובץ ‫pixmap: ‫%s"
 
-#: ../gtk/chat.c:493
-msgid "Copy"
-msgstr ""
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "כעת שולח..."
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "הודעה לא נשלחה"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "העתק"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
-msgstr ""
+msgstr "נתיב לקובץ שברצונך לרשום אליו את הרשומות."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
-msgstr ""
+msgstr "התחל את לינפון עם וידאו מנוטרל."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
-msgstr ""
+msgstr "קובץ תצורה"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -146,8 +159,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -156,258 +168,247 @@ msgstr ""
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"אנא הזן סיסמה עבור משתמש <i>%s</i>\n"
-"במתחם <i>%s</i>:"
+msgstr "אנא הזן סיסמה עבור משתמש <i>%s</i>\nבמתחם <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "שגיאת קריאה"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "שיחה הסתיימה"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "קריאה נכנסת"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "לענות"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "לדחות"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "שיחה הושהתה"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>על ידי %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "‏%s רוצה להתחיל וידאו. האם אתה מסכים ?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "קישור אתר רשת"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
-msgstr ""
+msgstr "וידאופון אינטרנטי"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "‫%s (ברירת מחדל)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "אנחנו מועברים אל %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"לא אותרו כרטיסי קול במחשב זה.\n"
-"לא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
+msgstr "לא אותרו כרטיסי קול במחשב זה.\nלא תהיה ביכולתך לשלוח או לקבל שיחות אודיו."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "וידאופון SIP חופשי"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
-msgstr ""
+msgstr "שלום\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "הוסף אל ספר כתובות"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "מצב נוכחות"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "שם"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "קריאה"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "שיחה"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "חיפוש במדור %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "כתובת sip לא תקפה !"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "הוסף איש קשר חדש"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "ערוך איש קשר '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "מחק איש קשר '%s'"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "מחק היסטוריית שיחה של '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "הוסף איש קשר חדש מן מדור %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "שם"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "שיעור (הרץ)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "מצב"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "פרמטרים"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "מופעל"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "לא מופעל"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "חשבון"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "English"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Français"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Español"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "português brasileiro"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polski"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Deutsch"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Русский"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Česky"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "中文"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "繁體字"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "norsk"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "српски srpski"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "עליך לאתחל את לינפון כדי שהשפה החדשה תיכנס לתוקף."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "ללא"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr ""
 
@@ -416,9 +417,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"גרסא מאוחרת יותר זמינה מן %s.\n"
-"האם ברצונך לפתוח דפדפן בכדי להורידה ?"
+msgstr "גרסא מאוחרת יותר זמינה מן %s.\nהאם ברצונך לפתוח דפדפן בכדי להורידה ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -451,347 +450,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] "נמצא איש קשר %i"
 msgstr[1] "נמצאו %i אנשי קשר"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "שם משתמש כבר מצוי בשימוש!"
+
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "צור חשבון אצל linphone.org"
-
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "כבר קיים חשבון linphone.org ברשותי וברצוני לעשות בו שימוש"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "כבר קיים חשבון sip ברשותי וברצוני לעשות בו שימוש"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "שם משתמש*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "סיסמה*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "מתחם*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "פרוקסי"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "הזן את שם משתמשך אצל linphone.org"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "שם משתמש:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "סיסמה:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) שדות חובה"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "שם משתמש: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "סיסמה: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "דוא״ל: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "אימות סיסמתך: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\n"
-"אחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\n"
-"נא לחזור ולנסות שוב."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "תודה לך. חשבונך מוגדר ומוכן לשימוש כעת."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "ברוך בואך אל אשף הגדרת החשבון"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "אשף הגדרת חשבון"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "הגדרת חשבונך (צעד 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "הזנת שם משתמש sip (צעד 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "הזנת מידע חשבון (צעד 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "אימות (צעד 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "שגיאה"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "מסיים כעת"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "שיחה מס׳ %i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "העברה אל שיחה מס׳ %i עם %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "לא בשימוש"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "‏ICE לא מופעלת"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "‏ICE נכשלה"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "‏ICE מצויה כעת בעיצומה"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "עובר דרך NAT אחד או יותר"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "ישיר"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "דרך שרת ממסר"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "‏uPnP לא מופעלת"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "‏uPnP מצויה כעת בעיצומה"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "‏uPnp לא זמינה"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "‏uPnP מורצת כעת"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "‏uPnP נכשלה"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "ישיר או דרך שרת"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"הורדה: %f\n"
-"העלאה: %f (קי״ב/שנ׳)"
+msgstr "הורדה: %f\nהעלאה: %f (קי״ב/שנ׳)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f שניות"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "נתק"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>מתקשר כעת...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
-#, fuzzy
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
-msgstr "‭00::00::00"
+msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>קריאה נכנסת</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "טובה"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "ממוצעת"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "דלה"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "דלה מאוד"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "גרועה מדי"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "לא זמינה"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "מאובטחת על ידי SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
-msgstr ""
+msgstr "מאובטח על ידי DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "מאובטחת על ידי ZRTP - [אות אימות: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "הגדר כלא מאומתת"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "הגדר כמאומתת"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "בשיחת ועידה"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>בשיחה כעת</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>שיחה מושהית</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>שיחה הסתיימה.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "העברה מצויה כעת בעיצומה"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "העברה הסתיימה."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "העברה נכשלה."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "חזור"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "השהה"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>מקליט אל תוך\n"
-"%s %s</i></small>"
+msgstr "<small><i>מקליט אל תוך\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(מושהה)"
 
@@ -828,181 +679,94 @@ msgstr "חזק מדי"
 
 #: ../gtk/audio_assistant.c:188
 msgid "Did you hear three beeps ?"
-msgstr ""
+msgstr "האם שמעת שלושה צפצופים ?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "התקן לכידה"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "אין קול"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "התקן השמעה"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "נגן שלושה צפצופים"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
-msgstr ""
+msgstr "הקלט"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
-msgstr ""
+msgstr "נגן"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "הבא נתחיל את Linphone עכשיו"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "כל המשתמשים"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "משתמשים מקוונים"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "‫ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "ערוץ סיב"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "ברירת מחדל"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "מחק"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_אפשרויות"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "התחל תמיד וידאו"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "אפשר ראות-עצמית"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_עזרה"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "הצג חלון ניפוי שגיאות"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_עמוד הבית"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "בדיקת _עדכונים"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "אשף חשבון"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "כתובת SIP או מספר טלפון"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "התחל שיחה חדשה"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "אנשי קשר"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "חיפוש"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>הוסף אנשי קשר מן מדור</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "הוסף איש קשר"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "שיחות אחרונות"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "זהותי הנוכחית:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "מסיים כעת"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
-msgstr ""
+msgstr "אודות Linphone"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
@@ -1028,486 +792,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "כתובת ‫SIP"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "הצג את מצב נוכחותו של איש קשר זה"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "הרשה לאיש קשר זה לראות את מצב הנוכחות שלי"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>מידע איש קשר</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "חלון ניפוי שגיאות ‫Linphone"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "גלול אוטומטית לסוף"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "‫Linphone - נדרש אימות"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "נא להזין את סיסמת המתחם"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "מזהה משתמש"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "היסטוריית שיחות"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "טיהור מוחלט"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "חיוג חוזר"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "‫Linphone - הגדרת חשבון ‫SIP"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "זהות ה־SIP שלך:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "נראה כמו ‪sip:<username>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "כתובת SIP Proxy:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "נראה כמו ‪sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "משך רישום (בשניות):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "ניתוב (רשות):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "טרנספורט"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "רישום"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "פרסם מידע נוכחות"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "אפשר AVPF"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "הגדרת חשבון ‫SIP"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "כרטיס קול משתמט"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "כרטיס קול"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "מצלמה משתמטת"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "קודקים של אודיו"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "קודקים של וידאו"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "‏SIP ‏(UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "‏SIP ‏(TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "‏SIP ‏(TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "הגדרות"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "חלק זה מגדיר את כתובת ה־SIP כאשר אינך עושה שימוש בחשבון SIP"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "שם התצוגה שלך (למשל: יורם יהודה):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "שם המשתמש שלך:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "כתובת SIP נובעת:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>זהות משתמטת</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "אשף"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "הוסף"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "ערוך"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "הסר"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>חשבונות Proxy</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "מחק סיסמאות"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>פרטיות</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "ניהול חשבונות ‫SIP"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "צליל צלצול:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "התקן ALSA מיוחד (רשות):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "התקן לכידה:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "התקן צלצול:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "התקן פס קול:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "אפשר ביטול הד"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>אודיו</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "התקן קלט וידאו:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 מסמל \"בלי הגבלה\""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>וידאו</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "אפשר בקרת קצב מסתגלת"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה.</"
-"i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>בקרת רוחב פס</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "הגדרות מולטימדיה"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "הגדר יחידת תמסורת מרבית:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "שלח טזמ״תים (DTMFs) כמידע SIP"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>טרנספורט</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "אודיו RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "מקובע"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "וידאו RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "סוג הצפנת מדיה"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "הצפנת מדיה הינה מנדטורית"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "מינהור"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "שדות DSCP"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>פרוטוקולי רשת תקשורת ופורטים</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "חיבור ישיר אל האינטרנט"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "מאחורי NAT  /  חומת אש (בעזרת STUN לפתירה)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "מאחורי NAT  /  חומת אש (בעזרת ICE)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "מאחורי NAT  /  חומת אש (בעזרת uPnP)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "כתובת IP פומבית:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "שרת STUN:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>‫NAT וחומת אש</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "הגדרות רשת תקשורת"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "אפשר"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "נטרל"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "קודקים"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>שפה</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "הצג הגדרות מתקדמות"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>רמה</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "ממשק משתמש"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "סיום"
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr "חיפוש אנשי קשר בתוך מדור"
@@ -1520,29 +804,21 @@ msgstr "הוסף אל הרשימה שלי"
 msgid "<b>Search somebody</b>"
 msgstr "<b>חיפוש אחר מישהו</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "נא להמתין"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>שם מקבל</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "אפשרויות DSCP"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "היסטוריית שיחות"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr ""
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "טיהור מוחלט"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "זרם RTP אודיו"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "זרם RTP וידאו"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>קבע ערכי DSCP (בהקסדצימלי)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "חיוג חוזר"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1586,44 +862,118 @@ msgstr ""
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
-msgstr ""
+msgstr "פרופיל RTP"
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>סטטיסטיקות ומידע שיחה</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "הגדר תיעול VoIP"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "שלח"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "מארח"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "סיים ועידה"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "פורט"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>הגדר מינהור</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "שם משתמש"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "כתובת ‫SIP"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "סיסמה"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "הצג את מצב נוכחותו של איש קשר זה"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>הגדר http proxy (רשות)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "הרשה לאיש קשר זה לראות את מצב הנוכחות שלי"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>מידע איש קשר</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "אפשרויות DSCP"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "זרם RTP אודיו"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "זרם RTP וידאו"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>קבע ערכי DSCP (בהקסדצימלי)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "הקלט את שיחה זו אל קובץ אודיו"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "וידאו"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "השתק"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "העבר"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "בשיחה כעת"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "משך זמן"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "אומדן איכות שיחה"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
+msgstr "הגדרות LDAP"
+
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "כתובת שרת:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "שם משתמש:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "סיסמה:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1634,7 +984,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:8
 msgid "<b>Connection</b>"
-msgstr ""
+msgstr "<b>חיבור</b>"
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1709,70 +1059,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "שם משתמש"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "שלח"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>שם מקבל</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "סיים ועידה"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "הקלט את שיחה זו אל קובץ אודיו"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "וידאו"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "השתק"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "העבר"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "בשיחה כעת"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "משך זמן"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "אומדן איכות שיחה"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "סיסמה"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1782,299 +1075,1002 @@ msgstr "חיבור אינטרנט:"
 msgid "Automatically log me in"
 msgstr "חבר אותי אוטומטית"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "מזהה משתמש"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "מידע התחברות"
 
 #: ../gtk/login_frame.ui.h:7
 msgid "<b>Welcome!</b>"
+msgstr "<b>ברוכים הבאים!</b>"
+
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "‫ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "ערוץ סיב"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "חלון ניפוי שגיאות ‫Linphone"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "גלול אוטומטית לסוף"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "מחק"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_אפשרויות"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "התחל תמיד וידאו"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "אפשר ראות-עצמית"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "הצג לוח חיוג"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_עזרה"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "הצג חלון ניפוי שגיאות"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_עמוד הבית"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "בדיקת _עדכונים"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "אשף חשבון"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "כתובת SIP או מספר טלפון"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "התחל שיחה חדשה"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "אנשי קשר"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "חיפוש"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>הוסף אנשי קשר מן מדור</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "הוסף איש קשר"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "טהר היסטוריית שיחות"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "זהותי הנוכחית:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "מענה אוטומטי הינו מאופשר"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "אנונימי"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "כרטיס קול משתמט"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "כרטיס קול"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "מצלמה משתמטת"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "קודקים של אודיו"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "קודקים של וידאו"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "‏SIP ‏(UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "‏SIP ‏(TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "‏SIP ‏(TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "הגדרות"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "חלק זה מגדיר את כתובת ה־SIP כאשר אינך עושה שימוש בחשבון SIP"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "שם התצוגה שלך (למשל: יורם יהודה):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "שם המשתמש שלך:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "כתובת SIP נובעת:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>זהות משתמטת</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "אשף"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "הוסף"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "ערוך"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "הסר"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>חשבונות Proxy</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "מחק סיסמאות"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>פרטיות</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>מענה-אוטומטי</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "ניהול חשבונות ‫SIP"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "צליל צלצול:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "התקן ALSA מיוחד (רשות):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "התקן לכידה:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "התקן צלצול:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "התקן פס קול:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "אפשר ביטול הד"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>אודיו</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "התקן קלט וידאו:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 מסמל \"בלי הגבלה\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>וידאו</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "מגבלת מהירות העלאה בקי״ב/שנ׳:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "מגבלת מהירות הורדה בקי״ב/שנ׳:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "אפשר בקרת קצב מסתגלת"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>בקרת קצב מסתגלת הינה טכניקה להשערה דינמית של רוחב הפס הזמין במהלך שיחה.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>בקרת רוחב פס</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "הגדרות מולטימדיה"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "הגדר יחידת תמסורת מרבית:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "שלח טזמ״תים (DTMFs) כמידע SIP"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "התר IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>טרנספורט</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "פורט SIP/UDP"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "אקראי"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "פורט SIP/TCP"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "אודיו RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "מקובע"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "וידאו RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "מינהור"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "שדות DSCP"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>פרוטוקולי רשת תקשורת ופורטים</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "חיבור ישיר אל האינטרנט"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "מאחורי NAT  /  חומת אש (בעזרת STUN לפתירה)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "מאחורי NAT  /  חומת אש (בעזרת ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "מאחורי NAT  /  חומת אש (בעזרת uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "כתובת IP פומבית:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "שרת STUN:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>‫NAT וחומת אש</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "סוג הצפנת מדיה"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "הצפנת מדיה הינה מנדטורית"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "הגדרות רשת תקשורת"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "אפשר"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "נטרל"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "קודקים"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>שפה</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "הצג הגדרות מתקדמות"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>רמה</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "ממשק משתמש"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>הבניית חשבון LDAP</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "סיום"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "‫Linphone - נדרש אימות"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "נא להזין את סיסמת המתחם"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "כעת מגדיר..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "ברוך בואך אל אשף הגדרת החשבון"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "צור חשבון אצל linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "כבר קיים חשבון linphone.org ברשותי וברצוני לעשות בו שימוש"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "כבר קיים חשבון sip ברשותי וברצוני לעשות בו שימוש"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "אשף הגדרת חשבון"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "שם משתמש*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "סיסמה*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "מתחם*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "פרוקסי"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "הגדרת חשבונך (צעד 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "הזן את שם משתמשך אצל linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "הזנת שם משתמש sip (צעד 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) שדות חובה"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "דוא״ל: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "שם משתמש: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "סיסמה: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "אימות סיסמתך: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "הזנת מידע חשבון (צעד 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "נא לאמת את חשבונך באמצעות הקלקה על הקישור ששלחנו לך עתה באמצעות דוא״ל.\nאחרי כן נא לחזור לכאן וללחוץ על הלחצן 'קדימה'."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "אימות (צעד 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "שגיאה, חשבון לא אומת, שם משתמש כבר בשימוש או שרת לא ניתן להשגה.\nנא לחזור ולנסות שוב."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "שגיאה"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "תודה לך. חשבונך מוגדר ומוכן לשימוש כעת."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "‫Linphone - הגדרת חשבון ‫SIP"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "זהות ה־SIP שלך:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "נראה כמו ‪sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "כתובת SIP Proxy:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "נראה כמו ‪sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "משך רישום (בשניות):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "ניתוב (רשות):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "טרנספורט"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "רישום"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "פרסם מידע נוכחות"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "אפשר AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "הגדרת חשבון ‫SIP"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "הגדר תיעול VoIP"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "מארח"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "פורט"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>הגדר מינהור</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>הגדר http proxy (רשות)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "נא להמתין"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "מוכן"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
-msgstr ""
+msgstr "תצורה"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "מתקשר כעת"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "לא ניתן להתקשר"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "הגענו אל המספר המרבי של שיחות מקבילות, עמך הסליחה"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "מתקשר/ת אליך"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr " ומבקש/ת מענה אוטומטי."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "מתאים כעת פרמטרים של שיחה..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "מקושר."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "קריאה בוטלה"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "לא ניתן להשהות את השיחה"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "משהה כעת שיחה נוכחית..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "בדיקת STUN מצויה כעת בעיצומה..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "צבירת מועמדים מקומיים של ICE מצויה כעת בעיצומה..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "מקוון"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "כבר אשוב"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "נעדר"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "בטלפון"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "בארוחת צהריים"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "נא לא להפריע"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "עברתי דירה"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "אני עושה כעת שימוש בשירות מסרים אחר"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "לא מקוון"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "בהמתנה"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
-msgstr ""
+msgstr "חופשה"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
-msgstr ""
+msgstr "מצב לא ידוע"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
+msgstr "כתובת sip proxy שהזנת הינה שגויה, זו צריכה להתחיל עם‭\"sip:\" ‬ לאחר שם מארח."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"זהות sip שהוזנה הינה שגויה.\n"
-"זו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
+msgstr "זהות sip שהוזנה הינה שגויה.\nזו צריכה להיראות כמו sip:username@proxydomain, למשל sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "מחפש כעת עבור יעד מספר טלפון..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "לא ניתן לפתור את מספר זה."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "לא ניתן להתחבר בזהות %s"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "צלצול מרוחק."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "צלצול מרוחק..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "מדיה מוקדמת."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "שיחה עם %s מושהית."
+msgid "Call answered by %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "קריאה נענתה על ידי %s - בהמתנה."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "קריאה חודשה."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "קריאה נענתה על ידי %s."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr "חוסר תאימות, בדוק קודקים או הגדרות אבטחה..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "פרמטריי מדיה חסרי תואמים."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "חזרנו."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "אנו מושהים על ידי צד אחר."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "שיחה עודכנה מרחוק."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "קריאה הסתיימה."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "משתמש עסוק כעת."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "משתמש לא זמין זמנית."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "משתמש לא מעוניין שיפריעו לו."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "קריאה סורבה."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "מכוון מחדש"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "קריאה נכשלה."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "רישום אצל %s הושלם בהצלחה."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "אי רישום אצל %s סוים."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "אין היענות תוך זמן מוגדר"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "רישום אצל %s נכשל: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "אות האימות הינה %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "החמצת שיחה %i."
 msgstr[1] "החמצת %i שיחות."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2084,11 +2080,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index dc1155db5..bee6d8fdf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,80 +1,88 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Free Bill <commodum@justemail.net>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/hu/)\n"
-"Language: hu\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Hungarian (http://www.transifex.com/belledonne-communications/linphone-gtk/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "%s hívása"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Szöveg küldése a következőnek: %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Legutóbbi hívások"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr ""
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "-"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Megszakítva"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Nem fogadott"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Elutasítva"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i perc"
+msgstr[1] "%i perc"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i másodperc"
+msgstr[1] "%i másodperc"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
+msgstr "<small><i>%s</i>\t<i>Minőség: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/in_call_frame.ui.h:11
 msgid "Conference"
@@ -89,51 +97,57 @@ msgstr "én"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nemtalálható a pixmap fájl: %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "Futás közben némi hibakeresési információ az stdout-ra naplózása."
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "fájl elérési útja, melybe a naplók kerülnek."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Linphone indítása, videó kikpacsolva. "
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Csak a tálcaikon indítása, ne mutassa a fő ablakot."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "Cím azonnali híváshoz"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne "
-"lennie, pl. C:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Adjon meg egy munkakönyvtárat (ennek az installációs könyvtárnak kéne lennie, pl. C:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -141,8 +155,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -153,256 +166,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Hiba a hívás közben"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Hívás vége"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Beérkező hívás"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Hívás fogadása"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Elutasítás"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Hívás várakoztatva"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>a következő által: %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s szerené elidítani a videót. Elfogadja?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Internetes oldal"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Alapértelmezett)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Át vagyunk irányítva ide: %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Hangkártya nincs érzékelve ezen a számítógépen.\n"
-"Nem fog tudni hang hívásokat küldeni vagy fogadni."
+msgstr "Hangkártya nincs érzékelve ezen a számítógépen.\nNem fog tudni hang hívásokat küldeni vagy fogadni."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Egy ingyenes SIP video-telefon"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Hozzáadás címjegyzékhez"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Jelenlét státusz"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Név"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Hivás"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Csevegés"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Keresés ebben a könyvtárban: %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Érvénytelen sip partner !"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Kapcsolatinformációk szerkesztése: '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "'%s' partner törlése"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Új partner hozzáadása ebből a könyvtárból: %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Név"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Érték (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Állapot"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Paraméterek"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Tiltva"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "angol"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "francia"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "svéd"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "olasz"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "spanyol"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "brazil-portugál"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "lengyel"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "német"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "orosz"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "japán"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "holland"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "magyar"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "cseh"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "egyszerúsített kínai"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "tradícionális kínai"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "norvég"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "héber"
 
-#: ../gtk/propertybox.c:1186
-msgid "Serbian"
-msgstr ""
-
 #: ../gtk/propertybox.c:1187
-msgid "Arabic"
-msgstr ""
+msgid "Serbian"
+msgstr "szerb"
 
 #: ../gtk/propertybox.c:1188
-msgid "Turkish"
-msgstr ""
+msgid "Arabic"
+msgstr "arab"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "török"
+
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre "
-"jusson. "
+msgstr "Újra kell indítania a linphone-t, hogy az új nyelv kiválasztása érvényre jusson. "
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Nincs"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -411,9 +413,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Elérhető egy újabb verzió a következőn: %s.\n"
-"Szeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?"
+msgstr "Elérhető egy újabb verzió a következőn: %s.\nSzeretné, hogy a letöltéshez egy új böngésző ablak nyíljon?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -446,348 +446,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Fiók létrehozása a linphone.org -on"
-
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Már rendelkezem linphone.org fiókkal, azt szeretném használni"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "Már rendelkezem sip fiókkal, azt szeretném használni"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Felhasználónév*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Jelszó*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Tartomány"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Adja meg linphone.org felhasználónevét"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Felhasználónév:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Jelszó:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Mező kitöltése szükséges"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Felhasználónév: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Jelszó: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "E-mail: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Jelszó megerősítése: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött "
-"hivatkozásra kattintva.\n"
-"Azután térjen vissza ide és kattintson a Következő gombra."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet "
-"vagy a kiszolgáló nem elérhető.\n"
-"Kérjük, lépjen vissza és próbálja újra."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Köszönjük! Az Ön fiókját beállítottuk és használatra kész."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "A fiók beállítása varázsló üdvözli Önt"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Fiók beállítása varázsló"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Az Ön fiókjának beállítása (1/1 lépés)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Adja meg sip felhasználónevét (1/2 lépés)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Adja meg a fiókinformációt (1/2 lépés)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Érvényesítés (2/2 lépés)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Hiba"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Befejezés"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "Hívás #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Átirányítás #%i híváshoz ezzel: %s "
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Nem használt"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE nincs aktiválva"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ICE nem sikerült"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ICE folyamatban"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Átmegy egy vagy több NAT-on"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "Közvetlen"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Közvetítő kiszolgálón keresztül"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnP nincs aktiválva"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "uPnP folyamatban"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnP nem elérhető"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP fut"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "uPnP nem sikerült"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "közvetlen vagy kiszolgálón keresztül"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"letöltés: %f\n"
-"feltöltés: %f (kbit/mp)"
+msgstr "letöltés: %f\nfeltöltés: %f (kbit/mp)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f másodperc"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Befejezés"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Hívás folyamatban...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Beérkező hívás</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "jó"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "közepes"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "gyenge"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "nagyon gyenge"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "rossz"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "nem elérhető"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "SRTP-vel titkosítva"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr ""
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "ZRTP-vel titkosítva - [hitelesítési jel: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Beállítás ellenőrizetlenként"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Beállítás ellenőrzöttként"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "Konferencián"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>vonalban</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Várakoztatott hívás</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Hívás vége.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Átvitel folyamatban"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Átvitel befejezve."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Az átvitel sikertelen."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Visszatérés"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Várakoztatás"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Felvétel a következőbe\n"
-"%s %s</i></small>"
+msgstr "<small><i>Felvétel a következőbe\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(Várakoztatva)"
 
@@ -816,7 +667,7 @@ msgstr ""
 
 #: ../gtk/audio_assistant.c:105
 msgid "Good"
-msgstr ""
+msgstr "Jó"
 
 #: ../gtk/audio_assistant.c:106
 msgid "Too loud"
@@ -826,175 +677,88 @@ msgstr ""
 msgid "Did you hear three beeps ?"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Minden felhasználó"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Elérhető"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Fiber csatorna"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Alapértelmezett"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Törlés"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Beállítások"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Videó indítása mindig"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Saját nézet"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Segítség"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Hibakeresési ablak mutatása"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Honlap"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Frissítések keresése"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Fiók varázsló"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "Adja meg a SIP címet vagy a telefonszámot:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Új hívás kezdeményezése"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Partnerek"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Keresés"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Partnerek hozzáadása könyvtárból</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Partner hozzáadása"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Legutóbbi hívások"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Jelenlegi identitásom:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Befejezés"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1006,9 +770,7 @@ msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt "
-"használja."
+msgstr "Internetes videó telefon, mely a szabványos SIP (rfc3261) protokolt használja."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1026,486 +788,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP cím"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "A partner jelenlétének mutatása"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Megengedem ennek a partnernek, hogy lássa a jelenlétemet"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Partner információ</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone Hibakereső Ablak"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Görgetés a végéhez"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Hitelesítés szükséges"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Kérem adja meg a tartomány jelszavát"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "Felhasználó azonosító"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Híváselőzmények"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Mind törlése"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Visszahívás"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - SIP fiók beállítása"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Az Ön SIP azonosítója:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Így néz ki: sip:<felhasznalonev>@<tartomany>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP Proxy cím:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Így néz ki: sip:<proxy hosztnév>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Regisztrálási Időköz (mp):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Út (nem kötelező):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Regisztráció"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Jelenléti információ közlése"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "SIP fiók beállítása"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "alapértelmezett hangkártya"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "egy hangkártya"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "alapértelmezett kamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Audió kódekek"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Videó kódekek"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Beállítások"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Ez a rész határozza meg az Ön SIP címét, amikor nem használ SIP fiókot"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Az Ön megjelenített neve (pl. Kis József):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Az Ön felhasználóneve:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Az Ön így keletkezett SIP címe:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Alapértelmezett identitás</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Varázsló"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Eltávolítás"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy fiókok</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Minden kulcsszó törlése"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Titoktartás</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "SIP fiókok beállítása"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Csengőhang:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Különleges ALSA eszköz (nem kötelező):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Felvevő hang eszköz:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Csengőhang eszköz:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Lejátszó hang eszköz:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Visszhang-elnyomás engedélyezése"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Audió</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Videó bemeneti eszköz:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "A 0 jelentése \"végtelen\""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Videó</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Feltöltési sebesség korlát (kbit/mp):"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Letöltési sebesség korlát (kbit/mp):"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Alkalmazkodó mérték-szabályozás engedélyezése"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja "
-"megállapítani a rendelkezésre álló sávszélességet hívás alatt.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Sávszélesség szabályozása</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Multimédia beállítások"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Maximum Továbbítási Egység beállítása:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "DTMF küldése SIP infóként"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Átvitel</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Audió RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Javítva"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Videó RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Média titkosítás típusa"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Média titkosítás kötelező"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Alagút"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "DSCP mezők"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Hálózati protokoll és port</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Közvetlen Internet kapcsolat"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "NAT / tűzfal mögött (STUN használata a feloldáshoz)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "NAT / tűzfal mögött (ICE használata)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "NAT / tűzfal mögött (uPnP használata)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Publikus IP cím:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "STUN kiszolgáló:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT és tűzfal</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Hálózati beállítások"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Engedélyezés"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Tiltás"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Kódekek"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Nyelv</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Haladó beállítások megjelenítése"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Szint</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Felhasználói környezet"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Kész"
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr "Partnerek keresése könyvtárban"
@@ -1518,29 +800,21 @@ msgstr "Hozzáadása a listámhoz"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Keres valakit</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Kérem várjon"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Hívott neve</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr ""
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Híváselőzmények"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Mind törlése"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "Audió RTP folyam"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "Videó RTP folyam"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>DSCP értékek beállítása (hexadecimális)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Visszahívás"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1590,38 +864,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>Hívási statisztika és információ</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "VoIP alagút beállítása"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Küld"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Hoszt"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Konferencia vége"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Port"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Alagút beállítása</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Felhasználónév"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP cím"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Jelszó"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "A partner jelenlétének mutatása"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>http proxy beállítása (nem kötelező)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Megengedem ennek a partnernek, hogy lássa a jelenlétemet"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Partner információ</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Audió RTP folyam"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Videó RTP folyam"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>DSCP értékek beállítása (hexadecimális)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Beszélgetés felvétele hangfájlba"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Videó"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Elnémítás"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Átvitel"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "vonalban"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Időtartam"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Hívásminőség"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Felhasználónév:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Jelszó:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1707,70 +1055,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Felhasználónév"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Küld"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Hívott neve</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Konferencia vége"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Beszélgetés felvétele hangfájlba"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Videó"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Elnémítás"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Átvitel"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "vonalban"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Időtartam"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Hívásminőség"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Jelszó"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1780,6 +1071,10 @@ msgstr "Internet kapcsolat:"
 msgid "Automatically log me in"
 msgstr "Jelentkeztessen be automatikusan"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Felhasználó azonosító"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Bejelentkezési információ"
@@ -1788,294 +1083,990 @@ msgstr "Bejelentkezési információ"
 msgid "<b>Welcome!</b>"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fiber csatorna"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone Hibakereső Ablak"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Görgetés a végéhez"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Törlés"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Beállítások"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Videó indítása mindig"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Saját nézet"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Segítség"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Hibakeresési ablak mutatása"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Honlap"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Frissítések keresése"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Fiók varázsló"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "Adja meg a SIP címet vagy a telefonszámot:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Új hívás kezdeményezése"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Partnerek"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Keresés"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Partnerek hozzáadása könyvtárból</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Partner hozzáadása"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Jelenlegi identitásom:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "alapértelmezett hangkártya"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "egy hangkártya"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "alapértelmezett kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Audió kódekek"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Videó kódekek"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Beállítások"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Ez a rész határozza meg az Ön SIP címét, amikor nem használ SIP fiókot"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Az Ön megjelenített neve (pl. Kis József):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Az Ön felhasználóneve:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Az Ön így keletkezett SIP címe:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Alapértelmezett identitás</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Varázsló"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Hozzáadás"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Eltávolítás"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Proxy fiókok</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Minden kulcsszó törlése"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Titoktartás</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "SIP fiókok beállítása"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Csengőhang:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Különleges ALSA eszköz (nem kötelező):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Felvevő hang eszköz:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Csengőhang eszköz:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Lejátszó hang eszköz:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Visszhang-elnyomás engedélyezése"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Audió</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Videó bemeneti eszköz:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "A 0 jelentése \"végtelen\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Videó</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Feltöltési sebesség korlát (kbit/mp):"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Letöltési sebesség korlát (kbit/mp):"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Alkalmazkodó mérték-szabályozás engedélyezése"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Az alkalmazkodó mérték-szabályozás egy módszer, mely erőteljesen próbálja megállapítani a rendelkezésre álló sávszélességet hívás alatt.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Sávszélesség szabályozása</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Multimédia beállítások"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Maximum Továbbítási Egység beállítása:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "DTMF küldése SIP infóként"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Átvitel</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Audió RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Javítva"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Videó RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Alagút"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP mezők"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Hálózati protokoll és port</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Közvetlen Internet kapcsolat"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "NAT / tűzfal mögött (STUN használata a feloldáshoz)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "NAT / tűzfal mögött (ICE használata)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "NAT / tűzfal mögött (uPnP használata)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Publikus IP cím:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "STUN kiszolgáló:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT és tűzfal</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Média titkosítás típusa"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Média titkosítás kötelező"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Hálózati beállítások"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Engedélyezés"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Tiltás"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Kódekek"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Nyelv</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Haladó beállítások megjelenítése"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Szint</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Felhasználói környezet"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Kész"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Hitelesítés szükséges"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Kérem adja meg a tartomány jelszavát"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "A fiók beállítása varázsló üdvözli Önt"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Fiók létrehozása a linphone.org -on"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Már rendelkezem linphone.org fiókkal, azt szeretném használni"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Már rendelkezem sip fiókkal, azt szeretném használni"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Fiók beállítása varázsló"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Felhasználónév*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Jelszó*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Tartomány"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Az Ön fiókjának beállítása (1/1 lépés)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Adja meg linphone.org felhasználónevét"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Adja meg sip felhasználónevét (1/2 lépés)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Mező kitöltése szükséges"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "E-mail: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Felhasználónév: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Jelszó: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Jelszó megerősítése: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Adja meg a fiókinformációt (1/2 lépés)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Kérjük, érvényesítse fiókját az általunk elektronikus levélben küldött hivatkozásra kattintva.\nAzután térjen vissza ide és kattintson a Következő gombra."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Érvényesítés (2/2 lépés)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Hiba, a fiók nincs érvényesítve. Valaki már használja ezt a felhasználónevet vagy a kiszolgáló nem elérhető.\nKérjük, lépjen vissza és próbálja újra."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Hiba"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Köszönjük! Az Ön fiókját beállítottuk és használatra kész."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - SIP fiók beállítása"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Az Ön SIP azonosítója:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Így néz ki: sip:<felhasznalonev>@<tartomany>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP Proxy cím:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Így néz ki: sip:<proxy hosztnév>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Regisztrálási Időköz (mp):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Út (nem kötelező):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Regisztráció"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Jelenléti információ közlése"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "SIP fiók beállítása"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "VoIP alagút beállítása"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Hoszt"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Port"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Alagút beállítása</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>http proxy beállítása (nem kötelező)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Kérem várjon"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Kész"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Kapcsolódás"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Nem sikerült hívni"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Elnézést, elértük a egyidejű hívások maximális számát"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "kapcsolatba lépett veled."
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "és automatikus választ kért."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "A hívási jellemzők módosítása..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Kapcsolódva."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Hívás megszakítva"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "Nem sikerült várakoztatni a hívást"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Jelenlegi hívás várakoztatásának aktiválása..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "Stun keresés folyamatban..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "ICE helyi jelentkezők begyűjtése folyamatban..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Elérhető"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Foglalt"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Mindjárt visszajön"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Nem elérhető"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "Vonalban"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "Ebédelni ment"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Ne zavarj"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Elment"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Másik üzenő szolgáltatás használata"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Nem elérhető"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Függőben"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, "
-"ezt egy hosztnév követi."
+msgstr "Az Ön által megadott SIP proxy cím érvénytelen. \"sip:\"-tal kell kezdődnie, ezt egy hosztnév követi."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Az Ön által megadott SIP identitás érvénytelen.\n"
-"Így kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:"
-"aladar@pelda.hu"
+msgstr "Az Ön által megadott SIP identitás érvénytelen.\nÍgy kéne kinéznie: sip:felhasznalonev@proxytartomany, például sip:aladar@pelda.hu"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Telefonszám-cél keresése..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Nem sikkerült értelmezni a számot."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Nem sikerült belépni ezzel: %s"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Távoli csengés."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "Távoli csengés..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Korai médiák."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "A hívás a következővel: %s várakoztatva"
+msgid "Call answered by %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "%s fogadta a hívást - várakoztatva."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Hívás visszatért"
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "%s válaszolt a hívásra."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
-"Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
+msgstr "Nem kompatibilis, ellenőrizze a kódek- vagy a biztonsági beállításokat..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "Nem kompatibilis médiajellemzők."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "Visszatértünk."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "Megállítva a másik fél által."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "A hívás távolról frissítve."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "A hívás befejezve."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "A felhasználó foglalt."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "A felhasználó ideiglenesen nem elérhető"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "A felhasználó nem akarja, hogy zavarják."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Hívás elutasítva"
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Átirányítva"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Nem sikerült a hívás."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "A regisztáció a %s -n sikerült."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "A kiregisztrálás kész a következőn: %s ."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "időtúllépés után nincs válasz"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "A regisztáció a %s -n nem sikerült: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Hitelesítési jel: %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2085,11 +2076,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 12b147d6d..63dc17acb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,79 +1,86 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Daniele <inactive+dforsi@transifex.com>, 2015
 # Fabrizio Carrai, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-08-03 18:31+0000\n"
-"Last-Translator: Fabrizio Carrai\n"
-"Language-Team: Italian (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/it/)\n"
-"Language: it\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Italian (http://www.transifex.com/belledonne-communications/linphone-gtk/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Chiama %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
-msgstr "Invia testo a %s"
+msgstr "Invia messaggio a %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Aggiungi %s alla tua lista dei contatti"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Chiamate recenti"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>Chiamate recenti (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "n/d"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Annullata"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Persa"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Rifiutata"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minuti"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i secondo"
 msgstr[1] "%i secondi"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Qualità: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Qualità: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -91,53 +98,57 @@ msgstr "Me"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Impossibile trovare il file pixmap %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Invio in corso..."
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Messaggio non inviato"
+
+#: ../gtk/chat.c:498
 msgid "Copy"
-msgstr ""
+msgstr "Copia"
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
-msgstr ""
-"alcune informazioni di debug verranno registrate sullo stdout durante "
-"l'esecuzione"
+msgstr "alcune informazioni di debug verranno registrate sullo stdout durante l'esecuzione"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr "mostra la versione e termina."
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "percorso del file di log."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Avvia linphone con il video disabilitato."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Avvia solo nel system tray, non mostrare l'interfaccia principale."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "indirizzo da chiamare adesso"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Specificare una directory di lavoro (dovrebbe essere quella di "
-"installazione, es: c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Specificare una directory di lavoro (dovrebbe essere quella di installazione, es: c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "File di configurazione"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "Avvia l'assistente audio"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr "Esegui il self test e esci con 0 in caso di successo"
 
@@ -145,272 +156,256 @@ msgstr "Esegui il self test e esci con 0 in caso di successo"
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s vorrebbe aggiungerti alla sua lista dei contatti.\n"
-"Vuoi aggiungerlo/a ai tuoi contatti e pemettergli di conoscere la tua "
-"presenza?\n"
-"Se rispondi NO questa persona verrà temporaneamente bloccata."
+msgstr "%s vorrebbe aggiungerti alla sua lista dei contatti.\nVuoi aggiungerlo/a ai tuoi contatti e pemettergli di conoscere la tua presenza?\nSe rispondi NO questa persona verrà temporaneamente bloccata."
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Digitare la password per l'utente <i>%s</i>\n"
-"nel dominio <i>%s</i>:"
+msgstr "Digitare la password per l'utente <i>%s</i>\nnel dominio <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Errore durante la chiamata"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Chiamata terminata"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Risposta"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Rifiuta"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Chiamata in pausa"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>da %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s chiede di avviare il video. Accetti ?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Collegamento al sito web"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr "Un videotelefono su internet"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Siamo trasferiti verso %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Non è stata trovata nessuna scheda audio.\n"
-"Non sarà possibile effettuare o ricevere chiamate in voce."
+msgstr "Non è stata trovata nessuna scheda audio.\nNon sarà possibile effettuare o ricevere chiamate in voce."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Un videotelefono SIP free"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr "Salve\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Aggiungi alla rubrica"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Presenza"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Nome"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Chiama"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Chat"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Cerca contatti nella directory %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Contatto SIP non valido"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Aggiungi un nuovo contatto"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Modifica contatto %s"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Elimina il contatto %s"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "Cancella la cronologia della chat con '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Aggiungi nuovo contatto dalla directory %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Nome"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Frequenza (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Stato"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "IP Bitrate (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parametri"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Attivato"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Disattivato"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Account"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Inglese"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Francese"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Portoghese brasiliano"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Tedesco"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Russo"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Cinese"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Cinese tradizionale"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr "Arabo"
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Riavviare il software per utilizzare la nuova lingua selezionata"
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Nessuno"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr "DTLS"
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -419,9 +414,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Una versione più recente è disponibile su %s.\n"
-"Vuoi aprire un browser per eseguire il download ?"
+msgstr "Una versione più recente è disponibile su %s.\nVuoi aprire un browser per eseguire il download ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -454,350 +447,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] "Trovato %i contatto"
 msgstr[1] "Trovati %i contatti"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
-"Benvenuto!\n"
-"L'assistente vi aiuterà ad usare un indirizzo SIP per le vostre chiamate."
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Creare un account su linphone.org"
-
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Ho già un account su linphone.org che voglio usare."
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "Ho già un account SIP e voglio usarlo"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr "Voglio specificare un URI per la configurazione remota"
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr "Inserire i dati del vostro account"
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Nome utente*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Password*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Dominio*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Immettere il vostro nome utente su linphone.org"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Password:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Campi obbligatori"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Nome utente: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Password: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "Email: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Confermare la password: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "Mantenetemi aggiornato sugli aggiornamenti di linphone"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr "Il vostro account è stato creato, attendere."
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
-"Attivate il vostro account cin il link che vi è appena stato inviato per "
-"posta elettronica.\n"
-"Quindi tornare qui e premere il tasto \"Avanti\"."
 
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr "Verifica della validazione dell'account, attendere."
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Errore, account non valido, nome utente già in uso o server non "
-"raggiungibile.\n"
-"Tornare indietro e riprovare."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Grazie. Il tuo account è configurato e pronto all'uso"
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "Assistente per la configurazione di un account SIP"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Benvenuto nel configuratore di account"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Configuratore di account"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Configurare il tuo account (passo 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Introdurre il vostro nome utente SIP (passo 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Introdurre le informazioni dell'account (passo 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr "Creazione dell'account in corso"
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Validazione (passo 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr "Controllo della validazione dell'account in corso"
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Errore"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Terminando"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "Chiamata #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Trasferimento per chiamare #%i con %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Non usato"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE non attivato"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ICE fallito"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ICE in corso"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Attraversando uno o più NAT"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "Diretto"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Attraverso un relay server"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnP non attivo"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "uPnP in corso"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnP non disponibile"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP in esecuzione"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "uPnP ha fallito"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "Diretto o attraverso un server"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"download: %f\n"
-"upload: %f (kbit/s)"
+msgstr "download: %f\nupload: %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f fps"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f secondi"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Riagganciare"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Chiamando...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Chiamata in ingresso</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "bene"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "media"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "ridotto"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "molto poco"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "troppo brutto"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "non disponibile"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Trasmissione sicura con SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr "Trasmissione sicura con DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Trasmissione sicura con ZRTP - [auth token: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
-msgstr "Marcato con non verificato"
+msgstr "Marcato come non verificato"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Marcato come verificato"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "In conferenza"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>Chiamata in corso</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Chiamata sospesa</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Chiamata terminata.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Trasferimento in corso"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Trasferimento completato."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Trasferimento fallito."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Riprendere"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Registrare in\n"
-"%s %s</i></small>"
+msgstr "<small><i>Registrare in\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(Sospeso)"
 
@@ -836,177 +678,88 @@ msgstr "Troppo forte"
 msgid "Did you hear three beeps ?"
 msgstr "Hai sentito tre segnali ?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "Le preferenze sui suoni non sono state trovate"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "Non è possibile eseguire il controllo dell'audio di sistema"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Benvenuto!\n"
-"L'assistente ti aiuterà a configurare i settaggi audio di Linphone"
+msgstr "Benvenuto!\nL'assistente ti aiuterà a configurare i settaggi audio di Linphone"
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "Dispositivo di acquisizione"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "Volume di registrazione"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "Nessuna voce"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "Preferenze per l'audio di sistema"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "Dispositivo di riproduzione"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "Riproduci tre segnali"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "Premere il pulsante registrazione e parlare"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "Ascoltare la voce registrata"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "Registra"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "Riproduci"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
-msgstr "Ora avviamo Linphone"
+msgstr "Ora è possibile usare Linphone"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "Assistente Audio"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "Assistente Audio"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "Calibrazione del guadagano del microfono"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "Calibrazione del volume di riproduzione"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "Registra e Riproduci"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Tutti gli utenti"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Utenti in linea"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Fibra ottica"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Default"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Cancellare"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Options"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr "Imposta l' URI di configurazione"
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Avvia sempre il video"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Self-view abilitato"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Help"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Mostra la finestra di debug"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Homepage"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Check _Updates"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Assistente per l'account"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "Indirizzo sip o numero."
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Inizia una nuova chiamata"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Contatti"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Ricerca"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Aggiungi contatti dalla directory</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Aggiungi un contatto"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Chiamate recenti"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Identità corrente"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Procedura completata"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1034,501 +787,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"it: Fabrizio Carrai\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "Rubrica"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Mostra lo stato di presenza del contatto"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Permitti al contatto di vedere il mio stato di presenza"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Contact informazioni</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone debug window"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Vai in fondo"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - E' richiesta l'autenticazione"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Prego inserire la password di dominio"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "Identificativo utente"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Cronologia"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Pulisci tutto"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Richiamata"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Configurazione SIP account"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Identità SIP"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Simile a sip:<username>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "Indirizzo sip proxy:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Simile a sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Durata registrazione (sec)"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "Parametri del contatto (opzionali)"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "AVPF regular RTCP interval (sec):"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Rotta (opzionale)"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Trasporto"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Registro"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Pubblica stato della presenza"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "Abilita AVPF"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Configurazione SIP account"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "anonimo"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "default scheda audio"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "una scheda audio"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "default videocamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Codificatori audio"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Codificatori video"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr "default"
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr "high-fps"
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr "custom"
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Preferenze"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Nome visualizzato (es: Mario Rossi):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Username"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Il tuo indirizzo sip:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Identità di default</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Wizard"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Edita"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Account proxy</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Cancella tutte le password"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Privacy</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr "Rispondi automaticamente alla chiamata in arrivo"
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr "Ritardo prima della risposta (ms)"
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr "<b>Risposta automatica</b>"
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "Gestici SIP Account"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Suoneria:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Dispositivo ALSA (optional):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Dispositivo microfono:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Dispositivo squillo:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Dispositivo uscita audio:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Attiva cancellazione eco"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Dispositivo Video:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr "Risoluzione video preferita:"
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "Modalità video in uscita:"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "Mostra il preview della videocamera"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr "Preconfigurazione del video:"
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr "Frame rate video preferito:"
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 sta per illimitato"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Velocità massima in upload Kbit/sec:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Velocita massima in Dowload Kbit/sec"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Abilita il controllo adattivo del rate"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Il controllo adattivo del rate è una tecnica per la stima dinamica della "
-"banda disponibile durante una chiamata</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Gestione banda</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Impostazioni multimediali"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Imposta Maximum Transmission Unit:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Invia DTMF come SIP info"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr "Permetti IPv6"
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Transporto</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "Porta SIP/UDP"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "Casuale"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "Porta SIP/TCP"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Audio RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Fissa"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Tipo di cifratura"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "La cifratura è obbligatoria"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Tunnel"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "Campi DSCP"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Protocollo di rete e porte</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Connessione diretta a internet"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Dietro ad un NAT / Firewall (specificare IP del gateway)"
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Dietro NAT / Firewall (utilizza STUN)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Dietro ad un NAT / Firewall (usa ICE)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Dietro ad un NAT / Fiewall (usa uPnP)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Indirizzo IP pubblico:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Server STUN:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT and Firewall</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Impostazioni di rete"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Attivato"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Disattivato"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr "<b>Codificatori audio</b>"
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr "<b>Codificatori video</b>"
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Codec"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Linguaggio</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Mostra la configurazione avanzata"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Livello</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Interfaccia utente"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "Indirizzo del server:"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "Metodo di autenticazione"
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Configurazione dell' account LDAP</b>"
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Fatto"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nit: Fabrizio Carrai\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1542,29 +801,21 @@ msgstr "Aggiungi alla mia lista"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Cerca</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Prego attendere"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Nome del chiamato</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "Configurazione DSCP"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Cronologia"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Pulisci tutto"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "Stream audio RTP"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "Stream video RTP"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>Valore DSCP (in esadecimale)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Richiamata"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1614,38 +865,112 @@ msgstr "Profilo RTP"
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>Statistiche della chiamata e informazioni</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "Configurare il tunnel VoIP"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Invia"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Host"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Fine della conferenza"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Porta"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Specificare un URI per la configurazione remota"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Configurazione del tunnel</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Questo modulo permette di impostare un indirizzo http o https da cui prelevare la configurazione all'avvio.\nDi seguito inserire o modificare l' URI della configurazione. Dopo aver selezionato OK Linphone verrà automaticamente riavvato per leggere ed usare la nuova configurazione."
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Username"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "Indirizzo SIP"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Password"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Mostra lo stato di presenza del contatto"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>Configurazione del proxy http (opzionale)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Permetti al contatto di vedere il mio stato di presenza"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Informazioni sul contatto</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "Configurazione DSCP"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Stream audio RTP"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Stream video RTP"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>Valore DSCP (in esadecimale)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Selezionare qui per regolare il volume"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Registra questa chiamata su un file audio"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Video"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Silenzia"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Trasferimento"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "In chiamata"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Durata"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Giudizio della qualità della chiamata"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "Configurazione LDAP"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Indirizzo del server:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Metodo di autenticazione"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Password:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "Usa connessione TLS"
@@ -1731,75 +1056,13 @@ msgstr "DIGEST-MD5"
 msgid "NTLM"
 msgstr "NTLM"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr "Specificare un URI per la configurazione remota"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Nome utente"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"Questo modulo permette di impostare un indirizzo http o https da cui "
-"prelevare la configurazione all'avvio.\n"
-"Di seguito inserire o modificare l' URI della configurazione. Dopo aver "
-"selezionato OK Linphone verrà automaticamente riavvato per leggere ed usare "
-"la nuova configurazione."
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "Configurando..."
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr "Caricamento della configurazione dal server, attendere..."
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Invia"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Nome del chiamato</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Fine della conferenza"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Registra questa chiamata su un file audio"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Video"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Silenzia"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Trasferimento"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "In chiamata"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Durata"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Giudizio della qualità della chiamata"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Password"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1809,6 +1072,10 @@ msgstr "Connessione Internet:"
 msgid "Automatically log me in"
 msgstr "Login Automatico"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Identificativo utente"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Credenziali di accesso"
@@ -1817,292 +1084,990 @@ msgstr "Credenziali di accesso"
 msgid "<b>Welcome!</b>"
 msgstr "<b>Benvenuto!</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fibra ottica"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone debug window"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Vai in fondo"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Default"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Cancellare"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Opzioni"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Imposta l' URI di configurazione"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Avvia sempre il video"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Self-view abilitato"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Mostra il tastierino"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Aiuto"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Mostra la finestra di debug"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Homepage"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Check _Updates"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Assistente per l'account"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "Indirizzo sip o numero."
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Inizia una nuova chiamata"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Contatti"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Ricerca"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Aggiungi contatti dalla directory</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Aggiungi un contatto"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Cancella la cronologia della chiamate"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Identità corrente"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Risponditore automatico attivato"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "anonimo"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "default scheda audio"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "una scheda audio"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "default videocamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Codificatori audio"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Codificatori video"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Preferenze"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "questa sezione definisce il tuo indirizzo SIP se non hai account attivi"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Nome visualizzato (es: Mario Rossi):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Nome utente:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Il tuo indirizzo sip:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Identità di default</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Wizard"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Aggiungi"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Edita"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Account proxy</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Cancella tutte le password"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Privacy</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Rispondi automaticamente alla chiamata in arrivo"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Ritardo prima della risposta (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Risposta automatica</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Gestici SIP Account"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Suoneria:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Dispositivo ALSA (optional):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Dispositivo microfono:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Dispositivo squillo:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Dispositivo uscita audio:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Attiva cancellazione eco"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Dispositivo Video:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Risoluzione video preferita:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Modalità video in uscita:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Mostra il preview della videocamera"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Preconfigurazione del video:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Frame rate video preferito:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 sta per illimitato"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Velocità massima in upload Kbit/sec:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Velocita massima in Dowload Kbit/sec"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Abilita il controllo adattivo del rate"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Il controllo adattivo del rate è una tecnica per la stima dinamica della banda disponibile durante una chiamata</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Gestione banda</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Impostazioni multimediali"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Imposta Maximum Transmission Unit:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Invia DTMF come SIP info"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Permetti IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Transporto</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "Porta SIP/UDP"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Casuale"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "Porta SIP/TCP"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Audio RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Fissa"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "Campi DSCP"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Protocollo di rete e porte</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Connessione diretta a internet"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Dietro ad un NAT / Firewall (specificare IP del gateway)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Dietro NAT / Firewall (utilizza STUN)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Dietro ad un NAT / Firewall (usa ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Dietro ad un NAT / Fiewall (usa uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Indirizzo IP pubblico:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Server STUN:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT and Firewall</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Tipo di cifratura"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "La cifratura è obbligatoria"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Impostazioni di rete"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Attivato"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Disattivato"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Codificatori audio</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Codificatori video</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Codec"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Linguaggio</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Mostra la configurazione avanzata"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Livello</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Interfaccia utente"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>Configurazione dell' account LDAP</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Fatto"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - E' richiesta l'autenticazione"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Prego inserire la password di dominio"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Configurando..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Caricamento della configurazione dal server, attendere..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "Assistente per la configurazione di un account SIP"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Benvenuto!\nL'assistente vi aiuterà ad usare un indirizzo SIP per le vostre chiamate."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Benvenuto nel configuratore di account"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Creare un account su linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Ho già un account su linphone.org che voglio usare."
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Ho già un account SIP e voglio usarlo"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Voglio specificare un URI per la configurazione remota"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Configuratore di account"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Inserire i dati del vostro account"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Nome utente*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Password*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Dominio*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Configurare il tuo account (passo 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Immettere il vostro nome utente su linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Introdurre il vostro nome utente SIP (passo 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Campi obbligatori"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "Email: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Nome utente: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Password: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Confermare la password: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Mantenetemi aggiornato sugli aggiornamenti di linphone"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Introdurre le informazioni dell'account (passo 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Il vostro account è stato creato, attendere."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Creazione dell'account in corso"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Attivate il vostro account cin il link che vi è appena stato inviato per posta elettronica.\nQuindi tornare qui e premere il tasto \"Avanti\"."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Validazione (passo 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Verifica della validazione dell'account, attendere."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Controllo della validazione dell'account in corso"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Errore, account non valido, nome utente già in uso o server non raggiungibile.\nTornare indietro e riprovare."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Errore"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Grazie. Il tuo account è configurato e pronto all'uso"
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Configurazione SIP account"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Identità SIP"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Simile a sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "Indirizzo sip proxy:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Simile a sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Durata registrazione (sec)"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Parametri del contatto (opzionali)"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF regular RTCP interval (sec):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Rotta (opzionale)"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Trasporto"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Registro"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Pubblica stato della presenza"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Abilita AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Configurazione SIP account"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Configurare il tunnel VoIP"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Host"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Porta"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Configurazione del tunnel</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Configurazione del proxy http (opzionale)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Prego attendere"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Pronto"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr "Configurando"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "In connessione"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Impossibile chiamare"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Spiacenti, è stato raggiunto il massimo numero di chiamate simultanee"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "ti sta contattando"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "e ha richiesto la risposta automatica"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Modificando i parametri di chiamata..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Connessione"
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Chiamata annullata"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "Impossibile sospendere la chiamata"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Sospensione della chiamata in corso..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "Ricerca Stun in progresso ..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "Raccolta dei candidati ICE locali in corso..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
-msgstr "Onlinea"
+msgstr "In linea"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Torno subito"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Assente"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "Al telefono"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "Fuori per pranzo"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
-msgstr "Mosso"
+msgstr "Trasferito"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
-msgstr "Utilizza una altro servizio di meesaggistica"
+msgstr "Utilizza una altro servizio di messaggistica"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Offline"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Pendente"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "Assente"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "Stato sconosciuto"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" "
-"seguito dall' hostaname."
+msgstr "L'indirizzo sip proxy utilizzato è invalido, deve iniziare con  \"sip:\" seguito dall' hostaname."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"L'identità sip utilizza è invalida.\n"
-"Dovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
+msgstr "L'identità sip utilizza è invalida.\nDovrebbre essere sip:username@proxydomain, esempio: sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Ricerca numero destinazione..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Impossibile risolvere il numero."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "impossibile login come %s"
 
-#: ../coreapi/proxy.c:1494
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1522
+#, c-format
 msgid "Refreshing on %s..."
-msgstr "prelevando da %s"
+msgstr "Aggiornamento da %s..."
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Il chiamato sta squillando."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "Il chiamato sta squillando..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Early media."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "La chiamata con %s è stata sospesa."
+msgid "Call answered by %s"
+msgstr "Risposta da  %s."
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Chiamata con %s - in attesa."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Prosecuzione della chiamata."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "Risposta da  %s."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Incompatibile, controllare i codecs o i parametri della sicurezza..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "Parametri di comunicazione incompatibili."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "La comunicazione è stata ripresa."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "L'interlocutore ci ha messi in attesa."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "Aggiornamento della chiamata dalla parte remota."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Chiamata terminata."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Utente occupato"
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Utente non disponibile"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "L'utente non vuole essere disturbato"
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Chiamata rifiutata"
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "Richiesta scaduta"
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Trasferito"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Chiamata non riuscita."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrazione su %s attiva"
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Unregistrazione su %s"
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "timeout no risposta"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrazione su %s fallita: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr "Servizio non disponibile, nuovo tentativo in corso"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Il codice di autenticazione è %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "I parametri della chiamata sono stati modificati con successo: %s."
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr "I parametri della chiamata sono stati modificati con successo."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "%i chiamata persa."
 msgstr[1] "%i chiamate perse."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr "annulata"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr "completata"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr "persa"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2110,18 +2075,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
-"%s a %s\n"
-"Da: %s\n"
-"A: %s\n"
-"Stato: %s\n"
-"Durata: %i min %i sec\n"
+msgstr "%s a %s\nDa: %s\nA: %s\nStato: %s\nDurata: %i min %i sec\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr "chiamata in uscita"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr "Impossibile riprodurre %s."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index c0d7b5838..851003f4e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alexander, 2014
 # Alexander, 2014-2015
@@ -9,71 +9,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/ja/)\n"
-"Language: ja\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/belledonne-communications/linphone-gtk/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "%s を呼び出し中"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "%s に文章を送信"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "%sを連絡先に追加"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "通話時間"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>通話時間 (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "n/a"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "中断"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "失敗"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "辞退"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i 秒"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>⇥<i>品質: %s</i></small>\n"
-"%s⇥%s⇥"
+msgstr "<small><i>%s</i>⇥<i>品質: %s</i></small>\n%s⇥%s⇥"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>⇥%s"
@@ -91,316 +96,314 @@ msgstr "自分"
 msgid "Couldn't find pixmap file: %s"
 msgstr "pixmapファイルが見つかりません %s"
 
-#: ../gtk/chat.c:493
-msgid "Copy"
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "コピー"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "実行中にいくつかのデバッグ情報をstdoutに送信します。"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
-msgstr ""
+msgstr "バージョン表示と退出"
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "ログを書き込むファイルへのパス。"
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "ビデオを無効にしてLinphoneを開始します。"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "主なインターフェイスを表示しないでシステムトレイに移動します。"
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "今すぐに呼び出す"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。"
-"例:c:\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "作業ディレクトリをSpecifiy (インストールした時のベースである必要があります。例:c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "設定ファイル"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "オーディオアシスタントを実行"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
-msgstr ""
+msgstr "セルフテストは0で終了したら成功です"
 
 #: ../gtk/main.c:1058
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
+msgstr "相手が自分の連絡先に%sを追加したいそうです。\nあなたが自分の連絡先に相手を追加したらできるようになり相手のステータスも表示されるようになります。\n拒否した場合その相手は一時的にブラックリストに登録されます。"
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
+msgstr "パスワードを入力してください <i>%s</i>\nrealm <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "呼出エラー"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "呼出終了"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "着信"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "応答"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "拒否"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "呼び出しの一時停止"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>%s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
+msgstr "%sがテレビ電話をしたいそうですが受け入れますか？"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "ウェブサイトリンク"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
-msgstr ""
+msgstr "テレビ電話"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (デフォルト)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "%s に転送しました"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
+msgstr "サウンドカードが検出されていません。\n音声通話の送受信はできません。"
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "無料 SIP ビデオ-電話"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
-msgstr ""
+msgstr "こんにちは\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "電話帳に追加する"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "状態のステータス"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "名前"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "通話"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "チャット"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "%s のディレクトリ内を検索"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "無効なSIP接続です！"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "新しい連絡先を追加する"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "'%s' の連絡先を編集"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "'%s' の連絡先を削除"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "'%s' のチャット履歴を削除"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
-msgstr ""
+msgstr "フォルダ %s から連絡先を追加する"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "名前"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "レート (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "状態"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "IP ビットレート (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "パラメーター"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "使用する"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "使用しない"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "アカウント"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "English"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Français"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Español"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Português do Brasil"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polski"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Deutsch"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Pусский"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "čeština"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "简体中文"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Cрпски"
 
-#: ../gtk/propertybox.c:1187
-msgid "Arabic"
-msgstr ""
-
 #: ../gtk/propertybox.c:1188
-msgid "Turkish"
-msgstr ""
+msgid "Arabic"
+msgstr "アラビア語"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "トルコ語"
+
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "言語の選択を有効にするには、 Linphoneを再起動する必要があります。"
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "なし"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
-msgid "DTLS"
-msgstr ""
-
 #: ../gtk/propertybox.c:1342
+msgid "DTLS"
+msgstr "DTLS"
+
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -409,9 +412,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"%s よりも新しいバージョンが利用可能です。\n"
-"ダウンロードするために、ブラウザを開きますか？"
+msgstr "%s よりも新しいバージョンが利用可能です。\nダウンロードするために、ブラウザを開きますか？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -443,358 +444,211 @@ msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "%i 件発見"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"ようこそ！\n"
-"あなたの通話のためのSIPアカウント設定をお手伝いします。"
-
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "linphone.orgのアカウントを作成"
-
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "linphone.orgのアカウントを持っているのでそれを使います"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "SIPアカウントを持っているのでそれを使います"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "ユーザー名*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "パスワード*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "ドメイン*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "プロキシ*"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "linphone.orgで取得したユーザー名を入力"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "ユーザー名:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "パスワード:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) 必須"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "ユーザー名: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "パスワード: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "メールアドレス: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "パスワードを再入力: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "アップデートでLinphoneを常に最新にする"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"送信されたメールの本文内にあるリンクをクリックしてアカウントを有効にしてくだ"
-"さい。\n"
-"その後こちらへ戻って「次へ」を押してください。"
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-"ありがとう。あなたのアカウントは無事に設定され、使用する準備ができました。"
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "SIPアカウント設定アシスタント"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "アカウント設定アシスタントへようこそ"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "アカウント設定アシスタント"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "アカウントを設定します (1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "SIPのユーザー名を入力してください (1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "アカウント情報を入力してください (1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "検証します (2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "エラー"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "終了"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "呼び出し #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
-msgstr ""
+msgstr "通話 #%i を %s に転送する"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "使用しない"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE 未認証"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ICE 失敗"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ICE 進行中"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
-msgstr ""
+msgstr "NATを通ります"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "直接"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "間接的にリレーサーバーを使う"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnPは作動しておりません"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "uPnPを使用中"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnPは利用できません"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP作動中"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "uPnP失敗"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
-msgstr ""
+msgstr "直接またはサーバー経由"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"ダウンロード： %f\n"
-"アップロード： %f (kbit/s)"
+msgstr "ダウンロード： %f\nアップロード： %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f fps"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f 秒"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
-msgstr ""
+msgstr "電話を切る"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>かけています…</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>着信</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "良い"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "アベレージ"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "悪い"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "非常にプアな"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "非常にバッドな"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "利用できません"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "SRTPのセキュリティ"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
-msgstr ""
+msgstr "DTLSセキュリティ"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "ZRTP によるセキュリティ - [auth token: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "セット未検証"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "セット検証済"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "会議で"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>呼び出し中</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>呼び出し停止</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>呼び出し終了</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "進行中の転送"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "転送完了。"
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "転送失敗。"
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "レジューム"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
+msgstr "<small><i>記録\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(停止中)"
 
 #: ../gtk/loginframe.c:75
 #, c-format
 msgid "Please enter login information for %s"
-msgstr ""
+msgstr "%sの情報はログインしてご確認ください"
 
 #: ../gtk/config-fetching.c:57
 #, c-format
 msgid "fetching from %s"
-msgstr ""
+msgstr "%sからのフェッチ"
 
 #: ../gtk/config-fetching.c:73
 #, c-format
@@ -821,175 +675,88 @@ msgstr "大きい"
 msgid "Did you hear three beeps ?"
 msgstr "3回のビープ音が聞こえましたか？"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "音声の設定が見つかりません"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "音声制御システムを起動できません"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "キャプチャーデバイス"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "録音音量"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "音声なし"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "システムサウンド設定"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "3回分のビープ音を再生する"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "録音した音声を聞く"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "録音"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "再生"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "Linphoneをはじめる"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "音声アシスタント"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "音声アシスタント"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "マイクのゲイン測定"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "スピーカーの音量測定"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "録音して再生"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "すべての利用者"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "オンラインの利用者"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr ""
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "デフォルト"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "削除"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_オプション"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "いつでもビデオをスタートする"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "セルフビューを有効にする"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_ヘルプ"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "デバッグウインドウを見る"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_ホームページ"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "チェック _アップデート"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "アカウントのアシスタント"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SIPアドレスもしくは電話番号："
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr ""
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr ""
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "検索"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "連絡相手に追加する"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr ""
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "終了"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1001,9 +768,7 @@ msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"インターネットによる動画送信には標準的なSIPプロトコル (rfc3261) を使用してい"
-"ます。"
+msgstr "インターネットによる動画送信には標準的なSIPプロトコル (rfc3261) を使用しています。"
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1019,497 +784,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIPアドレス"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr ""
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphoneデバッグウインドウ"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "ユーザーID"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "呼出履歴"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "すべて消去する"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP プロキシ:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "転送"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "登録"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "パブリッシュ情報"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "AVPFを有効にする"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "anonymous"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "サウンドカード"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "デフォルトのカメラ"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "オーディオのコーデック"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "ビデオのコーデック"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "設定"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "あなたの表示名 (例: John Doe):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "あなたのユーザー名:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "ウィザード"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "追加する"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "編集する"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "削除する"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "プロキシアカウント"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "すべてのパスワードを消去する"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>プライバシー</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "鳴動音:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "エコーキャンセラーを有効にする"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>オーディオ</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>ビデオ</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "アップロード速度制限 Kbit/sec:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "ダウンロード速度制限 Kbit/sec:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>帯域幅制御</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "マルチメディア設定"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "DTMFをSIP情報で送信する"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>転送</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "SIP/UDP ポート"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "SIP/TCP ポート"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "オーディオ RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "ビデオ RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "メディアの暗号化の種類"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "トンネル"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "DSCP値"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>ネットワークのプロトコルとポート</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "パブリック IP アドレス:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Stunサーバー:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT と ファイヤーウォール</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "ネットワーク設定"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "使用する"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "使用しない"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "コーデック"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>言語</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "拡張設定を表示する"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>レベル</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "ユーザーインターフェイス"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "サーバーアドレス:"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "完了"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1523,28 +798,20 @@ msgstr ""
 msgid "<b>Search somebody</b>"
 msgstr ""
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "お待ちください"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "DSCP設定"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "呼出履歴"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "すべて消去する"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "オーディオのRTP"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "ビデオのRTP"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
@@ -1577,7 +844,7 @@ msgstr "接続しているビデオ用メディア"
 
 #: ../gtk/call_statistics.ui.h:8
 msgid "Round trip time"
-msgstr ""
+msgstr "RTT"
 
 #: ../gtk/call_statistics.ui.h:9
 msgid "Video resolution received"
@@ -1595,38 +862,112 @@ msgstr "RTPプロファイル"
 msgid "<b>Call statistics and information</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "送信"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "会議を終了する"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "ホスト"
-
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "ポート"
-
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "ユーザー名"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIPアドレス"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "パスワード"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr ""
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "DSCP設定"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "オーディオのRTP"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "ビデオのRTP"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "この通話をファイルに録音する"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "ビデオ"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "消音"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "転送"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "着信"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "期限"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "LDAP設定"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "サーバーアドレス:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "ユーザー名:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "パスワード:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "TLS接続を使用する"
@@ -1712,17 +1053,514 @@ msgstr "ダイジェスト-MD5"
 msgid "NTLM"
 msgstr "NTLM"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "ユーザー名"
+
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "パスワード"
+
+#: ../gtk/login_frame.ui.h:3
+msgid "Internet connection:"
+msgstr "インターネット接続:"
+
+#: ../gtk/login_frame.ui.h:4
+msgid "Automatically log me in"
+msgstr "自動的にログインする"
+
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "ユーザーID"
+
+#: ../gtk/login_frame.ui.h:6
+msgid "Login information"
+msgstr "ログイン情報"
+
+#: ../gtk/login_frame.ui.h:7
+msgid "<b>Welcome!</b>"
+msgstr "<b>ようこそ!</b>"
+
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:2
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphoneデバッグウインドウ"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "最下部までスクロールする"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "デフォルト"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "削除"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_オプション"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "いつでもビデオをスタートする"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "セルフビューを有効にする"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "キーパッドを表示する"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_ヘルプ"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "デバッグウインドウを見る"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_ホームページ"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "チェック _アップデート"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "アカウントのアシスタント"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIPアドレスもしくは電話番号："
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr ""
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "連絡相手"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "検索"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr ""
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "連絡相手に追加する"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "通話履歴を削除する"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr ""
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "anonymous"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "サウンドカード"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "デフォルトのカメラ"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "オーディオのコーデック"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "ビデオのコーデック"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "設定"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "あなたの表示名 (例: John Doe):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "あなたのユーザー名:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "ウィザード"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "追加する"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "編集する"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "削除する"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "プロキシアカウント"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "すべてのパスワードを消去する"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>プライバシー</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "鳴動音:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "エコーキャンセラーを有効にする"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>オーディオ</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0で制限なしになります"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>ビデオ</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "アップロード速度制限 Kbit/sec:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "ダウンロード速度制限 Kbit/sec:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
 msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>帯域幅制御</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "マルチメディア設定"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "DTMFをSIP情報で送信する"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "IPv6を有効にする"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>転送</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "SIP/UDP ポート"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "ランダム"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "SIP/TCP ポート"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "オーディオ RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "ビデオ RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "トンネル"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP値"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>ネットワークのプロトコルとポート</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "NAT / ファイヤーウォール (ICEを使う)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "NAT / ファイヤーウォール (uPnPを使う)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "パブリック IP アドレス:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Stunサーバー:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT と ファイヤーウォール</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "メディアの暗号化の種類"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "ネットワーク設定"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "使用する"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "使用しない"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>音声コーデック</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>動画コーデック</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "コーデック"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>言語</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "拡張設定を表示する"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>レベル</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "ユーザーインターフェイス"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "完了"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr ""
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
 msgstr ""
 
 #: ../gtk/provisioning-fetch.ui.h:1
@@ -1733,347 +1571,499 @@ msgstr ""
 msgid "Please wait while fetching configuration from server..."
 msgstr ""
 
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "送信"
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "SIPアカウント設定アシスタント"
 
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "ようこそ！\nあなたの通話のためのSIPアカウント設定をお手伝いします。"
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "アカウント設定アシスタントへようこそ"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "linphone.orgのアカウントを作成"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "linphone.orgのアカウントを持っているのでそれを使います"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "SIPアカウントを持っているのでそれを使います"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
 msgstr ""
 
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "会議を終了する"
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "アカウント設定アシスタント"
 
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
 msgstr ""
 
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "この通話をファイルに録音する"
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "ユーザー名*"
 
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "ビデオ"
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "パスワード*"
 
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "消音"
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "ドメイン*"
 
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "プロキシ*"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "アカウントを設定します (1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "linphone.orgで取得したユーザー名を入力"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "SIPのユーザー名を入力してください (1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) 必須"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "メールアドレス: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "ユーザー名: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "パスワード: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "パスワードを再入力: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "アップデートでLinphoneを常に最新にする"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "アカウント情報を入力してください (1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "送信されたメールの本文内にあるリンクをクリックしてアカウントを有効にしてください。\nその後こちらへ戻って「次へ」を押してください。"
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "検証します (2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "エラー"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "ありがとう。あなたのアカウントは無事に設定され、使用する準備ができました。"
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - SIPアカウントを設定します"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP プロキシ:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
 msgstr "転送"
 
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "着信"
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "登録"
 
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "期限"
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "パブリッシュ情報"
 
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "AVPFを有効にする"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
 msgstr ""
 
-#: ../gtk/login_frame.ui.h:3
-msgid "Internet connection:"
-msgstr "インターネット接続:"
-
-#: ../gtk/login_frame.ui.h:4
-msgid "Automatically log me in"
-msgstr "自動的にログインする"
-
-#: ../gtk/login_frame.ui.h:6
-msgid "Login information"
-msgstr "ログイン情報"
-
-#: ../gtk/login_frame.ui.h:7
-msgid "<b>Welcome!</b>"
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "ホスト"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "ポート"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "お待ちください"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "準備"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "と自動応答を尋ねる"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "コールパラメーターの変更..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "接続しました。"
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "呼び出しを打ち切る"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "呼び出しを一時停止できませんでした"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "現在の通話を一時停止..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "Stunによるルックアップの進行中…"
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "オンライン"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "ビジー"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr ""
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "離席中"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr ""
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr ""
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "手が離せません"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "移動中"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr ""
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "オフライン"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "保留"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "休暇中"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "不明なステータス"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Early media."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
+msgid "Call answered by %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "呼び出し終了。"
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "相手はビジーです。"
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "相手は、今出られません。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "相手は手が離せないようです。"
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "通話は拒否されました。"
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "リクエストは時間切れです。"
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "不明"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2083,11 +2073,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr "%s が再生出来ません。"
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
new file mode 100644
index 000000000..70a798dbf
--- /dev/null
+++ b/po/lt.po
@@ -0,0 +1,2094 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Moo, 2015-2016
+msgid ""
+msgstr ""
+"Project-Id-Version: linphone-gtk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/belledonne-communications/linphone-gtk/language/lt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../gtk/calllogs.c:178
+#, c-format
+msgid "Call %s"
+msgstr "Skambinti %s"
+
+#: ../gtk/calllogs.c:179
+#, c-format
+msgid "Send text to %s"
+msgstr "Siųsti tekstą į %s"
+
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Pridėti %s į jūsų kontaktų sąrašą"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Paskiausi skambučiai"
+
+#: ../gtk/calllogs.c:260
+#, c-format
+msgid "<b>Recent calls (%i)</b>"
+msgstr "<b>Paskiausi skambučiai (%i)</b>"
+
+#: ../gtk/calllogs.c:334
+msgid "n/a"
+msgstr "—"
+
+#: ../gtk/calllogs.c:337
+msgid "Aborted"
+msgstr "Nutrauktas"
+
+#: ../gtk/calllogs.c:340
+msgid "Missed"
+msgstr "Praleistas"
+
+#: ../gtk/calllogs.c:343
+msgid "Declined"
+msgstr "Atmestas"
+
+#: ../gtk/calllogs.c:349
+#, c-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i minutė"
+msgstr[1] "%i minutės"
+msgstr[2] "%i minučių"
+
+#: ../gtk/calllogs.c:352
+#, c-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] "%i sekundė"
+msgstr[1] "%i sekundės"
+msgstr[2] "%i sekundžių"
+
+#: ../gtk/calllogs.c:357
+#, c-format
+msgid ""
+"<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
+"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Kokybė: %s</i></small>\n%s\t%s\t"
+
+#: ../gtk/calllogs.c:361
+#, c-format
+msgid "<big><b>%s</b></big>\t%s"
+msgstr "<big><b>%s</b></big>\t%s"
+
+#: ../gtk/conference.c:38 ../gtk/in_call_frame.ui.h:11
+msgid "Conference"
+msgstr "Konferencija"
+
+#: ../gtk/conference.c:46
+msgid "Me"
+msgstr ""
+
+#: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nepavyko rasti paveikslo žemėlapio failo: %s"
+
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Siunčiama..."
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Pranešimas neišsiųstas"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "Kopijuoti"
+
+#: ../gtk/main.c:134
+msgid "log to stdout some debug information while running."
+msgstr "kol vykdoma, registruoti į stdout kai kurią derinimo informaciją."
+
+#: ../gtk/main.c:135
+msgid "display version and exit."
+msgstr "parodyti versiją ir išeiti."
+
+#: ../gtk/main.c:136
+msgid "path to a file to write logs into."
+msgstr "kelias į failą, į kurį rašyti žurnalus."
+
+#: ../gtk/main.c:137
+msgid "Start linphone with video disabled."
+msgstr "Paleisti linphone su išjungtu vaizdu."
+
+#: ../gtk/main.c:138
+msgid "Start only in the system tray, do not show the main interface."
+msgstr "Paleisti tik sistemos dėkle, nerodyti pagrindinės sąsajos."
+
+#: ../gtk/main.c:139
+msgid "address to call right now"
+msgstr "adresas, į kurį tuoj pat skambinti"
+
+#: ../gtk/main.c:140
+msgid ""
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Nurodyti darbinį katalogą (turėtų būti diegimo bazė, pvz.,: c:\\Program Files\\Linphone)"
+
+#: ../gtk/main.c:141
+msgid "Configuration file"
+msgstr "Konfigūracijos failas"
+
+#: ../gtk/main.c:142
+msgid "Run the audio assistant"
+msgstr "Vykdyti garso pagelbiklį"
+
+#: ../gtk/main.c:143
+msgid "Run self test and exit 0 if succeed"
+msgstr "Vykdyti savikontrolę ir išeiti 0, jei pavyks"
+
+#: ../gtk/main.c:1058
+#, c-format
+msgid ""
+"%s would like to add you to his/her contact list.\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
+"If you answer no, this person will be temporarily blacklisted."
+msgstr "%s norėtų jus pridėti į savo kontaktų sąrašą.\nAr jūs norėtumėte taip pat pridėti jį/ją į savo kontaktų sąrašą ir leisti jam/jai matyti jūsų prisijungimo būseną?\nJeigu atsakysite ne, šis asmuo bus laikinai pridėtas į juodąjį sąrašą."
+
+#: ../gtk/main.c:1135
+#, c-format
+msgid ""
+"Please enter your password for username <i>%s</i>\n"
+" at realm <i>%s</i>:"
+msgstr ""
+
+#: ../gtk/main.c:1244
+msgid "Call error"
+msgstr "Skambučio klaida"
+
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
+msgid "Call ended"
+msgstr "Skambutis užbaigtas"
+
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
+msgid "Incoming call"
+msgstr "Įeinantis skambutis"
+
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
+msgid "Answer"
+msgstr "Atsiliepti"
+
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
+msgid "Decline"
+msgstr "Atmesti"
+
+#: ../gtk/main.c:1262
+msgid "Call paused"
+msgstr "Skambutis pristabdytas"
+
+#: ../gtk/main.c:1262
+#, c-format
+msgid "<b>by %s</b>"
+msgstr "<b>naudotojo %s</b>"
+
+#: ../gtk/main.c:1336
+#, c-format
+msgid "%s proposed to start video. Do you accept ?"
+msgstr "%s pasiūlė pradėti vaizdą. Jūs sutinkate ?"
+
+#: ../gtk/main.c:1502
+msgid "Website link"
+msgstr "Svetainės nuoroda"
+
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
+msgid "Linphone"
+msgstr "Linphone"
+
+#: ../gtk/main.c:1562
+msgid "A video internet phone"
+msgstr "Internetinis vaizdo telefonas"
+
+#: ../gtk/main.c:1624
+#, c-format
+msgid "%s (Default)"
+msgstr "%s (Numatytoji)"
+
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
+#, c-format
+msgid "We are transferred to %s"
+msgstr ""
+
+#: ../gtk/main.c:2008
+msgid ""
+"No sound cards have been detected on this computer.\n"
+"You won't be able to send or receive audio calls."
+msgstr "Šiame kompiuteryje nebuvo aptikta jokių garso plokščių.\nJūs negalėsite siųsti ir priimti garso skambučių."
+
+#: ../gtk/main.c:2173
+msgid "A free SIP video-phone"
+msgstr "Nemokamas SIP vaizdo telefonas"
+
+#: ../gtk/main.c:2292
+#, c-format
+msgid "Hello\n"
+msgstr "Sveiki\n"
+
+#: ../gtk/friendlist.c:460
+msgid "Add to addressbook"
+msgstr "Pridėti į adresų knygą"
+
+#: ../gtk/friendlist.c:626
+#, c-format
+msgid "Search in %s directory"
+msgstr ""
+
+#: ../gtk/friendlist.c:773
+msgid "Invalid sip contact !"
+msgstr "Netaisyklingas sip kontaktas !"
+
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Pridėti naują kontaktą"
+
+#: ../gtk/friendlist.c:823
+#, c-format
+msgid "Edit contact '%s'"
+msgstr "Redaguoti kontaktą \"%s\""
+
+#: ../gtk/friendlist.c:824
+#, c-format
+msgid "Delete contact '%s'"
+msgstr "Ištrinti kontaktą \"%s\""
+
+#: ../gtk/friendlist.c:825
+#, c-format
+msgid "Delete chat history of '%s'"
+msgstr "Ištrinti \"%s\" pokalbių istoriją"
+
+#: ../gtk/friendlist.c:862
+#, c-format
+msgid "Add new contact from %s directory"
+msgstr "Pridėti naują kontaktą iš %s katalogo"
+
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Vardas"
+
+#: ../gtk/propertybox.c:598
+msgid "Rate (Hz)"
+msgstr "Sparta (Hz)"
+
+#: ../gtk/propertybox.c:604
+msgid "Status"
+msgstr "Būsena"
+
+#: ../gtk/propertybox.c:617
+msgid "IP Bitrate (kbit/s)"
+msgstr "IP Pralaidumas (kbit/s)"
+
+#: ../gtk/propertybox.c:628
+msgid "Parameters"
+msgstr "Parametrai"
+
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
+msgid "Enabled"
+msgstr "Įjungta"
+
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
+msgid "Disabled"
+msgstr "Išjungta"
+
+#: ../gtk/propertybox.c:902
+msgid "Account"
+msgstr "Paskyra"
+
+#: ../gtk/propertybox.c:1170
+msgid "English"
+msgstr "Anglų"
+
+#: ../gtk/propertybox.c:1171
+msgid "French"
+msgstr "Prancūzų"
+
+#: ../gtk/propertybox.c:1172
+msgid "Swedish"
+msgstr "Švedų"
+
+#: ../gtk/propertybox.c:1173
+msgid "Italian"
+msgstr "Italų"
+
+#: ../gtk/propertybox.c:1174
+msgid "Spanish"
+msgstr "Ispanų"
+
+#: ../gtk/propertybox.c:1175
+msgid "Brazilian Portugese"
+msgstr "Brazilijos Portugalų"
+
+#: ../gtk/propertybox.c:1176
+msgid "Polish"
+msgstr "Lenkų"
+
+#: ../gtk/propertybox.c:1177
+msgid "German"
+msgstr "Vokiečių"
+
+#: ../gtk/propertybox.c:1178
+msgid "Russian"
+msgstr "Rusų"
+
+#: ../gtk/propertybox.c:1179
+msgid "Japanese"
+msgstr "Japonų"
+
+#: ../gtk/propertybox.c:1180
+msgid "Dutch"
+msgstr "Olandų"
+
+#: ../gtk/propertybox.c:1181
+msgid "Hungarian"
+msgstr "Vengrų"
+
+#: ../gtk/propertybox.c:1182
+msgid "Czech"
+msgstr "Čekų"
+
+#: ../gtk/propertybox.c:1183
+msgid "Chinese"
+msgstr "Kinų"
+
+#: ../gtk/propertybox.c:1184
+msgid "Traditional Chinese"
+msgstr "Tradicinė Kinų"
+
+#: ../gtk/propertybox.c:1185
+msgid "Norwegian"
+msgstr "Norvegų"
+
+#: ../gtk/propertybox.c:1186
+msgid "Hebrew"
+msgstr "Hebrajų"
+
+#: ../gtk/propertybox.c:1187
+msgid "Serbian"
+msgstr "Serbų"
+
+#: ../gtk/propertybox.c:1188
+msgid "Arabic"
+msgstr "Arabų"
+
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "Turkų"
+
+#: ../gtk/propertybox.c:1246
+msgid ""
+"You need to restart linphone for the new language selection to take effect."
+msgstr "Tam, kad įsigaliotų naujas kalbos pasirinkimas, turite iš naujo paleisti programą linphone."
+
+#: ../gtk/propertybox.c:1332
+msgid "None"
+msgstr "Nėra"
+
+#: ../gtk/propertybox.c:1336
+msgid "SRTP"
+msgstr "SRTP"
+
+#: ../gtk/propertybox.c:1342
+msgid "DTLS"
+msgstr "DTLS"
+
+#: ../gtk/propertybox.c:1349
+msgid "ZRTP"
+msgstr "ZRTP"
+
+#: ../gtk/update.c:80
+#, c-format
+msgid ""
+"A more recent version is availalble from %s.\n"
+"Would you like to open a browser to download it ?"
+msgstr "Yra prieinama naujesnė versija iš %s.\nAr norėtumėte atverti naršyklę ir ją atsisiųsti?"
+
+#: ../gtk/update.c:91
+msgid "You are running the lastest version."
+msgstr "Jūs naudojatės paskiausia versija."
+
+#: ../gtk/buddylookup.c:85
+msgid "Firstname, Lastname"
+msgstr "Vardas, Pavardė"
+
+#: ../gtk/buddylookup.c:160
+msgid "Error communicating with server."
+msgstr "Klaida, susisiekiant su serveriu."
+
+#: ../gtk/buddylookup.c:164
+msgid "Connecting..."
+msgstr "Jungiamasi..."
+
+#: ../gtk/buddylookup.c:168
+msgid "Connected"
+msgstr "Prisijungta"
+
+#: ../gtk/buddylookup.c:172
+msgid "Receiving data..."
+msgstr "Gaunami duomenys..."
+
+#: ../gtk/buddylookup.c:180
+#, c-format
+msgid "Found %i contact"
+msgid_plural "Found %i contacts"
+msgstr[0] "Rastas %i kontaktas"
+msgstr[1] "Rasti %i kontaktai"
+msgstr[2] "Rasta %i kontaktų"
+
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Naudotojo vardas jau yra naudojamas!"
+
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Nepavyko patikrinti naudotojo vardo prieinamumą. Prašome vėliau bandyti dar kartą."
+
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
+#, c-format
+msgid "Call #%i"
+msgstr "Skambutis #%i"
+
+#: ../gtk/incall_view.c:145
+#, c-format
+msgid "Transfer to call #%i with %s"
+msgstr ""
+
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
+msgid "Not used"
+msgstr "Nenaudojama"
+
+#: ../gtk/incall_view.c:212
+msgid "ICE not activated"
+msgstr "ICE neaktyvuota"
+
+#: ../gtk/incall_view.c:214
+msgid "ICE failed"
+msgstr "ICE nepavyko"
+
+#: ../gtk/incall_view.c:216
+msgid "ICE in progress"
+msgstr "ICE yra eigoje"
+
+#: ../gtk/incall_view.c:218
+msgid "Going through one or more NATs"
+msgstr ""
+
+#: ../gtk/incall_view.c:220
+msgid "Direct"
+msgstr ""
+
+#: ../gtk/incall_view.c:222
+msgid "Through a relay server"
+msgstr ""
+
+#: ../gtk/incall_view.c:230
+msgid "uPnP not activated"
+msgstr "uPnP neaktyvuota"
+
+#: ../gtk/incall_view.c:232
+msgid "uPnP in progress"
+msgstr "uPnP yra eigoje"
+
+#: ../gtk/incall_view.c:234
+msgid "uPnp not available"
+msgstr "uPnp neprieinama"
+
+#: ../gtk/incall_view.c:236
+msgid "uPnP is running"
+msgstr "uPnP yra vykdoma"
+
+#: ../gtk/incall_view.c:238
+msgid "uPnP failed"
+msgstr "uPnP nepavyko"
+
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
+msgid "Direct or through server"
+msgstr ""
+
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
+#, c-format
+msgid ""
+"download: %f\n"
+"upload: %f (kbit/s)"
+msgstr "atsiuntimas: %f\nišsiuntimas: %f (kbit/s)"
+
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
+#, c-format
+msgid "%ix%i @ %f fps"
+msgstr "%ix%i @ %f kadr./s"
+
+#: ../gtk/incall_view.c:295
+#, c-format
+msgid "%.3f seconds"
+msgstr "%.3f sekundžių"
+
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
+msgid "Hang up"
+msgstr "Padėti ragelį"
+
+#: ../gtk/incall_view.c:558
+msgid "<b>Calling...</b>"
+msgstr "<b>Skambinama...</b>"
+
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../gtk/incall_view.c:572
+msgid "<b>Incoming call</b>"
+msgstr "<b>Įeinantis skambutis</b>"
+
+#: ../gtk/incall_view.c:609
+msgid "good"
+msgstr "geras"
+
+#: ../gtk/incall_view.c:611
+msgid "average"
+msgstr "vidutinis"
+
+#: ../gtk/incall_view.c:613
+msgid "poor"
+msgstr "žemas"
+
+#: ../gtk/incall_view.c:615
+msgid "very poor"
+msgstr "labai žemas"
+
+#: ../gtk/incall_view.c:617
+msgid "too bad"
+msgstr "pernelyg blogas"
+
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
+msgid "unavailable"
+msgstr "neprieinama"
+
+#: ../gtk/incall_view.c:732
+msgid "Secured by SRTP"
+msgstr ""
+
+#: ../gtk/incall_view.c:738
+msgid "Secured by DTLS"
+msgstr ""
+
+#: ../gtk/incall_view.c:744
+#, c-format
+msgid "Secured by ZRTP - [auth token: %s]"
+msgstr ""
+
+#: ../gtk/incall_view.c:748
+msgid "Set unverified"
+msgstr ""
+
+#: ../gtk/incall_view.c:748
+msgid "Set verified"
+msgstr ""
+
+#: ../gtk/incall_view.c:788
+msgid "In conference"
+msgstr "Konferencijoje"
+
+#: ../gtk/incall_view.c:788
+msgid "<b>In call</b>"
+msgstr "<b>Skambutyje</b>"
+
+#: ../gtk/incall_view.c:825
+msgid "<b>Paused call</b>"
+msgstr "<b>Skambutis pristabdytas</b>"
+
+#: ../gtk/incall_view.c:862
+msgid "<b>Call ended.</b>"
+msgstr "<b>Skambutis užbaigtas.</b>"
+
+#: ../gtk/incall_view.c:893
+msgid "Transfer in progress"
+msgstr ""
+
+#: ../gtk/incall_view.c:896
+msgid "Transfer done."
+msgstr ""
+
+#: ../gtk/incall_view.c:899
+msgid "Transfer failed."
+msgstr ""
+
+#: ../gtk/incall_view.c:930
+msgid "Resume"
+msgstr "Tęsti"
+
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
+msgid "Pause"
+msgstr "Pristabdyti"
+
+#: ../gtk/incall_view.c:996
+#, c-format
+msgid ""
+"<small><i>Recording into\n"
+"%s %s</i></small>"
+msgstr "<small><i>Įrašoma į\n%s %s</i></small>"
+
+#: ../gtk/incall_view.c:996
+msgid "(Paused)"
+msgstr "(Pristabdyta)"
+
+#: ../gtk/loginframe.c:75
+#, c-format
+msgid "Please enter login information for %s"
+msgstr "Prašome įvesti %s prisijungimo informaciją"
+
+#: ../gtk/config-fetching.c:57
+#, c-format
+msgid "fetching from %s"
+msgstr "gaunama iš %s"
+
+#: ../gtk/config-fetching.c:73
+#, c-format
+msgid "Downloading of remote configuration from %s failed."
+msgstr "Nuotolinės konfigūracijos atsiuntimas iš %s nepavyko."
+
+#: ../gtk/audio_assistant.c:103
+msgid "No voice detected"
+msgstr "Neaptikta jokio balso"
+
+#: ../gtk/audio_assistant.c:104
+msgid "Too low"
+msgstr "Per tyliai"
+
+#: ../gtk/audio_assistant.c:105
+msgid "Good"
+msgstr "Gerai"
+
+#: ../gtk/audio_assistant.c:106
+msgid "Too loud"
+msgstr "Per garsiai"
+
+#: ../gtk/audio_assistant.c:188
+msgid "Did you hear three beeps ?"
+msgstr "Ar girdėjote tris byptelėjimus?"
+
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
+msgid "Sound preferences not found "
+msgstr "Garso nuostatos nerastos"
+
+#: ../gtk/audio_assistant.c:315
+msgid "Cannot launch system sound control "
+msgstr "Nepavyko paleisti sistemos garso valdymą"
+
+#: ../gtk/audio_assistant.c:327
+msgid ""
+"Welcome!\n"
+"This assistant will help you to configure audio settings for Linphone"
+msgstr "Sveiki!\nŠis pagelbiklis padės jums sukonfigūruoti Linphone garso nustatymus"
+
+#: ../gtk/audio_assistant.c:337
+msgid "Capture device"
+msgstr "Mikrofonas"
+
+#: ../gtk/audio_assistant.c:338
+msgid "Recorded volume"
+msgstr "Įrašomas garsis"
+
+#: ../gtk/audio_assistant.c:342
+msgid "No voice"
+msgstr "Nėra balso"
+
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
+msgid "System sound preferences"
+msgstr "Sistemos garso nuostatos"
+
+#: ../gtk/audio_assistant.c:378
+msgid "Playback device"
+msgstr "Atkūrimo įrenginys"
+
+#: ../gtk/audio_assistant.c:379
+msgid "Play three beeps"
+msgstr "Groti tris byptelėjimus"
+
+#: ../gtk/audio_assistant.c:412
+msgid "Press the record button and say some words"
+msgstr "Spustelėkite įrašymo mygtuką ir tarkite kelis žodžius"
+
+#: ../gtk/audio_assistant.c:413
+msgid "Listen to your record voice"
+msgstr "Klausytis savo įrašyto balso"
+
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
+msgid "Record"
+msgstr "Įrašyti"
+
+#: ../gtk/audio_assistant.c:415
+msgid "Play"
+msgstr "Groti"
+
+#: ../gtk/audio_assistant.c:442
+msgid "Let's start Linphone now"
+msgstr "Dabar, paleiskime Linphone"
+
+#: ../gtk/audio_assistant.c:513
+msgid "Audio Assistant"
+msgstr "Garso Pagelbiklis"
+
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
+msgid "Audio assistant"
+msgstr "Garso pagelbiklis"
+
+#: ../gtk/audio_assistant.c:528
+msgid "Mic Gain calibration"
+msgstr "Mikrofono stiprinimo gradavimas"
+
+#: ../gtk/audio_assistant.c:534
+msgid "Speaker volume calibration"
+msgstr "Garsiakalbių garsio gradavimas"
+
+#: ../gtk/audio_assistant.c:539
+msgid "Record and Play"
+msgstr "Įrašykite ir Grokite"
+
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Baigiama"
+
+#: ../gtk/about.ui.h:1
+msgid "About Linphone"
+msgstr "Apie Linphone"
+
+#: ../gtk/about.ui.h:2
+msgid "(C) Belledonne Communications, 2010\n"
+msgstr "(C) Belledonne Communications, 2010\n"
+
+#: ../gtk/about.ui.h:4
+msgid "An internet video phone using the standard SIP (rfc3261) protocol."
+msgstr "Internetinis vaizdo telefonas, naudojantis standartinį SIP (rfc3261) protokolą."
+
+#: ../gtk/about.ui.h:5
+msgid ""
+"fr: Simon Morlat\n"
+"en: Simon Morlat and Delphine Perreau\n"
+"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
+"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
+"sv: Daniel Nylander <po@danielnylander.se>\n"
+"es: Jesus Benitez <gnelson at inMail dot sk>\n"
+"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
+"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
+"pl: Robert Nasiadek <darkone@darkone.pl>\n"
+"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
+"hu: anonymous\n"
+"he: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
+
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr ""
+
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr "Pridėti į mano sąrašą"
+
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
+msgstr ""
+
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr ""
+
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr ""
+
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Išvalyti viską"
+
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:1
+msgid "Call statistics"
+msgstr "Skambučio statistika"
+
+#: ../gtk/call_statistics.ui.h:2
+msgid "Audio codec"
+msgstr "Garso kodekas"
+
+#: ../gtk/call_statistics.ui.h:3
+msgid "Video codec"
+msgstr "Vaizdo kodekas"
+
+#: ../gtk/call_statistics.ui.h:4
+msgid "Audio IP bandwidth usage"
+msgstr "Garso IP pralaidumo naudojimas"
+
+#: ../gtk/call_statistics.ui.h:5
+msgid "Audio Media connectivity"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:6
+msgid "Video IP bandwidth usage"
+msgstr "Vaizdo IP pralaidumo naudojimas"
+
+#: ../gtk/call_statistics.ui.h:7
+msgid "Video Media connectivity"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:8
+msgid "Round trip time"
+msgstr ""
+
+#: ../gtk/call_statistics.ui.h:9
+msgid "Video resolution received"
+msgstr "Gaunamo vaizdo raiška"
+
+#: ../gtk/call_statistics.ui.h:10
+msgid "Video resolution sent"
+msgstr "Siunčiamo vaizdo raiška"
+
+#: ../gtk/call_statistics.ui.h:11
+msgid "RTP profile"
+msgstr "RTP profilis"
+
+#: ../gtk/call_statistics.ui.h:12
+msgid "<b>Call statistics and information</b>"
+msgstr "<b>Skambučio statistika ir informacija</b>"
+
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Siųsti"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Užbaigti konferenciją"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Nuotolinės konfigūracijos URI nurodymas"
+
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Šis dialogas leidžia nustatyti http ar https adresą, kai konfigūracija bus gaunama paleisties metu.\nPrašome žemiau įvesti ar pakeisti konfigūracijos URI. Po to, kai nuspausite mygtuką Gerai, programa Linphone bus automatiškai paleista iš naujo, kad gautų ir naudotų naująją konfigūraciją."
+
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP adresas"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Rodyti šio kontakto prisijungimo būseną"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Leisti šiam kontaktui matyti mano prisijungimo būseną"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Kontakto informacija</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "DSCP nustatymai"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Garso RTP srautas"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Vaizdo RTP srautas"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>Nustatykite DSCP reikšmes (šešioliktainiais)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Spustelėkite čia, kad nustatytumėte garsiakalbių garsį"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Įrašyti šį skambutį į garso įrašo failą"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Vaizdas"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Nutildyti"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Trukmė"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Skambučio kokybės įvertinimas"
+
+#: ../gtk/ldap.ui.h:1
+msgid "LDAP Settings"
+msgstr "LDAP nustatymai"
+
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Serverio adresas:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Tapatybės nustatymo metodas:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Naudotojo vardas:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Slaptažodis:"
+
+#: ../gtk/ldap.ui.h:6
+msgid "Use TLS Connection"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:7
+msgid "Not yet available"
+msgstr "Kol kas neprieinama"
+
+#: ../gtk/ldap.ui.h:8
+msgid "<b>Connection</b>"
+msgstr "<b>Ryšys</b>"
+
+#: ../gtk/ldap.ui.h:9
+msgid "Bind DN"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:10
+msgid "Authname"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:11
+msgid "Realm"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:12
+msgid "<b>SASL</b>"
+msgstr "<b>SASL</b>"
+
+#: ../gtk/ldap.ui.h:13
+msgid "Base object:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:15
+#, no-c-format
+msgid "Filter (%s for name):"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:16
+msgid "Name Attribute:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:17
+msgid "SIP address attribute:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:18
+msgid "Attributes to query:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:19
+msgid "<b>Search</b>"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:20
+msgid "Timeout for search:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:21
+msgid "Max results:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:22
+msgid "Follow Aliases"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:23
+msgid "<b>Miscellaneous</b>"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:24
+msgid "ANONYMOUS"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:25
+msgid "SIMPLE"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:26
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:27
+msgid "NTLM"
+msgstr "NTLM"
+
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Naudotojo vardas"
+
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: ../gtk/login_frame.ui.h:3
+msgid "Internet connection:"
+msgstr "Interneto ryšys:"
+
+#: ../gtk/login_frame.ui.h:4
+msgid "Automatically log me in"
+msgstr "Prijungti mane automatiškai"
+
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Naudotojo ID"
+
+#: ../gtk/login_frame.ui.h:6
+msgid "Login information"
+msgstr "Prisijungimo informacija"
+
+#: ../gtk/login_frame.ui.h:7
+msgid "<b>Welcome!</b>"
+msgstr "<b>Sveiki!</b>"
+
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr ""
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone derinimo langas"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Slinkti į pabaigą"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr ""
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Ištrinti"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Parinktys"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Nustatyti konfigūracijos URI"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Visada pradėti vaizdą"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr ""
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Rodyti pagalbinę klaviatūrą"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "P_agalba"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Rodyti derinimo langą"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Internetinė svetainė"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Tikrinti ar yra at_naujinimų"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Paskyros pagelbiklis"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP adresas arba telefono numeris:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Inicijuoti naują skambutį"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Kontaktai"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr ""
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr ""
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Pridėti kontaktą"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Išvalyti skambučių istoriją"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Mano esama tapatybė:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Automatinis atsiliepimas yra įjungtas"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "numatytoji garso plokštė"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "garso plokštė"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "numatytoji kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Garso kodekai"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Vaizdo kodekai"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Ši sekcija apibrėžia jūsų SIP adresą tais atvejais, kai nenaudojate SIP paskyros"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Jūsų rodomas vardas (pvz., Džonas Do):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Jūsų naudotojo vardas:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Jūsų galutinis SIP adresas:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Numatytoji tapatybė</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Vediklis"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Pridėti"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Keisti"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Šalinti"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Įgaliotojo serverio paskyros</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Ištrinti visus slaptažodžius"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatumas</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Automatiškai atsiliepti, kai yra gaunamas skambutis"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Delsa, prieš atsiliepiant (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Automatinis atsiliepimas</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Tvarkyti SIP paskyras"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Skambinimo garsas:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Specialus ALSA įrenginys (nebūtina):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Mikrofonas:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Skambinimo įrenginys:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Atkūrimo įrenginys:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Įjungti aido panaikinimą"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Garsas</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Vaizdo įvesties įrenginys:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Pageidaujama vaizdo raiška:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Vaizdo išvesties metodas:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Rodyti kameros peržiūrą"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Vaizdo išankstinė parinktis:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Pageidaujamas vaizdo kadrų dažnis:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 reiškia \"neribota\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Vaizdas</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Išsiuntimo greičio riba, Kbit/sek.:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Atsiuntimo greičio riba, Kbit/sek.:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Įjungti adaptyvų spartos valdymą"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Adaptyvus spartos valdymas yra technika, skirta, skambučio metu, dinamiškai atspėti prieinamą pralaidumą.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Pralaidumo valdymas</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Multimedijos nustatymai"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Nustatyti didžiausią duomenų persiuntimo įtaisą:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Siųsti DTMF kaip SIP informaciją"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Leisti IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Perdavimas</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "SIP/UDP prievadas"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Atsitiktinis"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "SIP/TCP prievadas"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Garso RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Fiksuotas"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Vaizdo RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP laukai"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Tinklo protokolas ir prievadai</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Tiesioginis sujungimas su internetu"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Už NAT / Užkardos (nurodyti tinklų sietuvo IP )"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Už NAT / Užkardos (naudoti STUN, siekiant išspręsti)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Už NAT / Užkardos (naudoti ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Už NAT / Užkardos (naudoti uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Viešas IP adresas:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Stun serveris:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT ir Užkarda</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Medijos šifravimo tipas"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Medijos šifravimas yra privalomas"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Šifravimas</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Tinklo nustatymai"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Įjungti"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Išjungti"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Garso kodekai</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Vaizdo kodekai</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Kodekai"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Kalba</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Rodyti išplėstinius nustatymus"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Lygmuo</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Naudotojo sąsaja"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>LDAP paskyros sąranka</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Atlikta"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Reikalingas tapatybės nustatymas"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Prašome įvesti srities slaptažodį"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Konfigūruojama..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Prašome palaukti kol iš serverio yra gaunama konfigūracija..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "SIP paskyros konfigūravimo pagelbiklis"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Sveiki!\nŠis pagelbiklis padės jums savo skambučiams naudoti SIP paskyrą."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Sveiki atvykę į paskyros sąrankos pagelbiklį"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Susikurti linphone.org paskyrą"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Aš jau turiu linphone.org paskyrą ir, tiesiog, noriu ją naudoti"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Aš jau turiu sip paskyrą ir, tiesiog, noriu ją naudoti"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Aš noriu nurodyti nuotolinės konfigūracijos URI"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Paskyros sąrankos pagelbiklis"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Įveskite savo paskyros informaciją"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Naudotojo vardas*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Slaptažodis*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Sritis*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Įgaliotasis serveris"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Konfigūruokite savo paskyrą (žingsnis 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Įveskite savo linphone.org naudotojo vardą"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Įveskite savo sip paskyros naudotojo vardą (žingsnis 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Būtini laukai"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "El. paštas: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Naudotojo vardas: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Slaptažodis: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Patvirtinkite savo slaptažodį: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Informuokite mane apie linphone atnaujinimus"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Įveskite paskyros informaciją (žingsnis 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Jūsų paskyra yra kuriama, prašome palaukti."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Paskyra kūrimo eigoje"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Prašome patvirtinti savo paskyrą, nuspaudžiant nuorodą, kurią ką tik atsiuntėme jums el. paštu.\nTuomet grįžkite čia ir spauskite mygtuką Pirmyn."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Patvirtinimas (žingsnis 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Tikrinama ar jūsų paskyra buvo patvirtinta, prašome palaukti."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Pakyros patvirtinimo patikrinimas eigoje"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Klaida, paskyra nepatvirtinta, naudotojo vardas jau yra naudojamas arba serveris nepasiekiamas.\nPrašome grįžti atgal ir bandyti dar kartą."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Klaida"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Dėkojame. Jūsų paskyra yra sukonfigūruota ir paruošta naudoti."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - SIP paskyros konfigūravimas"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Jūsų SIP tapatybė:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Atrodo taip sip:<naudotojovardas>@<sritis>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP Įgaliotojo serverio adresas:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Registravimo trukmė (sek.):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Kontakto parametrai (nebūtinai):"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF reguliarus RTCP intervalas (sek.):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Maršrutas (nebūtinai):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Perdavimas"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Registruoti"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Skelbti prisijungimo būsenos informaciją"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Įjungti AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Konfigūruokite SIP paskyrą"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Prievadas"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Prašome palaukti"
+
+#: ../coreapi/linphonecore.c:1594
+msgid "Ready"
+msgstr "Pasiruošę"
+
+#: ../coreapi/linphonecore.c:2685
+msgid "Configuring"
+msgstr "Konfigūruojama"
+
+#. must be known at that time
+#: ../coreapi/linphonecore.c:3084
+msgid "Contacting"
+msgstr "Susisiekiama su"
+
+#: ../coreapi/linphonecore.c:3089
+msgid "Could not call"
+msgstr "Nepavyko skambinti"
+
+#: ../coreapi/linphonecore.c:3228
+msgid "Sorry, we have reached the maximum number of simultaneous calls"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3388
+msgid "is contacting you"
+msgstr "bando su jumis susisiekti"
+
+#: ../coreapi/linphonecore.c:3389
+msgid " and asked autoanswer."
+msgstr ""
+
+#: ../coreapi/linphonecore.c:3506
+msgid "Modifying call parameters..."
+msgstr "Modifikuojami skambučio parametrai..."
+
+#: ../coreapi/linphonecore.c:3898
+msgid "Connected."
+msgstr "Prisijungta."
+
+#: ../coreapi/linphonecore.c:3923
+msgid "Call aborted"
+msgstr "Skambutis nutrauktas"
+
+#: ../coreapi/linphonecore.c:4125
+msgid "Could not pause the call"
+msgstr "Nepavyko pristabdyti skambučio"
+
+#: ../coreapi/linphonecore.c:4128
+msgid "Pausing the current call..."
+msgstr "Pristabdomas esamas skambutis..."
+
+#: ../coreapi/misc.c:441
+msgid "Stun lookup in progress..."
+msgstr ""
+
+#: ../coreapi/misc.c:657
+msgid "ICE local candidates gathering in progress..."
+msgstr ""
+
+#: ../coreapi/friend.c:48
+msgid "Online"
+msgstr "Prisijungęs"
+
+#: ../coreapi/friend.c:51
+msgid "Busy"
+msgstr "Užimtas"
+
+#: ../coreapi/friend.c:54
+msgid "Be right back"
+msgstr "Netrukus sugrįš"
+
+#: ../coreapi/friend.c:57
+msgid "Away"
+msgstr "Pasišalinęs"
+
+#: ../coreapi/friend.c:60
+msgid "On the phone"
+msgstr "Kalba telefonu"
+
+#: ../coreapi/friend.c:63
+msgid "Out to lunch"
+msgstr "Pietauja"
+
+#: ../coreapi/friend.c:66
+msgid "Do not disturb"
+msgstr "Netrukdyti"
+
+#: ../coreapi/friend.c:69
+msgid "Moved"
+msgstr "Perkeltas"
+
+#: ../coreapi/friend.c:72
+msgid "Using another messaging service"
+msgstr "Naudoja kitą pokalbių tarnybą"
+
+#: ../coreapi/friend.c:75
+msgid "Offline"
+msgstr "Atsijungęs"
+
+#: ../coreapi/friend.c:78
+msgid "Pending"
+msgstr ""
+
+#: ../coreapi/friend.c:81
+msgid "Vacation"
+msgstr ""
+
+#: ../coreapi/friend.c:83
+msgid "Unknown status"
+msgstr "Nežinoma būsena"
+
+#: ../coreapi/proxy.c:339
+msgid ""
+"The sip proxy address you entered is invalid, it must start with \"sip:\" "
+"followed by a hostname."
+msgstr ""
+
+#: ../coreapi/proxy.c:345
+msgid ""
+"The sip identity you entered is invalid.\n"
+"It should look like sip:username@proxydomain, such as sip:alice@example.net"
+msgstr "jūsų įvesta sip tapatybė yra neteisinga.\nJi turėtų atrodyti taip sip:naudotojovardas@įgaliotojoserveriosritis, kaip, pavyzdžiui, sip:alice@example.net"
+
+#: ../coreapi/proxy.c:979
+msgid "Looking for telephone number destination..."
+msgstr ""
+
+#: ../coreapi/proxy.c:983
+msgid "Could not resolve this number."
+msgstr ""
+
+#: ../coreapi/proxy.c:1437
+#, c-format
+msgid "Could not login as %s"
+msgstr "Nepavyko prisijungti kaip %s"
+
+#: ../coreapi/proxy.c:1522
+#, c-format
+msgid "Refreshing on %s..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:415
+msgid "Remote ringing."
+msgstr ""
+
+#: ../coreapi/callbacks.c:427
+msgid "Remote ringing..."
+msgstr ""
+
+#: ../coreapi/callbacks.c:450
+msgid "Early media."
+msgstr ""
+
+#: ../coreapi/callbacks.c:480
+#, c-format
+msgid "Call answered by %s"
+msgstr "%s atsiliepė į skambutį"
+
+#: ../coreapi/callbacks.c:522
+msgid "Call resumed."
+msgstr "Skambutis pratęstas."
+
+#: ../coreapi/callbacks.c:577
+msgid "Incompatible, check codecs or security settings..."
+msgstr "Nesuderinama, patikrinkite kodekus ar saugos nustatymus..."
+
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
+msgid "Incompatible media parameters."
+msgstr "Nesuderinami medijos parametrai."
+
+#: ../coreapi/callbacks.c:607
+msgid "We have been resumed."
+msgstr "Mūsų skambutis yra pratęstas."
+
+#. we are being paused
+#: ../coreapi/callbacks.c:615
+msgid "We are paused by other party."
+msgstr "Kita šalis pristabdė skambutį."
+
+#: ../coreapi/callbacks.c:625
+msgid "Call is updated by remote."
+msgstr ""
+
+#: ../coreapi/callbacks.c:794
+msgid "Call terminated."
+msgstr "Skambutis baigtas."
+
+#: ../coreapi/callbacks.c:822
+msgid "User is busy."
+msgstr "Naudotojas yra užimtas."
+
+#: ../coreapi/callbacks.c:823
+msgid "User is temporarily unavailable."
+msgstr "Naudotojas laikinai neprieinamas."
+
+#. char *retrymsg=_("%s. Retry after %i minute(s).");
+#: ../coreapi/callbacks.c:825
+msgid "User does not want to be disturbed."
+msgstr "Naudotojas nenori būti trukdomas."
+
+#: ../coreapi/callbacks.c:826
+msgid "Call declined."
+msgstr "Skambutis atmestas."
+
+#: ../coreapi/callbacks.c:841
+msgid "Request timeout."
+msgstr "Baigėsi užklausos laikas."
+
+#: ../coreapi/callbacks.c:872
+msgid "Redirected"
+msgstr ""
+
+#: ../coreapi/callbacks.c:922
+msgid "Call failed."
+msgstr "Skambutis nepavyko."
+
+#: ../coreapi/callbacks.c:1000
+#, c-format
+msgid "Registration on %s successful."
+msgstr ""
+
+#: ../coreapi/callbacks.c:1001
+#, c-format
+msgid "Unregistration on %s done."
+msgstr ""
+
+#: ../coreapi/callbacks.c:1019
+msgid "no response timeout"
+msgstr ""
+
+#: ../coreapi/callbacks.c:1022
+#, c-format
+msgid "Registration on %s failed: %s"
+msgstr ""
+
+#: ../coreapi/callbacks.c:1029
+msgid "Service unavailable, retrying"
+msgstr "Paslauga neprieinama, bandoma iš naujo"
+
+#. if encryption is DTLS, no status to be displayed
+#: ../coreapi/linphonecall.c:204
+#, c-format
+msgid "Authentication token is %s"
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Nepavyko modifikuoti skambučio parametrų: %s."
+
+#: ../coreapi/linphonecall.c:1665
+msgid "Call parameters were successfully modified."
+msgstr "Skambučio parametrai buvo sėkmingai modifikuoti."
+
+#: ../coreapi/linphonecall.c:4636
+#, c-format
+msgid "You have missed %i call."
+msgid_plural "You have missed %i calls."
+msgstr[0] "Jūs turite %i praleistą skambutį."
+msgstr[1] "Jūs turite %i praleistus skambučius."
+msgstr[2] "Jūs turite %i praleistų skambučių."
+
+#: ../coreapi/call_log.c:223
+msgid "aborted"
+msgstr "nutrauktas"
+
+#: ../coreapi/call_log.c:226
+msgid "completed"
+msgstr "užbaigtas"
+
+#: ../coreapi/call_log.c:229
+msgid "missed"
+msgstr "praleistas"
+
+#: ../coreapi/call_log.c:232
+msgid "unknown"
+msgstr "nežinoma"
+
+#: ../coreapi/call_log.c:234
+#, c-format
+msgid ""
+"%s at %s\n"
+"From: %s\n"
+"To: %s\n"
+"Status: %s\n"
+"Duration: %i mn %i sec\n"
+msgstr "%s ties %s\nNuo: %s\nKam: %s\nBūsena: %s\nTrukmė: %i min. %i sek.\n"
+
+#: ../coreapi/call_log.c:235
+msgid "Outgoing call"
+msgstr "Išeinantis skambutis"
+
+#: ../gtk/videowindow.c:72
+#, c-format
+msgid "Cannot play %s."
+msgstr "Nepavyksta groti %s."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 638f894ed..87aff17c0 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -1,78 +1,85 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Øyvind Sæther <oyvinds@everdot.org>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/"
-"belledonne-communications/linphone-gtk/language/nb_NO/)\n"
-"Language: nb_NO\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/belledonne-communications/linphone-gtk/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Ring %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Send tekst til %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr ""
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr ""
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr ""
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr ""
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr ""
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr ""
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
@@ -90,51 +97,57 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Fant ikke pixmap fli: %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "skriv logg-informasjon under kjøring"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Start skjult i systemkurven, ikke vis programbildet."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "address som skal ringes nå"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:"
-"\\Programfiler\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Spesifiser arbeidsmappe (bør være base for installasjonen, f.eks: c:\\Programfiler\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -142,8 +155,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -154,254 +166,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Samtale avsluttet"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Svarer"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Avvis"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Peker til nettsted"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Standard)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Vi er overført til %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Klarte ikke å finne noe lydkort på denne datamaskinen.\n"
-"Du vil ikke kunne sende eller motta lydsamtaler."
+msgstr "Klarte ikke å finne noe lydkort på denne datamaskinen.\nDu vil ikke kunne sende eller motta lydsamtaler."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr ""
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Tilstedestatus"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Navn"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Søk i %s katalogen"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Ugyldig SIP kontakt !"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Rediger kontakt '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Slett kontakt '%s'"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Legg til kontakt fra %s katalogen"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Navn"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Frekvens (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parametere"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "På"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Av"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Engelsk"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Fransk"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italisensk"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Portugisisk"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Tysk"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "Du må restarte linphone for at det nye språkvalget skal iverksettes."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr ""
 
@@ -410,9 +413,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"En nyere utgave er tilgjengelig fra %s.\n"
-"Vil du åpne en nettleser og laste den ned ?"
+msgstr "En nyere utgave er tilgjengelig fra %s.\nVil du åpne en nettleser og laste den ned ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -445,339 +446,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] "Fant kontakt %i"
 msgstr[1] "Hittat kontakt %i"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Passord:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Takk. Ditt konto er nå satt opp og klart til bruk."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Velkommen til brukerkontoveiviseren"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Brukerkontoveiviser"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr ""
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr ""
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr ""
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr ""
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr ""
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr ""
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr ""
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr ""
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
-#, fuzzy
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
-msgstr "00:00:00"
+msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "Innkommende samtale"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr ""
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>I samtale med</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Pauset samtale</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtale avsluttet.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Fortsett"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr ""
 
@@ -816,176 +677,89 @@ msgstr ""
 msgid "Did you hear three beeps ?"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Alle brukere"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Tilkoblede brukere"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Fiber Kanal"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Standard"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
 msgstr ""
 
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Alternativer"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Vis video av deg selv"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Vis avlusningsvindu"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "H_jemmeside"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Sjekk _Oppdateringer"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "Sip adresse eller telefonnummer:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Start en ny samtale"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Søk"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Legg til kontakter fra katalogen</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Legg til kontakt"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Min nåværende identitet:"
-
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
 msgstr ""
@@ -996,9 +770,7 @@ msgstr ""
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"En Internet Videotelefon som bruker den standardiserte SIP-protokollen "
-"(rfc3261)."
+msgstr "En Internet Videotelefon som bruker den standardiserte SIP-protokollen (rfc3261)."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1016,484 +788,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP Addresse"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Vis kontaktens tilstedestatus"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "La denne kontakten se min tilstedestatus"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Kontaktinformasjon</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone avlusningsvindu"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Autorisering kreves"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Skriv inn passordet for domenet"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "BrukerID"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Samtalehistorikk"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Fjern alle"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Ring tilbake"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Konfigurer en SIP konto"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Din SIP identitet:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Ser ut som sip:<brukernavn>@<domene>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP Proxy addresse:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Ser ut som sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Registreringsfrekvens (sek.):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Route (valgfritt):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Publiser tilstedestatus"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Konfigurer en SIP konto"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "standard lydkort"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "ett lydkort"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "standard kamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Lyd kodek"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Video kodek"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Denne seksjonen velger SIP-addresse når du ikke bruker en SIP-konto"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Vist navn (eks: Ola Nordmann):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Ditt brukernavn:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Din resulterende SIP addresse:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Standard identitet</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Legg til"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Rediger"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy kontoer</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Slett alle passord"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Personvern</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "Behandle SIP-kontoer"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Ringelyd:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Spesiell ALSA enhet (valgfritt):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Mikrofonenhet:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Ringe-enhet:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Avspillingsenhet:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Bruk ekko-kansellering"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Lyd</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Videoenhet:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 betyr \"ubegrenset\""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Maks opplastningshastighet i Kbit/sek:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Nedlastningsbegrensning i Kbit/sek:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Båndbreddekontrol</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Multimediainnstillinger"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Velg MTU (Maximum Transmission Unit):"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Send DTMF som SIP-info"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Transport</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Lyd RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Tilkoblet Internett direkte"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Offentlig IP-addresse:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "STUN tjener:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT og Brannvegg</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Nettverksinnstillinger"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Aktiver"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Deaktiver"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Kodek"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Språk</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Vis avanserte innstillinger"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Nivå</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Brukergrensesnitt"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Ferdig"
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr "Søk kontakter i katalogen"
@@ -1506,29 +800,21 @@ msgstr "Legg til listen min"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Søk noen</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Vennligst vent"
-
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr ""
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Samtalehistorikk"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Fjern alle"
 
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Ring tilbake"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1578,38 +864,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Send"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP Addresse"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Vis kontaktens tilstedestatus"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "La denne kontakten se min tilstedestatus"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Kontaktinformasjon</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Brukernavn"
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Passord"
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Overfører"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "I samtale"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Varighet"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Passord:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1695,70 +1055,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Brukernavn"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Send"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Overfører"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "I samtale"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Varighet"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr ""
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Passord"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1768,6 +1071,10 @@ msgstr "Internet forbindelse:"
 msgid "Automatically log me in"
 msgstr "Logg meg på automatisk"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "BrukerID"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Innlogginsinformasjon"
@@ -1776,292 +1083,990 @@ msgstr "Innlogginsinformasjon"
 msgid "<b>Welcome!</b>"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fiber Kanal"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone avlusningsvindu"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr ""
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Standard"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr ""
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Alternativer"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr ""
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Vis video av deg selv"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Vis avlusningsvindu"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "H_jemmeside"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Sjekk _Oppdateringer"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr ""
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "Sip adresse eller telefonnummer:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Start en ny samtale"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Søk"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Legg til kontakter fra katalogen</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Legg til kontakt"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Min nåværende identitet:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "standard lydkort"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "ett lydkort"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "standard kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Lyd kodek"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Video kodek"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Denne seksjonen velger SIP-addresse når du ikke bruker en SIP-konto"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Vist navn (eks: Ola Nordmann):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Ditt brukernavn:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Din resulterende SIP addresse:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Standard identitet</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Legg til"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Rediger"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Proxy kontoer</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Slett alle passord"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Personvern</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Behandle SIP-kontoer"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Ringelyd:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Spesiell ALSA enhet (valgfritt):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Mikrofonenhet:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Ringe-enhet:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Avspillingsenhet:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Bruk ekko-kansellering"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Lyd</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Videoenhet:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 betyr \"ubegrenset\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Maks opplastningshastighet i Kbit/sek:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Nedlastningsbegrensning i Kbit/sek:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Båndbreddekontrol</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Multimediainnstillinger"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Velg MTU (Maximum Transmission Unit):"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Send DTMF som SIP-info"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Transport</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Lyd RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Tilkoblet Internett direkte"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Bak NAT / Brannmur (bruk STUN for å avgjøre)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Offentlig IP-addresse:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "STUN tjener:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT og Brannvegg</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Nettverksinnstillinger"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Aktiver"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Deaktiver"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Kodek"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Språk</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Vis avanserte innstillinger"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Nivå</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Brukergrensesnitt"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Ferdig"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Autorisering kreves"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Skriv inn passordet for domenet"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Velkommen til brukerkontoveiviseren"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Brukerkontoveiviser"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Takk. Ditt konto er nå satt opp og klart til bruk."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Konfigurer en SIP konto"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Din SIP identitet:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Ser ut som sip:<brukernavn>@<domene>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP Proxy addresse:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Ser ut som sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Registreringsfrekvens (sek.):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Route (valgfritt):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Publiser tilstedestatus"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Konfigurer en SIP konto"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Vennligst vent"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Klar"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Tilknytter"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Kunne ikke ringe"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Beklager, du har nådd maksimalt antall samtidige samtaler"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "Kontakter deg."
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr " og ba om autosvar."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Endrer ringeparametre..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Tilkoblet"
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Samtale avbrutt"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "Kunne ikke pause samtalen"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Pauser nåværende samtale"
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "STUN oppslag pågår..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Tilknyttet"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Kommer plutselig tilbake"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Borte"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "I telefonen"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "Ute til lunsj"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Flyttet"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Bruker en annen tjeneste"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Pågående"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" "
-"etterfult av vertsnavn."
+msgstr "SIP proxy adressen du har angitt er ugyldig, den må begynne med \"sip:\" etterfult av vertsnavn."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"SIP adressen du har angitt er feil. Adressen bør se ut som sip: "
-"brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
+msgstr "SIP adressen du har angitt er feil. Adressen bør se ut som sip: brukernavn@domenenavn, f.eks sip:ola@eksempel.no"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Ser etter telefonnummer for destinasjonen..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Kan ikke tilkoble dette nummeret."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Ikke ikke logge inn som %s"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Tidlig media"
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "Samtalen med %s er pauset."
+msgid "Call answered by %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Samtale besvart av %s - på vent."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Samtale gjenopptatt."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "Samtale besvart av %s."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Samtale avsluttet."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Brukeren er opptatt."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Brukeren er midlertidig ikke tilgjengelig."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Brukeren vil ikke bli forstyrret."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Samtale avvist."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Omdirigert"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Samtale feilet."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lykkes."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "ingen svar innen angitt tid"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislykkes: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i ubesvarte anrop."
 msgstr[1] "Du har %i missade samtal"
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2071,11 +2076,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 647840d44..a833e03b7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,80 +1,85 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Heimen Stoffels <vistausss@outlook.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/nl/)\n"
-"Language: nl\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/belledonne-communications/linphone-gtk/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "%s bellen"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "SMS versturen aan %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Recente gesprekken"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>Recent oproepen (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "n.v.t."
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Afgebroken"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Gemist"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuut"
 msgstr[1] "%i minuten"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i seconde"
 msgstr[1] "%i seconden"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Kwaliteit: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Kwaliteit: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -92,53 +97,57 @@ msgstr "Ik"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Het pixmap-bestand %s kon niet worden gevonden"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
-msgstr ""
-"loggen naar stdout om wat foutopsporingsinformatie te verkrijgen tijdens "
-"uitvoeren."
+msgstr "loggen naar stdout om wat foutopsporingsinformatie te verkrijgen tijdens uitvoeren."
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "Pad naar een bestand om logbestanden heen te schrijven."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Linphone opstarten met uitgeschakelde video."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Alleen in het systeemvak opstarten, niet met venster en al."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "adres om nu naar toe te bellen"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Specificeer een werkmap (dit moet de basis van uw installatie zijn, bijv.: C:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Specificeer een werkmap (dit moet de basis van uw installatie zijn, bijv.: C:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "Configuratiebestand"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "Doorloop de audio-instelwizard"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr "Draai een zelftest en exit 0 wanneer succesvol"
 
@@ -146,8 +155,7 @@ msgstr "Draai een zelftest en exit 0 wanneer succesvol"
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -156,259 +164,247 @@ msgstr ""
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Vul uw wachtwoord in voor gebruikersnaam <i>%s</i>\n"
-"op realm <i>%s</i>"
+msgstr "Vul uw wachtwoord in voor gebruikersnaam <i>%s</i>\nop realm <i>%s</i>"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Oproepfout"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Oproep beëindigd"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Opnemen"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Weigeren"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Oproep gepauzeerd"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>door %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s stelt u voor om video in te schakelen. Wilt u dit accepteren?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Websitelink"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Standaard)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "We zijn overgeschakeld naar %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Er zijn geluidskaarten aangetroffen op deze computer.\n"
-"U zult niet in staat zijn om audio-oproepen te ontvangen of versturen."
+msgstr "Er zijn geluidskaarten aangetroffen op deze computer.\nU zult niet in staat zijn om audio-oproepen te ontvangen of versturen."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Een gratis SIP-videotelefoon"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Toevoegen aan adresboek"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Aanwezigheidsstatus"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Naam"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Bellen"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Chatten"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Zoeken in de map %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Ongeldig SIP-contactpersoon"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Contactpersoon '%s' bewerken"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Contactpersoon '%s' verwijderen"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "Chatgeschiedenis van '%s' verwijderen"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Nieuw contactpersoon toevoegen vanuit de map %s"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Naam"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Frequentie (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "IP-bitrate (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Argumenten"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Account"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Engels"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Frans"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Braziliaans Portugees"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Pools"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Duits"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Japans"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Tjechisch"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Chinees"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Traditioneel Chinees"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Noors"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Servisch"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"U moet linphone herstarten om de nieuw geselecteerde taal toe te passen."
+msgstr "U moet linphone herstarten om de nieuw geselecteerde taal toe te passen."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Geen"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr "DTLS"
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -417,9 +413,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Er is een nieuwere versie beschikbaar op %s.\n"
-"Wilt een webbrowser openen en deze downloaden?"
+msgstr "Er is een nieuwere versie beschikbaar op %s.\nWilt een webbrowser openen en deze downloaden?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -452,349 +446,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] "%i contactpersoon gevonden"
 msgstr[1] "%i contactpersonen gevonden"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Welkom!\n"
-"Deze instelwizard zal u begeleiden bij het gebruiken van een SIP-account "
-"voor oproepen."
-
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Creëer een account op linphone.org"
-
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Ik heb al een linphone.org-account en wil deze graag gebruiken"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "Ik heb al een SIP-account en wil deze graag gebruiken"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr "Ik wil een externe URI-configuratie opgeven"
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Gebruikersnaam*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Wachtwoord*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Domeinnaam*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Proxy"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Vul uw linphone.org-gebruikersnaam in"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Verplichte velden"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Gebruikersnaam: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Wachtwoord: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "E-mailadres: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Bevestig uw wachtwoord: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "Houdt me op de hoogte van linphone-updates"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Valideer uw account door te klikken op de link die we zojuist naar uw e-"
-"mailadres hebben verstuurd.\n"
-"Kom dan terug naar dit venster en klik op de knop Volgende."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Er is een fout opgetreden: uw account is niet gevalideerd, de gebruikersnaam "
-"wordt al door iemand anders gebruikt of de server is onbereikbaar.\n"
-"Ga terug en probeer het opnieuw."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Bedankt. Uw account is nu ingesteld en klaar voor gebruik."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "SIP-account-instelwizard"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Welkom bij de account-instelwizard"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Account-instelwizard"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Uw account instellen (stap 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Vul uw SIP-gebruikersnaam in (stap 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Vul uw accountinformatie in (stap 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Geldigheid (stap 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Fout"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Bezig met vernietigen"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "#%i bellen"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Overschakelen naar gesprek #%i met %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Niet in gebruik"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE is niet geactiveerd"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ICE is mislukt"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ICE is bezig"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Die door één of meer NATs gaan"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "Direct"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Via een relay-server"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnP is niet geactiveerd"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "uPnP is bezig"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnP is niet beschikbaar"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP wordt uitgevoerd"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "uPnP is mislukt"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "Direct of via een server"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"download: %f\n"
-"upload: %f (kbit/s)"
+msgstr "download: %f\nupload: %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f fps"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f seconden"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Ophangen"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Bezig met bellen...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
-msgstr "00:00:00"
+msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Inkomende oproep</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "goed"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "gemiddeld"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "slecht"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "erg slecht"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "verschrikkelijk"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "niet beschikbaar"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Beveiligd door SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr "Beveiligd door DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Beveiligd door ZRTP - [authenticatiesleutel: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Instellen als niet-geverifieerd"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Instellen als geverifieerd"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "In een vergadering"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>In gesprek</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Gepauzeerde oproep</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Oproep is beëindigd.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "De overdracht is bezig"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "De overdracht is voltooid."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "De overdracht is mislukt."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Hervatten"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr "<small><i>Bezig met opnemen naar%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(Gepauzeerd)"
 
@@ -833,178 +677,88 @@ msgstr "Te hard"
 msgid "Did you hear three beeps ?"
 msgstr "Heeft u drie pieptonen gehoord?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "De geluidsvoorkeuren zijn niet gevonden"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "Het systeemgeluidspaneel kon niet worden gestart"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Welkom!\n"
-"Deze instelwizard zal u begeleiden bij het instellen van de audio-"
-"instellingen van Linphone"
+msgstr "Welkom!\nDeze instelwizard zal u begeleiden bij het instellen van de audio-instellingen van Linphone"
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "Opname-apparaat"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "Opgenomen volume"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "Geen stem"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "Systeemgeluidsinstellingen"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "Afspeelapparaat"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "Drie pieptonen afspelen"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "Klik op de opnameknop en zeg enkele woorden"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "Luister naar uw opgenomen stem"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "Opnemen"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "Afspelen"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "Laten we nu Linphone opstarten"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "Audio-instelwizard"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "Audio-instelwizard"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "Kalibratie van het microfoonbereik"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "Kalibratie van het luidsprekervolume"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "Opnemen en afspelen"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Alle gebruikers"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Online gebruikers"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Fiber-kanaal"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Standaard"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Opties"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr "Configuratie-URI instellen"
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Video altijd starten"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Eigen weergave inschakelen"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Hulp"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Foutopsporingsvenster weergeven"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Website"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Controleren op _updates"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Account-instelwizard"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SIP-adres of telefoonnummer:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Een nieuw gesprek beginnen"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Contactpersonen"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Zoeken"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Voeg contactpersonen toe uit map</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Contactpersoon toevoegen"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Recente gesprekken"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Mijn huidige identiteit:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Bezig met vernietigen"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1016,9 +770,7 @@ msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Een internetvideotelefoon gebruikmakende van het standaard SIP (rfc3261) "
-"protocol."
+msgstr "Een internetvideotelefoon gebruikmakende van het standaard SIP (rfc3261) protocol."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1034,498 +786,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP-adres"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "De aanwezigheidsstatus van dit contactpersoon weergeven"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr ""
-"Toestaan dat deze contactpersoon mijn aanwezigheidsstatus kan weergeven"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Contactinformatie</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone-foutopsporingsvenster"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Scroll naar het einde"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Authenticatie is vereist"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Vul het domeinnaamwachtwoord in"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "Gebruikersidentificatie"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Gespreksgeschiedenis"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Alles wissen"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Terugbellen"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Een SIP-account instellen"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Uw SIP-identiteit:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Lijkt op:<username>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP-proxyadres:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Lijkt op sip:<proxy hostnaam>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Registratieduur (sec):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "Contactparameters (optioneel):"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "AVPF regulier RTCP-tussenpose (sec):"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Route (optioneel):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Overdracht"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Registreren"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Aanwezigheidsinformatie publiceren"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "AVPF inschakelen"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Een SIP-account instellen"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "anoniem"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "standaard geluidskaart"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "een geluidskaart"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "standaard camera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Audio-codecs"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Video-codecs"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Instellingen"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Uw weergavenaam (bijv.: Jan Noniem):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Uw gebruikersnaam:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Standaardidentiteit</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Instelhulp"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Toevoegen"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Bewerken"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Belgeluid:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "ALSA speciaal apparaat (optioneel)"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Opnameapparaat:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Belapparaat:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Afspeelapparaat:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Echo-onderdrukking inschakelen"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Videoingang-apparaat:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "Videouitgangsmethode:"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "Cameravoorbeeld weergeven"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Multimedia-instellingen"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Maximale Transmissie-unit instellen:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "DTMF's als SIP-informatie versturen"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Overdracht</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "SIP/UDP-poort"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "Willekeurig"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "SIP/TCP-poort"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "AUDIO RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Vastgezet"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Video RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Mediaversleutelingstype"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Mediaversleuteling is vereist"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Tunnel"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "DSCP-velden"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Netwerkprotocol en -poorten</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Directe verbinding met het internet"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Achter een NAT / Firewall (specificeer de gateway IP)"
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Openbaar IP-adres:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Stun-server"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT en Firewall</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Netwerkinstellingen"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Aan"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Uit"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr ""
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1539,29 +800,21 @@ msgstr ""
 msgid "<b>Search somebody</b>"
 msgstr ""
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr ""
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Bellernaam</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr ""
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Gespreksgeschiedenis"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Alles wissen"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Terugbellen"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1611,38 +864,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Verzenden"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Vergadering beëindigen"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP-adres"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "De aanwezigheidsstatus van dit contactpersoon weergeven"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Toestaan dat deze contactpersoon mijn aanwezigheidsstatus kan weergeven"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Contactinformatie</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
 msgstr ""
 
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Deze oproep opnemen naar een audiobestand"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Video"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Dempen"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Overdracht"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "In gesprek"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Duur"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Waardering van de gesprekskwaliteit"
+
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Gebruikersnaam:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Wachtwoord:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1728,70 +1055,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Gebruikersnaam"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Verzenden"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Bellernaam</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Vergadering beëindigen"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Deze oproep opnemen naar een audiobestand"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Video"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Dempen"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Overdracht"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "In gesprek"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Duur"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Waardering van de gesprekskwaliteit"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Wachtwoord"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1801,6 +1071,10 @@ msgstr "Internetverbinding:"
 msgid "Automatically log me in"
 msgstr "Automatisch inloggen"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Gebruikersidentificatie"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Inloginformatie"
@@ -1809,288 +1083,990 @@ msgstr "Inloginformatie"
 msgid "<b>Welcome!</b>"
 msgstr "<b>Welkom!</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fiber-kanaal"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone-foutopsporingsvenster"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Scroll naar het einde"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Standaard"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Opties"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Configuratie-URI instellen"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Video altijd starten"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Eigen weergave inschakelen"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Hulp"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Foutopsporingsvenster weergeven"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Website"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Controleren op _updates"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Account-instelwizard"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP-adres of telefoonnummer:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Een nieuw gesprek beginnen"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Contactpersonen"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Zoeken"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Voeg contactpersonen toe uit map</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Contactpersoon toevoegen"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Mijn huidige identiteit:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "anoniem"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "standaard geluidskaart"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "een geluidskaart"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "standaard camera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Audio-codecs"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Video-codecs"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Instellingen"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Uw weergavenaam (bijv.: Jan Noniem):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Uw gebruikersnaam:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Standaardidentiteit</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Instelhulp"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Toevoegen"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Bewerken"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Belgeluid:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "ALSA speciaal apparaat (optioneel)"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Opnameapparaat:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Belapparaat:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Afspeelapparaat:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Echo-onderdrukking inschakelen"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Videoingang-apparaat:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Videouitgangsmethode:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Cameravoorbeeld weergeven"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr ""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Multimedia-instellingen"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Maximale Transmissie-unit instellen:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "DTMF's als SIP-informatie versturen"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Overdracht</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "SIP/UDP-poort"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Willekeurig"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "SIP/TCP-poort"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "AUDIO RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Vastgezet"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Video RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP-velden"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Netwerkprotocol en -poorten</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Directe verbinding met het internet"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Achter een NAT / Firewall (specificeer de gateway IP)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Openbaar IP-adres:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Stun-server"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT en Firewall</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Mediaversleutelingstype"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Mediaversleuteling is vereist"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Netwerkinstellingen"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Aan"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Uit"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr ""
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Authenticatie is vereist"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Vul het domeinnaamwachtwoord in"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "SIP-account-instelwizard"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Welkom!\nDeze instelwizard zal u begeleiden bij het gebruiken van een SIP-account voor oproepen."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Welkom bij de account-instelwizard"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Creëer een account op linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Ik heb al een linphone.org-account en wil deze graag gebruiken"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Ik heb al een SIP-account en wil deze graag gebruiken"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Ik wil een externe URI-configuratie opgeven"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Account-instelwizard"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Gebruikersnaam*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Wachtwoord*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Domeinnaam*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Uw account instellen (stap 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Vul uw linphone.org-gebruikersnaam in"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Vul uw SIP-gebruikersnaam in (stap 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Verplichte velden"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "E-mailadres: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Gebruikersnaam: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Wachtwoord: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Bevestig uw wachtwoord: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Houdt me op de hoogte van linphone-updates"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Vul uw accountinformatie in (stap 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Valideer uw account door te klikken op de link die we zojuist naar uw e-mailadres hebben verstuurd.\nKom dan terug naar dit venster en klik op de knop Volgende."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Geldigheid (stap 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Er is een fout opgetreden: uw account is niet gevalideerd, de gebruikersnaam wordt al door iemand anders gebruikt of de server is onbereikbaar.\nGa terug en probeer het opnieuw."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Fout"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Bedankt. Uw account is nu ingesteld en klaar voor gebruik."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Een SIP-account instellen"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Uw SIP-identiteit:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Lijkt op:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP-proxyadres:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Lijkt op sip:<proxy hostnaam>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Registratieduur (sec):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Contactparameters (optioneel):"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF regulier RTCP-tussenpose (sec):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Route (optioneel):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Overdracht"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Registreren"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Aanwezigheidsinformatie publiceren"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "AVPF inschakelen"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Een SIP-account instellen"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Gereed."
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Verbinden"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Verbonden."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "STUN adres wordt opgezocht..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Aanwezig"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Bezet"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr ""
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr ""
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr ""
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Niet storen"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr ""
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr ""
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr ""
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr ""
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Zoekt de lokatie van het telefoonnummer..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Kon dit nummer niet vinden."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/proxy.c:1494
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1522
+#, c-format
 msgid "Refreshing on %s..."
-msgstr "bezig met ophalen van %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
+msgid "Call answered by %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Oproep beeindigd."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Gebruiker is bezet."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Gebruiker is tijdelijk niet beschikbaar."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "De gebruiker wenst niet gestoord te worden."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Oproep geweigerd."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registratie op %s gelukt."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2100,11 +2076,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 27329ea36..00d4e22cd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,57 +1,63 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Polish (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/pl/)\n"
-"Language: pl\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Polish (http://www.transifex.com/belledonne-communications/linphone-gtk/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr ""
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr ""
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr ""
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr ""
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr ""
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr ""
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr ""
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -59,7 +65,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -67,14 +73,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
@@ -92,49 +98,57 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nie można znaleźć pixmapy: %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -142,8 +156,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -154,252 +167,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr ""
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr ""
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr ""
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr ""
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr ""
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Nazwa"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Jakość (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parametr"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr ""
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr ""
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr ""
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr ""
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr ""
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr ""
 
@@ -442,338 +448,199 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr ""
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr ""
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr ""
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr ""
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr ""
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr ""
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr ""
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr ""
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr ""
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr ""
 
@@ -812,174 +679,87 @@ msgstr ""
 msgid "Did you hear three beeps ?"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr ""
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr ""
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr ""
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr ""
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr ""
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr ""
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr ""
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr ""
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr ""
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr ""
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr ""
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr ""
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr ""
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr ""
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr ""
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr ""
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr ""
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
@@ -1010,484 +790,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr ""
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr ""
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Włączony"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Wyłącz"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr ""
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr ""
@@ -1500,28 +802,20 @@ msgstr ""
 msgid "<b>Search somebody</b>"
 msgstr ""
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
-
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
@@ -1572,38 +866,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr ""
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr ""
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1689,69 +1057,12 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr ""
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
 msgstr ""
 
 #: ../gtk/login_frame.ui.h:3
@@ -1762,6 +1073,10 @@ msgstr ""
 msgid "Automatically log me in"
 msgstr ""
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr ""
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr ""
@@ -1770,265 +1085,967 @@ msgstr ""
 msgid "<b>Welcome!</b>"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr ""
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr ""
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr ""
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr ""
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr ""
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr ""
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr ""
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr ""
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr ""
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr ""
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr ""
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr ""
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr ""
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr ""
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr ""
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr ""
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr ""
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr ""
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr ""
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr ""
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr ""
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr ""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Włączony"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Wyłącz"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr ""
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr ""
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Połączony"
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr ""
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr ""
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr ""
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Zajęty"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr ""
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr ""
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Nie przeszkadzać"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr ""
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr ""
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr ""
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr ""
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
+msgid "Call answered by %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr ""
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Osoba jest zajęta."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Osoba jest tymczasowo niedostępna."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Osoba nie chce, aby jej przeszkadzać."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Rozmowa odrzucona."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -2036,23 +2053,23 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2062,11 +2079,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bf6aa49b8..2fa82eac4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,77 +1,84 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/belledonne-"
-"communications/linphone-gtk/language/pt_BR/)\n"
-"Language: pt_BR\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/belledonne-communications/linphone-gtk/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr ""
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr ""
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr ""
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr ""
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr ""
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr ""
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr ""
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
@@ -89,49 +96,57 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "Não é possível achar arquivo pixmap: %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr ""
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr ""
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr ""
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -139,8 +154,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -151,252 +165,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr ""
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Camadas recebidas"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr ""
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr ""
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr ""
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr ""
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr ""
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr ""
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Status de presença"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Nome"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr ""
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr ""
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr ""
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Nome"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Taxa (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr ""
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Desativado"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr ""
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr ""
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr ""
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr ""
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr ""
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr ""
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr ""
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Nenhum"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr ""
 
@@ -438,338 +445,199 @@ msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr ""
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr ""
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr ""
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr ""
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr ""
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr ""
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr ""
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr ""
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr ""
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr ""
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr ""
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr ""
 
@@ -808,174 +676,87 @@ msgstr ""
 msgid "Did you hear three beeps ?"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr ""
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr ""
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr ""
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr ""
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr ""
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr ""
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr ""
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr ""
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr ""
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr ""
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr ""
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr ""
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr ""
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr ""
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr ""
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr ""
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr ""
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
 msgstr ""
 
 #: ../gtk/about.ui.h:1
@@ -1006,484 +787,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr ""
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr ""
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr ""
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr ""
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr ""
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Rota (opcional):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Editar"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Remover"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Ativado"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Desativar"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr ""
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr ""
@@ -1496,28 +799,20 @@ msgstr ""
 msgid "<b>Search somebody</b>"
 msgstr ""
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
@@ -1568,38 +863,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr ""
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr ""
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1685,69 +1054,12 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr ""
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
 msgstr ""
 
 #: ../gtk/login_frame.ui.h:3
@@ -1758,6 +1070,10 @@ msgstr ""
 msgid "Automatically log me in"
 msgstr ""
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr ""
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr ""
@@ -1766,288 +1082,990 @@ msgstr ""
 msgid "<b>Welcome!</b>"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr ""
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr ""
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr ""
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr ""
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr ""
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr ""
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr ""
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr ""
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr ""
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr ""
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr ""
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr ""
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr ""
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr ""
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr ""
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr ""
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr ""
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr ""
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr ""
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr ""
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr ""
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Editar"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Remover"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr ""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Ativado"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Desativar"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr ""
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr ""
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Rota (opcional):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr ""
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Conectado."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr ""
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr ""
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr ""
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Ocupado"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr ""
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr ""
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr ""
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr ""
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr ""
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr ""
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Procurando por telefone de destino..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Não foi possível encontrar este número."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
+msgid "Call answered by %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr ""
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Usuário está ocupado."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Usuário está temporáriamente indisponível."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr ""
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr ""
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2057,11 +2075,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 48f1f7880..294f2f35a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,10 +1,10 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # AlexL <loginov.alex.valer@gmail.com>, 2014
-# AlexL <loginov.alex.valer@gmail.com>, 2014-2015
+# AlexL <loginov.alex.valer@gmail.com>, 2014-2016
 # AlexL <loginov.alex.valer@gmail.com>, 2014
 # Maxim Prokopyev <jazzelastic@gmail.com>, 2010
 # Simon Morlat <linphone@free.fr>, 2001
@@ -12,51 +12,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:40+0000\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 12:36+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.com/belledonne-communications/linphone-gtk/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Звонок %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Послать текст для %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Добавить %s в мой список контактов"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Последние звонки"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>Последние вызовы (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "—"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Прервано"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Пропущено"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Отклонено"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -65,7 +71,7 @@ msgstr[1] "%i минуты"
 msgstr[2] "%i минут"
 msgstr[3] "%i минут"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -74,16 +80,14 @@ msgstr[1] "%i секунды"
 msgstr[2] "%i секунд"
 msgstr[3] "%i секунд"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Качество: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Качество: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -101,53 +105,57 @@ msgstr "Мне"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Невозможно найти графический файл: %s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Отправка..."
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Сообщение не отправилось"
+
+#: ../gtk/chat.c:498
 msgid "Copy"
-msgstr ""
+msgstr "Копировать"
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
-msgstr ""
-"Вывод некоторой отладочной информации на устройство стандартного вывода во "
-"время работы."
+msgstr "Вывод некоторой отладочной информации на устройство стандартного вывода во время работы."
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr "показать версию и выйти."
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "Путь к файлу для записи логов."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Запуск linphone с видео отключен."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Показывать только в системном лотке, не запуская главное окно."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "Адрес для звонка прямо сейчас."
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Определить рабочий каталог (относительно каталога установки, например: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Определить рабочий каталог (относительно каталога установки, например: c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "Файл конфигурации"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "Запустить помощника аудио"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr "Запустить самотест и выйти при успехе со статусом 0"
 
@@ -155,274 +163,256 @@ msgstr "Запустить самотест и выйти при успехе с
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
-"%s хочет добавить Вас в его/её список контактов.\n"
-"Вы бы добавили его/её в свой список контактов и позволили ему/ей видеть ваш "
-"статус присутствия?\n"
-"Если вы ответите нет, то этот человек будет временно занесён в чёрный список."
+msgstr "%s хочет добавить Вас в его/её список контактов.\nВы бы добавили его/её в свой список контактов и позволили ему/ей видеть ваш статус присутствия?\nЕсли вы ответите нет, то этот человек будет временно занесён в чёрный список."
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Пожалуйста, введите пароль для пользователя <i>%s</i>\n"
-" для реалм (рилм) <i>%s</i>:"
+msgstr "Пожалуйста, введите пароль для пользователя <i>%s</i>\n для реалм (рилм) <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Ошибка звонка"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Звонок окончен"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Входящий звонок"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Ответ"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Звонок приостановлен"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>%s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s предложил запустить видео. Вы принимаете?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Домашняя страница"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr "Видео интернет телефон"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (по умолчанию)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Мы передали в %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Звуковые карты не были обнаружены на этом компьютере.\n"
-"Вы не сможете отправлять или получать аудио звонки."
+msgstr "Звуковые карты не были обнаружены на этом компьютере.\nВы не сможете отправлять или получать аудио звонки."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Свободный SIP видео-телефон"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr "Привет\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Добавить в адресную книгу"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Статус присутствия"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Имя"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Звонок"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Чат"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Поиск в директории %s"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Неверный sip контакт!"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Добавить новый контакт"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Редактировать контакт '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Удалить контакт '%s'"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "Удалить историю чата для '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Добавить новый контакт из директории '%s'"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Имя"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Частота (Гц)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Статус"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "IP битрейт (КБит/сек)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Параметры"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Разрешён"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Не разрешён"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Учётная запись"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Английский"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Французский"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Бразильский португальский"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Польский"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Немецкий"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Русский"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Японский"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Датский"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Китайский"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Традиционный китайский"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Сербский"
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr "Арабский"
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr "Турецкий"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили "
-"в силу."
+msgstr "Вы должны перезагрузить linphone для того, чтобы языковые настройки вступили в силу."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Нет"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr "DTLS"
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -431,9 +421,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Доступна новая версия с %s.\n"
-"Открыть браузер для загрузки?"
+msgstr "Доступна новая версия с %s.\nОткрыть браузер для загрузки?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -468,353 +456,199 @@ msgstr[1] "Найдено %i контакта"
 msgstr[2] "Найдено %i контактов"
 msgstr[3] "Найдено %i контактов"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Добро пожаловать!\n"
-"Этот ассистент поможет вам использовать SIP аккаунт для ваших звонков."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Имя пользователя уже используется!"
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Создать учётную запись на linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Не удалось проверить наличие имени пользователя. Пожалуйста, повторите попытку позднее."
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-"Я уже имею учётную запись на linphone.org и только хочу использовать её"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "Я уже имею учётную запись sip и только хочу использовать её"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr "Я хочу указать удалённую конфигурацию URI"
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr "Введите вашу информацию об учётной записи"
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Имя пользователя*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Пароль*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Домен*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Прокси"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Введите ваше имя пользователя для linphone.org"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Имя пользователя:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Обязательные поля"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Имя пользователя: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Пароль: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "Электронная почта: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Подтвердите ваш пароль: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "Информировать об обновлениях linphone"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr "Ваша учётная запись создаётся, пожалуйста, подождите."
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы "
-"только\n"
-"что получили по электронной почте. Затем вернитесь сюда и нажмите кнопку "
-"Далее."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-"Проверяется действительность вашей учётной записи, пожалуйста, подождите."
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Ошибка, учётная запись не подтверждена, имя пользователя уже используется "
-"или\n"
-"сервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Спасибо! Учётная запись успешно настроена и готова к использованию."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "Помощник настройки учётной записи SIP"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Добро пожаловать в помощник настройки учётной записи"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Помощник настройки учётной записи"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Настроить вашу учётную запись (шаг 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Введите ваше sip имя пользователя (шаг 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Введите информацию об учётной записи (шаг 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr "Создание учётной записи в прогрессе"
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Подтверждение (шаг 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr "Проверка действительности учётной записи в прогрессе"
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Ошибка"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Прерывание"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "Звонок #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Передача позвонить #%i с %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Не используется"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE не активировано"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "Неудача ICE"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ICE в прогрессе"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Пройти через один или несколько NAT"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "Напрямую"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Через сервер ретрансляции"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "uPnP не активировано"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "uPnP в прогрессе"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "uPnp недоступен"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "uPnP выполняется"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "Неудача uPnP"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "Напрямую или через сервер"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"загрузка: %f\n"
-"отдача: %f (КБит/сек)"
+msgstr "загрузка: %f\nотдача: %f (КБит/сек)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f кадр/сек"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f секунд"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Повесить трубку"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Звоним...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Входящий звонок</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "хороший"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "средний"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "плохой"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "очень плохой"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "совсем плохой"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "недоступен"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Защищённые с помощью SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr "Защищённые с помощью DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Защищённые с помощью ZRTP - [знак аутентификации: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Установить непроверенный"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Установить проверенный"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "В конференции"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>Звоним</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Звонок приостановлен</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Звонок закончен.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Передача в прогрессе"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Передача завершена."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Передача неудачна."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Продолжить"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Записывается в\n"
-"%s %s</i></small>"
+msgstr "<small><i>Записывается в\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(Пауза)"
 
@@ -853,177 +687,88 @@ msgstr "Слишком громко"
 msgid "Did you hear three beeps ?"
 msgstr "Вы слышали 3 сигнала?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "Настройки звука не найдены"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "Не удаётся запустить системное управление звуком"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Добро пожаловать!\n"
-"Этот ассистент поможет вам настроить настройки аудио для Linphone."
+msgstr "Добро пожаловать!\nЭтот ассистент поможет вам настроить настройки аудио для Linphone."
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "Устройство захвата"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "Уровень записи"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "Нет голоса"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "Системные настройки звука"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "Устройство воспроизведения"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "Проиграть три сигнала"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "Нажмите кнопку записи и скажите несколько слов"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "Прослушайте ваш записанный голос"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "Запись"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "Воспроизведение"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "Давайте сейчас запустим linphone"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "Помощник аудио"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "Помощник аудио"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "Калибровка усиления микрофона"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "Калибровка громкости динамика"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "Записать и проиграть"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Все пользователи"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Пользователи в сети"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Оптоволоконный канал"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Удалить"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Опции"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr "Установить конфигурацию URI"
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Всегда запускать видео"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Показать окно видео"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Помощь"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Показать окно отладки"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Домашняя страница"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Проверить _обновления"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Помощник учётной записи"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SIP-адрес или номер телефона:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Начать новый звонок"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Контакты"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Поиск"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Добавить контакты из директории</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Добавить контакт"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Последние звонки"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Мой текущий идентификатор:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Прерывание"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1051,501 +796,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP адрес"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Показывать этому контакту статус присутствия"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Разрешить этому контакту видеть мой статус присутствия"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Контактная информация</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Окно отладки linphone"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Прокрутка в конец"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - необходима регистрация"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Введите пароль для домена"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "Идентификатор пользователя"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "История звонков"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Очистить всё"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Позвонить повторно"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - настроить учётную запись SIP"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Ваш идентификатор SIP:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Выглядит как sip:<имя_пользователя>@<домен>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "Адрес SIP прокси:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Выглядит как sip:<прокси имя_хоста>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Продолжительность регистрации (сек):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "Параметры контакта (опционально):"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "AVPF постоянный интервал RTCP (сек):"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Маршрут (опционально):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Транспорт"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Регистрация"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Опубликовать статус присутствия"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "Разрешить AVPF"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Настроить учётную запись SIP"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "аноним"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "звуковая карта по умолчанию"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "звуковая карта"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "камера по умолчанию"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Аудио кодеки"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Видео кодеки"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr "По умолчанию"
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr "много кадров в секунду"
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr "Пользовательский"
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Настройки"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись "
-"SIP"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Отображаемое имя (например: Иван Сидоров):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Ваше имя пользователя:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Ваш результирующий SIP адрес:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Идентификатор по умолчанию</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Мастер"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Добавить"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Редактировать"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Удалить"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Учётные записи</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Стереть все пароли"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Секретность</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr "Автоматический ответ при получении звонка"
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr "Задержка перед ответом (мс)"
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr "<b>Автоответ</b>"
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "Управление учётными записями SIP"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Мелодия звонка:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "Специальное устройство ALSA (опционально)"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Устройство захвата:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Устройство звонка:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Устройство воспроизведения:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Разрешить подавление эха"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Аудио</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Устройство для вывода видео:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr "Предпочтительное разрешение видео:"
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "Метод вывода видео:"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "Показать предпросмотр с камеры"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr "Предустановки видео:"
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr "Предпочтительная частота кадров:"
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 означает \"безлимитный\""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Видео</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Ограничение исходящего потока КБит/сек:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Ограничение скорости входящего потока КБит/сек:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Разрешить адаптивное управление скоростью"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Адаптивное управление скоростью - это технология динамического угадывания "
-"доступной пропускной способности во время звонка.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Пропускная способность</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Настройки мультимедиа"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Установить MTU (максимально передаваемый блок):"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Отправлять DTFM как SIP-информацию"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr "Разрешить IPv6"
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Транспорт</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "Порт SIP/UDP"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "Случайно"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "Порт SIP/TCP"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "Аудио RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Фиксированный"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "Видео RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Тип медиа-шифрования"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Медиа-шифрование обязательно"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Тунель"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "Поля DSCP"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Сетевые протоколы и порты</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Прямое подключение к интернет"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "За NAT / брандмауэром (указать IP шлюза)"
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "За NAT / брандмауэром (использовать STUN)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "За NAT / брандмауэром (использовать ICE)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "За NAT / брандмауэром (использовать uPnP)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Выделенный (публичный) IP-адрес:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "STUN сервер:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT и брандмауэр</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Настройки сети"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Разрешить"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Выключить"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr "<b>Аудио кодеки</b>"
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr "<b>Видео кодеки</b>"
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Кодеки"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Язык</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Показать дополнительные настройки"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Уровень</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Пользовательский интерфейс"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "Адрес сервера:"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "Метод аутентификации:"
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Установка учётной записи LDAP</b>"
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Готово"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1559,29 +810,21 @@ msgstr "Добавить в мой список"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Поиск кого-нибудь</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Пожалуйста, подождите"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Имя вызываемого</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "Настройки DSCP"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "История звонков"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SIP"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Очистить всё"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "Аудио поток RTP"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "Видео поток RTP"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>Установить значения DSCP (в шестнадцатеричном формате)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Позвонить повторно"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1631,38 +874,112 @@ msgstr "Профиль RTP"
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>Вызов статистики и информации</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "Настроить тунель VoIP"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Отправить"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Хост"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Конец конференции"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Порт"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Указание удалённой конфигурации URI"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Конфигурировать тунель</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация будет получена при запуске.\nПожалуйста, введите или измените настройки URI ниже. После нажатия OK linphone автоматически перезагрузится чтобы получить и учесть новую конфигурацию в учётной записи."
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Имя пользователя"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP адрес"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Пароль"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Показывать этому контакту статус присутствия"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>Конфигурировать http прокси (опционально)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Разрешить этому контакту видеть мой статус присутствия"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Контактная информация</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "Настройки DSCP"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SIP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "Аудио поток RTP"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "Видео поток RTP"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>Установить значения DSCP (в шестнадцатеричном формате)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Щёлкните здесь чтобы установить громкость динамиков"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Записать этот вызов в аудио файл"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Видео"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Без звука"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Передача"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "Входящий звонок"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Продолжительность"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Вызвать рейтинг качества"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "Настройки LDAP"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Адрес сервера:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Метод аутентификации:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Пароль:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "Использовать соединение TLS"
@@ -1748,75 +1065,13 @@ msgstr "ДАЙДЖЕСТ-MD5"
 msgid "NTLM"
 msgstr "NTLM"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr "Указание удалённой конфигурации URI"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Имя пользователя"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"Этот диалог позволяет установить HTTP или HTTPS адрес, когда конфигурация "
-"будет получена при запуске.\n"
-"Пожалуйста, введите или измените настройки URI ниже. После нажатия OK "
-"linphone автоматически перезагрузится чтобы получить и учесть новую "
-"конфигурацию в учётной записи."
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "Конфигурирование..."
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr "Пожалуйста, подождите пока получается конфигурация с сервера..."
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Отправить"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Имя вызываемого</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Конец конференции"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Записать этот вызов в аудио файл"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Видео"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Без звука"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Передача"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "Входящий звонок"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Продолжительность"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Вызвать рейтинг качества"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Пароль"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1826,6 +1081,10 @@ msgstr "Интернет-соединение:"
 msgid "Automatically log me in"
 msgstr "Входить автоматически"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Идентификатор пользователя"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Информация для входа"
@@ -1834,271 +1093,967 @@ msgstr "Информация для входа"
 msgid "<b>Welcome!</b>"
 msgstr "<b>Добро пожаловать!</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Оптоволоконный канал"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Окно отладки linphone"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Прокрутка в конец"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Опции"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Установить конфигурацию URI"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Всегда запускать видео"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Показать окно видео"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Показать клавиатуру"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr "Импорт контактов из vCards"
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr "Экспорт контактов как vCards"
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Помощь"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Показать окно отладки"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Домашняя страница"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Проверить _обновления"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Помощник учётной записи"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP-адрес или номер телефона:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Начать новый звонок"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Контакты"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Поиск"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Добавить контакты из директории</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Добавить контакт"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Очистить историю звонков"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Мой текущий идентификатор:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Автоответ включен"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "аноним"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "звуковая карта по умолчанию"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "звуковая карта"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "камера по умолчанию"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Аудио кодеки"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Видео кодеки"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Настройки"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Эта секция определяет ваш SIP адрес, когда вы не используете учётную запись SIP"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Отображаемое имя (например: Иван Сидоров):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Ваше имя пользователя:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Ваш результирующий SIP адрес:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Идентификатор по умолчанию</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Мастер"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Добавить"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Редактировать"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Удалить"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Учётные записи</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Стереть все пароли"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Секретность</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Автоматический ответ при получении звонка"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Задержка перед ответом (мс)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Автоответ</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Управление учётными записями SIP"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Мелодия звонка:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Специальное устройство ALSA (опционально)"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Устройство захвата:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Устройство звонка:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Устройство воспроизведения:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Разрешить подавление эха"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Аудио</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Устройство для вывода видео:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Предпочтительное разрешение видео:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Метод вывода видео:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Показать предпросмотр с камеры"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Предустановки видео:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Предпочтительная частота кадров:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 означает \"безлимитный\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Видео</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Ограничение исходящего потока КБит/сек:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Ограничение скорости входящего потока КБит/сек:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Разрешить адаптивное управление скоростью"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Адаптивное управление скоростью - это технология динамического угадывания доступной пропускной способности во время звонка.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Пропускная способность</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Настройки мультимедиа"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Установить MTU (максимально передаваемый блок):"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Отправлять DTFM как SIP-информацию"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Разрешить IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Транспорт</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "Порт SIP/UDP"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Случайно"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "Порт SIP/TCP"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Аудио RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Фиксированный"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Видео RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Тунель"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "Поля DSCP"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Сетевые протоколы и порты</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Прямое подключение к интернет"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "За NAT / брандмауэром (указать IP шлюза)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "За NAT / брандмауэром (использовать STUN)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "За NAT / брандмауэром (использовать ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "За NAT / брандмауэром (использовать uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Выделенный (публичный) IP-адрес:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "STUN сервер:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT и брандмауэр</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Тип медиа-шифрования"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "Использовать лайм для исходящих сообщений чата"
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Медиа-шифрование обязательно"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr "Обязательный"
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr "Предпочтительный"
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Шифрование</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Настройки сети"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Разрешить"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Выключить"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Аудио кодеки</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Видео кодеки</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Кодеки"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Язык</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Показать дополнительные настройки"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Уровень</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Пользовательский интерфейс"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>Установка учётной записи LDAP</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Готово"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - необходима регистрация"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Введите пароль для домена"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Конфигурирование..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Пожалуйста, подождите пока получается конфигурация с сервера..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "Помощник настройки учётной записи SIP"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Добро пожаловать!\nЭтот ассистент поможет вам использовать SIP аккаунт для ваших звонков."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Добро пожаловать в помощник настройки учётной записи"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Создать учётную запись на linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Я уже имею учётную запись на linphone.org и только хочу использовать её"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Я уже имею учётную запись sip и только хочу использовать её"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Я хочу указать удалённую конфигурацию URI"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Помощник настройки учётной записи"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Введите вашу информацию об учётной записи"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Имя пользователя*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Пароль*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Домен*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Прокси"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Настроить вашу учётную запись (шаг 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Введите ваше имя пользователя для linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Введите ваше sip имя пользователя (шаг 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Обязательные поля"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "Электронная почта: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Имя пользователя: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Пароль: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Подтвердите ваш пароль: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Информировать об обновлениях linphone"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Введите информацию об учётной записи (шаг 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Ваша учётная запись создаётся, пожалуйста, подождите."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Создание учётной записи в прогрессе"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Пожалуйста, подтвердите вашу учётную запись, щёлкнув на ссылку, которую вы только\nчто получили по электронной почте. Затем вернитесь сюда и нажмите кнопку Далее."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Подтверждение (шаг 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Проверяется действительность вашей учётной записи, пожалуйста, подождите."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Проверка действительности учётной записи в прогрессе"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Ошибка, учётная запись не подтверждена, имя пользователя уже используется или\nсервер недоступен. Пожалуйста, зайдите снова и попробуйте ещё раз."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Спасибо! Учётная запись успешно настроена и готова к использованию."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - настроить учётную запись SIP"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Ваш идентификатор SIP:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Выглядит как sip:<имя_пользователя>@<домен>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "Адрес SIP прокси:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Выглядит как sip:<прокси имя_хоста>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Продолжительность регистрации (сек):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Параметры контакта (опционально):"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF постоянный интервал RTCP (сек):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Маршрут (опционально):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Транспорт"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Регистрация"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Опубликовать статус присутствия"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Разрешить AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Настроить учётную запись SIP"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Настроить тунель VoIP"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Хост"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Порт"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Конфигурировать тунель</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Конфигурировать http прокси (опционально)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Пожалуйста, подождите"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Готов"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr "Конфигурирование"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Соединение"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Невозможно позвонить"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
-msgstr ""
-"К сожалению, мы достигли максимального количества одновременных звонков"
+msgstr "К сожалению, мы достигли максимального количества одновременных звонков"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "контактирует с вами"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "и спросил автоматический ответ."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Изменение параметров звонка..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Соединён."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Звонок отменён"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "Невозможно приостановить звонок"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Приостановка текущего звонка..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "Идет поиск STUN..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "Сбор локальных кандидатов ICE в прогрессе..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "В сети"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Занят"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Скоро вернусь"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Нет на месте"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "На телефоне"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "На обеде"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Не беспокоить"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Отошёл"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Разговариваю"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Не в сети"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "В ожидании"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "Отдых"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "Неизвестный статус"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Введённый SIP-адрес прокси является недействительным, он должен начинаться с "
-"\"sip:имя_хоста\""
+msgstr "Введённый SIP-адрес прокси является недействительным, он должен начинаться с \"sip:имя_хоста\""
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Неверные параметры для sip идентификации\n"
-"Должно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:"
-"alice@example.net"
+msgstr "Неверные параметры для sip идентификации\nДолжно выглядеть как sip:имя_пользователя@домен_прокси, как например, sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Поиск назначения для телефонного номера.."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Не получилось принять решение по этому номеру."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Невозможно зайти как: %s"
 
-#: ../coreapi/proxy.c:1494
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1522
+#, c-format
 msgid "Refreshing on %s..."
-msgstr "получение от %s"
+msgstr "Обновление %s..."
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Дистанционный звонок."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "Дистанционный звонок..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Предответное проключение."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "Звонок с %s приостановлен."
+msgid "Call answered by %s"
+msgstr "На звонок ответил %s"
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "На звонок ответил %s - на удержании."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Звонок возобновлён."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "На звонок ответил %s."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Несовместимость, проверьте кодеки или параметры безопасности..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "Несовместимость медиа-параметров."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "Мы возобновили."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "Мы приостановлены другой стороной."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "Звонок был дистанционно обновлён."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Звонок прерван."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Пользователь занят."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Пользователь временно недоступен."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Пользователь не хочет чтобы его беспокоили."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Звонок отклонён."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "Таймаут запроса."
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Переадресован"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Звонок не удался."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Регистрация на %s прошла успешно."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Отмена регистрации на %s завершена."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "время ожидания истекло"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Регистрация на %s не удалась: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr "Сервис недоступен, повтор"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Маркер проверки подлинности: %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Параметры звонка не были изменены: %s."
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr "Параметры звонка были успешно изменены."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -2107,23 +2062,23 @@ msgstr[1] "У вас %i пропущенных вызова."
 msgstr[2] "У вас %i пропущенных вызов."
 msgstr[3] "У вас %i пропущенных вызов."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr "прервано"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr "завершено"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr "пропущено"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "неизвестно"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2131,18 +2086,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
-"%s в %s\n"
-"От: %s\n"
-"До: %s\n"
-"Статус: %s\n"
-"Продолжительность: %i мин %i сек\n"
+msgstr "%s в %s\nОт: %s\nДо: %s\nСтатус: %s\nПродолжительность: %i мин %i сек\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr "Исходящий вызов"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr "Невозможно воспроизвести %s."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr "Сделать скриншот"
diff --git a/po/sr.po b/po/sr.po
index 9026fe636..eb96493a2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,58 +1,64 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/sr/)\n"
-"Language: sr\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/belledonne-communications/linphone-gtk/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Позови „%s“"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Пошаљи текст за %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Додајте „%s“ на списак контаката"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Скорашњи позиви"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr "<b>Недавни позиви (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr "н/д"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "Прекинут"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Пропуштен"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Одбијен"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -60,7 +66,7 @@ msgstr[0] "%i минут"
 msgstr[1] "%i минута"
 msgstr[2] "%i минута"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -68,16 +74,14 @@ msgstr[0] "%i секунда"
 msgstr[1] "%i секунде"
 msgstr[2] "%i секунди"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
-"<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n"
-"%s\t%s\t"
+msgstr "<small><i>%s</i>\t<i>Квалитет: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr "<big><b>%s</b></big>\t%s"
@@ -95,51 +99,57 @@ msgstr "Ја"
 msgid "Couldn't find pixmap file: %s"
 msgstr "Не могу да пронађем датотеку сличице: %s"
 
-#: ../gtk/chat.c:493
-msgid "Copy"
-msgstr ""
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Шаљем..."
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Порука није послата"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "Умножи"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "бележи на стандардни излаз неке податке прочишћавања док ради."
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
-msgstr ""
+msgstr "приказује издање и излази."
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "путања до датотеке за уписивање дневника."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Покреће линфон са искљученим видеом."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Покреће се само у системској фиоци, не приказује главно сучеље."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "адреса за позивање управо сада"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:"
-"\\Program Files\\Linphone“)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Наводи радни директоријум (треба да буде основа инсталације, нпр: „c:\\Program Files\\Linphone“)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "Датотека подешавања"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "Покреће помоћника звука"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr "Покреће самоиспробавање и излази 0 ако је успешно"
 
@@ -147,269 +157,256 @@ msgstr "Покреће самоиспробавање и излази 0 ако 
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
+msgstr "%s жели да вас дода на свој списак контакта.\nДа ли желите да га/је додате на ваш списак контакта и да му/јој омогућите да види ваше стање присуства?\nАко одговорите негативно, ова особа ће тренутно бити стављена на списак забрањених."
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
-"Унесите вашу лозинку за корисничко име <i>%s</i>\n"
-" на подручју <i>%s</i>:"
+msgstr "Унесите вашу лозинку за корисничко име <i>%s</i>\n на подручју <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Грешка позива"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Позив је завршен"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Јави се"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Позив је заустављен"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr "<b>од %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr "%s предлаже да започнете видео. Да ли прихватате ?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Веза веб сајта"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Линфон"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
-msgstr ""
+msgstr "Интернетски видео телефон"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (основно)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "Преселили смо се на %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"Ниједна звучна картица није откривена на овом рачунару.\n"
-"Нећете бити у могућности да шаљете или да примате звучне позиве."
+msgstr "Ниједна звучна картица није откривена на овом рачунару.\nНећете бити у могућности да шаљете или да примате звучне позиве."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Слободан СИП телефон са снимком"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
-msgstr ""
+msgstr "Здраво\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Додајте у адресар"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Стање присуства"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Име"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Позови"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Ћаскај"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Тражи у директоријуму „%s“"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Неисправан сип контакт !"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Додај нови контакт"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Уредите контакт „%s“"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Обришите контакт „%s“"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr "Обришите историјат ћаскања за „%s“"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Додајте нови контакт из директоријума „%s“"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Име"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Проток (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Стање"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "Проток бита ИП-а (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Параметри"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Укључено"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Искључено"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Налог"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Енглески"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Француски"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Шведски"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "Италијански"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Шпански"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Бразилски португалски"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Пољски"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Немачки"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Руски"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Јапански"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Холандски"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Мађарски"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Чешки"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Кинески"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Традиционални кинески"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "Јеврејски"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Српски"
 
-#: ../gtk/propertybox.c:1187
-msgid "Arabic"
-msgstr ""
-
 #: ../gtk/propertybox.c:1188
-msgid "Turkish"
-msgstr ""
+msgid "Arabic"
+msgstr "Арапски"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "Турски"
+
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Треба поново да покренете линфон да би нови изабрани језик ступио у дејство."
+msgstr "Треба поново да покренете линфон да би нови изабрани језик ступио у дејство."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Ништа"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "СРТП"
 
-#: ../gtk/propertybox.c:1335
-msgid "DTLS"
-msgstr ""
-
 #: ../gtk/propertybox.c:1342
+msgid "DTLS"
+msgstr "ДТЛС"
+
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ЗРТП"
 
@@ -418,9 +415,7 @@ msgstr "ЗРТП"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"Новије издање је доступно са „%s“.\n"
-"Да ли желите да отворите прегледник и да га преузмете ?"
+msgstr "Новије издање је доступно са „%s“.\nДа ли желите да отворите прегледник и да га преузмете ?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -454,350 +449,199 @@ msgstr[0] "Нашао сам %i контакт"
 msgstr[1] "Нашао сам %i контакта"
 msgstr[2] "Нашао сам %i контаката"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Добро дошли!\n"
-"Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Корисничко име је већ у употреби!"
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "Направи налог на линфон.орг-у"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Нисам успео да проверим доступност корисничког имена. Касније покушајте опет."
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr "Већ имам налог линфон.орг-а и желим да га користим"
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr "Већ имам сип налог и желим да га користим"
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr "Желим да наведем удаљену путању подешавања"
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Корисник*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Лозинка*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Домен*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Посредник"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "Унесите ваше корисничко име линфон.орг-а"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Корисничко име:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Лозинка:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Обавезна поља"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Корисник: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Лозинка: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "Ел. пошта: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Потврдите вашу лозинку: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "Обавештавај ме о ажурирањима линфона"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Потврдите ваш налог притиском на везу коју смо вам управо послали ел. "
-"поштом.\n"
-"Затим се вратите овде и притисните дугме „Напред“."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Грешка, налог није потврђен, корисничко име је већ у употреби или је сервер "
-"недоступан.\n"
-"Вратите се назад и покушајте опет."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Хвала вам. Ваш налог је сада подешен и спреман за употребу."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "Помоћник подешавања СИП налога"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Добро дошли у помоћника подешавања налога"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Помоћник подешавања налога"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Подесите ваш налог (корак 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "Унесите ваше корисничко име сип-а (корак 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Унесите податке налога (корак 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Потврђивање (корак 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Грешка"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Завршавам"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr "Позив бр. %i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr "Пребаци позив #%i са %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Не користи се"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ИЦЕ није покренут"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ИЦЕ није успео"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ИЦЕ је у току"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr "Пролазим кроз један или више НАТ-са"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr "Непосредно"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr "Преко преносног сервера"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "уПнП није покренут"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "уПнП је у току"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "уПнП није доступан"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "уПнП ради"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "уПнП није успео"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr "Непосредно или кроз сервер"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
-"преузимање: %f\n"
-"отпремање: %f (kbit/s)"
+msgstr "преузимање: %f\nотпремање: %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr "%ix%i @ %f к/с"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr "%.3f секунде"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Прекини"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Позивам...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>Долазни позив</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "добро"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "просечно"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr "оскудно"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr "јадно"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr "много лоше"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "недоступно"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "Осигурано СРТП-ом"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
-msgstr ""
+msgstr "Осигурано ДТЛС-ом"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr "Осигурано ЗРТП-ом [потврђивање идентитета: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Непроверено подешавање"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr "Проверено подешавање"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr "На конференцији"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>У позиву</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>Заустављен позив</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Позив је завршен.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Пренос је у току"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Пренос је обављен."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Пренос није успео."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Настави"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Застани"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
-"<small><i>Снимам у\n"
-"%s %s</i></small>"
+msgstr "<small><i>Снимам у\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(Паузирано)"
 
@@ -836,177 +680,88 @@ msgstr "Сувише гласан"
 msgid "Did you hear three beeps ?"
 msgstr "Да ли сте чули три писка ?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "Нисам пронашао поставке звука "
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "Не могу да покренем управљање звуком система "
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Добро дошли!\n"
-"Овај помоћник ће вам помоћи да подесите поставке звука за Линфон"
+msgstr "Добро дошли!\nОвај помоћник ће вам помоћи да подесите поставке звука за Линфон"
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "Уређај за снимање"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr "Снимљени волумен"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "Нема гласа"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "Поставке звука система"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "Уређај за пуштање"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "Пусти три писка"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "Притисните дугме за снимање и реците нешто"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "Слушајте ваш снимљени глас"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "Сними"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "Пусти"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr "Хајде сада да покренемо Линфон"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "Помоћник звука"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "Помоћник звука"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr "Дотеривање појачања микрофона"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr "Дотеривање јачине звука звучника"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "Снимите и пустите"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Сви корисници"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Корисници на мрежи"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "АДСЛ"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "Оптички канал"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Основно"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Обриши"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Могућности"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr "Постави путању подешавања"
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr "Увек покрени видео"
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Укључи самовиђење"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "По_моћ"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Прикажи прозорче прочишћавања"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Матична страница"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Провери _ажурирања"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Помоћник налога"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "СИП адреса или број телефона:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Започните нови позив"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Пријатељи"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Тражи"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Додај пријатеље из директоријума</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Додај пријатеља"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Скорашњи позиви"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Мој тренутни идентитет:"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Завршавам"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -1018,8 +773,7 @@ msgstr "(C) Беледоне комуникације, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr ""
-"Интернет телефон са снимком који користи уобичајени СИП протокол (rfc3261)."
+msgstr "Интернет телефон са снимком који користи уобичајени СИП протокол (rfc3261)."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1035,500 +789,7 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
-"sr: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "СИП адреса"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "Прикажи стање присуства овог пријатеља"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "Дозволи овом пријатељу да види стање мог присуства"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Подаци о пријатељу</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Линфоново прозорче прочишћавања"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Премакни на крај"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Линфон — Потребно је потврђивање идентитета"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Унесите лозинку домена"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "ИБ корисника"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Историјат позива"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "Очистите све"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "Повратни позив"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Линфон — Подесите СИП налог"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Ваш СИП идентитет:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "Изгледа као „sip:<корисничко-име>@<домен>“"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "сип:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "Адреса СИП посредника:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "Изгледа као „sip:<назив посредника>“"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Трајање уписа (сек):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr "Параметри пријатеља (изборно):"
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr "АВПФ редован РТЦП интервал (сек):"
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Рута (изборно):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Пренос"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Упиши се"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Објави податке о присуству"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "Укључи АВПФ"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Подесите СИП налог"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "безимено"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "ГССАПИ"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "САСЛ"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "основна звучна картица"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "звучна картица"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "основна камерица"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "ЦИФ"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Кодеци звука"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Кодеци снимка"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "В"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "СИП (УДП)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "СИП (ТЦП)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "СИП (ТЛС)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Подешавања"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "Овај одељак одређује вашу СИП адресу када не користите СИП налог"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Ваше приказано име (нпр: Пера Перић):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Ваше корисничко име:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Ваша резултирајућа СИП адреса:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Основни идентитет</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Чаробњак"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Додај"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Уреди"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Уклони"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Посреднички налози</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Обриши све лозинке"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Приватност</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "СИП налози"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Звук звона:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "АЛСА-ин посебни уређај (изборно):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Уређај за снимање:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Уређај за звоно:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Уређај за пуштање:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Укључи поништавање одјека"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Звук</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Улазни уређај снимка:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "Начин излаза снимка:"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "Прикажи претпреглед камерице"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 значи „неограничено“"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Снимак</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Ограничи брзину слања на (Kb/s):"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Ограничи брзину преузимања на (Kb/s):"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr "Укључи прилагодљиво управљање протоком"
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-"<i>Прилагодљиво управљање протоком је техника за променљиво погађање "
-"доступног пропусног опсега за време позива.</i>"
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Управљање пропусним опсегом</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Мултимедија"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Подеси јединицу највећег преноса:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Пошаљи ДТМФ као СИП податке"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Пренос</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "СИП/УДП прикључник"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "Насумично"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "СИП/ТЦП прикључник"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "РТП/УДП звука:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Неизмењиво"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "РТП/УДП снимка:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Врста шифровања медија"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Шифровање медија је обавезно"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Тунел"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr "ДСЦП поља"
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr "<b>Мрежни протокол и прикључници</b>"
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Непосредна веза на Интернет"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr "Иза НАТ-а / мрежне баријере (наведите ИП мрежног пролаза)"
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Иза НАТ-а / мрежне баријере (користите СТУН за решавање)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr "Иза НАТ-а / мрежне баријере (користите ИЦЕ)"
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr "Иза НАТ-а / мрежне баријере (користите уПнП)"
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Јавна ИП адреса:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Стун сервер:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>НАТ и мрежна баријера</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Мрежа"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Укључи"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Искључи"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Kодеци"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Језик</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Прикажи напредна подешавања"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Ниво</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Корисничко сучеље"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "Адреса сервера:"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "Начин потврђивања идентитета:"
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr "<b>Подешавања ЛДАП налога</b>"
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "ЛДАП"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Готово"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\nsr: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
@@ -1542,29 +803,21 @@ msgstr "Додај на мој списак"
 msgid "<b>Search somebody</b>"
 msgstr "<b>Потражите неког</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Сачекајте мало"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Име позивника</b>"
 
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "ДСЦП подешавања"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Историјат позива"
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "СИП"
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Очистите све"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr "РТП ток звука"
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr "РТП ток снимка"
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr "<b>Подесите ДСЦП вредности (хексадецимално)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Повратни позив"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1614,38 +867,112 @@ msgstr "РТП профил"
 msgid "<b>Call statistics and information</b>"
 msgstr "<b>Статистика позива и подаци</b>"
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr "Подесите ВоИП тунел"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Пошаљи"
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr "Домаћин"
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Заврши конференцију"
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Прикључник"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Наводим удаљену путању подешавања"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr "<b>Подесите тунел</b>"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Ово прозорче омогућава подешавање хттп или хттпс адресе када се подешавање добавља на покретању.\nУнесите или измените путању подешавања. Након што притиснете „У реду“, Линфон ће се сам поново покренути како би довукао и унео у налог нова подешавања. "
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Корисник"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "СИП адреса"
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Лозинка"
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Прикажи стање присуства овог пријатеља"
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr "<b>Подесите хттп посредника (изборно)</b>"
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "Дозволи овом пријатељу да види стање мог присуства"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Подаци о пријатељу</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "ДСЦП подешавања"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "СИП"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr "РТП ток звука"
+
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr "РТП ток снимка"
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr "<b>Подесите ДСЦП вредности (хексадецимално)</b>"
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Притисните овде да подесите јачину звучника"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Сними овај позив у звучну датотеку"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Видео"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Утишај"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Пренос"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "Долазни позив"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Трајање"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Оцена квалитета позива"
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "ЛДАП подешавања"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Адреса сервера:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Начин потврђивања идентитета:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Корисничко име:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Лозинка:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "Користи ТЛС везу"
@@ -1731,75 +1058,13 @@ msgstr "ДИГЕСТ-МД5"
 msgid "NTLM"
 msgstr "НТЛМ"
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr "Наводим удаљену путању подешавања"
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Корисник"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-"Ово прозорче омогућава подешавање хттп или хттпс адресе када се подешавање "
-"добавља на покретању.\n"
-"Унесите или измените путању подешавања. Након што притиснете „У реду“, "
-"Линфон ће се сам поново покренути како би довукао и унео у налог нова "
-"подешавања. "
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "Подешавам..."
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr "Сачекајте док довучем подешавања са сервера..."
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Пошаљи"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr "<b>Име позивника</b>"
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Заврши конференцију"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr "Сними овај позив у звучну датотеку"
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Видео"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Утишај"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Пренос"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "Долазни позив"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Трајање"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr "Оцена квалитета позива"
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Лозинка"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1809,6 +1074,10 @@ msgstr "Интернет веза:"
 msgid "Automatically log me in"
 msgstr "Сам ме пријави"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "ИБ корисника"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "Подаци пријављивања"
@@ -1817,270 +1086,967 @@ msgstr "Подаци пријављивања"
 msgid "<b>Welcome!</b>"
 msgstr "<b>Добро дошли!</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "АДСЛ"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Оптички канал"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Линфоново прозорче прочишћавања"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Премакни на крај"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Основно"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Обриши"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Могућности"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Постави путању подешавања"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Увек покрени видео"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Укључи самовиђење"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Прикажи тастатуру"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr "Увези контакте из вКарти"
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr "Извези контакте у вКарте"
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "По_моћ"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Прикажи прозорче прочишћавања"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Матична страница"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Провери _ажурирања"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Помоћник налога"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "СИП адреса или број телефона:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Започните нови позив"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Пријатељи"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Тражи"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Додај пријатеље из директоријума</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Додај пријатеља"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Очисти историјат озива"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Мој тренутни идентитет:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Самојављање је укључено"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "безимено"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "ГССАПИ"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "САСЛ"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "основна звучна картица"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "звучна картица"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "основна камерица"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "ЦИФ"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Кодеци звука"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Кодеци снимка"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "В"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "СИП (УДП)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "СИП (ТЦП)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "СИП (ТЛС)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Подешавања"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Овај одељак одређује вашу СИП адресу када не користите СИП налог"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Ваше приказано име (нпр: Пера Перић):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Ваше корисничко име:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Ваша резултирајућа СИП адреса:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Основни идентитет</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Чаробњак"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Додај"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Уреди"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Уклони"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Посреднички налози</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Обриши све лозинке"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Приватност</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Сам одговори када се прими позив"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Сачекај пре него што одговориш (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Самостални-одговор</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "СИП налози"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Звук звона:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "АЛСА-ин посебни уређај (изборно):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Уређај за снимање:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Уређај за звоно:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Уређај за пуштање:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Укључи поништавање одјека"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Звук</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Улазни уређај снимка:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Жељена резолуција снимка:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Начин излаза снимка:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Прикажи претпреглед камерице"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Претподешавање снимка:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Жељени проток кадрова снимка:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 значи „неограничено“"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Снимак</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Ограничи брзину слања на (Kb/s):"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Ограничи брзину преузимања на (Kb/s):"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Укључи прилагодљиво управљање протоком"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Прилагодљиво управљање протоком је техника за променљиво погађање доступног пропусног опсега за време позива.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Управљање пропусним опсегом</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Мултимедија"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Подеси јединицу највећег преноса:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Пошаљи ДТМФ као СИП податке"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Омогући ИПв6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Пренос</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "СИП/УДП прикључник"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Насумично"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "СИП/ТЦП прикључник"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "РТП/УДП звука:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Неизмењиво"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "РТП/УДП снимка:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Тунел"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "ДСЦП поља"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Мрежни протокол и прикључници</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Непосредна веза на Интернет"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Иза НАТ-а / мрежне баријере (наведите ИП мрежног пролаза)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Иза НАТ-а / мрежне баријере (користите СТУН за решавање)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Иза НАТ-а / мрежне баријере (користите ИЦЕ)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Иза НАТ-а / мрежне баријере (користите уПнП)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Јавна ИП адреса:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Стун сервер:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>НАТ и мрежна баријера</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Врста шифровања медија"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "Користи Лиме за одлазне поруке ћаскања"
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Шифровање медија је обавезно"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr "Обавезно"
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr "Жељено"
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Шифровање</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Мрежа"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Укључи"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Искључи"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Кодеци звука</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Кодеци снимка</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Kодеци"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Језик</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Прикажи напредна подешавања"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Ниво</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Корисничко сучеље"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>Подешавања ЛДАП налога</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "ЛДАП"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Готово"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Линфон — Потребно је потврђивање идентитета"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Унесите лозинку домена"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Подешавам..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Сачекајте док довучем подешавања са сервера..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "Помоћник подешавања СИП налога"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Добро дошли!\nОвај помоћник ће вам помоћи да користите СИП налог за ваше позиве."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Добро дошли у помоћника подешавања налога"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Направи налог на линфон.орг-у"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Већ имам налог линфон.орг-а и желим да га користим"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Већ имам сип налог и желим да га користим"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Желим да наведем удаљену путању подешавања"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Помоћник подешавања налога"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Унесите податке вашег налога"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Корисник*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Лозинка*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Домен*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Посредник"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Подесите ваш налог (корак 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Унесите ваше корисничко име линфон.орг-а"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Унесите ваше корисничко име сип-а (корак 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Обавезна поља"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "Ел. пошта: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Корисник: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Лозинка: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Потврдите вашу лозинку: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Обавештавај ме о ажурирањима линфона"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Унесите податке налога (корак 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Ваш налог је направљен, сачекајте тренутак."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Прављење налога је у току"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Потврдите ваш налог притиском на везу коју смо вам управо послали ел. поштом.\nЗатим се вратите овде и притисните дугме „Напред“."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Потврђивање (корак 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Проверавам да ли је ваш налог потврђен, сачекајте тренутак."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Провера налога је у току"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Грешка, налог није потврђен, корисничко име је већ у употреби или је сервер недоступан.\nВратите се назад и покушајте опет."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Грешка"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Хвала вам. Ваш налог је сада подешен и спреман за употребу."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Линфон — Подесите СИП налог"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Ваш СИП идентитет:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Изгледа као „sip:<корисничко-име>@<домен>“"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "сип:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "Адреса СИП посредника:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Изгледа као „sip:<назив посредника>“"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Трајање уписа (сек):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Параметри пријатеља (изборно):"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "АВПФ редован РТЦП интервал (сек):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Рута (изборно):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Пренос"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Упиши се"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Објави податке о присуству"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Укључи АВПФ"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Подесите СИП налог"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Подесите ВоИП тунел"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Домаћин"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Прикључник"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Подесите тунел</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Подесите хттп посредника (изборно)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Сачекајте мало"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Спреман"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr "Подешавам"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Ступам у везу"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "Не могу да позовем"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "Извините, достигли смо највећи број истовремених позива"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "вам се обраћа"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr " и затражени само-одговор."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "Мењам параметре позива..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Повезан сам."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Позив је прекинут"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "Не могу да зауставим позив"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "Заустављам тренутни позив..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "У току је тражење стуна..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr "Прикупљање месних ИЦЕ кандидата је у току..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "На вези"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Одмах се враћам"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Одсутан"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "На телефону"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "На ручку сам"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Не узнемиравај"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Премештен"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Користим другу услугу дописивања"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Неповезан"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "На чекању"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "На одмору"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "Непознато стање"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за "
-"којим следи назив домаћина."
+msgstr "Адреса сип посредника коју сте унели је неисправна, мора почети на „sip:“ за којим следи назив домаћина."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"Сип идентитет који сте унели није исправан.\n"
-"Треба да изгледа као „sip:корисник@домен-посредника, као што је „sip:"
-"alice@example.net“"
+msgstr "Сип идентитет који сте унели није исправан.\nТреба да буде у облику „sip:корисник@домен-посредника“, као што је „sip:alice@example.net“"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "Тражим одредиште телефонског броја..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "Не могу да решим овај број."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Не могу да се пријавим као %s"
 
-#: ../coreapi/proxy.c:1494
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:1522
+#, c-format
 msgid "Refreshing on %s..."
-msgstr "довлачим са „%s“"
+msgstr "Освежавам на %s..."
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Удаљено звоњење."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "Удаљено звоњење..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Ранији медиј."
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "Позив са „%s“ је заустављен."
+msgid "Call answered by %s"
+msgstr "На позив је одговорио/ла %s"
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "Позив на који је одговорио „%s“ — на чекању."
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "Позив је настављен."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "На позив је одговорио „%s“."
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr "Несагласно, проверите кодеке или безбедносна подешавања..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr "Медијски параметри су несагласни."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr "Наставили смо."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr "Друга страна нас је паузирала."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr "Позив је освежен удаљеним."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Позив је завршен."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Корисник је заузет."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "Корисник је привремено недоступан."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Корисник не жели да буде узнемираван."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Позив је одбијен."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "Истекло је време захтева."
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Преусмерен"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Позив није успео."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Уписивање на „%s“ је успело."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Исписивање са „%s“ је обављено."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "нема ограничења одговора"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Уписивање на „%s“ није успело: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr "Услуга није доступна, поново покушавам"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr "Симбол потврђивања идентитета је „%s“"
 
-#: ../coreapi/linphonecall.c:1314
-msgid "Call parameters were successfully modified."
-msgstr ""
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Параметри позива не могу бити измењени: %s."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:1665
+msgid "Call parameters were successfully modified."
+msgstr "Параметри позива су успешно измењени."
+
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
@@ -2088,23 +2054,23 @@ msgstr[0] "Пропустили сте %i позив."
 msgstr[1] "Пропустили сте %i позива."
 msgstr[2] "Пропустили сте %i позива."
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr "прекинут"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr "завршен"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr "пропуштен"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "непознато"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2112,18 +2078,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
-"%s на %s\n"
-"Позивач: %s\n"
-"Позивник: %s\n"
-"Стање: %s\n"
-"Трајање: %i мин. %i сек.\n"
+msgstr "%s на %s\nПозивач: %s\nПозивник: %s\nСтање: %s\nТрајање: %i мин. %i сек.\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr "Одлазни позив"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr "Не могу да пустим „%s“."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 455492964..983966d5a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,415 +1,420 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Henrik Mattsson-Mårn <h@reglage.net>, 2016
+# Magnus Johansson <johanssongreppet@yahoo.se>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/sv/)\n"
-"Language: sv\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Swedish (http://www.transifex.com/belledonne-communications/linphone-gtk/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "Ringer %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "Skicka text till %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr "Lägg till %s till din kontaktlista"
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Senaste samtal"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr ""
+msgstr "<b>Senaste samtal (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
-msgstr ""
+msgstr "n/a"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
-msgstr ""
+msgstr "Avbrutna"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
-msgstr ""
+msgstr "Missade"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
-msgstr ""
+msgstr "Avvisade"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i minut"
+msgstr[1] "%i minuter"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i sekund"
+msgstr[1] "%i sekunder"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
+msgstr "<small><i>%s</i>\t<i>Kvalitet: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/in_call_frame.ui.h:11
 msgid "Conference"
-msgstr ""
+msgstr "Konferens"
 
 #: ../gtk/conference.c:46
 msgid "Me"
-msgstr ""
+msgstr "Jag"
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kunde inte hitta pixmap filen: %s"
 
-#: ../gtk/chat.c:493
-msgid "Copy"
-msgstr ""
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Skickar..."
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "Meddelande ej skickat"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "Kopiera"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "skriv loggning information under körning"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
-msgstr ""
+msgstr "visa version och avsluta."
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
-msgstr ""
+msgstr "sökväg till en fil att skriva loggar i."
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
-msgstr ""
+msgstr "Starta linphone med video inaktiverat."
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Starta ikonifierat, visa inte huvudfönstret"
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "Samtalsmottagare"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Välj en arbetskatalog som ska vara basen för installationen, såsom C:"
-"\\Program\\Linphone"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Välj en arbetskatalog som ska vara basen för installationen, såsom C:\\Program\\Linphone"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
-msgstr ""
+msgstr "Konfigurationsfil"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
-msgstr ""
+msgstr "Kör ljudassistenten"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
-msgstr ""
+msgstr "Kör självtest och avsluta 0 om möjligt"
 
 #: ../gtk/main.c:1058
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
-msgstr ""
+msgstr "%s skulle vilja lägga dig till sin kontaktlista.\nVill du lägga denna person till din kontaktlista och tillåta den att se din närvarostatus?\nOm du svarar nej kommer personen att bli tillfälligt svartlistad."
 
 #: ../gtk/main.c:1135
 #, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at realm <i>%s</i>:"
-msgstr ""
+msgstr "Var vänlig och ange ditt lösenord för användarnam <i>%s</i>\n i område <i>%s</i>:"
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
-msgstr ""
+msgstr "Samtalsfel"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Samtalet slut"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
-msgstr ""
+msgstr "Svara"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Avböj"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
-msgstr ""
+msgstr "Samtal pausat"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
-msgstr ""
+msgstr "<b>av %s</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
+msgstr "%s föreslår att starta video. Godtar du det?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "Webbsajt"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
-msgstr ""
+msgstr "En internetvideotelefon"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (Default)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
-msgstr ""
+msgstr "Vi är överförda till %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
+msgstr "Inget ljudkort har upptäckts på denna dator.\nDu kommer inte att kunna skicka och ta emot samtal."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "En gratis SIP video-telefon"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
-msgstr ""
+msgstr "Hej\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
-msgstr ""
+msgstr "Lägg till i adressbok"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "Närvarostatus"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Namn"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "Sök i %s katalogen"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "ogiltig SIP kontakt!"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Lägg till en ny kontakt"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "Ändra kontakt '%s'"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "Ta bort kontakt '%s'"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
-msgstr ""
+msgstr "Ta bort chatthistorik för '%s'"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "Lägg till kontakt ifrån %s katalogen"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Namn"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Frekvens (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
-msgstr ""
+msgstr "Datahastighet (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Parametrar"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "På"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Av"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Konto"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "Engelska"
 
-#: ../gtk/propertybox.c:1170
-msgid "French"
-msgstr "Fransk"
-
 #: ../gtk/propertybox.c:1171
+msgid "French"
+msgstr "Franska"
+
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../gtk/propertybox.c:1172
-msgid "Italian"
-msgstr "Italiensk"
-
 #: ../gtk/propertybox.c:1173
+msgid "Italian"
+msgstr "Italienska"
+
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "Spanska"
 
-#: ../gtk/propertybox.c:1174
-msgid "Brazilian Portugese"
-msgstr "Portugisiska"
-
 #: ../gtk/propertybox.c:1175
+msgid "Brazilian Portugese"
+msgstr "Portugisiska (Brasilien)"
+
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Polska"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Tyska"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Ryska"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Japanska"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Nederländksa"
 
-#: ../gtk/propertybox.c:1180
-msgid "Hungarian"
-msgstr "Hungerska"
-
 #: ../gtk/propertybox.c:1181
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Tjekiska"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: ../gtk/propertybox.c:1183
-msgid "Traditional Chinese"
-msgstr ""
-
 #: ../gtk/propertybox.c:1184
-msgid "Norwegian"
-msgstr ""
+msgid "Traditional Chinese"
+msgstr "Kinesiska (traditionell)"
 
 #: ../gtk/propertybox.c:1185
-msgid "Hebrew"
-msgstr ""
+msgid "Norwegian"
+msgstr "Norska"
 
 #: ../gtk/propertybox.c:1186
-msgid "Serbian"
-msgstr ""
+msgid "Hebrew"
+msgstr "Hebreiska"
 
 #: ../gtk/propertybox.c:1187
-msgid "Arabic"
-msgstr ""
+msgid "Serbian"
+msgstr "Serbiska"
 
 #: ../gtk/propertybox.c:1188
-msgid "Turkish"
-msgstr ""
+msgid "Arabic"
+msgstr "Arabiska"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "Turkiska"
+
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "Du behöver starta om programmet för att det nya språket ska synas."
+msgstr "Du behöver starta om Linphone för att det nya språket ska synas."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
-msgstr ""
-
-#: ../gtk/propertybox.c:1335
-msgid "DTLS"
-msgstr ""
+msgstr "SRTP"
 
 #: ../gtk/propertybox.c:1342
+msgid "DTLS"
+msgstr "DTLS"
+
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
-msgstr ""
+msgstr "ZRTP"
 
 #: ../gtk/update.c:80
 #, c-format
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"En nyare version är tillgänglig på %s.\n"
-"Vill du öppna en browser för att ladda ner den?"
+msgstr "En nyare version är tillgänglig på %s.\nVill du öppna en webbläsare för att ladda ner den?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -421,11 +426,11 @@ msgstr "Förnamn, Efternamn"
 
 #: ../gtk/buddylookup.c:160
 msgid "Error communicating with server."
-msgstr "Error med förbindelsen till servern."
+msgstr "Kommunikationsfel med servern."
 
 #: ../gtk/buddylookup.c:164
 msgid "Connecting..."
-msgstr "Kontaktar"
+msgstr "Kontaktar ..."
 
 #: ../gtk/buddylookup.c:168
 msgid "Connected"
@@ -442,558 +447,331 @@ msgid_plural "Found %i contacts"
 msgstr[0] "Hittat kontakt %i"
 msgstr[1] "Hittat kontakt %i"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Användarnamnet är upptaget!"
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr ""
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Misslyckades att kontrollera tillgänglighet. Var vänlig och försök senare."
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Tack. Ditt konto är nu konfigurerad och färdig att användas."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Välkommen till kontoinstallationsassistenten"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Kontoinstallationsassistenten"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
-msgstr ""
+msgstr "Ring #%i"
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
-msgstr ""
+msgstr "Övergår till att ringa #%i med %s"
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
-msgstr ""
+msgstr "Används ej"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
-msgstr ""
+msgstr "ICE inte aktiverat"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
-msgstr ""
+msgstr "ICE misslyckades"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
-msgstr ""
+msgstr "ICE pågår"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
-msgstr ""
+msgstr "Går igenom en eller flera NAT:s"
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
-msgstr ""
+msgstr "Direkt"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
-msgstr ""
+msgstr "Genom en reläserver"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
-msgstr ""
+msgstr "uPnP inte aktiverat"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
-msgstr ""
+msgstr "uPnP pågår"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
-msgstr ""
+msgstr "uPnP ej tillgängligt"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
-msgstr ""
+msgstr "uPnP körs"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
-msgstr ""
+msgstr "uPnP misslyckades"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
-msgstr ""
+msgstr "Direkt eller genom server"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
+msgstr "nedladdning: %f\nuppladdning: %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
-msgstr ""
+msgstr "%ix%i @ %f fps"
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
-msgstr ""
+msgstr "%.3f sekunder"
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
-msgstr ""
+msgstr "Lägg på"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>Ringer...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
-#, fuzzy
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
-msgstr ""
+msgstr "<b>Inkommande samtal</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
-msgstr ""
+msgstr "bra"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
-msgstr ""
+msgstr "medelmåttig"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
-msgstr ""
+msgstr "dålig"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
-msgstr ""
+msgstr "mycket dålig"
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
-msgstr ""
+msgstr "för dålig"
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
-msgstr ""
+msgstr "ej tillgänglig"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
-msgstr ""
+msgstr "Säkrad av SRTP"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
-msgstr ""
+msgstr "Säkrad av DTLS"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
-msgstr ""
+msgstr "Säkrad av ZRTP - [auth token: %s]"
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
-msgstr ""
+msgstr "Ange som obekräftad"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
-msgstr ""
+msgstr "Ange som bekräftad"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
-msgstr ""
+msgstr "I konferens"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
-msgstr ""
+msgstr "<b>I samtal</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
-msgstr ""
+msgstr "<b>Pausat samtal</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>Samtalet slut.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
-msgstr ""
+msgstr "Överföring pågår"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
-msgstr ""
+msgstr "Överföring klar."
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
-msgstr ""
+msgstr "Överföring misslyckades."
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
-msgstr ""
+msgstr "Fortsätt"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
-msgstr ""
+msgstr "Pausa"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
-msgstr ""
+msgstr "<small><i>Spelar in i\n%s %s</i></small>"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
-msgstr ""
+msgstr "(Pauserad)"
 
 #: ../gtk/loginframe.c:75
 #, c-format
 msgid "Please enter login information for %s"
-msgstr "Mata in ditt lösenord för domänen %s:"
+msgstr "Ange inloggningsuppgifter för %s"
 
 #: ../gtk/config-fetching.c:57
 #, c-format
 msgid "fetching from %s"
-msgstr ""
+msgstr "hämtar från %s"
 
 #: ../gtk/config-fetching.c:73
 #, c-format
 msgid "Downloading of remote configuration from %s failed."
-msgstr ""
+msgstr "Hämtning av fjärrkonfiguration från %s misslyckades."
 
 #: ../gtk/audio_assistant.c:103
 msgid "No voice detected"
-msgstr ""
+msgstr "Ingen röst upptäckt"
 
 #: ../gtk/audio_assistant.c:104
 msgid "Too low"
-msgstr ""
+msgstr "För svag"
 
 #: ../gtk/audio_assistant.c:105
 msgid "Good"
-msgstr ""
+msgstr "Bra"
 
 #: ../gtk/audio_assistant.c:106
 msgid "Too loud"
-msgstr ""
+msgstr "För stark"
 
 #: ../gtk/audio_assistant.c:188
 msgid "Did you hear three beeps ?"
-msgstr ""
+msgstr "Hörde du tre pip?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
-msgstr ""
+msgstr "Ljudinställningar ej funna"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
-msgstr ""
+msgstr "Kan inte starta systemljudkontroll"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
+msgstr "Välkommen\nDenna assistent kommer att hjälpa dig ställa in ljudet för Linphone"
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
-msgstr ""
+msgstr "Inspelningsenhet"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
-msgstr ""
+msgstr "Inspelad volym"
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
-msgstr ""
+msgstr "Ingen röst"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
-msgstr ""
+msgstr "Systemljudsinställningar"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
-msgstr ""
+msgstr "Uppspelningsenhet"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:410
-msgid "Press the record button and say some words"
-msgstr ""
-
-#: ../gtk/audio_assistant.c:411
-msgid "Listen to your record voice"
-msgstr ""
+msgstr "Spela tre pip"
 
 #: ../gtk/audio_assistant.c:412
-msgid "Record"
-msgstr ""
+msgid "Press the record button and say some words"
+msgstr "Klicka på inspelningsknappen och säg några ord"
 
 #: ../gtk/audio_assistant.c:413
+msgid "Listen to your record voice"
+msgstr "Lyssna på din inspelade röst"
+
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
+msgid "Record"
+msgstr "Spela in"
+
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
-msgstr ""
+msgstr "Spela"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
-msgstr ""
+msgstr "Låt oss starta Linphone nu"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
-msgstr ""
+msgstr "Ljudassistent"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
-msgstr ""
+msgstr "Ljudassistent"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
-msgstr ""
+msgstr "Mikrofonkalibrering"
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
-msgstr ""
+msgstr "Högtalarvolymkalibrering"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
-msgstr ""
+msgstr "Spela in och upp"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr ""
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr ""
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr ""
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr ""
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr ""
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr ""
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr ""
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "Själv bild"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr ""
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr ""
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr ""
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr ""
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "Användarnamn"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr ""
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr ""
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Sök"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>Lägg till kontakt ifrån katalogen</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr ""
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "Min nuvarande identitet"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Avslutar"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
-msgstr ""
+msgstr "Om Linphone"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr ""
+msgstr "(C) Belledonne Communications, 2010\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "En Internet video telefon baserat på SIP protokoll."
+msgstr "En internetvideotelefon som använder SIP (rfc3261)."
 
 #: ../gtk/about.ui.h:5
 msgid ""
@@ -1009,7 +787,101 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
+msgstr "fr: Simon Morlat\nen: Simon Morlat och Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: Yoshiya Yamaguchi <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonym\nhe: Eli Zaretskii <eliz@gnu.org>\n"
+
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr "Sök kontakter i katalogen"
+
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr "Lägg till min lista"
+
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
+msgstr "<b>Sök någon</b>"
+
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
+msgstr "<b>Den uppringdas namn</b>"
+
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "Samtalshistorik"
+
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "Rensa alla"
+
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "Ring tillbaka"
+
+#: ../gtk/call_statistics.ui.h:1
+msgid "Call statistics"
+msgstr "Samtalsstatistik"
+
+#: ../gtk/call_statistics.ui.h:2
+msgid "Audio codec"
+msgstr "Ljudkodek"
+
+#: ../gtk/call_statistics.ui.h:3
+msgid "Video codec"
+msgstr "Videokodek"
+
+#: ../gtk/call_statistics.ui.h:4
+msgid "Audio IP bandwidth usage"
+msgstr "Bandbreddsanvändning för ljud"
+
+#: ../gtk/call_statistics.ui.h:5
+msgid "Audio Media connectivity"
+msgstr "Ljudanslutningsbarhet"
+
+#: ../gtk/call_statistics.ui.h:6
+msgid "Video IP bandwidth usage"
+msgstr "Bandbreddsanvändning för bild"
+
+#: ../gtk/call_statistics.ui.h:7
+msgid "Video Media connectivity"
+msgstr "Videoanslutningsbarhet"
+
+#: ../gtk/call_statistics.ui.h:8
+msgid "Round trip time"
+msgstr "Rundturstid"
+
+#: ../gtk/call_statistics.ui.h:9
+msgid "Video resolution received"
+msgstr "Videoupplösning mottagen"
+
+#: ../gtk/call_statistics.ui.h:10
+msgid "Video resolution sent"
+msgstr "Videoupplösning skickad"
+
+#: ../gtk/call_statistics.ui.h:11
+msgid "RTP profile"
+msgstr "RTP-profil"
+
+#: ../gtk/call_statistics.ui.h:12
+msgid "<b>Call statistics and information</b>"
+msgstr "<b>Samtalsstatistik och information</b>"
+
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Skicka"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Avsluta konferens"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
+msgstr "Anger en fjärrkonfigurations-URI"
+
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
+msgstr "Detta dialogfönster tillåter angivandet av en http- eller https-adress när konfigurationen hämtas vid starten.\nVar vänlig och ange eller modifiera konfigurations-URI:n nedan. Sedan du klickat på OK kommer Linphone att starta om automatiskt för att kunna hämta och använda den nya konfigurationen."
 
 #: ../gtk/contact.ui.h:2
 msgid "SIP Address"
@@ -1027,722 +899,45 @@ msgstr "Tillåt den här kontakten att se min närvarostatus"
 msgid "<b>Contact information</b>"
 msgstr "<b>Kontakt information</b>"
 
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone debug fönster"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Mata in lösenordet för domänen"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "AnvändarID"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "Samtalshistorik"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Konfigurera ett SIP konto"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "Din SIP identitet:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP Proxy adress:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Registreringsfrekvens (sek.):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "Route (tillval):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "Publicera närvaro information"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Konfigurera ett SIP konto"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "default ljudkort"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "default kamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Inställningar"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-"Denna sektion specificerar din SIP adress när du inte använder ett SIP konto"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Ditt synliga namn, e.g. Kalle Karlsson:"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Ditt användarnamn:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "Din SIP adress:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Default identitet</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Lägg till"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Editera"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Ta bort"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy konton</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Glöm alla lösenord"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Integritet</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "Hantera SIP konton"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Ring signal:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "ALSA speciell enhet (tillval):"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Mikrofon enhet:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Ringning enhet:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Uppspelningsenhet:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "Tillåta ekokancellering"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Video ingångsenhet:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 står för \"utan begränsning\""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Video</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Max upstream bandbreddshastighet i kbit/sek:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "Max downstream bandbreddshastighet i kbit/sek:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Bandbreddskontroll</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Multimedia inställningar"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "Välj MTU (Maximum Transmission Unit):"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "Kicka DTMF koder som SIP info"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>Transport</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "Direkt förbindelse till Internet"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Publik IP adress:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "STUN server:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT och Brandvägg</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Nätverksinställningar"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Möjliggör"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Inaktivera"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Codecs"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Språk</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Visa avancerade inställningar"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Nivå</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Användarinterface"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Klar"
-
-#: ../gtk/buddylookup.ui.h:1
-msgid "Search contacts in directory"
-msgstr "Sök för kontakter i katalogen"
-
-#: ../gtk/buddylookup.ui.h:2
-msgid "Add to my list"
-msgstr "Lägg till min lista"
-
-#: ../gtk/buddylookup.ui.h:3
-msgid "<b>Search somebody</b>"
-msgstr "<b>Sök efter kontakter</b>"
-
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Vänta"
-
 #: ../gtk/dscp_settings.ui.h:1
 msgid "DSCP settings"
-msgstr ""
+msgstr "DSCP-inställningar"
 
 #: ../gtk/dscp_settings.ui.h:2
 msgid "SIP"
-msgstr ""
+msgstr "SIP"
 
 #: ../gtk/dscp_settings.ui.h:3
 msgid "Audio RTP stream"
-msgstr ""
+msgstr "Ljud-RTP-ström"
 
 #: ../gtk/dscp_settings.ui.h:4
 msgid "Video RTP stream"
-msgstr ""
+msgstr "Video-RTP-ström"
 
 #: ../gtk/dscp_settings.ui.h:5
 msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
+msgstr "<b>Ange DSCP-värden (med hexadecimal)</b>"
 
-#: ../gtk/call_statistics.ui.h:1
-msgid "Call statistics"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:2
-msgid "Audio codec"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:3
-msgid "Video codec"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:4
-msgid "Audio IP bandwidth usage"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:5
-msgid "Audio Media connectivity"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:6
-msgid "Video IP bandwidth usage"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:7
-msgid "Video Media connectivity"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:8
-msgid "Round trip time"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:9
-msgid "Video resolution received"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:10
-msgid "Video resolution sent"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:11
-msgid "RTP profile"
-msgstr ""
-
-#: ../gtk/call_statistics.ui.h:12
-msgid "<b>Call statistics and information</b>"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
-msgstr ""
-
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Användarnamn"
-
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Lösenord"
-
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:1
-msgid "LDAP Settings"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:6
-msgid "Use TLS Connection"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:7
-msgid "Not yet available"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:8
-msgid "<b>Connection</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:9
-msgid "Bind DN"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:10
-msgid "Authname"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:11
-msgid "Realm"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:12
-msgid "<b>SASL</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:13
-msgid "Base object:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:15
-#, no-c-format
-msgid "Filter (%s for name):"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:16
-msgid "Name Attribute:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:17
-msgid "SIP address attribute:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:18
-msgid "Attributes to query:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:19
-msgid "<b>Search</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:20
-msgid "Timeout for search:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:21
-msgid "Max results:"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:22
-msgid "Follow Aliases"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:23
-msgid "<b>Miscellaneous</b>"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:24
-msgid "ANONYMOUS"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:25
-msgid "SIMPLE"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:26
-msgid "DIGEST-MD5"
-msgstr ""
-
-#: ../gtk/ldap.ui.h:27
-msgid "NTLM"
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
-
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Skicka"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:1
 msgid "Click here to set the speakers volume"
-msgstr ""
+msgstr "Klicka här för att ställa in högtalarvolymen"
 
 #: ../gtk/in_call_frame.ui.h:5
 msgid "Record this call to an audio file"
-msgstr ""
+msgstr "Spela in detta samtal till en ljudfil"
 
 #: ../gtk/in_call_frame.ui.h:6
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: ../gtk/in_call_frame.ui.h:8
 msgid "Mute"
-msgstr ""
+msgstr "Tysta"
 
 #: ../gtk/in_call_frame.ui.h:9
 msgid "Transfer"
-msgstr ""
+msgstr "Överför"
 
 #: ../gtk/in_call_frame.ui.h:12
 msgid "In call"
@@ -1750,314 +945,1129 @@ msgstr "I samtal"
 
 #: ../gtk/in_call_frame.ui.h:13
 msgid "Duration"
-msgstr "Förlopp"
+msgstr "Längd"
 
 #: ../gtk/in_call_frame.ui.h:14
 msgid "Call quality rating"
-msgstr ""
+msgstr "Samtalskvalitetsbetyg"
+
+#: ../gtk/ldap.ui.h:1
+msgid "LDAP Settings"
+msgstr "LDAP-inställningar"
+
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Serveradress:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Autentiseringsmetod:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: ../gtk/ldap.ui.h:6
+msgid "Use TLS Connection"
+msgstr "Använd TLS-anslutning"
+
+#: ../gtk/ldap.ui.h:7
+msgid "Not yet available"
+msgstr "Inte tillgänglig än"
+
+#: ../gtk/ldap.ui.h:8
+msgid "<b>Connection</b>"
+msgstr "<b>Anslutning</b>"
+
+#: ../gtk/ldap.ui.h:9
+msgid "Bind DN"
+msgstr "Bind DN"
+
+#: ../gtk/ldap.ui.h:10
+msgid "Authname"
+msgstr "Autentiseringsnamn"
+
+#: ../gtk/ldap.ui.h:11
+msgid "Realm"
+msgstr "Område"
+
+#: ../gtk/ldap.ui.h:12
+msgid "<b>SASL</b>"
+msgstr "<b>SASL</b>"
+
+#: ../gtk/ldap.ui.h:13
+msgid "Base object:"
+msgstr "Basobjekt:"
+
+#: ../gtk/ldap.ui.h:15
+#, no-c-format
+msgid "Filter (%s for name):"
+msgstr "Filter (%s för namn):"
+
+#: ../gtk/ldap.ui.h:16
+msgid "Name Attribute:"
+msgstr "Namnattribut:"
+
+#: ../gtk/ldap.ui.h:17
+msgid "SIP address attribute:"
+msgstr "SIP-adressattribut:"
+
+#: ../gtk/ldap.ui.h:18
+msgid "Attributes to query:"
+msgstr "Attribut för fråga:"
+
+#: ../gtk/ldap.ui.h:19
+msgid "<b>Search</b>"
+msgstr "<b>Sök</b>"
+
+#: ../gtk/ldap.ui.h:20
+msgid "Timeout for search:"
+msgstr "Tidsgräns för sökning:"
+
+#: ../gtk/ldap.ui.h:21
+msgid "Max results:"
+msgstr "Max resultat:"
+
+#: ../gtk/ldap.ui.h:22
+msgid "Follow Aliases"
+msgstr "Följ alias"
+
+#: ../gtk/ldap.ui.h:23
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diverse</b>"
+
+#: ../gtk/ldap.ui.h:24
+msgid "ANONYMOUS"
+msgstr "ANONYMOUS"
+
+#: ../gtk/ldap.ui.h:25
+msgid "SIMPLE"
+msgstr "SIMPLE"
+
+#: ../gtk/ldap.ui.h:26
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: ../gtk/ldap.ui.h:27
+msgid "NTLM"
+msgstr "NTLM"
+
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Användarnamn"
+
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Lösenord"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
-msgstr "Internet förbindelse:"
+msgstr "Internetförbindelse:"
 
 #: ../gtk/login_frame.ui.h:4
 msgid "Automatically log me in"
-msgstr "Logga mig automatiskt"
+msgstr "Logga in mig automatiskt"
+
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "AnvändarID"
 
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
-msgstr "Login information"
+msgstr "Inloggningsuppgifter"
 
 #: ../gtk/login_frame.ui.h:7
 msgid "<b>Welcome!</b>"
+msgstr "<b>Välkommen!</b>"
+
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fiberkanal"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphones felrättningsfönster"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Rulla till slutet"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Standard"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Alternativ"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "Ange konfigurations-URI"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Starta alltid video"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Självbild"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Visa knappsats"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Visa felrättningsfönster"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Hemsida"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Sök efter _uppdateringar"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Kontoassistent"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP-adress eller telefonnummer:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Påbörja ett nytt samtal"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Sök"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Lägg till kontakt ifrån katalogen</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Lägg till kontakt"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Rensa samtalshistorik"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Min nuvarande identitet"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Autosvar är aktiverat"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "anonym"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "standardljudkort"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "ett ljudkort"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "standardkamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Ljudkodekar"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Videokodekar"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Inställningar"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Denna sektion specificerar din SIP-adress när du inte använder ett SIP-konto"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Ditt synliga namn (t.ex. Kalle Karlsson):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Ditt användarnamn:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "Din SIP-adress:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Standardidentitet</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Guide"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Lägg till"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Editera"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Ta bort"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Proxykonton</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Radera alla lösenord"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Integritet</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Svara automatiskt när ett samtal tas emot"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Fördröjning före svar (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Autosvar</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "Hantera SIP-konton"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Ringsignal:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "Speciell enhet för ALSA (tillval):"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Inspelningsenhet:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Ringningsenhet:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Uppspelningsenhet:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "Tillåt ekoborttagning"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Ljud</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Videoinmatningsenhet:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Föredragen videoupplösning:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Videoutmatningsmetod:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Visa kameraförhandsgranskning"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Videoförval:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Föredragen videobildfrekvens:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 står för \"utan begränsning\""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Max uppladdningshastighet i Kbit/sek:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "Max nedladdningshastighet i Kbit/sek:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Aktivera anpassningsbar hastighetskontroll"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr "<i>Anpassningsbar hastighetskontroll är en teknik för att dynamiskt gissa tillgänglig bandbredd under ett samtal.</i>"
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Bandbreddskontroll</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Multimediainställningar"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Välj MTU (Maximum Transmission Unit):"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "Skicka DTMF-koder som SIP-information"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "Tillåt IPv6"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Transport</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "SIP/UDP-port"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Slumpmässig"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "SIP/TCP-port"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "Ljud-RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Låst"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "Video-RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tunnel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP-fält"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Nätverksprotokoll och portar</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "Direkt förbindelse till internet"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "Bakom NAT / brandvägg (specificera IP)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "Bakom en NAT / brandvägg (använd STUN för att avgöra adressen)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "Bakom NAT / brandvägg (använd ICE)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "Bakom NAT / brandvägg (använd uPnP)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Publik IP-adress:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "STUN-server:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT och Brandvägg</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Mediakrypteringstyp"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "Använd Lime för utgående chattmeddelanden"
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Mediakryptering är obligatorisk"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Kryptering</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Nätverksinställningar"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Aktivera"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Inaktivera"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Ljudkodekar</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Videokodekar</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Kodekar"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Språk</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Visa avancerade inställningar"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Nivå</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Användargränssnitt"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>LDAP-kontoinställning</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Klar"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Autentisering krävs"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Ange lösenordet för domänen"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Konfigurerar ..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Var vänlig och vänta medan konfiguration hämtas från server ..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "Inställningsassistent för SIP-konto"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Välkommen!\nDenna assistent kommer att hjälpa dig använda ett SIP-konto för dina samtal."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Välkommen till kontoinstallationsassistenten"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "Skapa ett konto på linphone.org"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Jag har redan ett linphone.org-konto och jag vill bara använda det"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Jag har redan ett sip-konto och jag vill bara använda det"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Jag vill ange ett fjärrkonfigurations-URI"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Kontoinstallationsassistenten"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Ange din konto-information"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Användarnamn*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Lösenord*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Domän*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Konfigurera ditt konto (steg 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "Ange ditt linphone.org-användarnamn"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "Ange ditt sip-användarnamn (steg 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Obligatoriska fält"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "E-post: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Användarnamn: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Lösenord: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Bekräfta ditt lösenord: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "Håll mig informerad om Linphone-uppdateringar"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Ange kontoinformation (steg 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Ditt konto skapas. Var vänlig vänta."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Kontoskapande pågår"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Var vänlig och bekräfta ditt konto genom att klicka på länken vi nyss skickade dig via e-post.\nKom sedan tillbaka hit och klicka på knappen Nästa."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Bekräftelse (steg 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Kontrollerar om ditt konto bekräftas. Var vänlig, vänta."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Kontobekräftelsekontroll pågår"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Fel. Konto ej bekräftat, användarnamn upptaget eller server onåbar.\nVar vänlig, gå tillbaka och försök igen."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Fel"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Tack. Ditt konto är nu konfigurerat och färdigt att användas."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Konfigurera ett SIP-konto"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "Din SIP-identitet:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "Ser ut som sip:<användarnamn>@<domän>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP-proxyadress:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "Ser ut som sip:<proxyvärdnamn>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Registreringstid (sek.):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr "Kontaktparametrar (tillval):"
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr "AVPF regular RTCP intervall (sek):"
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Route (tillval):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Transport"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Registrera"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Publicera närvaroinformation"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "Aktivera AVPF"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Konfigurera ett SIP-konto"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "Konfigurera VoIP-tunnel"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Värd"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Port"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Konfigurera tunnel</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>Konfigurera http-proxy (valfritt)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Vänta"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Redo"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
-msgstr ""
+msgstr "Konfigurerar"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Kontaktar"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
-msgstr ""
+msgstr "Kunde inte ringa"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
-msgstr ""
+msgstr "Beklagar. Vi har nått det maximala antalet samtidiga samtal."
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
-msgstr ""
+msgstr "kontaktar dig"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
-msgstr ""
+msgstr "och frågade autosvar."
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
-msgstr ""
+msgstr "Modifierar samtalsparametrar ..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Kopplad"
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
-msgstr ""
+msgstr "Samtal avbrutet"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
-msgstr ""
+msgstr "Kunde inte pausa samtalet"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
-msgstr ""
+msgstr "Pausar nuvarande samtal..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
-msgstr "STUN uppslagning pågår..."
+msgstr "STUN-uppslagning pågår ..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
-msgstr ""
+msgstr "Samlande av ICE-lokalkandidater pågår ..."
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Online"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Kommer strax tillbaka"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Borta"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
-msgstr "På telefon"
+msgstr "I telefon"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
-msgstr "Lunchar"
+msgstr "På lunch"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Stör ej"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Flyttat"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
-msgstr "Använder en annan tjänst"
+msgstr "Använder en annan meddelandetjänst"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
-msgstr "Offline"
+msgstr "Frånkopplad"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Pågående"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
-msgstr ""
+msgstr "Ledighet"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
-msgstr ""
+msgstr "Okänd status"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"SIP proxy adressen som du matade in är inte rätt, adressen måste starta med "
-"\"sip:\", följd av ett hostnamn"
+msgstr "SIP-proxyadressen du angav är inte rätt. Adressen måste starta med \"sip:\" följt av ett värdnamn."
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"SIP adressen som du matade in är inte rätt. Adressen borde se ut som sip:"
-"namn@domän, såsom sip:peter@exempel.se"
+msgstr "SIP-adressen du angav är inte rätt.\nAdressen bör se ut som sip:användarnamn@domän, såsom sip:alice@exempel.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
-msgstr "Leta efter telefonnummer för destinationen..."
+msgstr "Leta efter telefonnummerdestinationen ..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
-msgstr "Kan inte nå dett nummer."
+msgstr "Kan inte nå detta nummer."
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "Kunde inte logga in som %s"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
-msgstr ""
+msgstr "Förnyar på %s ..."
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "Ringer hos motparten."
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
-msgstr ""
+msgstr "Ringer hos motparten ..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "Tidig media"
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr ""
+msgid "Call answered by %s"
+msgstr "Samtal besvarat av %s"
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
-msgstr ""
+msgstr "Samtal återupptaget."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
-msgstr ""
+msgstr "Inkompatibel. Kontrollera kodekar eller säkerhetsinställningar ..."
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
-msgstr ""
+msgstr "Inkompatibla mediaparametrar."
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
-msgstr ""
+msgstr "Vi har återupptagits."
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
-msgstr ""
+msgstr "Vi har pauserats av annan part."
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
-msgstr ""
+msgstr "Samtalet är uppdaterat av motpart."
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Samtalet slut."
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
-msgstr "Användare upptagen."
+msgstr "Användare är upptagen."
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
-msgstr "Användaren temporärt inte tillgänglig."
+msgstr "Användaren är tillfälligt otillgänglig."
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Användaren vill inte bli störd."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Samtalet avböjdes."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
-msgstr ""
+msgstr "Förfråganstid"
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
-msgstr ""
+msgstr "Omdirigerad"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
-msgstr ""
+msgstr "Samtal misslyckades."
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "Registrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "Avregistrering hos %s lyckades."
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "Inget svar inom angiven tid"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "Registrering hos %s mislyckades: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
-msgstr ""
+msgstr "Tjänst ej tillgänglig, försöker igen"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
-msgstr ""
+msgstr "Autentiseringstecken är %s"
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr "Samtalsparametrar kunde inte ändras: %s"
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
-msgstr ""
+msgstr "Samtalsparametrar ändrades framgångsrikt."
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "Du har %i missat samtal"
 msgstr[1] "Du har %i missade samtal"
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
-msgstr ""
+msgstr "avbruten"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
-msgstr ""
+msgstr "slutförd"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
-msgstr ""
+msgstr "missad"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
-msgstr ""
+msgstr "okänd"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2065,13 +2075,17 @@ msgid ""
 "To: %s\n"
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
-msgstr ""
+msgstr "%s vid %s\nFrån: %s\nTill: %s\nStatus: %s\nLängd: %i min %i sek\n"
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
-msgstr ""
+msgstr "Utgående samtal"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
+msgstr "Kan inte spela %s."
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 0cf1f6ac7..4b27eecfa 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,81 +1,89 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# faradundamarti <faradundamarti@yandex.com>, 2015
+# Emin Tufan <etcetin@gmail.com>, 2016
+# faradundamarti <faradundamarti@yandex.com>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Turkish (http://www.transifex.com/belledonne-communications/"
-"linphone-gtk/language/tr/)\n"
-"Language: tr\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/belledonne-communications/linphone-gtk/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr ""
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr ""
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr "Son çağrılar"
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
-msgstr ""
+msgstr "<b>Son çağrılar (%i)</b>"
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
-msgstr ""
+msgstr "yok"
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr "İptal edildi"
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr "Yanıtsız"
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr "Reddedildi"
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i dakika"
+msgstr[1] "%i dakika"
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i saniye"
+msgstr[1] "%i saniye"
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
-msgstr ""
+msgstr "<small><i>%s</i>\t<i>Kalite: %s</i></small>\n%s\t%s\t"
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
-msgstr ""
+msgstr "<big><b>%s</b></big>\t%s"
 
 #: ../gtk/conference.c:38 ../gtk/in_call_frame.ui.h:11
 msgid "Conference"
@@ -83,58 +91,64 @@ msgstr "Grup görüşme"
 
 #: ../gtk/conference.c:46
 msgid "Me"
-msgstr ""
+msgstr "Bana"
 
 #: ../gtk/support.c:49 ../gtk/support.c:73 ../gtk/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../gtk/chat.c:493
-msgid "Copy"
-msgstr ""
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr "Gönderiliyor..."
 
-#: ../gtk/main.c:138
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr "İleti gitmedi"
+
+#: ../gtk/chat.c:498
+msgid "Copy"
+msgstr "Kopya"
+
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr ""
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
-msgstr ""
+msgstr "sürümü görüntüle ve çık."
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr "Günlükleri içine yazmak için bir dosya yolu"
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr "Linphonu görüntü olmadan başlat"
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "Sadece sistem tepsisinde başlat, ana arayüzü gösterme."
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "adres ara"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"Bir çalışma dizini belirtin (kurulum temelinde olmalı,örneğin: c:\\Program "
-"Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "Bir çalışma dizini belirtin (kurulum temelinde olmalı,örneğin: c:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr "Yapılandırma dosyası"
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr "Ses yardımcısını çalıştır"
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -142,8 +156,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -154,253 +167,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr "Çağrı yanlış"
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "Çağrı sonlandırıldı"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "Gelen çağrı"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "Yanıt"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "Reddet"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr "Çağrı duraklatıldı"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
-msgstr ""
+msgstr "<b>%s tarafından</b>"
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
-msgstr ""
+msgstr "%s görüntü başlatmayı önerdi.Kabul ediyor musun?"
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "İnternet "
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr "Görüntülü internet telefonu"
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
-msgstr ""
+msgstr "%s (Öntanımlı)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
-msgstr ""
+msgstr "%s ye aktardık"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
+msgstr "Bu bilgisayarda bir ses kartı bulunamadı.\nSesli görüşme yapamazsınız."
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "Özgür bir SİP görüntülü-telefon"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr "Merhaba\n"
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr "Adres defterine ekle"
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "durum bilgisi"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "Ad"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr "Çağrı"
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr "Söyleşi"
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
-msgstr ""
+msgstr "%s dizininde ara"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "Geçersiz sip bağlantısı !"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr "Yeni bir bağlantı ekle"
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
-msgstr ""
+msgstr "'%s' bağlantısını düzenle"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
-msgstr ""
+msgstr "'%s' bağlantısını sil"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
-msgstr ""
+msgstr "'%s' sohbet geçmişini sil"
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
-msgstr ""
+msgstr "%s dizininden yeni bağlantı ekle"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "Ad"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "Hız (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "Durum"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr "İP Bit hızı (kbit/s)"
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "Değişkenler"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "Etkin"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "Devre dışı"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "Hesap"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "İngilizce"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "Fransızca"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "İsveççe"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "İspanyolca"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "Brezilya Portekizcesi"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "Lehçe"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "Almanca"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "Rusca"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "Japonca"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "Flemenkçe"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "Macarca"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "Çekce"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "Çince"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr "Geleneksel Çince"
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr "Norveççe"
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr "Sırpça"
 
-#: ../gtk/propertybox.c:1187
-msgid "Arabic"
-msgstr ""
-
 #: ../gtk/propertybox.c:1188
-msgid "Turkish"
-msgstr ""
+msgid "Arabic"
+msgstr "Arapça"
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1189
+msgid "Turkish"
+msgstr "Türkçe"
+
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr ""
-"Yeni dil seçiminizin etkili olabilmesi için linfonu yeniden başlatmalısınız."
+msgstr "Yeni dil seçiminizin etkili olabilmesi için linfonu yeniden başlatmalısınız."
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr "SRTP (Güvenli Gerçek Zamanlı Aktarım Protokolü)"
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr "DTLS"
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr "ZRTP"
 
@@ -409,7 +414,7 @@ msgstr "ZRTP"
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
+msgstr "%s den indirilebilir daha yeni bir sürüm var.\nOnu indirmek için internet tarayıcınızı açmak istiyor musunuz?"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -442,352 +447,206 @@ msgid_plural "Found %i contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
-msgstr ""
-"Hoşgeldiniz!\n"
-"Bu yardımcı,çağrılarınız için bir SIP hesabı kullanmanıza yardım edecek."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
+msgstr "Kullanıcı adınız zaten kullanılıyor!"
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
-msgstr "linphone.org'da bir hesap oluştur"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
+msgstr "Kullanıcı adınızın geçerlilik denetimi başarısız.Daha sonra tekrar deneyin."
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr "Kallanıcı adı*"
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr "Parola*"
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr "Alan adı*"
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr "Vekil sunucu"
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr "linphone.org kullanıcı adınızı girin"
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "Kullanıcı adı:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "Parola:"
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr "(*) Zorunlu alanlar"
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr "Kullanıcı adı: (*)"
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr "Parola: (*)"
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr "E-posta: (*)"
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr "Parolanızı onaylayın: (*)"
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr "linphone güncellemeleri hakkında beni bilgilendir"
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-"Lütfen size e-posta yoluyla gönderdiğimiz bağlantıyı tıklayarak hesabınızı "
-"doğrulayın.\n"
-"Sonra buraya geri dönün ve İleri düğmesine basın."
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-"Hata,hesap geçersiz,kullanıcı adı kullanılıyor veya sunucuya erişilemiyor.\n"
-"Lütfen geri dönün ve tekrar deneyin."
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Teşekkürler. Hesabınız yapılandırıldı ve kullanıma hazır."
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr "SİP hesabı yapılandırma yardımcısı"
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "Hesap açma yardımcısına hoşgeldiniz"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "Hesap açma yardımcısı"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr "Hesabınızı yapılandırın (adım 1/1)"
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr "sip kullanıcı adınızı girin (adım 1/1)"
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr "Hesap bilgilerini girin (adım 1/2)"
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr "Doğrulama (adım 2/2)"
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr "Hata"
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr "Sonlandırma"
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr ""
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr "Kullanılmıyor"
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr "ICE etkin değil"
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr "ICE başarısız"
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr "ICE sürüyor"
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr ""
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
-msgstr ""
+msgstr "Doğrudan"
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
-msgstr ""
+msgstr "Bir röle sunucu aracılığı ile"
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr "Evrensel Tak-Çalıştır etkin değil"
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr "Evrensel Tak-Çalıştır ilerliyor"
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr "Evrensel Tak-Çalıştır kullanılamaz"
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr "Evrensel Tak-Çalıştır çalışıyor"
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr "Evrensel Tak-Çalıştır başarısız"
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
-msgstr ""
+msgstr "Doğrudan veya sunucu aracılığıyla"
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
-msgstr ""
+msgstr "İndime: %f\nkarşıya yükleme: %f (kbit/s)"
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr "Telefonu kapatma"
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
-msgstr ""
+msgstr "<b>Arıyor...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
 msgstr "00:00:00"
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
-msgstr ""
+msgstr "<b>Gelen çağrı</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr "iyi"
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr "orta"
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
-msgstr "kötü"
+msgstr "zayıf"
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
+msgstr "çok zayıf"
+
+#: ../gtk/incall_view.c:617
+msgid "too bad"
 msgstr "çok kötü"
 
-#: ../gtk/incall_view.c:569
-msgid "too bad"
-msgstr ""
-
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr "kullanılamaz"
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr "SRTP güvencesi altında"
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr "DLTS güvencesi altında"
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr "Doğrulanmamış ayar"
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
-msgstr ""
+msgstr "Doğrulanmış ayar"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
-msgstr ""
+msgstr "Grup görüşmede"
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
-msgstr ""
+msgstr "<b>Duraklatılmış çağrı</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
-msgstr ""
+msgstr "<b>Çağrı sonlandı.</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr "Aktarım sürüyor"
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr "Aktarım tamam"
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr "Aktarım başarısız"
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "Devam et"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "Duraklat"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr "(Duraklatıldı)"
 
 #: ../gtk/loginframe.c:75
 #, c-format
 msgid "Please enter login information for %s"
-msgstr ""
+msgstr "%s için giriş bilgisini girin "
 
 #: ../gtk/config-fetching.c:57
 #, c-format
@@ -819,177 +678,88 @@ msgstr "Çok yüksek"
 msgid "Did you hear three beeps ?"
 msgstr "Üç bip sesi duydun mu?"
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr "Ses tercihleri bulunamadı"
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr "Ses kontrol sistemi başlatılamıyor"
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
-msgstr ""
-"Hoşgeldiniz!\n"
-"Bu yardımcı,Linphone'un ses ayarlarını yapılandırmanıza yardım edecek"
+msgstr "Hoşgeldiniz!\nBu yardımcı,Linphone'un ses ayarlarını yapılandırmanıza yardım edecek"
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr "Görüntü yakalama aygıtı"
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr "Ses yok"
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr "Sistem ses tercihleri"
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr "Oynatma aygıtı"
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr "Üç bip sesi çal"
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr "Kayıt tuşuna bas ve bazı kelimeler söyle"
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr "Kaydettiğin sesi dinle"
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr "Kayıt"
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr "Çalma"
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
-msgstr ""
+msgstr "Haydi şimdi Linphona başlayalım"
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr "Ses Yardımcısı"
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr "Ses yardımcısı"
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
-msgstr ""
+msgstr "Hoparlör ses yüksekliği ayarı"
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr "Kaydet ve Oynat"
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "Tüm kullanıcılar"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "Çevrimiçi kullanıcılar"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr ""
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "Öntanımlı"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr "Sil"
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "_Seçenekler"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr ""
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "_Yardım"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "Hata düzeltme penceresini göster"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "_Anasayfa"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "Güncellemeleri _Denetle"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr "Hesap yardımcısı"
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SİP adresi veya telefon numarası:"
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "Yeni bir arama başlat"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "Bağlantılar"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "Arama"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr ""
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "Bağlantı ekle"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr "Son çağrılar"
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr ""
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
+msgstr "Sonlandırma"
 
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
@@ -997,9 +767,7 @@ msgstr "Linphone Hakkında"
 
 #: ../gtk/about.ui.h:2
 msgid "(C) Belledonne Communications, 2010\n"
-msgstr ""
-"(C) Belledonne Communications, 2010\n"
-"\n"
+msgstr "(C) Belledonne Communications, 2010\n\n"
 
 #: ../gtk/about.ui.h:4
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
@@ -1019,56 +787,24 @@ msgid ""
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
 "he: Eli Zaretskii <eliz@gnu.org>\n"
-msgstr ""
-"fr: Simon Morlat\n"
-"en: Simon Morlat and Delphine Perreau\n"
-"it: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\n"
-"de: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\n"
-"sv: Daniel Nylander <po@danielnylander.se>\n"
-"es: Jesus Benitez <gnelson at inMail dot sk>\n"
-"ja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\n"
-"pt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\n"
-"pl: Robert Nasiadek <darkone@darkone.pl>\n"
-"cs: Petr Pisar <petr.pisar@atlas.cz>\n"
-"hu: anonymous\n"
-"he: Eli Zaretskii <eliz@gnu.org>\n"
+msgstr "fr: Simon Morlat\nen: Simon Morlat and Delphine Perreau\nit: Alberto Zanoni <alberto.zanoni@-NO-SPAM-PLEASE!-tiscalinet.it>\nde: Jean-Jacques Sarton <jj.sarton@-NO-SPAM-PLEASE-t-online.de>\nsv: Daniel Nylander <po@danielnylander.se>\nes: Jesus Benitez <gnelson at inMail dot sk>\nja: YAMAGUCHI YOSHIYA <yushiya@anet.ne.jp>\npt_BR: Rafael Caesar Lenzi <rc_lenzi@yahoo.com.br>\npl: Robert Nasiadek <darkone@darkone.pl>\ncs: Petr Pisar <petr.pisar@atlas.cz>\nhu: anonymous\nhe: Eli Zaretskii <eliz@gnu.org>\n"
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SİP Adresi"
+#: ../gtk/buddylookup.ui.h:1
+msgid "Search contacts in directory"
+msgstr "Dizinde bağlantılar ara"
 
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
+#: ../gtk/buddylookup.ui.h:2
+msgid "Add to my list"
+msgstr "Listeme ekle"
+
+#: ../gtk/buddylookup.ui.h:3
+msgid "<b>Search somebody</b>"
 msgstr ""
 
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
 msgstr ""
 
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>Bağlantı bilgisi</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone hata giderme penceresi"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr "Sonuna kadar ilerleyin"
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - Kimlik doğrulaması gerekli"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "Lütfen alan adı parolası girin"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "Kullanıcı kimliği"
-
 #: ../gtk/call_logs.ui.h:1
 msgid "Call history"
 msgstr "Çağrı geçmişi"
@@ -1081,472 +817,6 @@ msgstr "Hepsini temizle"
 msgid "Call back"
 msgstr "Geri arama"
 
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - Bir SİP hesabı yapılandır"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "SİP kimliğiniz:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SİP Vekil sunucu adresi:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "Kayıt süresi (saniye)"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr "Taşıma"
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr "Kayıt"
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr "AVPF'yi etkinleştir"
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "Bir SİP hesabı yapılandır"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr "kimliği belirsiz"
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr "SASL"
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "öntanımlı ses kartı"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "Ses kartı"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "öntanımlı kamera"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "Ses kodekleri"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "Görüntü kodekleri"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr "SIP (UDP)"
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr "SIP (TCP)"
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr "SIP (TLS)"
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "Görünecek adınız (örneğin: Faradunda Marti)"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "Kullanıcı adınız:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>Öntanımlı kimlik</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr "Yardımcı"
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "Ekle"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "Düzenle"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "Kaldır"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "Bütün parolaları sil"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>Gizlilik</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr "<b>Otomatik yanıt</b>"
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "SİP Hesaplarını Yönet"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "Zil sesi:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "ALSA özel aygıt (seçmeli)"
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "Görüntü yakalama aygıtı"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "Ses çalma aygıtı:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "Oynatma aygıtı:"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>Ses</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "Görüntü aygıtı:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr "Görüntü çıkış yöntemi:"
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr "Kamera önizlemesi göster"
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr ""
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>Görüntü</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "Gönderim hız sınırı Kbit/saniye:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "İndirme hız sınırı Kbit/saniye:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>Bantgenişliği denetimi</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "Çokluortam ayarları"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr "SIP/UDP bağlantı noktası"
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr "Rastgele"
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr "SIP/TCP bağlantı noktası"
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr "Sabitlenmiş"
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr "Ortam şifreleme türü"
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr "Ortam şifrelemesi zorunludur"
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr "Tünel"
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "İnternete doğrudan bağlantı"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "Ortak İP adresi:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Stun sunucusu:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "Ağ ayarları"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "Etkinleştirme"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "Devre dışı"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "Çözücüler"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>Dil</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "Gelişmiş ayarları göster"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>Aşama</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "Kullanıcı arayüzü"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr "Sunucu adresi:"
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr "Kimlik doğrulama yöntemi:"
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr "<b>LDAP Hesap ayarı</b>"
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "Tamam"
-
-#: ../gtk/buddylookup.ui.h:1
-msgid "Search contacts in directory"
-msgstr ""
-
-#: ../gtk/buddylookup.ui.h:2
-msgid "Add to my list"
-msgstr "Listeme ekle"
-
-#: ../gtk/buddylookup.ui.h:3
-msgid "<b>Search somebody</b>"
-msgstr ""
-
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "Lütfen bekleyin"
-
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
-msgstr "DSCP ayarları"
-
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr "SİP"
-
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
-
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
 msgstr "Çağrı istatistikleri"
@@ -1589,44 +859,118 @@ msgstr "Giden görüntü çözünürlüğü"
 
 #: ../gtk/call_statistics.ui.h:11
 msgid "RTP profile"
-msgstr ""
+msgstr "RTP profili"
 
 #: ../gtk/call_statistics.ui.h:12
 msgid "<b>Call statistics and information</b>"
+msgstr "<b>Çağrı istatistikleri ve bilgisi</b>"
+
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "Gönder"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
+msgstr "Grup görüşme son"
+
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SİP Adresi"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "Bu bağlantının varolan durumunu göster"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
-msgstr "Bağlantı noktası"
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>Bağlantı bilgisi</b>"
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
+msgstr "DSCP ayarları"
+
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr "SİP"
+
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "Kallanıcı adı"
-
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "Parola"
-
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
 msgstr ""
 
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr "Hoparlör ses miktarı ayarı için buraya tıkla"
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr "Bu aramayı bir ses dosyasına kaydet"
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr "Görüntü"
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr "Sessiz"
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "Aktarım"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "arıyor"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "Süre"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
+msgstr "Çağrı kalitesi düzeyi"
+
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr "LDAP Ayarları"
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr "Sunucu adresi:"
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr "Kimlik doğrulama yöntemi:"
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "Kullanıcı adı:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "Parola:"
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr "TLS Bağlantısı Kullan"
@@ -1637,7 +981,7 @@ msgstr "Henüz kullanılabilir değil"
 
 #: ../gtk/ldap.ui.h:8
 msgid "<b>Connection</b>"
-msgstr ""
+msgstr "<b>Bağlantı</b>"
 
 #: ../gtk/ldap.ui.h:9
 msgid "Bind DN"
@@ -1645,7 +989,7 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:10
 msgid "Authname"
-msgstr ""
+msgstr "Yazar Adı"
 
 #: ../gtk/ldap.ui.h:11
 msgid "Realm"
@@ -1653,11 +997,11 @@ msgstr "Ülke"
 
 #: ../gtk/ldap.ui.h:12
 msgid "<b>SASL</b>"
-msgstr ""
+msgstr "<b>SASL</b>"
 
 #: ../gtk/ldap.ui.h:13
 msgid "Base object:"
-msgstr ""
+msgstr "Temel nesne:"
 
 #: ../gtk/ldap.ui.h:15
 #, no-c-format
@@ -1666,11 +1010,11 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:16
 msgid "Name Attribute:"
-msgstr ""
+msgstr "Öznitelik Adı:"
 
 #: ../gtk/ldap.ui.h:17
 msgid "SIP address attribute:"
-msgstr ""
+msgstr "SIP adresi özniteliği"
 
 #: ../gtk/ldap.ui.h:18
 msgid "Attributes to query:"
@@ -1678,23 +1022,23 @@ msgstr ""
 
 #: ../gtk/ldap.ui.h:19
 msgid "<b>Search</b>"
-msgstr ""
+msgstr "<b>Ara</b>"
 
 #: ../gtk/ldap.ui.h:20
 msgid "Timeout for search:"
-msgstr ""
+msgstr "Arama zamanaşımına uğradı:"
 
 #: ../gtk/ldap.ui.h:21
 msgid "Max results:"
-msgstr ""
+msgstr "En çok sonuç:"
 
 #: ../gtk/ldap.ui.h:22
 msgid "Follow Aliases"
-msgstr ""
+msgstr "Takma Adları İzle"
 
 #: ../gtk/ldap.ui.h:23
 msgid "<b>Miscellaneous</b>"
-msgstr ""
+msgstr "<b>Çeşitli</b>"
 
 #: ../gtk/ldap.ui.h:24
 msgid "ANONYMOUS"
@@ -1712,70 +1056,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "Kallanıcı adı"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr "Yapılandırılıyor..."
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "Gönder"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr "Grup görüşme son"
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr "Görüntü"
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr "Sessiz"
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "Aktarım"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "Süre"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr ""
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "Parola"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1785,296 +1072,1002 @@ msgstr "İnternet bağlantısı:"
 msgid "Automatically log me in"
 msgstr ""
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "Kullanıcı kimliği"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
-msgstr ""
+msgstr "Giriş bilgisi"
 
 #: ../gtk/login_frame.ui.h:7
 msgid "<b>Welcome!</b>"
 msgstr "<b>Hoşgeldiniz!</b>"
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "Fiber Kanal"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone hata giderme penceresi"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr "Sonuna kadar ilerleyin"
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "Öntanımlı"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr "Sil"
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "_Seçenekler"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr "URl yapılandırma ayarları"
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr "Her zaman görüntüyü başlat"
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "Özgörüntü etkin"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr "Tuştakımını göster"
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "_Yardım"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "Hata düzeltme penceresini göster"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "_Anasayfa"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "Güncellemeleri _Denetle"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr "Hesap yardımcısı"
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SİP adresi veya telefon numarası:"
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "Yeni bir arama başlat"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "Bağlantılar"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "Arama"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>Rehberden bağlantılar ekle</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "Bağlantı ekle"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr "Çağrı geçmişini temizle"
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "Güncel kimliğim:"
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr "Otomatik yanıtlama etkin"
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr "kimliği belirsiz"
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr "SASL"
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "öntanımlı ses kartı"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "Ses kartı"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "öntanımlı kamera"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "Ses çözücüleri"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "Görüntü çözücüleri"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr "SIP (UDP)"
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr "SIP (TCP)"
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr "SIP (TLS)"
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "Bu bölüm bir SİP hesabı kullanmadığınız zaman sizin SİP adresinizi tanımlar"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "Görünecek adınız (örneğin: Faradunda Marti)"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "Kullanıcı adınız:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>Öntanımlı kimlik</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr "Yardımcı"
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "Ekle"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "Düzenle"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "Kaldır"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>Vekil sunucu hesapları</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "Bütün parolaları sil"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>Gizlilik</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr "Bir çağrı alındığında otomatik olarak yanıtla"
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr "Yanıtlamadan önceki gecikme (ms)"
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr "<b>Otomatik yanıt</b>"
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "SİP Hesaplarını Yönet"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "Zil sesi:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "ALSA özel aygıt (seçmeli)"
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "Görüntü yakalama aygıtı"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "Ses çalma aygıtı:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "Oynatma aygıtı:"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "yankı giderme etkin"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>Ses</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "Görüntü aygıtı:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr "Tercih edilen görüntü çözünürlüğü:"
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr "Görüntü çıkış yöntemi:"
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr "Kamera önizlemesi göster"
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr "Görüntü ön ayarları:"
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr "Tercih edilen görüntü kare sayısı:"
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr ""
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>Görüntü</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "Gönderim hız sınırı Kbit/saniye:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "İndirme hız sınırı Kbit/saniye:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr "Uyarlanabilir hız denetimi etkin"
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>Bantgenişliği denetimi</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "Çokluortam ayarları"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "Maksimum İletim Birimi Ayarları"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr "IPv6'ya izin ver"
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>Taşıma</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr "SIP/UDP bağlantı noktası"
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr "Rastgele"
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr "SIP/TCP bağlantı noktası"
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr "Sabitlenmiş"
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr "Tünel"
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr "DSCP alanları"
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr "<b>Ağ protokol ve bağlanma yerleri</b>"
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "İnternete doğrudan bağlantı"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr "NAT Arkasından / Güvenlik Duvarı (IP ağ geçidi belirleme)"
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr "NAT Arkasından / Güvenlik Duvarı (ICE kullan)"
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr "NAT arkasından / Güvenlik Duvarı (evrensel tak-çalıştır kullan)"
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "Ortak İP adresi:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Stun sunucusu:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT ve Güvenlik Duvarı</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr "Ortam şifreleme türü"
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr "Giden sohbet iletileri için Lime kullan"
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr "Ortam şifrelemesi zorunludur"
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr "<b>Şifreleme</b>"
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "Ağ ayarları"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "Etkinleştirme"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "Devre dışı"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr "<b>Ses çözücüleri</b>"
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr "<b>Görüntü çözücüleri</b>"
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "Çözücüler"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>Dil</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "Gelişmiş ayarları göster"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>Aşama</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "Kullanıcı arayüzü"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr "<b>LDAP Hesap ayarı</b>"
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "Tamam"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - Kimlik doğrulaması gerekli"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "Lütfen alan adı parolası girin"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr "Yapılandırılıyor..."
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr "Sunucudan yapılandırma ayarlarınız getirilirken bekleyin..."
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr "SİP hesabı yapılandırma yardımcısı"
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr "Hoşgeldiniz!\nBu yardımcı,çağrılarınız için bir SIP hesabı kullanmanıza yardım edecek."
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "Hesap açma yardımcısına hoşgeldiniz"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr "linphone.org'da bir hesap oluştur"
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr "Önceden bir linphone.org hesabım var ve onu kullanmak istiyorum"
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr "Önceden bir sip hesabım var ve onu kullanmak istiyorum"
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr "Bir uzaktan URl yapılandırma belirlemek istiyorum"
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "Hesap açma yardımcısı"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr "Hesap bilgilerinizi girin"
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr "Kallanıcı adı*"
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr "Parola*"
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr "Alan adı*"
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr "Vekil sunucu"
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr "Hesabınızı yapılandırın (adım 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr "linphone.org kullanıcı adınızı girin"
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr "sip kullanıcı adınızı girin (adım 1/1)"
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr "(*) Zorunlu alanlar"
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr "E-posta: (*)"
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr "Kullanıcı adı: (*)"
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr "Parola: (*)"
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr "Parolanızı onaylayın: (*)"
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr "linphone güncellemeleri hakkında beni bilgilendir"
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr "Hesap bilgilerini girin (adım 1/2)"
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr "Hebabınız oluşturulmaya başlandı,lütfen bekleyin."
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr "Hesap oluşturma sürüyor"
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr "Lütfen size e-posta yoluyla gönderdiğimiz bağlantıyı tıklayarak hesabınızı doğrulayın.\nSonra buraya geri dönün ve İleri düğmesine basın."
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr "Doğrulama (adım 2/2)"
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr "Hesabınızın geçerli olup olmadığı denetleniyor,lütfen bekleyin."
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr "Hesap geçerlilik sınaması sürüyor"
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr "Hata,hesap geçersiz,kullanıcı adı kullanılıyor veya sunucuya erişilemiyor.\nLütfen geri dönün ve tekrar deneyin."
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr "Hata"
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "Teşekkürler. Hesabınız yapılandırıldı ve kullanıma hazır."
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - Bir SİP hesabı yapılandır"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "SİP kimliğiniz:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SİP Vekil sunucu adresi:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "Kayıt süresi (saniye)"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "Güzergah (isteğe bağlı)"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr "Taşıma"
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr "Kayıt"
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "Yayınlama ön bilgisi"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr "AVPF'yi etkinleştir"
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "Bir SİP hesabı yapılandır"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr "VoIP tüneli yapılandır"
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr "Barındırıcı"
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr "Bağlantı noktası"
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr "<b>Tünel yapılandır</b>"
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr "<b>http vekil yapılandır (isteğe bağlı)</b>"
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "Lütfen bekleyin"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "Hazır"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr "Yapılandırılıyor"
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "Bağlanıyor"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
-msgstr ""
+msgstr "Aranamıyor"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
-msgstr ""
+msgstr "Çağrı değiştirgeleri değiştiriliyor..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "Bağlandı."
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "Çağrı iptal edildi"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
-msgstr ""
+msgstr "Çağrı duraklatılamadı"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
-msgstr ""
+msgstr "Geçerli çağrı duraklatılıyor..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr ""
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "Çevrimiçi"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "Meşgul"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "Hemen döneceğim"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "Uzakta"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "Telefondayım"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "Yemekteyim"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "Rahatsız etmeyin"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "Taşındı"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "Diğer mesaj servisi kullanılıyor"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr "Tatil"
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr "Bilinmeyen durum"
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr ""
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr ""
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr ""
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr ""
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
+msgid "Call answered by %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
-msgstr ""
+msgstr "Arama yeniden başlatıldı."
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "Çağrı sonlandırıldı"
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "Kullanıcı meşgul"
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
-msgstr ""
+msgstr "K"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "Kullanıcı rahatsız edilmek istemiyor."
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "Çağrı reddedildi."
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr "İstek zamanaşımına uğradı."
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "Yeniden yönlendirildi"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "Arama başarısız"
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr ""
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr "Servis kullanımdışı, tekrar deneyin"
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr "iptal edildi"
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr "tamamlandı"
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr "Yanıtsız"
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2084,11 +2077,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
-msgstr ""
+msgstr "Giden arama"
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1b9b07725..3ae8176a3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,75 +1,82 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/belledonne-"
-"communications/linphone-gtk/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/belledonne-communications/linphone-gtk/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "呼叫 %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "发送消息给 %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr ""
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr ""
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr ""
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr ""
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr ""
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr ""
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] ""
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
@@ -87,49 +94,57 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "无法打开位图文件：%s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "运行时向标准输出记录调试信息。"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "启动到系统托盘，不显示主界面。"
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "现在呼叫的地址"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
 msgstr "指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -137,8 +152,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -149,254 +163,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "呼叫结束"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "呼入"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr ""
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "网站"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s (默认)"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr ""
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"未在此计算机上检测到声卡。\n"
-"您无法发送或接收音频呼叫。"
+msgstr "未在此计算机上检测到声卡。\n您无法发送或接收音频呼叫。"
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "免费的 SIP 视频电话"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr ""
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "在线状态"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "名称"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "在 %s 目录中查找 "
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "无效的 SIP 联系人！"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "编辑联系人 %s"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "删除联系人 %s"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "从 %s 目录增加联系人 "
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "名称"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "采样率(Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "状态"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "参数"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "启用"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "帐户"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "英语"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "法语"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙语"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "波兰语"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "德语"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "俄语"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "日语"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "捷克语"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "中文"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "您需要重启 linphone 以使语言选择生效。"
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr ""
 
@@ -405,9 +410,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"%s 有新版本。\n"
-"您是否要打开浏览器下载它？"
+msgstr "%s 有新版本。\n您是否要打开浏览器下载它？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -439,338 +442,199 @@ msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "找到 %i 联系方式"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "用户名:"
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "密码："
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "谢谢，您的帐户已经配置完毕，可以使用。"
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "欢迎使用帐户设置向导"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "帐户设置向导"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr ""
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr ""
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr ""
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr ""
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr ""
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr ""
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr ""
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr ""
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>正在呼叫...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
-msgstr "00:00:00"
+msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr ""
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr ""
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>通话结束。</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr ""
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr ""
 
@@ -809,176 +673,89 @@ msgstr ""
 msgid "Did you hear three beeps ?"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
 msgstr ""
 
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr ""
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr ""
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr ""
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "默认"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
-msgstr ""
-
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr ""
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "启用自视"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr ""
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr ""
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr ""
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr ""
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SIP 地址或电话号码："
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr ""
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "搜索"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>从目录增加联系人</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr ""
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "当前地址："
-
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
 msgstr ""
@@ -1007,484 +784,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP 地址"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "显示该联系人的在线状态"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "允许此人看到我的在线状态"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>联系人信息</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone 调试窗口"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr ""
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "请输入密码"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "用户 ID"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "呼叫历史"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr ""
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - 配置 SIP 帐户"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "您的 SIP 地址："
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "类似于 sip:<用户名>@<域>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP 代理地址："
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "类似于 sip:<代理主机名>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "注册间隔(秒)："
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "路由(可选)："
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "发布在线状态"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "配置 SIP 帐户"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "默认声卡"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "默认摄像头"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "设置"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "该段在您不使用SIP帐户时的SIP地址"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "您的显示名："
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "您的用户名："
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "您的 SIP 地址结果："
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>默认帐户</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "添加"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "编辑"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "移除"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>代理帐户</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "清除所有密码"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>隐私</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "SIP 帐户管理"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "铃声文件："
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "ALSA 特殊设备(可选)："
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "录音设备："
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "响铃设备："
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "回放设备："
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "启用回声抑制"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>音频</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "视频输入设备："
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 表示 “没有限制”"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>视频</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "上传速率限制 kbit/s："
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "下载速率限制 kbit/s："
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>带宽控制</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "音视频设置"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "设置最大传输单元(MTU)："
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "以 SIP 消息发送 DTMF"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>传输协议</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "音频 RTP/UDP："
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "视频 RTP/UDP："
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "直接连接到互联网"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "公网 IP 地址："
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Stun 服务器："
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT 及防火墙</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "网络设置"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "启用"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "禁用"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "编解码器"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>语言</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "显示高级设置"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>级别</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "用户界面"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "完成"
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr "查找联系人"
@@ -1497,28 +796,20 @@ msgstr "添加为联系人"
 msgid "<b>Search somebody</b>"
 msgstr "<b>找人</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "请稍候"
-
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "呼叫历史"
+
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
 msgstr ""
 
 #: ../gtk/call_statistics.ui.h:1
@@ -1569,38 +860,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "发送"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP 地址"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "显示该联系人的在线状态"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "允许此人看到我的在线状态"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>联系人信息</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "用户名"
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "密码"
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "呼入"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "通话时间"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "用户名:"
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "密码："
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1686,70 +1051,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "用户名"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "发送"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "呼入"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "通话时间"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr ""
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "密码"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1759,6 +1067,10 @@ msgstr "网络连接："
 msgid "Automatically log me in"
 msgstr "自动登录"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "用户 ID"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "登录信息"
@@ -1767,289 +1079,989 @@ msgstr "登录信息"
 msgid "<b>Welcome!</b>"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr ""
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr ""
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone 调试窗口"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr ""
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "默认"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr ""
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr ""
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr ""
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "启用自视"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr ""
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr ""
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr ""
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr ""
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr ""
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP 地址或电话号码："
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr ""
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "搜索"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>从目录增加联系人</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr ""
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "当前地址："
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "默认声卡"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "默认摄像头"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "设置"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "该段在您不使用SIP帐户时的SIP地址"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "您的显示名："
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "您的用户名："
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "您的 SIP 地址结果："
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>默认帐户</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "添加"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "编辑"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "移除"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>代理帐户</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "清除所有密码"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>隐私</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "SIP 帐户管理"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "铃声文件："
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "ALSA 特殊设备(可选)："
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "录音设备："
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "响铃设备："
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "回放设备："
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "启用回声抑制"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>音频</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "视频输入设备："
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 表示 “没有限制”"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>视频</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "上传速率限制 kbit/s："
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "下载速率限制 kbit/s："
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>带宽控制</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "音视频设置"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "设置最大传输单元(MTU)："
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "以 SIP 消息发送 DTMF"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>传输协议</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "音频 RTP/UDP："
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "视频 RTP/UDP："
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "直接连接到互联网"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "公网 IP 地址："
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Stun 服务器："
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT 及防火墙</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "网络设置"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "启用"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "禁用"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "编解码器"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>语言</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "显示高级设置"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>级别</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "用户界面"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "完成"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr ""
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "请输入密码"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "欢迎使用帐户设置向导"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "帐户设置向导"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "谢谢，您的帐户已经配置完毕，可以使用。"
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - 配置 SIP 帐户"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "您的 SIP 地址："
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "类似于 sip:<用户名>@<域>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP 代理地址："
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "类似于 sip:<代理主机名>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "注册间隔(秒)："
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "路由(可选)："
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "发布在线状态"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "配置 SIP 帐户"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "请稍候"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "就绪"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "正在联系您"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr " 并询问了自动回答。"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr ""
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "正在进行 Stun 查找..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "在线"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "很快回来"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "离开"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "正在通话"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "外出吃饭"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "请勿打扰"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "已转到其他服务"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "正在使用其他消息服务"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "离线"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "挂起"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr "您输入的 SIP 代理地址无效，它必须是以“sip:”开头，并紧随一个主机名。"
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"您输入的地址无效。\n"
-"它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
+msgstr "您输入的地址无效。\n它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "查询电话号码目的地..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "该号码无法解析。"
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "无法登录为 %s"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "响铃。"
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
+msgid "Call answered by %s"
 msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr ""
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr ""
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr ""
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "通话结束。"
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "被叫正忙。"
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "您呼叫的用户暂时无法接通。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "用户已开启免打扰功能。"
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "呼叫被拒绝。"
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "已重定向"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "呼叫失败。"
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "成功注册到 %s"
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "已在 %s 解除注册。"
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "没有响应，超时"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "注册到 %s 失败: %s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您错过了 %i 个呼叫。"
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2059,11 +2071,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 86a3b8f5e..581911162 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,75 +1,82 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: linphone-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-24 11:11+0200\n"
-"PO-Revision-Date: 2015-07-17 07:34+0000\n"
-"Last-Translator: Belledonne Communications <support@belledonne-"
-"communications.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/belledonne-"
-"communications/linphone-gtk/language/zh_TW/)\n"
-"Language: zh_TW\n"
+"POT-Creation-Date: 2016-05-19 14:01+0200\n"
+"PO-Revision-Date: 2016-05-10 09:58+0000\n"
+"Last-Translator: Belledonne Communications <support@belledonne-communications.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/belledonne-communications/linphone-gtk/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gtk/calllogs.c:149 ../gtk/friendlist.c:976
+#: ../gtk/calllogs.c:178
 #, c-format
 msgid "Call %s"
 msgstr "播打給 %s"
 
-#: ../gtk/calllogs.c:150 ../gtk/friendlist.c:977
+#: ../gtk/calllogs.c:179
 #, c-format
 msgid "Send text to %s"
 msgstr "傳送文字給 %s"
 
-#: ../gtk/calllogs.c:233
+#: ../gtk/calllogs.c:181
+#, c-format
+msgid "Add %s to your contact list"
+msgstr ""
+
+#: ../gtk/calllogs.c:245 ../gtk/main.ui.h:23
+msgid "Recent calls"
+msgstr ""
+
+#: ../gtk/calllogs.c:260
 #, c-format
 msgid "<b>Recent calls (%i)</b>"
 msgstr ""
 
-#: ../gtk/calllogs.c:315
+#: ../gtk/calllogs.c:334
 msgid "n/a"
 msgstr ""
 
-#: ../gtk/calllogs.c:318
+#: ../gtk/calllogs.c:337
 msgid "Aborted"
 msgstr ""
 
-#: ../gtk/calllogs.c:321
+#: ../gtk/calllogs.c:340
 msgid "Missed"
 msgstr ""
 
-#: ../gtk/calllogs.c:324
+#: ../gtk/calllogs.c:343
 msgid "Declined"
 msgstr ""
 
-#: ../gtk/calllogs.c:330
+#: ../gtk/calllogs.c:349
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] ""
 
-#: ../gtk/calllogs.c:333
+#: ../gtk/calllogs.c:352
 #, c-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] ""
 
-#: ../gtk/calllogs.c:338
+#: ../gtk/calllogs.c:357
 #, c-format
 msgid ""
 "<small><i>%s</i>\t<i>Quality: %s</i></small>\n"
 "%s\t%s\t"
 msgstr ""
 
-#: ../gtk/calllogs.c:342
+#: ../gtk/calllogs.c:361
 #, c-format
 msgid "<big><b>%s</b></big>\t%s"
 msgstr ""
@@ -87,50 +94,57 @@ msgstr ""
 msgid "Couldn't find pixmap file: %s"
 msgstr "找不到 pixmap 檔：%s"
 
-#: ../gtk/chat.c:493
+#: ../gtk/chat.c:207 ../gtk/chat.c:265
+msgid "Sending..."
+msgstr ""
+
+#: ../gtk/chat.c:224 ../gtk/chat.c:274
+msgid "Message not sent"
+msgstr ""
+
+#: ../gtk/chat.c:498
 msgid "Copy"
 msgstr ""
 
-#: ../gtk/main.c:138
+#: ../gtk/main.c:134
 msgid "log to stdout some debug information while running."
 msgstr "執行時將一些除錯資訊記錄到標準輸出。"
 
-#: ../gtk/main.c:139
+#: ../gtk/main.c:135
 msgid "display version and exit."
 msgstr ""
 
-#: ../gtk/main.c:140
+#: ../gtk/main.c:136
 msgid "path to a file to write logs into."
 msgstr ""
 
-#: ../gtk/main.c:141
+#: ../gtk/main.c:137
 msgid "Start linphone with video disabled."
 msgstr ""
 
-#: ../gtk/main.c:142
+#: ../gtk/main.c:138
 msgid "Start only in the system tray, do not show the main interface."
 msgstr "只在系統匣啟動，不要顯示主要介面。"
 
-#: ../gtk/main.c:143
+#: ../gtk/main.c:139
 msgid "address to call right now"
 msgstr "現在要打電話的位址"
 
-#: ../gtk/main.c:144
+#: ../gtk/main.c:140
 msgid ""
-"Specifiy a working directory (should be the base of the installation, eg: c:"
-"\\Program Files\\Linphone)"
-msgstr ""
-"指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）"
+"Specifiy a working directory (should be the base of the installation, eg: "
+"c:\\Program Files\\Linphone)"
+msgstr "指定一個工作目錄（應該為安裝的根目錄，例如：c:\\Program Files\\Linphone）"
 
-#: ../gtk/main.c:145
+#: ../gtk/main.c:141
 msgid "Configuration file"
 msgstr ""
 
-#: ../gtk/main.c:146
+#: ../gtk/main.c:142
 msgid "Run the audio assistant"
 msgstr ""
 
-#: ../gtk/main.c:147
+#: ../gtk/main.c:143
 msgid "Run self test and exit 0 if succeed"
 msgstr ""
 
@@ -138,8 +152,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%s would like to add you to his/her contact list.\n"
-"Would you add him/her to your contact list and allow him/her to see your "
-"presence status?\n"
+"Would you add him/her to your contact list and allow him/her to see your presence status?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
 
@@ -150,254 +163,245 @@ msgid ""
 " at realm <i>%s</i>:"
 msgstr ""
 
-#: ../gtk/main.c:1256
+#: ../gtk/main.c:1244
 msgid "Call error"
 msgstr ""
 
-#: ../gtk/main.c:1259 ../coreapi/linphonecore.c:3669
+#: ../gtk/main.c:1247 ../coreapi/linphonecore.c:3942
 msgid "Call ended"
 msgstr "通話已結束"
 
-#: ../gtk/main.c:1262 ../coreapi/call_log.c:221
+#: ../gtk/main.c:1250 ../coreapi/call_log.c:235
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../gtk/main.c:1264 ../gtk/incall_view.c:531 ../gtk/in_call_frame.ui.h:3
+#: ../gtk/main.c:1253 ../gtk/incall_view.c:579 ../gtk/in_call_frame.ui.h:2
 msgid "Answer"
 msgstr "接聽"
 
-#: ../gtk/main.c:1266 ../gtk/in_call_frame.ui.h:4
+#: ../gtk/main.c:1255 ../gtk/in_call_frame.ui.h:3
 msgid "Decline"
 msgstr "拒接"
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 msgid "Call paused"
 msgstr ""
 
-#: ../gtk/main.c:1272
+#: ../gtk/main.c:1262
 #, c-format
 msgid "<b>by %s</b>"
 msgstr ""
 
-#: ../gtk/main.c:1342
+#: ../gtk/main.c:1336
 #, c-format
 msgid "%s proposed to start video. Do you accept ?"
 msgstr ""
 
-#: ../gtk/main.c:1508
+#: ../gtk/main.c:1502
 msgid "Website link"
 msgstr "網站連結"
 
-#: ../gtk/main.c:1567 ../gtk/waiting.ui.h:1
+#: ../gtk/main.c:1561 ../gtk/waiting.ui.h:1
 msgid "Linphone"
 msgstr "Linphone"
 
-#: ../gtk/main.c:1568
+#: ../gtk/main.c:1562
 msgid "A video internet phone"
 msgstr ""
 
-#: ../gtk/main.c:1627
+#: ../gtk/main.c:1624
 #, c-format
 msgid "%s (Default)"
 msgstr "%s （預設值）"
 
-#: ../gtk/main.c:1973 ../coreapi/callbacks.c:1078
+#: ../gtk/main.c:1997 ../coreapi/callbacks.c:1080
 #, c-format
 msgid "We are transferred to %s"
 msgstr "我們被轉接到 %s"
 
-#: ../gtk/main.c:1983
+#: ../gtk/main.c:2008
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
-msgstr ""
-"在這臺電腦中偵測不到音效卡。\n"
-"您將無法傳送或接收語音電話。"
+msgstr "在這臺電腦中偵測不到音效卡。\n您將無法傳送或接收語音電話。"
 
-#: ../gtk/main.c:2127
+#: ../gtk/main.c:2173
 msgid "A free SIP video-phone"
 msgstr "自由的 SIP 視訊電話"
 
-#: ../gtk/main.c:2236
+#: ../gtk/main.c:2292
 #, c-format
 msgid "Hello\n"
 msgstr ""
 
-#: ../gtk/friendlist.c:506
+#: ../gtk/friendlist.c:460
 msgid "Add to addressbook"
 msgstr ""
 
-#: ../gtk/friendlist.c:692
-msgid "Presence status"
-msgstr "上線狀態"
-
-#: ../gtk/friendlist.c:710 ../gtk/propertybox.c:591 ../gtk/contact.ui.h:1
-msgid "Name"
-msgstr "名稱"
-
-#: ../gtk/friendlist.c:722
-msgid "Call"
-msgstr ""
-
-#: ../gtk/friendlist.c:727
-msgid "Chat"
-msgstr ""
-
-#: ../gtk/friendlist.c:757
+#: ../gtk/friendlist.c:626
 #, c-format
 msgid "Search in %s directory"
 msgstr "在 %s 目錄中搜尋"
 
-#: ../gtk/friendlist.c:926
+#: ../gtk/friendlist.c:773
 msgid "Invalid sip contact !"
 msgstr "無效的 sip 連絡人！"
 
-#: ../gtk/friendlist.c:978
+#: ../gtk/friendlist.c:820
+#, c-format
+msgid "Add a new contact"
+msgstr ""
+
+#: ../gtk/friendlist.c:823
 #, c-format
 msgid "Edit contact '%s'"
 msgstr "編輯連絡人「%s」"
 
-#: ../gtk/friendlist.c:979
+#: ../gtk/friendlist.c:824
 #, c-format
 msgid "Delete contact '%s'"
 msgstr "刪除連絡人「%s」"
 
-#: ../gtk/friendlist.c:980
+#: ../gtk/friendlist.c:825
 #, c-format
 msgid "Delete chat history of '%s'"
 msgstr ""
 
-#: ../gtk/friendlist.c:1031
+#: ../gtk/friendlist.c:862
 #, c-format
 msgid "Add new contact from %s directory"
 msgstr "從 %s 目錄加入新的連絡人"
 
-#: ../gtk/propertybox.c:597
+#: ../gtk/propertybox.c:592 ../gtk/contact.ui.h:1
+msgid "Name"
+msgstr "名稱"
+
+#: ../gtk/propertybox.c:598
 msgid "Rate (Hz)"
 msgstr "頻率 (Hz)"
 
-#: ../gtk/propertybox.c:603
+#: ../gtk/propertybox.c:604
 msgid "Status"
 msgstr "狀態"
 
-#: ../gtk/propertybox.c:616
+#: ../gtk/propertybox.c:617
 msgid "IP Bitrate (kbit/s)"
 msgstr ""
 
-#: ../gtk/propertybox.c:627
+#: ../gtk/propertybox.c:628
 msgid "Parameters"
 msgstr "參數"
 
-#: ../gtk/propertybox.c:669 ../gtk/propertybox.c:823
+#: ../gtk/propertybox.c:670 ../gtk/propertybox.c:824
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../gtk/propertybox.c:671 ../gtk/propertybox.c:823 ../gtk/parameters.ui.h:60
+#: ../gtk/propertybox.c:672 ../gtk/propertybox.c:824 ../gtk/parameters.ui.h:57
 msgid "Disabled"
 msgstr "已停用"
 
-#: ../gtk/propertybox.c:901
+#: ../gtk/propertybox.c:902
 msgid "Account"
 msgstr "帳號"
 
-#: ../gtk/propertybox.c:1169
+#: ../gtk/propertybox.c:1170
 msgid "English"
 msgstr "英語"
 
-#: ../gtk/propertybox.c:1170
+#: ../gtk/propertybox.c:1171
 msgid "French"
 msgstr "法語"
 
-#: ../gtk/propertybox.c:1171
+#: ../gtk/propertybox.c:1172
 msgid "Swedish"
 msgstr "瑞典語"
 
-#: ../gtk/propertybox.c:1172
+#: ../gtk/propertybox.c:1173
 msgid "Italian"
 msgstr "義大利語"
 
-#: ../gtk/propertybox.c:1173
+#: ../gtk/propertybox.c:1174
 msgid "Spanish"
 msgstr "西班牙語"
 
-#: ../gtk/propertybox.c:1174
+#: ../gtk/propertybox.c:1175
 msgid "Brazilian Portugese"
 msgstr "巴西葡萄牙語"
 
-#: ../gtk/propertybox.c:1175
+#: ../gtk/propertybox.c:1176
 msgid "Polish"
 msgstr "波蘭語"
 
-#: ../gtk/propertybox.c:1176
+#: ../gtk/propertybox.c:1177
 msgid "German"
 msgstr "德語"
 
-#: ../gtk/propertybox.c:1177
+#: ../gtk/propertybox.c:1178
 msgid "Russian"
 msgstr "俄語"
 
-#: ../gtk/propertybox.c:1178
+#: ../gtk/propertybox.c:1179
 msgid "Japanese"
 msgstr "日語"
 
-#: ../gtk/propertybox.c:1179
+#: ../gtk/propertybox.c:1180
 msgid "Dutch"
 msgstr "荷蘭語"
 
-#: ../gtk/propertybox.c:1180
+#: ../gtk/propertybox.c:1181
 msgid "Hungarian"
 msgstr "匈牙利語"
 
-#: ../gtk/propertybox.c:1181
+#: ../gtk/propertybox.c:1182
 msgid "Czech"
 msgstr "捷克語"
 
-#: ../gtk/propertybox.c:1182
+#: ../gtk/propertybox.c:1183
 msgid "Chinese"
 msgstr "中文"
 
-#: ../gtk/propertybox.c:1183
+#: ../gtk/propertybox.c:1184
 msgid "Traditional Chinese"
 msgstr ""
 
-#: ../gtk/propertybox.c:1184
+#: ../gtk/propertybox.c:1185
 msgid "Norwegian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1185
+#: ../gtk/propertybox.c:1186
 msgid "Hebrew"
 msgstr ""
 
-#: ../gtk/propertybox.c:1186
+#: ../gtk/propertybox.c:1187
 msgid "Serbian"
 msgstr ""
 
-#: ../gtk/propertybox.c:1187
+#: ../gtk/propertybox.c:1188
 msgid "Arabic"
 msgstr ""
 
-#: ../gtk/propertybox.c:1188
+#: ../gtk/propertybox.c:1189
 msgid "Turkish"
 msgstr ""
 
-#: ../gtk/propertybox.c:1245
+#: ../gtk/propertybox.c:1246
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
 msgstr "您需要重新啟動 linphone 才能讓新選擇的語言生效。"
 
-#: ../gtk/propertybox.c:1325
+#: ../gtk/propertybox.c:1332
 msgid "None"
 msgstr ""
 
-#: ../gtk/propertybox.c:1329
+#: ../gtk/propertybox.c:1336
 msgid "SRTP"
 msgstr ""
 
-#: ../gtk/propertybox.c:1335
+#: ../gtk/propertybox.c:1342
 msgid "DTLS"
 msgstr ""
 
-#: ../gtk/propertybox.c:1342
+#: ../gtk/propertybox.c:1349
 msgid "ZRTP"
 msgstr ""
 
@@ -406,9 +410,7 @@ msgstr ""
 msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
-msgstr ""
-"在 %s 有最新的版本。\n"
-"您想要開啟瀏覽器下載它嗎？"
+msgstr "在 %s 有最新的版本。\n您想要開啟瀏覽器下載它嗎？"
 
 #: ../gtk/update.c:91
 msgid "You are running the lastest version."
@@ -440,338 +442,199 @@ msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "找不到 %i 個連絡人"
 
-#: ../gtk/setupwizard.c:160
-msgid ""
-"Welcome!\n"
-"This assistant will help you to use a SIP account for your calls."
+#: ../gtk/setupwizard.c:219
+msgid "Username is already in use!"
 msgstr ""
 
-#: ../gtk/setupwizard.c:169
-msgid "Create an account on linphone.org"
+#: ../gtk/setupwizard.c:223
+msgid "Failed to check username availability. Please try again later."
 msgstr ""
 
-#: ../gtk/setupwizard.c:170
-msgid "I have already a linphone.org account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:171
-msgid "I have already a sip account and I just want to use it"
-msgstr ""
-
-#: ../gtk/setupwizard.c:172
-msgid "I want to specify a remote configuration URI"
-msgstr ""
-
-#: ../gtk/setupwizard.c:206
-msgid "Enter your account information"
-msgstr ""
-
-#: ../gtk/setupwizard.c:221
-msgid "Username*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:222
-msgid "Password*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:225
-msgid "Domain*"
-msgstr ""
-
-#: ../gtk/setupwizard.c:226
-msgid "Proxy"
-msgstr ""
-
-#: ../gtk/setupwizard.c:263
-msgid "Enter your linphone.org username"
-msgstr ""
-
-#: ../gtk/setupwizard.c:275 ../gtk/parameters.ui.h:91 ../gtk/ldap.ui.h:4
-msgid "Username:"
-msgstr "使用者名稱："
-
-#: ../gtk/setupwizard.c:277 ../gtk/password.ui.h:4 ../gtk/ldap.ui.h:5
-msgid "Password:"
-msgstr "密碼： "
-
-#: ../gtk/setupwizard.c:419
-msgid "(*) Required fields"
-msgstr ""
-
-#: ../gtk/setupwizard.c:420
-msgid "Username: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:422
-msgid "Password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:424
-msgid "Email: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:426
-msgid "Confirm your password: (*)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:441
-msgid "Keep me informed with linphone updates"
-msgstr ""
-
-#: ../gtk/setupwizard.c:486
-msgid "Your account is being created, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:494
-msgid ""
-"Please validate your account by clicking on the link we just sent you by "
-"email.\n"
-"Then come back here and press Next button."
-msgstr ""
-
-#: ../gtk/setupwizard.c:504
-msgid "Checking if your account is been validated, please wait."
-msgstr ""
-
-#: ../gtk/setupwizard.c:512
-msgid ""
-"Error, account not validated, username already used or server unreachable.\n"
-"Please go back and try again."
-msgstr ""
-
-#: ../gtk/setupwizard.c:521
-msgid "Thank you. Your account is now configured and ready for use."
-msgstr "謝謝您。您的帳號已設定完成並且可以使用。"
-
-#: ../gtk/setupwizard.c:557
-msgid "SIP account configuration assistant"
-msgstr ""
-
-#: ../gtk/setupwizard.c:578
-msgid "Welcome to the account setup assistant"
-msgstr "歡迎使用帳號設定助理"
-
-#: ../gtk/setupwizard.c:583
-msgid "Account setup assistant"
-msgstr "帳號設定助理"
-
-#: ../gtk/setupwizard.c:588
-msgid "Configure your account (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:592
-msgid "Enter your sip username (step 1/1)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:596
-msgid "Enter account information (step 1/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:601
-msgid "Account creation in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:605
-msgid "Validation (step 2/2)"
-msgstr ""
-
-#: ../gtk/setupwizard.c:610
-msgid "Account validation check in progress"
-msgstr ""
-
-#: ../gtk/setupwizard.c:614
-msgid "Error"
-msgstr ""
-
-#: ../gtk/setupwizard.c:618 ../gtk/audio_assistant.c:541
-msgid "Terminating"
-msgstr ""
-
-#: ../gtk/incall_view.c:70 ../gtk/incall_view.c:94
+#: ../gtk/incall_view.c:67 ../gtk/incall_view.c:87
 #, c-format
 msgid "Call #%i"
 msgstr ""
 
-#: ../gtk/incall_view.c:155
+#: ../gtk/incall_view.c:145
 #, c-format
 msgid "Transfer to call #%i with %s"
 msgstr ""
 
-#: ../gtk/incall_view.c:211 ../gtk/incall_view.c:214
+#: ../gtk/incall_view.c:202 ../gtk/incall_view.c:205
 msgid "Not used"
 msgstr ""
 
-#: ../gtk/incall_view.c:221
+#: ../gtk/incall_view.c:212
 msgid "ICE not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:223
+#: ../gtk/incall_view.c:214
 msgid "ICE failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:225
+#: ../gtk/incall_view.c:216
 msgid "ICE in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:227
+#: ../gtk/incall_view.c:218
 msgid "Going through one or more NATs"
 msgstr ""
 
-#: ../gtk/incall_view.c:229
+#: ../gtk/incall_view.c:220
 msgid "Direct"
 msgstr ""
 
-#: ../gtk/incall_view.c:231
+#: ../gtk/incall_view.c:222
 msgid "Through a relay server"
 msgstr ""
 
-#: ../gtk/incall_view.c:239
+#: ../gtk/incall_view.c:230
 msgid "uPnP not activated"
 msgstr ""
 
-#: ../gtk/incall_view.c:241
+#: ../gtk/incall_view.c:232
 msgid "uPnP in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:243
+#: ../gtk/incall_view.c:234
 msgid "uPnp not available"
 msgstr ""
 
-#: ../gtk/incall_view.c:245
+#: ../gtk/incall_view.c:236
 msgid "uPnP is running"
 msgstr ""
 
-#: ../gtk/incall_view.c:247
+#: ../gtk/incall_view.c:238
 msgid "uPnP failed"
 msgstr ""
 
-#: ../gtk/incall_view.c:257 ../gtk/incall_view.c:258
+#: ../gtk/incall_view.c:248 ../gtk/incall_view.c:249
 msgid "Direct or through server"
 msgstr ""
 
-#: ../gtk/incall_view.c:267 ../gtk/incall_view.c:279
+#: ../gtk/incall_view.c:258 ../gtk/incall_view.c:270
 #, c-format
 msgid ""
 "download: %f\n"
 "upload: %f (kbit/s)"
 msgstr ""
 
-#: ../gtk/incall_view.c:272 ../gtk/incall_view.c:274
+#: ../gtk/incall_view.c:263 ../gtk/incall_view.c:265
 #, c-format
 msgid "%ix%i @ %f fps"
 msgstr ""
 
-#: ../gtk/incall_view.c:304
+#: ../gtk/incall_view.c:295
 #, c-format
 msgid "%.3f seconds"
 msgstr ""
 
-#: ../gtk/incall_view.c:406 ../gtk/in_call_frame.ui.h:10
-#: ../gtk/videowindow.c:235
+#: ../gtk/incall_view.c:453 ../gtk/in_call_frame.ui.h:10
+#: ../gtk/videowindow.c:248
 msgid "Hang up"
 msgstr ""
 
-#: ../gtk/incall_view.c:510
+#: ../gtk/incall_view.c:558
 msgid "<b>Calling...</b>"
 msgstr "<b>播打...</b>"
 
-#: ../gtk/incall_view.c:513 ../gtk/incall_view.c:767
+#: ../gtk/incall_view.c:561 ../gtk/incall_view.c:793
 msgid "00:00:00"
-msgstr "00:00:00"
+msgstr ""
 
-#: ../gtk/incall_view.c:524
+#: ../gtk/incall_view.c:572
 msgid "<b>Incoming call</b>"
 msgstr "<b>來電</b>"
 
-#: ../gtk/incall_view.c:561
+#: ../gtk/incall_view.c:609
 msgid "good"
 msgstr ""
 
-#: ../gtk/incall_view.c:563
+#: ../gtk/incall_view.c:611
 msgid "average"
 msgstr ""
 
-#: ../gtk/incall_view.c:565
+#: ../gtk/incall_view.c:613
 msgid "poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:567
+#: ../gtk/incall_view.c:615
 msgid "very poor"
 msgstr ""
 
-#: ../gtk/incall_view.c:569
+#: ../gtk/incall_view.c:617
 msgid "too bad"
 msgstr ""
 
-#: ../gtk/incall_view.c:570 ../gtk/incall_view.c:586
+#: ../gtk/incall_view.c:618 ../gtk/incall_view.c:634
 msgid "unavailable"
 msgstr ""
 
-#: ../gtk/incall_view.c:715
+#: ../gtk/incall_view.c:732
 msgid "Secured by SRTP"
 msgstr ""
 
-#: ../gtk/incall_view.c:721
+#: ../gtk/incall_view.c:738
 msgid "Secured by DTLS"
 msgstr ""
 
-#: ../gtk/incall_view.c:727
+#: ../gtk/incall_view.c:744
 #, c-format
 msgid "Secured by ZRTP - [auth token: %s]"
 msgstr ""
 
-#: ../gtk/incall_view.c:733
+#: ../gtk/incall_view.c:748
 msgid "Set unverified"
 msgstr ""
 
-#: ../gtk/incall_view.c:733 ../gtk/in_call_frame.ui.h:1
+#: ../gtk/incall_view.c:748
 msgid "Set verified"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "In conference"
 msgstr ""
 
-#: ../gtk/incall_view.c:762
+#: ../gtk/incall_view.c:788
 msgid "<b>In call</b>"
 msgstr "<b>通話中</b>"
 
-#: ../gtk/incall_view.c:798
+#: ../gtk/incall_view.c:825
 msgid "<b>Paused call</b>"
 msgstr "<b>暫停通話</b>"
 
-#: ../gtk/incall_view.c:834
+#: ../gtk/incall_view.c:862
 msgid "<b>Call ended.</b>"
 msgstr "<b>通話結束。</b>"
 
-#: ../gtk/incall_view.c:865
+#: ../gtk/incall_view.c:893
 msgid "Transfer in progress"
 msgstr ""
 
-#: ../gtk/incall_view.c:868
+#: ../gtk/incall_view.c:896
 msgid "Transfer done."
 msgstr ""
 
-#: ../gtk/incall_view.c:871
+#: ../gtk/incall_view.c:899
 msgid "Transfer failed."
 msgstr ""
 
-#: ../gtk/incall_view.c:904
+#: ../gtk/incall_view.c:930
 msgid "Resume"
 msgstr "繼續"
 
-#: ../gtk/incall_view.c:911 ../gtk/in_call_frame.ui.h:7
+#: ../gtk/incall_view.c:930 ../gtk/in_call_frame.ui.h:7
 msgid "Pause"
 msgstr "暫停"
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 #, c-format
 msgid ""
 "<small><i>Recording into\n"
 "%s %s</i></small>"
 msgstr ""
 
-#: ../gtk/incall_view.c:977
+#: ../gtk/incall_view.c:996
 msgid "(Paused)"
 msgstr ""
 
@@ -810,176 +673,89 @@ msgstr ""
 msgid "Did you hear three beeps ?"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:299 ../gtk/audio_assistant.c:304
+#: ../gtk/audio_assistant.c:301 ../gtk/audio_assistant.c:306
 msgid "Sound preferences not found "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:313
+#: ../gtk/audio_assistant.c:315
 msgid "Cannot launch system sound control "
 msgstr ""
 
-#: ../gtk/audio_assistant.c:325
+#: ../gtk/audio_assistant.c:327
 msgid ""
 "Welcome!\n"
 "This assistant will help you to configure audio settings for Linphone"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:335
+#: ../gtk/audio_assistant.c:337
 msgid "Capture device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:336
+#: ../gtk/audio_assistant.c:338
 msgid "Recorded volume"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:340
+#: ../gtk/audio_assistant.c:342
 msgid "No voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:341 ../gtk/audio_assistant.c:380
+#: ../gtk/audio_assistant.c:343 ../gtk/audio_assistant.c:382
 msgid "System sound preferences"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:376
+#: ../gtk/audio_assistant.c:378
 msgid "Playback device"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:377
+#: ../gtk/audio_assistant.c:379
 msgid "Play three beeps"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:410
+#: ../gtk/audio_assistant.c:412
 msgid "Press the record button and say some words"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:411
+#: ../gtk/audio_assistant.c:413
 msgid "Listen to your record voice"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:412
+#: ../gtk/audio_assistant.c:414 ../gtk/conf_frame.ui.h:2
+#: ../gtk/in_call_frame.ui.h:4
 msgid "Record"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:413
+#: ../gtk/audio_assistant.c:415
 msgid "Play"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:440
+#: ../gtk/audio_assistant.c:442
 msgid "Let's start Linphone now"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:510
+#: ../gtk/audio_assistant.c:513
 msgid "Audio Assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:520 ../gtk/main.ui.h:16
+#: ../gtk/audio_assistant.c:523 ../gtk/main.ui.h:15
 msgid "Audio assistant"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:525
+#: ../gtk/audio_assistant.c:528
 msgid "Mic Gain calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:531
+#: ../gtk/audio_assistant.c:534
 msgid "Speaker volume calibration"
 msgstr ""
 
-#: ../gtk/audio_assistant.c:536
+#: ../gtk/audio_assistant.c:539
 msgid "Record and Play"
 msgstr ""
 
-#: ../gtk/main.ui.h:1
-msgid "All users"
-msgstr "所有使用者"
-
-#: ../gtk/main.ui.h:2
-msgid "Online users"
-msgstr "線上使用者"
-
-#: ../gtk/main.ui.h:3 ../gtk/login_frame.ui.h:8
-msgid "ADSL"
-msgstr "ADSL"
-
-#: ../gtk/main.ui.h:4 ../gtk/login_frame.ui.h:9
-msgid "Fiber Channel"
-msgstr "光纖通道"
-
-#: ../gtk/main.ui.h:5
-msgid "Default"
-msgstr "預設值"
-
-#: ../gtk/main.ui.h:6
-msgid "Delete"
+#: ../gtk/audio_assistant.c:544 ../gtk/setup_wizard.ui.h:38
+msgid "Terminating"
 msgstr ""
 
-#: ../gtk/main.ui.h:7
-msgid "_Options"
-msgstr "選項(_O)"
-
-#: ../gtk/main.ui.h:8
-msgid "Set configuration URI"
-msgstr ""
-
-#: ../gtk/main.ui.h:9
-msgid "Always start video"
-msgstr ""
-
-#: ../gtk/main.ui.h:10
-msgid "Enable self-view"
-msgstr "啟用自拍檢視"
-
-#: ../gtk/main.ui.h:11
-msgid "_Help"
-msgstr "求助(_H)"
-
-#: ../gtk/main.ui.h:12
-msgid "Show debug window"
-msgstr "顯示除錯視窗"
-
-#: ../gtk/main.ui.h:13
-msgid "_Homepage"
-msgstr "官方網頁(_H)"
-
-#: ../gtk/main.ui.h:14
-msgid "Check _Updates"
-msgstr "檢查更新(_U)"
-
-#: ../gtk/main.ui.h:15
-msgid "Account assistant"
-msgstr ""
-
-#: ../gtk/main.ui.h:17
-msgid "SIP address or phone number:"
-msgstr "SIP 位址或電話號碼："
-
-#: ../gtk/main.ui.h:18
-msgid "Initiate a new call"
-msgstr "打出新電話"
-
-#: ../gtk/main.ui.h:19
-msgid "Contacts"
-msgstr "連絡人"
-
-#: ../gtk/main.ui.h:20
-msgid "Search"
-msgstr "搜尋"
-
-#: ../gtk/main.ui.h:21
-msgid "<b>Add contacts from directory</b>"
-msgstr "<b>從目錄加入連絡人</b>"
-
-#: ../gtk/main.ui.h:22
-msgid "Add contact"
-msgstr "加入聯絡人"
-
-#: ../gtk/main.ui.h:23
-msgid "Recent calls"
-msgstr ""
-
-#: ../gtk/main.ui.h:24
-msgid "My current identity:"
-msgstr "我目前的使用者識別："
-
 #: ../gtk/about.ui.h:1
 msgid "About Linphone"
 msgstr ""
@@ -1008,484 +784,6 @@ msgid ""
 "he: Eli Zaretskii <eliz@gnu.org>\n"
 msgstr ""
 
-#: ../gtk/contact.ui.h:2
-msgid "SIP Address"
-msgstr "SIP 位址"
-
-#: ../gtk/contact.ui.h:3
-msgid "Show this contact presence status"
-msgstr "顯示這個連絡人的上線狀態"
-
-#: ../gtk/contact.ui.h:4
-msgid "Allow this contact to see my presence status"
-msgstr "允許這個連絡人看到我的上線狀態"
-
-#: ../gtk/contact.ui.h:5
-msgid "<b>Contact information</b>"
-msgstr "<b>連絡人資訊</b>"
-
-#: ../gtk/log.ui.h:1
-msgid "Linphone debug window"
-msgstr "Linphone 除錯視窗"
-
-#: ../gtk/log.ui.h:2
-msgid "Scroll to end"
-msgstr ""
-
-#: ../gtk/password.ui.h:1
-msgid "Linphone - Authentication required"
-msgstr "Linphone - 需要驗證"
-
-#: ../gtk/password.ui.h:2
-msgid "Please enter the domain password"
-msgstr "請輸入這個網域的密碼"
-
-#: ../gtk/password.ui.h:3 ../gtk/login_frame.ui.h:5
-msgid "UserID"
-msgstr "使用者ID"
-
-#: ../gtk/call_logs.ui.h:1
-msgid "Call history"
-msgstr "通話紀錄"
-
-#: ../gtk/call_logs.ui.h:2
-msgid "Clear all"
-msgstr "全部清除"
-
-#: ../gtk/call_logs.ui.h:3
-msgid "Call back"
-msgstr "回電"
-
-#: ../gtk/sip_account.ui.h:1
-msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - 設定 SIP 帳號"
-
-#: ../gtk/sip_account.ui.h:2
-msgid "Your SIP identity:"
-msgstr "您的 SIP 使用者識別:"
-
-#: ../gtk/sip_account.ui.h:3
-msgid "Looks like sip:<username>@<domain>"
-msgstr "看起來像 sip:<username>@<domain>"
-
-#: ../gtk/sip_account.ui.h:4
-msgid "sip:"
-msgstr "sip:"
-
-#: ../gtk/sip_account.ui.h:5
-msgid "SIP Proxy address:"
-msgstr "SIP 代理位址:"
-
-#: ../gtk/sip_account.ui.h:6
-msgid "Looks like sip:<proxy hostname>"
-msgstr "看起來像 sip:<proxy hostname>"
-
-#: ../gtk/sip_account.ui.h:7
-msgid "Registration duration (sec):"
-msgstr "註冊時間 (秒):"
-
-#: ../gtk/sip_account.ui.h:8
-msgid "Contact params (optional):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:9
-msgid "AVPF regular RTCP interval (sec):"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:10
-msgid "Route (optional):"
-msgstr "路由 (選擇性):"
-
-#: ../gtk/sip_account.ui.h:11
-msgid "Transport"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:12
-msgid "Register"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:13
-msgid "Publish presence information"
-msgstr "發布上線資訊"
-
-#: ../gtk/sip_account.ui.h:14
-msgid "Enable AVPF"
-msgstr ""
-
-#: ../gtk/sip_account.ui.h:15
-msgid "Configure a SIP account"
-msgstr "設定 SIP 帳號"
-
-#: ../gtk/parameters.ui.h:1
-msgid "anonymous"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:2
-msgid "GSSAPI"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:3
-msgid "SASL"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:4
-msgid "default soundcard"
-msgstr "預設的音效卡"
-
-#: ../gtk/parameters.ui.h:5
-msgid "a sound card"
-msgstr "音效卡"
-
-#: ../gtk/parameters.ui.h:6
-msgid "default camera"
-msgstr "預設的攝影機"
-
-#: ../gtk/parameters.ui.h:7
-msgid "CIF"
-msgstr "CIF"
-
-#: ../gtk/parameters.ui.h:8
-msgid "Audio codecs"
-msgstr "音訊編碼解碼器"
-
-#: ../gtk/parameters.ui.h:9
-msgid "Video codecs"
-msgstr "視訊編碼解碼器"
-
-#: ../gtk/parameters.ui.h:10
-msgid "C"
-msgstr "C"
-
-#: ../gtk/parameters.ui.h:11
-msgid "SIP (UDP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:12
-msgid "SIP (TCP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:13
-msgid "SIP (TLS)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:14
-msgid "default"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:15
-msgid "high-fps"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:16
-msgid "custom"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:17
-msgid "Settings"
-msgstr "設定值"
-
-#: ../gtk/parameters.ui.h:18
-msgid "This section defines your SIP address when not using a SIP account"
-msgstr "這一區在不使用 SIP 帳號時定義您的 SIP 位址"
-
-#: ../gtk/parameters.ui.h:19
-msgid "Your display name (eg: John Doe):"
-msgstr "您的顯示名稱 (例如: John Doe):"
-
-#: ../gtk/parameters.ui.h:20
-msgid "Your username:"
-msgstr "您的使用者名稱:"
-
-#: ../gtk/parameters.ui.h:21
-msgid "Your resulting SIP address:"
-msgstr "您組成的 SIP 位址:"
-
-#: ../gtk/parameters.ui.h:22
-msgid "<b>Default identity</b>"
-msgstr "<b>預設身分識別</b>"
-
-#: ../gtk/parameters.ui.h:23
-msgid "Wizard"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:24
-msgid "Add"
-msgstr "加入"
-
-#: ../gtk/parameters.ui.h:25
-msgid "Edit"
-msgstr "編輯"
-
-#: ../gtk/parameters.ui.h:26
-msgid "Remove"
-msgstr "移除"
-
-#: ../gtk/parameters.ui.h:27
-msgid "<b>Proxy accounts</b>"
-msgstr "<b>代理伺服器帳號</b>"
-
-#: ../gtk/parameters.ui.h:28
-msgid "Erase all passwords"
-msgstr "消除所有的密碼"
-
-#: ../gtk/parameters.ui.h:29
-msgid "<b>Privacy</b>"
-msgstr "<b>隱私</b>"
-
-#: ../gtk/parameters.ui.h:30
-msgid "Automatically answer when a call is received"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:31
-msgid "Delay before answering (ms)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:32
-msgid "<b>Auto-answer</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:33
-msgid "Manage SIP Accounts"
-msgstr "管理 SIP 帳號"
-
-#: ../gtk/parameters.ui.h:34
-msgid "Ring sound:"
-msgstr "鈴聲音效:"
-
-#: ../gtk/parameters.ui.h:35
-msgid "ALSA special device (optional):"
-msgstr "ALSA 特殊裝置 (選擇性)："
-
-#: ../gtk/parameters.ui.h:36
-msgid "Capture device:"
-msgstr "捕捉裝置:"
-
-#: ../gtk/parameters.ui.h:37
-msgid "Ring device:"
-msgstr "響鈴裝置:"
-
-#: ../gtk/parameters.ui.h:38
-msgid "Playback device:"
-msgstr "播放裝置"
-
-#: ../gtk/parameters.ui.h:39
-msgid "Enable echo cancellation"
-msgstr "啟用回音消除"
-
-#: ../gtk/parameters.ui.h:40
-msgid "<b>Audio</b>"
-msgstr "<b>音效</b>"
-
-#: ../gtk/parameters.ui.h:41
-msgid "Video input device:"
-msgstr "視訊輸入裝置:"
-
-#: ../gtk/parameters.ui.h:42
-msgid "Preferred video resolution:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:43
-msgid "Video output method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:44
-msgid "Show camera preview"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:45
-msgid "Video preset:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:46
-msgid "Preferred video framerate:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:47
-msgid "0 stands for \"unlimited\""
-msgstr "0 表示「不限制」"
-
-#: ../gtk/parameters.ui.h:48
-msgid "<b>Video</b>"
-msgstr "<b>視訊</b>"
-
-#: ../gtk/parameters.ui.h:49
-msgid "Upload speed limit in Kbit/sec:"
-msgstr "上傳速度限制於 Kbit/sec:"
-
-#: ../gtk/parameters.ui.h:50
-msgid "Download speed limit in Kbit/sec:"
-msgstr "下載速度限制於 Kbit/sec:"
-
-#: ../gtk/parameters.ui.h:51
-msgid "Enable adaptive rate control"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:52
-msgid ""
-"<i>Adaptive rate control is a technique to dynamically guess the available "
-"bandwidth during a call.</i>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:53
-msgid "<b>Bandwidth control</b>"
-msgstr "<b>頻寬控制</b>"
-
-#: ../gtk/parameters.ui.h:54
-msgid "Multimedia settings"
-msgstr "多媒體設定值"
-
-#: ../gtk/parameters.ui.h:55
-msgid "Set Maximum Transmission Unit:"
-msgstr "設定最大傳輸單位:"
-
-#: ../gtk/parameters.ui.h:56
-msgid "Send DTMFs as SIP info"
-msgstr "傳送 DTMFs 為 SIP 資訊"
-
-#: ../gtk/parameters.ui.h:57
-msgid "Allow IPv6"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:58
-msgid "<b>Transport</b>"
-msgstr "<b>傳輸</b>"
-
-#: ../gtk/parameters.ui.h:59
-msgid "SIP/UDP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:61
-msgid "Random"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:62
-msgid "SIP/TCP port"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:63
-msgid "Audio RTP/UDP:"
-msgstr "音效 RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:64
-msgid "Fixed"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:65
-msgid "Video RTP/UDP:"
-msgstr "視訊 RTP/UDP:"
-
-#: ../gtk/parameters.ui.h:66
-msgid "Media encryption type"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:67
-msgid "Media encryption is mandatory"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:68
-msgid "Tunnel"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:69
-msgid "DSCP fields"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:70
-msgid "<b>Network protocol and ports</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:71
-msgid "Direct connection to the Internet"
-msgstr "直接連線到網際網路"
-
-#: ../gtk/parameters.ui.h:72
-msgid "Behind NAT / Firewall (specify gateway IP )"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:73
-msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)"
-
-#: ../gtk/parameters.ui.h:74
-msgid "Behind NAT / Firewall (use ICE)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:75
-msgid "Behind NAT / Firewall (use uPnP)"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:76
-msgid "Public IP address:"
-msgstr "公共 IP 地址:"
-
-#: ../gtk/parameters.ui.h:77
-msgid "Stun server:"
-msgstr "Stun 伺服器:"
-
-#: ../gtk/parameters.ui.h:78
-msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT 與防火牆</b>"
-
-#: ../gtk/parameters.ui.h:79
-msgid "Network settings"
-msgstr "網路設定值"
-
-#: ../gtk/parameters.ui.h:80 ../gtk/tunnel_config.ui.h:4
-msgid "Enable"
-msgstr "啟用"
-
-#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:5
-msgid "Disable"
-msgstr "停用"
-
-#: ../gtk/parameters.ui.h:82
-msgid "<b>Audio codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:83
-msgid "<b>Video codecs</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:84
-msgid "Codecs"
-msgstr "編碼解碼器"
-
-#: ../gtk/parameters.ui.h:85
-msgid "<b>Language</b>"
-msgstr "<b>語言</b>"
-
-#: ../gtk/parameters.ui.h:86
-msgid "Show advanced settings"
-msgstr "顯示進階設定值"
-
-#: ../gtk/parameters.ui.h:87
-msgid "<b>Level</b>"
-msgstr "<b>級數</b>"
-
-#: ../gtk/parameters.ui.h:88
-msgid "User interface"
-msgstr "使用者介面"
-
-#: ../gtk/parameters.ui.h:89 ../gtk/ldap.ui.h:2
-msgid "Server address:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:90 ../gtk/ldap.ui.h:3
-msgid "Authentication method:"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:92
-msgid "<b>LDAP Account setup</b>"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:93
-msgid "LDAP"
-msgstr ""
-
-#: ../gtk/parameters.ui.h:94
-msgid "Done"
-msgstr "完成"
-
 #: ../gtk/buddylookup.ui.h:1
 msgid "Search contacts in directory"
 msgstr "在目錄中搜尋"
@@ -1498,29 +796,21 @@ msgstr "加入我的清單"
 msgid "<b>Search somebody</b>"
 msgstr "<b>搜尋某人</b>"
 
-#: ../gtk/waiting.ui.h:2
-msgid "Please wait"
-msgstr "請稍候"
-
-#: ../gtk/dscp_settings.ui.h:1
-msgid "DSCP settings"
+#: ../gtk/callee_frame.ui.h:1
+msgid "<b>Callee name</b>"
 msgstr ""
 
-#: ../gtk/dscp_settings.ui.h:2
-msgid "SIP"
-msgstr ""
+#: ../gtk/call_logs.ui.h:1
+msgid "Call history"
+msgstr "通話紀錄"
 
-#: ../gtk/dscp_settings.ui.h:3
-msgid "Audio RTP stream"
-msgstr ""
+#: ../gtk/call_logs.ui.h:2
+msgid "Clear all"
+msgstr "全部清除"
 
-#: ../gtk/dscp_settings.ui.h:4
-msgid "Video RTP stream"
-msgstr ""
-
-#: ../gtk/dscp_settings.ui.h:5
-msgid "<b>Set DSCP values (in hexadecimal)</b>"
-msgstr ""
+#: ../gtk/call_logs.ui.h:3
+msgid "Call back"
+msgstr "回電"
 
 #: ../gtk/call_statistics.ui.h:1
 msgid "Call statistics"
@@ -1570,38 +860,112 @@ msgstr ""
 msgid "<b>Call statistics and information</b>"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:1
-msgid "Configure VoIP tunnel"
+#: ../gtk/chatroom_frame.ui.h:1
+msgid "Send"
+msgstr "傳送"
+
+#: ../gtk/conf_frame.ui.h:1
+msgid "End conference"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:2
-msgid "Host"
+#: ../gtk/config-uri.ui.h:1
+msgid "Specifying a remote configuration URI"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:3
-msgid "Port"
+#: ../gtk/config-uri.ui.h:2
+msgid ""
+"This dialog allows to set an http or https address when configuration is to be fetched at startup.\n"
+"Please enter or modify the configuration URI below. After clicking OK, Linphone will restart automatically in order to fetch and take into account the new configuration. "
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:6
-msgid "<b>Configure tunnel</b>"
+#: ../gtk/contact.ui.h:2
+msgid "SIP Address"
+msgstr "SIP 位址"
+
+#: ../gtk/contact.ui.h:3
+msgid "Show this contact presence status"
+msgstr "顯示這個連絡人的上線狀態"
+
+#: ../gtk/contact.ui.h:4
+msgid "Allow this contact to see my presence status"
+msgstr "允許這個連絡人看到我的上線狀態"
+
+#: ../gtk/contact.ui.h:5
+msgid "<b>Contact information</b>"
+msgstr "<b>連絡人資訊</b>"
+
+#: ../gtk/dscp_settings.ui.h:1
+msgid "DSCP settings"
 msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:7 ../gtk/login_frame.ui.h:1
-msgid "Username"
-msgstr "使用者名稱"
+#: ../gtk/dscp_settings.ui.h:2
+msgid "SIP"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:8 ../gtk/login_frame.ui.h:2
-msgid "Password"
-msgstr "密碼"
+#: ../gtk/dscp_settings.ui.h:3
+msgid "Audio RTP stream"
+msgstr ""
 
-#: ../gtk/tunnel_config.ui.h:9
-msgid "<b>Configure http proxy (optional)</b>"
+#: ../gtk/dscp_settings.ui.h:4
+msgid "Video RTP stream"
+msgstr ""
+
+#: ../gtk/dscp_settings.ui.h:5
+msgid "<b>Set DSCP values (in hexadecimal)</b>"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:1
+msgid "Click here to set the speakers volume"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:5
+msgid "Record this call to an audio file"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:6
+msgid "Video"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:8
+msgid "Mute"
+msgstr ""
+
+#: ../gtk/in_call_frame.ui.h:9
+msgid "Transfer"
+msgstr "轉接"
+
+#: ../gtk/in_call_frame.ui.h:12
+msgid "In call"
+msgstr "通話中"
+
+#: ../gtk/in_call_frame.ui.h:13
+msgid "Duration"
+msgstr "時間長度"
+
+#: ../gtk/in_call_frame.ui.h:14
+msgid "Call quality rating"
 msgstr ""
 
 #: ../gtk/ldap.ui.h:1
 msgid "LDAP Settings"
 msgstr ""
 
+#: ../gtk/ldap.ui.h:2 ../gtk/parameters.ui.h:90
+msgid "Server address:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:3 ../gtk/parameters.ui.h:91
+msgid "Authentication method:"
+msgstr ""
+
+#: ../gtk/ldap.ui.h:4 ../gtk/parameters.ui.h:92 ../gtk/setup_wizard.ui.h:17
+msgid "Username:"
+msgstr "使用者名稱："
+
+#: ../gtk/ldap.ui.h:5 ../gtk/password.ui.h:4 ../gtk/setup_wizard.ui.h:18
+msgid "Password:"
+msgstr "密碼： "
+
 #: ../gtk/ldap.ui.h:6
 msgid "Use TLS Connection"
 msgstr ""
@@ -1687,70 +1051,13 @@ msgstr ""
 msgid "NTLM"
 msgstr ""
 
-#: ../gtk/config-uri.ui.h:1
-msgid "Specifying a remote configuration URI"
-msgstr ""
+#: ../gtk/login_frame.ui.h:1 ../gtk/tunnel_config.ui.h:7
+msgid "Username"
+msgstr "使用者名稱"
 
-#: ../gtk/config-uri.ui.h:2
-msgid ""
-"This dialog allows to set an http or https address when configuration is to "
-"be fetched at startup.\n"
-"Please enter or modify the configuration URI below. After clicking OK, "
-"Linphone will restart automatically in order to fetch and take into account "
-"the new configuration. "
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:1
-msgid "Configuring..."
-msgstr ""
-
-#: ../gtk/provisioning-fetch.ui.h:2
-msgid "Please wait while fetching configuration from server..."
-msgstr ""
-
-#: ../gtk/chatroom_frame.ui.h:1
-msgid "Send"
-msgstr "傳送"
-
-#: ../gtk/callee_frame.ui.h:1
-msgid "<b>Callee name</b>"
-msgstr ""
-
-#: ../gtk/conf_frame.ui.h:1
-msgid "End conference"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:2
-msgid "Click here to set the speakers volume"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:5
-msgid "Record this call to an audio file"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:6
-msgid "Video"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:8
-msgid "Mute"
-msgstr ""
-
-#: ../gtk/in_call_frame.ui.h:9
-msgid "Transfer"
-msgstr "轉接"
-
-#: ../gtk/in_call_frame.ui.h:12
-msgid "In call"
-msgstr "通話中"
-
-#: ../gtk/in_call_frame.ui.h:13
-msgid "Duration"
-msgstr "時間長度"
-
-#: ../gtk/in_call_frame.ui.h:14
-msgid "Call quality rating"
-msgstr ""
+#: ../gtk/login_frame.ui.h:2 ../gtk/tunnel_config.ui.h:8
+msgid "Password"
+msgstr "密碼"
 
 #: ../gtk/login_frame.ui.h:3
 msgid "Internet connection:"
@@ -1760,6 +1067,10 @@ msgstr "網路連線："
 msgid "Automatically log me in"
 msgstr "將我自動登入"
 
+#: ../gtk/login_frame.ui.h:5 ../gtk/password.ui.h:3
+msgid "UserID"
+msgstr "使用者ID"
+
 #: ../gtk/login_frame.ui.h:6
 msgid "Login information"
 msgstr "登入資訊"
@@ -1768,290 +1079,989 @@ msgstr "登入資訊"
 msgid "<b>Welcome!</b>"
 msgstr ""
 
-#: ../coreapi/linphonecore.c:1483
+#: ../gtk/login_frame.ui.h:8
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../gtk/login_frame.ui.h:9
+msgid "Fiber Channel"
+msgstr "光纖通道"
+
+#: ../gtk/log.ui.h:1
+msgid "Linphone debug window"
+msgstr "Linphone 除錯視窗"
+
+#: ../gtk/log.ui.h:2
+msgid "Scroll to end"
+msgstr ""
+
+#: ../gtk/main.ui.h:1
+msgid "Default"
+msgstr "預設值"
+
+#: ../gtk/main.ui.h:2
+msgid "Delete"
+msgstr ""
+
+#: ../gtk/main.ui.h:3
+msgid "_Options"
+msgstr "選項(_O)"
+
+#: ../gtk/main.ui.h:4
+msgid "Set configuration URI"
+msgstr ""
+
+#: ../gtk/main.ui.h:5
+msgid "Always start video"
+msgstr ""
+
+#: ../gtk/main.ui.h:6
+msgid "Enable self-view"
+msgstr "啟用自拍檢視"
+
+#: ../gtk/main.ui.h:7
+msgid "Show keypad"
+msgstr ""
+
+#: ../gtk/main.ui.h:8
+msgid "Import contacts from vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:9
+msgid "Export contacts as vCards"
+msgstr ""
+
+#: ../gtk/main.ui.h:10
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../gtk/main.ui.h:11
+msgid "Show debug window"
+msgstr "顯示除錯視窗"
+
+#: ../gtk/main.ui.h:12
+msgid "_Homepage"
+msgstr "官方網頁(_H)"
+
+#: ../gtk/main.ui.h:13
+msgid "Check _Updates"
+msgstr "檢查更新(_U)"
+
+#: ../gtk/main.ui.h:14
+msgid "Account assistant"
+msgstr ""
+
+#: ../gtk/main.ui.h:16
+msgid "SIP address or phone number:"
+msgstr "SIP 位址或電話號碼："
+
+#: ../gtk/main.ui.h:17
+msgid "Initiate a new call"
+msgstr "打出新電話"
+
+#: ../gtk/main.ui.h:18
+msgid "Contacts"
+msgstr "連絡人"
+
+#: ../gtk/main.ui.h:19
+msgid "Search"
+msgstr "搜尋"
+
+#: ../gtk/main.ui.h:20
+msgid "<b>Add contacts from directory</b>"
+msgstr "<b>從目錄加入連絡人</b>"
+
+#: ../gtk/main.ui.h:21
+msgid "Add contact"
+msgstr "加入聯絡人"
+
+#: ../gtk/main.ui.h:22
+msgid "Clear call history"
+msgstr ""
+
+#: ../gtk/main.ui.h:24
+msgid "My current identity:"
+msgstr "我目前的使用者識別："
+
+#: ../gtk/main.ui.h:25
+msgid "Autoanswer is enabled"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:1
+msgid "anonymous"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:2
+msgid "GSSAPI"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:3
+msgid "SASL"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:4
+msgid "default soundcard"
+msgstr "預設的音效卡"
+
+#: ../gtk/parameters.ui.h:5
+msgid "a sound card"
+msgstr "音效卡"
+
+#: ../gtk/parameters.ui.h:6
+msgid "default camera"
+msgstr "預設的攝影機"
+
+#: ../gtk/parameters.ui.h:7
+msgid "CIF"
+msgstr "CIF"
+
+#: ../gtk/parameters.ui.h:8
+msgid "Audio codecs"
+msgstr "音訊編碼解碼器"
+
+#: ../gtk/parameters.ui.h:9
+msgid "Video codecs"
+msgstr "視訊編碼解碼器"
+
+#: ../gtk/parameters.ui.h:10
+msgid "C"
+msgstr "C"
+
+#: ../gtk/parameters.ui.h:11
+msgid "SIP (UDP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:12
+msgid "SIP (TCP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:13
+msgid "SIP (TLS)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:14
+msgid "Settings"
+msgstr "設定值"
+
+#: ../gtk/parameters.ui.h:15
+msgid "This section defines your SIP address when not using a SIP account"
+msgstr "這一區在不使用 SIP 帳號時定義您的 SIP 位址"
+
+#: ../gtk/parameters.ui.h:16
+msgid "Your display name (eg: John Doe):"
+msgstr "您的顯示名稱 (例如: John Doe):"
+
+#: ../gtk/parameters.ui.h:17
+msgid "Your username:"
+msgstr "您的使用者名稱:"
+
+#: ../gtk/parameters.ui.h:18
+msgid "Your resulting SIP address:"
+msgstr "您組成的 SIP 位址:"
+
+#: ../gtk/parameters.ui.h:19
+msgid "<b>Default identity</b>"
+msgstr "<b>預設身分識別</b>"
+
+#: ../gtk/parameters.ui.h:20
+msgid "Wizard"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:21
+msgid "Add"
+msgstr "加入"
+
+#: ../gtk/parameters.ui.h:22
+msgid "Edit"
+msgstr "編輯"
+
+#: ../gtk/parameters.ui.h:23
+msgid "Remove"
+msgstr "移除"
+
+#: ../gtk/parameters.ui.h:24
+msgid "<b>Proxy accounts</b>"
+msgstr "<b>代理伺服器帳號</b>"
+
+#: ../gtk/parameters.ui.h:25
+msgid "Erase all passwords"
+msgstr "消除所有的密碼"
+
+#: ../gtk/parameters.ui.h:26
+msgid "<b>Privacy</b>"
+msgstr "<b>隱私</b>"
+
+#: ../gtk/parameters.ui.h:27
+msgid "Automatically answer when a call is received"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:28
+msgid "Delay before answering (ms)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:29
+msgid "<b>Auto-answer</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:30
+msgid "Manage SIP Accounts"
+msgstr "管理 SIP 帳號"
+
+#: ../gtk/parameters.ui.h:31
+msgid "Ring sound:"
+msgstr "鈴聲音效:"
+
+#: ../gtk/parameters.ui.h:32
+msgid "ALSA special device (optional):"
+msgstr "ALSA 特殊裝置 (選擇性)："
+
+#: ../gtk/parameters.ui.h:33
+msgid "Capture device:"
+msgstr "捕捉裝置:"
+
+#: ../gtk/parameters.ui.h:34
+msgid "Ring device:"
+msgstr "響鈴裝置:"
+
+#: ../gtk/parameters.ui.h:35
+msgid "Playback device:"
+msgstr "播放裝置"
+
+#: ../gtk/parameters.ui.h:36
+msgid "Enable echo cancellation"
+msgstr "啟用回音消除"
+
+#: ../gtk/parameters.ui.h:37
+msgid "<b>Audio</b>"
+msgstr "<b>音效</b>"
+
+#: ../gtk/parameters.ui.h:38
+msgid "Video input device:"
+msgstr "視訊輸入裝置:"
+
+#: ../gtk/parameters.ui.h:39
+msgid "Preferred video resolution:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:40
+msgid "Video output method:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:41
+msgid "Show camera preview"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:42
+msgid "Video preset:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:43
+msgid "Preferred video framerate:"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:44
+msgid "0 stands for \"unlimited\""
+msgstr "0 表示「不限制」"
+
+#: ../gtk/parameters.ui.h:45
+msgid "<b>Video</b>"
+msgstr "<b>視訊</b>"
+
+#: ../gtk/parameters.ui.h:46
+msgid "Upload speed limit in Kbit/sec:"
+msgstr "上傳速度限制於 Kbit/sec:"
+
+#: ../gtk/parameters.ui.h:47
+msgid "Download speed limit in Kbit/sec:"
+msgstr "下載速度限制於 Kbit/sec:"
+
+#: ../gtk/parameters.ui.h:48
+msgid "Enable adaptive rate control"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:49
+msgid ""
+"<i>Adaptive rate control is a technique to dynamically guess the available "
+"bandwidth during a call.</i>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:50
+msgid "<b>Bandwidth control</b>"
+msgstr "<b>頻寬控制</b>"
+
+#: ../gtk/parameters.ui.h:51
+msgid "Multimedia settings"
+msgstr "多媒體設定值"
+
+#: ../gtk/parameters.ui.h:52
+msgid "Set Maximum Transmission Unit:"
+msgstr "設定最大傳輸單位:"
+
+#: ../gtk/parameters.ui.h:53
+msgid "Send DTMFs as SIP info"
+msgstr "傳送 DTMFs 為 SIP 資訊"
+
+#: ../gtk/parameters.ui.h:54
+msgid "Allow IPv6"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:55
+msgid "<b>Transport</b>"
+msgstr "<b>傳輸</b>"
+
+#: ../gtk/parameters.ui.h:56
+msgid "SIP/UDP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:58
+msgid "Random"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:59
+msgid "SIP/TCP port"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:60
+msgid "Audio RTP/UDP:"
+msgstr "音效 RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:61
+msgid "Fixed"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:62
+msgid "Video RTP/UDP:"
+msgstr "視訊 RTP/UDP:"
+
+#: ../gtk/parameters.ui.h:63
+msgid "Tunnel"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:64
+msgid "DSCP fields"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:65
+msgid "<b>Network protocol and ports</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:66
+msgid "Direct connection to the Internet"
+msgstr "直接連線到網際網路"
+
+#: ../gtk/parameters.ui.h:67
+msgid "Behind NAT / Firewall (specify gateway IP )"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:68
+msgid "Behind NAT / Firewall (use STUN to resolve)"
+msgstr "在 NAT / 防火牆之後 (使用 STUN 解析)"
+
+#: ../gtk/parameters.ui.h:69
+msgid "Behind NAT / Firewall (use ICE)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:70
+msgid "Behind NAT / Firewall (use uPnP)"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:71
+msgid "Public IP address:"
+msgstr "公共 IP 地址:"
+
+#: ../gtk/parameters.ui.h:72
+msgid "Stun server:"
+msgstr "Stun 伺服器:"
+
+#: ../gtk/parameters.ui.h:73
+msgid "<b>NAT and Firewall</b>"
+msgstr "<b>NAT 與防火牆</b>"
+
+#: ../gtk/parameters.ui.h:74
+msgid "Media encryption type"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:75
+msgid "Use Lime for outgoing chat messages"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:76
+msgid "Media encryption is mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:77
+msgid "Mandatory"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:78
+msgid "Preferred"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:79
+msgid "<b>Encryption</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:80
+msgid "Network settings"
+msgstr "網路設定值"
+
+#: ../gtk/parameters.ui.h:81 ../gtk/tunnel_config.ui.h:4
+msgid "Enable"
+msgstr "啟用"
+
+#: ../gtk/parameters.ui.h:82 ../gtk/tunnel_config.ui.h:5
+msgid "Disable"
+msgstr "停用"
+
+#: ../gtk/parameters.ui.h:83
+msgid "<b>Audio codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:84
+msgid "<b>Video codecs</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:85
+msgid "Codecs"
+msgstr "編碼解碼器"
+
+#: ../gtk/parameters.ui.h:86
+msgid "<b>Language</b>"
+msgstr "<b>語言</b>"
+
+#: ../gtk/parameters.ui.h:87
+msgid "Show advanced settings"
+msgstr "顯示進階設定值"
+
+#: ../gtk/parameters.ui.h:88
+msgid "<b>Level</b>"
+msgstr "<b>級數</b>"
+
+#: ../gtk/parameters.ui.h:89
+msgid "User interface"
+msgstr "使用者介面"
+
+#: ../gtk/parameters.ui.h:93
+msgid "<b>LDAP Account setup</b>"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:94
+msgid "LDAP"
+msgstr ""
+
+#: ../gtk/parameters.ui.h:95
+msgid "Done"
+msgstr "完成"
+
+#: ../gtk/password.ui.h:1
+msgid "Linphone - Authentication required"
+msgstr "Linphone - 需要驗證"
+
+#: ../gtk/password.ui.h:2
+msgid "Please enter the domain password"
+msgstr "請輸入這個網域的密碼"
+
+#: ../gtk/provisioning-fetch.ui.h:1
+msgid "Configuring..."
+msgstr ""
+
+#: ../gtk/provisioning-fetch.ui.h:2
+msgid "Please wait while fetching configuration from server..."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:1
+msgid "SIP account configuration assistant"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:2
+msgid ""
+"Welcome!\n"
+"This assistant will help you to use a SIP account for your calls."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:4
+msgid "Welcome to the account setup assistant"
+msgstr "歡迎使用帳號設定助理"
+
+#: ../gtk/setup_wizard.ui.h:5
+msgid "Create an account on linphone.org"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:6
+msgid "I have already a linphone.org account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:7
+msgid "I have already a sip account and I just want to use it"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:8
+msgid "I want to specify a remote configuration URI"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:9
+msgid "Account setup assistant"
+msgstr "帳號設定助理"
+
+#: ../gtk/setup_wizard.ui.h:10
+msgid "Enter your account information"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:11
+msgid "Username*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:12
+msgid "Password*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:13
+msgid "Domain*"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:14
+msgid "Proxy"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:15
+msgid "Configure your account (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:16
+msgid "Enter your linphone.org username"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:19
+msgid "Enter your sip username (step 1/1)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:20
+msgid "(*) Required fields"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:21
+msgid "Email: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:22
+msgid "Username: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:23
+msgid "Password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:24
+msgid "Confirm your password: (*)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:25
+msgid "Keep me informed with linphone updates"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:26
+msgid "Enter account information (step 1/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:27
+msgid "Your account is being created, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:28
+msgid "Account creation in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:29
+msgid ""
+"Please validate your account by clicking on the link we just sent you by email.\n"
+"Then come back here and press Next button."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:31
+msgid "Validation (step 2/2)"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:32
+msgid "Checking if your account is been validated, please wait."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:33
+msgid "Account validation check in progress"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:34
+msgid ""
+"Error, account not validated, username already used or server unreachable.\n"
+"Please go back and try again."
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:36
+msgid "Error"
+msgstr ""
+
+#: ../gtk/setup_wizard.ui.h:37
+msgid "Thank you. Your account is now configured and ready for use."
+msgstr "謝謝您。您的帳號已設定完成並且可以使用。"
+
+#: ../gtk/sip_account.ui.h:1
+msgid "Linphone - Configure a SIP account"
+msgstr "Linphone - 設定 SIP 帳號"
+
+#: ../gtk/sip_account.ui.h:2
+msgid "Your SIP identity:"
+msgstr "您的 SIP 使用者識別:"
+
+#: ../gtk/sip_account.ui.h:3
+msgid "Looks like sip:<username>@<domain>"
+msgstr "看起來像 sip:<username>@<domain>"
+
+#: ../gtk/sip_account.ui.h:4
+msgid "sip:"
+msgstr "sip:"
+
+#: ../gtk/sip_account.ui.h:5
+msgid "SIP Proxy address:"
+msgstr "SIP 代理位址:"
+
+#: ../gtk/sip_account.ui.h:6
+msgid "Looks like sip:<proxy hostname>"
+msgstr "看起來像 sip:<proxy hostname>"
+
+#: ../gtk/sip_account.ui.h:7
+msgid "Registration duration (sec):"
+msgstr "註冊時間 (秒):"
+
+#: ../gtk/sip_account.ui.h:8
+msgid "Contact params (optional):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:9
+msgid "AVPF regular RTCP interval (sec):"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:10
+msgid "Route (optional):"
+msgstr "路由 (選擇性):"
+
+#: ../gtk/sip_account.ui.h:11
+msgid "Transport"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:12
+msgid "Register"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:13
+msgid "Publish presence information"
+msgstr "發布上線資訊"
+
+#: ../gtk/sip_account.ui.h:14
+msgid "Enable AVPF"
+msgstr ""
+
+#: ../gtk/sip_account.ui.h:15
+msgid "Configure a SIP account"
+msgstr "設定 SIP 帳號"
+
+#: ../gtk/tunnel_config.ui.h:1
+msgid "Configure VoIP tunnel"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:2
+msgid "Host"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:3
+msgid "Port"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:6
+msgid "<b>Configure tunnel</b>"
+msgstr ""
+
+#: ../gtk/tunnel_config.ui.h:9
+msgid "<b>Configure http proxy (optional)</b>"
+msgstr ""
+
+#: ../gtk/waiting.ui.h:2
+msgid "Please wait"
+msgstr "請稍候"
+
+#: ../coreapi/linphonecore.c:1594
 msgid "Ready"
 msgstr "準備就緒"
 
-#: ../coreapi/linphonecore.c:2415
+#: ../coreapi/linphonecore.c:2685
 msgid "Configuring"
 msgstr ""
 
 #. must be known at that time
-#: ../coreapi/linphonecore.c:2800
+#: ../coreapi/linphonecore.c:3084
 msgid "Contacting"
 msgstr "正在連絡"
 
-#: ../coreapi/linphonecore.c:2805
+#: ../coreapi/linphonecore.c:3089
 msgid "Could not call"
 msgstr "無法通話"
 
-#: ../coreapi/linphonecore.c:2956
+#: ../coreapi/linphonecore.c:3228
 msgid "Sorry, we have reached the maximum number of simultaneous calls"
 msgstr "抱歉，我們已達瀏同步通話的最大數目"
 
-#: ../coreapi/linphonecore.c:3114
+#: ../coreapi/linphonecore.c:3388
 msgid "is contacting you"
 msgstr "正在連絡您"
 
-#: ../coreapi/linphonecore.c:3115
+#: ../coreapi/linphonecore.c:3389
 msgid " and asked autoanswer."
 msgstr "並要求自動接聽。"
 
-#: ../coreapi/linphonecore.c:3241
+#: ../coreapi/linphonecore.c:3506
 msgid "Modifying call parameters..."
 msgstr "修改通話參數..."
 
-#: ../coreapi/linphonecore.c:3625
+#: ../coreapi/linphonecore.c:3898
 msgid "Connected."
 msgstr "已連線。"
 
-#: ../coreapi/linphonecore.c:3650
+#: ../coreapi/linphonecore.c:3923
 msgid "Call aborted"
 msgstr "通話已放棄"
 
-#: ../coreapi/linphonecore.c:3847
+#: ../coreapi/linphonecore.c:4125
 msgid "Could not pause the call"
 msgstr "無法暫停通話"
 
-#: ../coreapi/linphonecore.c:3850
+#: ../coreapi/linphonecore.c:4128
 msgid "Pausing the current call..."
 msgstr "暫停目前的通話..."
 
-#: ../coreapi/misc.c:436
+#: ../coreapi/misc.c:441
 msgid "Stun lookup in progress..."
 msgstr "正在進行 Stun 搜尋..."
 
-#: ../coreapi/misc.c:617
+#: ../coreapi/misc.c:657
 msgid "ICE local candidates gathering in progress..."
 msgstr ""
 
-#: ../coreapi/friend.c:33
+#: ../coreapi/friend.c:48
 msgid "Online"
 msgstr "上線"
 
-#: ../coreapi/friend.c:36
+#: ../coreapi/friend.c:51
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../coreapi/friend.c:39
+#: ../coreapi/friend.c:54
 msgid "Be right back"
 msgstr "馬上回來"
 
-#: ../coreapi/friend.c:42
+#: ../coreapi/friend.c:57
 msgid "Away"
 msgstr "離開"
 
-#: ../coreapi/friend.c:45
+#: ../coreapi/friend.c:60
 msgid "On the phone"
 msgstr "電話中"
 
-#: ../coreapi/friend.c:48
+#: ../coreapi/friend.c:63
 msgid "Out to lunch"
 msgstr "外出午餐"
 
-#: ../coreapi/friend.c:51
+#: ../coreapi/friend.c:66
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
-#: ../coreapi/friend.c:54
+#: ../coreapi/friend.c:69
 msgid "Moved"
 msgstr "移動中"
 
-#: ../coreapi/friend.c:57
+#: ../coreapi/friend.c:72
 msgid "Using another messaging service"
 msgstr "使用另一個訊息服務"
 
-#: ../coreapi/friend.c:60
+#: ../coreapi/friend.c:75
 msgid "Offline"
 msgstr "離線"
 
-#: ../coreapi/friend.c:63
+#: ../coreapi/friend.c:78
 msgid "Pending"
 msgstr "等待中"
 
-#: ../coreapi/friend.c:66
+#: ../coreapi/friend.c:81
 msgid "Vacation"
 msgstr ""
 
-#: ../coreapi/friend.c:68
+#: ../coreapi/friend.c:83
 msgid "Unknown status"
 msgstr ""
 
-#: ../coreapi/proxy.c:295
+#: ../coreapi/proxy.c:339
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
-msgstr ""
-"您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
+msgstr "您輸入的 sip 代理位址是無效的，它必須要以「sip:」開頭，後面接主機名稱。"
 
-#: ../coreapi/proxy.c:301
+#: ../coreapi/proxy.c:345
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
-msgstr ""
-"您輸入的 sip 身分是無效的。\n"
-"它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
+msgstr "您輸入的 sip 身分是無效的。\n它應該看起來像 sip:使用者名稱@代理網域，像是 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:1010
+#: ../coreapi/proxy.c:979
 msgid "Looking for telephone number destination..."
 msgstr "尋找電話號碼目的端..."
 
-#: ../coreapi/proxy.c:1014
+#: ../coreapi/proxy.c:983
 msgid "Could not resolve this number."
 msgstr "無法解析這個號碼。"
 
-#: ../coreapi/proxy.c:1407
+#: ../coreapi/proxy.c:1437
 #, c-format
 msgid "Could not login as %s"
 msgstr "無法以 %s 登入"
 
-#: ../coreapi/proxy.c:1494
+#: ../coreapi/proxy.c:1522
 #, c-format
 msgid "Refreshing on %s..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:442
+#: ../coreapi/callbacks.c:415
 msgid "Remote ringing."
 msgstr "遠端響鈴。"
 
-#: ../coreapi/callbacks.c:454
+#: ../coreapi/callbacks.c:427
 msgid "Remote ringing..."
 msgstr "遠端響鈴..."
 
-#: ../coreapi/callbacks.c:475
+#: ../coreapi/callbacks.c:450
 msgid "Early media."
 msgstr "早期媒體。"
 
-#: ../coreapi/callbacks.c:548
+#: ../coreapi/callbacks.c:480
 #, c-format
-msgid "Call with %s is paused."
-msgstr "和 %s 的通話已暫停。"
+msgid "Call answered by %s"
+msgstr ""
 
-#: ../coreapi/callbacks.c:561
-#, c-format
-msgid "Call answered by %s - on hold."
-msgstr "通話由 %s 接聽 - 保留中。"
-
-#: ../coreapi/callbacks.c:571
+#: ../coreapi/callbacks.c:522
 msgid "Call resumed."
 msgstr "通話已繼續。"
 
-#: ../coreapi/callbacks.c:575
-#, c-format
-msgid "Call answered by %s."
-msgstr "通話由 %s 接聽。"
-
-#: ../coreapi/callbacks.c:598
+#: ../coreapi/callbacks.c:577
 msgid "Incompatible, check codecs or security settings..."
 msgstr ""
 
-#: ../coreapi/callbacks.c:603 ../coreapi/callbacks.c:921
+#: ../coreapi/callbacks.c:582 ../coreapi/callbacks.c:918
 msgid "Incompatible media parameters."
 msgstr ""
 
-#: ../coreapi/callbacks.c:633
+#: ../coreapi/callbacks.c:607
 msgid "We have been resumed."
 msgstr ""
 
 #. we are being paused
-#: ../coreapi/callbacks.c:642
+#: ../coreapi/callbacks.c:615
 msgid "We are paused by other party."
 msgstr ""
 
-#. reINVITE and in-dialogs UPDATE go here
-#: ../coreapi/callbacks.c:680
+#: ../coreapi/callbacks.c:625
 msgid "Call is updated by remote."
 msgstr ""
 
-#: ../coreapi/callbacks.c:797
+#: ../coreapi/callbacks.c:794
 msgid "Call terminated."
 msgstr "通話已終止。"
 
-#: ../coreapi/callbacks.c:825
+#: ../coreapi/callbacks.c:822
 msgid "User is busy."
 msgstr "使用者現正忙碌。"
 
-#: ../coreapi/callbacks.c:826
+#: ../coreapi/callbacks.c:823
 msgid "User is temporarily unavailable."
 msgstr "使用者暫時無法聯繫。"
 
 #. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:828
+#: ../coreapi/callbacks.c:825
 msgid "User does not want to be disturbed."
 msgstr "使用者不想要被打擾。"
 
-#: ../coreapi/callbacks.c:829
+#: ../coreapi/callbacks.c:826
 msgid "Call declined."
 msgstr "通話被拒接。"
 
-#: ../coreapi/callbacks.c:844
+#: ../coreapi/callbacks.c:841
 msgid "Request timeout."
 msgstr ""
 
-#: ../coreapi/callbacks.c:875
+#: ../coreapi/callbacks.c:872
 msgid "Redirected"
 msgstr "已重新導向"
 
-#: ../coreapi/callbacks.c:930
+#: ../coreapi/callbacks.c:922
 msgid "Call failed."
 msgstr "通話失敗。"
 
-#: ../coreapi/callbacks.c:1008
+#: ../coreapi/callbacks.c:1000
 #, c-format
 msgid "Registration on %s successful."
 msgstr "在 %s 註冊成功。"
 
-#: ../coreapi/callbacks.c:1009
+#: ../coreapi/callbacks.c:1001
 #, c-format
 msgid "Unregistration on %s done."
 msgstr "在 %s 取消註冊完成。"
 
-#: ../coreapi/callbacks.c:1027
+#: ../coreapi/callbacks.c:1019
 msgid "no response timeout"
 msgstr "沒有回應逾時"
 
-#: ../coreapi/callbacks.c:1030
+#: ../coreapi/callbacks.c:1022
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "在 %s 註冊失敗：%s"
 
-#: ../coreapi/callbacks.c:1037
+#: ../coreapi/callbacks.c:1029
 msgid "Service unavailable, retrying"
 msgstr ""
 
 #. if encryption is DTLS, no status to be displayed
-#: ../coreapi/linphonecall.c:181
+#: ../coreapi/linphonecall.c:204
 #, c-format
 msgid "Authentication token is %s"
 msgstr ""
 
-#: ../coreapi/linphonecall.c:1314
+#: ../coreapi/linphonecall.c:1663
+#, c-format
+msgid "Call parameters could not be modified: %s."
+msgstr ""
+
+#: ../coreapi/linphonecall.c:1665
 msgid "Call parameters were successfully modified."
 msgstr ""
 
-#: ../coreapi/linphonecall.c:3904
+#: ../coreapi/linphonecall.c:4636
 #, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
 msgstr[0] "您有 %i 通未接來電。"
 
-#: ../coreapi/call_log.c:209
+#: ../coreapi/call_log.c:223
 msgid "aborted"
 msgstr ""
 
-#: ../coreapi/call_log.c:212
+#: ../coreapi/call_log.c:226
 msgid "completed"
 msgstr ""
 
-#: ../coreapi/call_log.c:215
+#: ../coreapi/call_log.c:229
 msgid "missed"
 msgstr ""
 
-#: ../coreapi/call_log.c:218
+#: ../coreapi/call_log.c:232
 msgid "unknown"
 msgstr ""
 
-#: ../coreapi/call_log.c:220
+#: ../coreapi/call_log.c:234
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -2061,11 +2071,15 @@ msgid ""
 "Duration: %i mn %i sec\n"
 msgstr ""
 
-#: ../coreapi/call_log.c:221
+#: ../coreapi/call_log.c:235
 msgid "Outgoing call"
 msgstr ""
 
-#: ../gtk/videowindow.c:66
+#: ../gtk/videowindow.c:72
 #, c-format
 msgid "Cannot play %s."
 msgstr ""
+
+#: ../gtk/videowindow.c:252
+msgid "Take screenshot"
+msgstr ""
diff --git a/scripts/mk-ca-bundle.pl b/scripts/mk-ca-bundle.pl
index 283ebd13c..5a1435c52 100755
--- a/scripts/mk-ca-bundle.pl
+++ b/scripts/mk-ca-bundle.pl
@@ -6,11 +6,11 @@
 # *                            | (__| |_| |  _ <| |___
 # *                             \___|\___/|_| \_\_____|
 # *
-# * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
 # *
 # * This software is licensed as described in the file COPYING, which
 # * you should have received as part of this distribution. The terms
-# * are also available at http://curl.haxx.se/docs/copyright.html.
+# * are also available at https://curl.haxx.se/docs/copyright.html.
 # *
 # * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # * copies of the Software, and permit persons to whom the Software is
@@ -34,40 +34,143 @@ use Getopt::Std;
 use MIME::Base64;
 use LWP::UserAgent;
 use strict;
-use vars qw($opt_b $opt_f $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v $opt_w);
+use vars qw($opt_b $opt_d $opt_f $opt_h $opt_i $opt_l $opt_n $opt_p $opt_q $opt_s $opt_t $opt_u $opt_v $opt_w);
+use List::Util;
+use Text::Wrap;
+my $MOD_SHA = "Digest::SHA";
+eval "require $MOD_SHA";
+if ($@) {
+  $MOD_SHA = "Digest::SHA::PurePerl";
+  eval "require $MOD_SHA";
+}
+
+my %urls = (
+  'nss' =>
+    'http://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt',
+  'central' =>
+    'http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt',
+  'aurora' =>
+    'http://hg.mozilla.org/releases/mozilla-aurora/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt',
+  'beta' =>
+    'http://hg.mozilla.org/releases/mozilla-beta/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt',
+  'release' =>
+    'http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt',
+);
+
+$opt_d = 'release';
 
-my $url = 'https://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1';
 # If the OpenSSL commandline is not in search path you can configure it here!
 my $openssl = 'openssl';
 
-my $version = '1.18';
+my $version = '1.25';
 
 $opt_w = 76; # default base64 encoded lines length
 
+# default cert types to include in the output (default is to include CAs which may issue SSL server certs)
+my $default_mozilla_trust_purposes = "SERVER_AUTH";
+my $default_mozilla_trust_levels = "TRUSTED_DELEGATOR";
+$opt_p = $default_mozilla_trust_purposes . ":" . $default_mozilla_trust_levels;
+
+my @valid_mozilla_trust_purposes = (
+  "DIGITAL_SIGNATURE",
+  "NON_REPUDIATION",
+  "KEY_ENCIPHERMENT",
+  "DATA_ENCIPHERMENT",
+  "KEY_AGREEMENT",
+  "KEY_CERT_SIGN",
+  "CRL_SIGN",
+  "SERVER_AUTH",
+  "CLIENT_AUTH",
+  "CODE_SIGNING",
+  "EMAIL_PROTECTION",
+  "IPSEC_END_SYSTEM",
+  "IPSEC_TUNNEL",
+  "IPSEC_USER",
+  "TIME_STAMPING",
+  "STEP_UP_APPROVED"
+);
+
+my @valid_mozilla_trust_levels = (
+  "TRUSTED_DELEGATOR",    # CAs
+  "NOT_TRUSTED",          # Don't trust these certs.
+  "MUST_VERIFY_TRUST",    # This explicitly tells us that it ISN'T a CA but is otherwise ok. In other words, this should tell the app to ignore any other sources that claim this is a CA.
+  "TRUSTED"               # This cert is trusted, but only for itself and not for delegates (i.e. it is not a CA).
+);
+
+my $default_signature_algorithms = $opt_s = "MD5";
+
+my @valid_signature_algorithms = (
+  "MD5",
+  "SHA1",
+  "SHA256",
+  "SHA384",
+  "SHA512"
+);
+
 $0 =~ s@.*(/|\\)@@;
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
-getopts('bfhilnqtuvw:');
+getopts('bd:fhilnp:qs:tuvw:');
+
+if(!defined($opt_d)) {
+    # to make plain "-d" use not cause warnings, and actually still work
+    $opt_d = 'release';
+}
+
+# Use predefined URL or else custom URL specified on command line.
+my $url = ( defined( $urls{$opt_d} ) ) ? $urls{$opt_d} : $opt_d;
+
+my $curl = `curl -V`;
 
 if ($opt_i) {
   print ("=" x 78 . "\n");
-  print "Script Version            : $version\n";
-  print "Perl Version              : $]\n";
-  print "Operating System Name     : $^O\n";
-  print "Getopt::Std.pm Version    : ${Getopt::Std::VERSION}\n";
-  print "MIME::Base64.pm Version   : ${MIME::Base64::VERSION}\n";
-  print "LWP::UserAgent.pm Version : ${LWP::UserAgent::VERSION}\n";
-  print "LWP.pm Version            : ${LWP::VERSION}\n";
+  print "Script Version                   : $version\n";
+  print "Perl Version                     : $]\n";
+  print "Operating System Name            : $^O\n";
+  print "Getopt::Std.pm Version           : ${Getopt::Std::VERSION}\n";
+  print "MIME::Base64.pm Version          : ${MIME::Base64::VERSION}\n";
+  print "LWP::UserAgent.pm Version        : ${LWP::UserAgent::VERSION}\n";
+  print "LWP.pm Version                   : ${LWP::VERSION}\n";
+  print "Digest::SHA.pm Version           : ${Digest::SHA::VERSION}\n" if ($Digest::SHA::VERSION);
+  print "Digest::SHA::PurePerl.pm Version : ${Digest::SHA::PurePerl::VERSION}\n" if ($Digest::SHA::PurePerl::VERSION);
   print ("=" x 78 . "\n");
 }
 
+sub warning_message() {
+  if ( $opt_d =~ m/^risk$/i ) { # Long Form Warning and Exit
+    print "Warning: Use of this script may pose some risk:\n";
+    print "\n";
+    print "  1) Using http is subject to man in the middle attack of certdata content\n";
+    print "  2) Default to 'release', but more recent updates may be found in other trees\n";
+    print "  3) certdata.txt file format may change, lag time to update this script\n";
+    print "  4) Generally unwise to blindly trust CAs without manual review & verification\n";
+    print "  5) Mozilla apps use additional security checks aren't represented in certdata\n";
+    print "  6) Use of this script will make a security engineer grind his teeth and\n";
+    print "     swear at you.  ;)\n";
+    exit;
+  } else { # Short Form Warning
+    print "Warning: Use of this script may pose some risk, -d risk for more details.\n";
+  }
+}
+
 sub HELP_MESSAGE() {
-  print "Usage:\t${0} [-b] [-f] [-i] [-l] [-n] [-q] [-t] [-u] [-v] [-w<l>] [<outputfile>]\n";
+  print "Usage:\t${0} [-b] [-d<certdata>] [-f] [-i] [-l] [-n] [-p<purposes:levels>] [-q] [-s<algorithms>] [-t] [-u] [-v] [-w<l>] [<outputfile>]\n";
   print "\t-b\tbackup an existing version of ca-bundle.crt\n";
+  print "\t-d\tspecify Mozilla tree to pull certdata.txt or custom URL\n";
+  print "\t\t  Valid names are:\n";
+  print "\t\t    ", join( ", ", map { ( $_ =~ m/$opt_d/ ) ? "$_ (default)" : "$_" } sort keys %urls ), "\n";
   print "\t-f\tforce rebuild even if certdata.txt is current\n";
   print "\t-i\tprint version info about used modules\n";
   print "\t-l\tprint license info about certdata.txt\n";
   print "\t-n\tno download of certdata.txt (to use existing)\n";
+  print wrap("\t","\t\t", "-p\tlist of Mozilla trust purposes and levels for certificates to include in output. Takes the form of a comma separated list of purposes, a colon, and a comma separated list of levels. (default: $default_mozilla_trust_purposes:$default_mozilla_trust_levels)"), "\n";
+  print "\t\t  Valid purposes are:\n";
+  print wrap("\t\t    ","\t\t    ", join( ", ", "ALL", @valid_mozilla_trust_purposes ) ), "\n";
+  print "\t\t  Valid levels are:\n";
+  print wrap("\t\t    ","\t\t    ", join( ", ", "ALL", @valid_mozilla_trust_levels ) ), "\n";
   print "\t-q\tbe really quiet (no progress output at all)\n";
+  print wrap("\t","\t\t", "-s\tcomma separated list of certificate signatures/hashes to output in plain text mode. (default: $default_signature_algorithms)\n");
+  print "\t\t  Valid signature algorithms are:\n";
+  print wrap("\t\t    ","\t\t    ", join( ", ", "ALL", @valid_signature_algorithms ) ), "\n";
   print "\t-t\tinclude plain text listing of certificates\n";
   print "\t-u\tunlink (remove) certdata.txt after processing\n";
   print "\t-v\tbe verbose and print out processed CAs\n";
@@ -79,8 +182,99 @@ sub VERSION_MESSAGE() {
   print "${0} version ${version} running Perl ${]} on ${^O}\n";
 }
 
+warning_message() unless ($opt_q || $url =~ m/^(ht|f)tps:/i );
 HELP_MESSAGE() if ($opt_h);
 
+sub report($@) {
+  my $output = shift;
+
+  print STDERR $output . "\n" unless $opt_q;
+}
+
+sub is_in_list($@) {
+  my $target = shift;
+
+  return defined(List::Util::first { $target eq $_ } @_);
+}
+
+# Parses $param_string as a case insensitive comma separated list with optional whitespace
+# validates that only allowed parameters are supplied
+sub parse_csv_param($$@) {
+  my $description = shift;
+  my $param_string = shift;
+  my @valid_values = @_;
+
+  my @values = map {
+    s/^\s+//;  # strip leading spaces
+    s/\s+$//;  # strip trailing spaces
+    uc $_      # return the modified string as upper case
+  } split( ',', $param_string );
+
+  # Find all values which are not in the list of valid values or "ALL"
+  my @invalid = grep { !is_in_list($_,"ALL",@valid_values) } @values;
+
+  if ( scalar(@invalid) > 0 ) {
+    # Tell the user which parameters were invalid and print the standard help message which will exit
+    print "Error: Invalid ", $description, scalar(@invalid) == 1 ? ": " : "s: ", join( ", ", map { "\"$_\"" } @invalid ), "\n";
+    HELP_MESSAGE();
+  }
+
+  @values = @valid_values if ( is_in_list("ALL",@values) );
+
+  return @values;
+}
+
+sub sha1 {
+  my $result;
+  if ($Digest::SHA::VERSION || $Digest::SHA::PurePerl::VERSION) {
+    open(FILE, $_[0]) or die "Can't open '$_[0]': $!";
+    binmode(FILE);
+    $result = $MOD_SHA->new(1)->addfile(*FILE)->hexdigest;
+    close(FILE);
+  } else {
+    # Use OpenSSL command if Perl Digest::SHA modules not available
+    $result = (split(/ |\r|\n/,`$openssl dgst -sha1 $_[0]`))[1];
+  }
+  return $result;
+}
+
+
+sub oldsha1 {
+  my $sha1 = "";
+  open(C, "<$_[0]") || return 0;
+  while(<C>) {
+    chomp;
+    if($_ =~ /^\#\# SHA1: (.*)/) {
+      $sha1 = $1;
+      last;
+    }
+  }
+  close(C);
+  return $sha1;
+}
+
+if ( $opt_p !~ m/:/ ) {
+  print "Error: Mozilla trust identifier list must include both purposes and levels\n";
+  HELP_MESSAGE();
+}
+
+(my $included_mozilla_trust_purposes_string, my $included_mozilla_trust_levels_string) = split( ':', $opt_p );
+my @included_mozilla_trust_purposes = parse_csv_param( "trust purpose", $included_mozilla_trust_purposes_string, @valid_mozilla_trust_purposes );
+my @included_mozilla_trust_levels = parse_csv_param( "trust level", $included_mozilla_trust_levels_string, @valid_mozilla_trust_levels );
+
+my @included_signature_algorithms = parse_csv_param( "signature algorithm", $opt_s, @valid_signature_algorithms );
+
+sub should_output_cert(%) {
+  my %trust_purposes_by_level = @_;
+
+  foreach my $level (@included_mozilla_trust_levels) {
+    # for each level we want to output, see if any of our desired purposes are included
+    return 1 if ( defined( List::Util::first { is_in_list( $_, @included_mozilla_trust_purposes ) } @{$trust_purposes_by_level{$level}} ) );
+  }
+
+  return 0;
+}
+
 my $crt = $ARGV[0] || 'ca-bundle.crt';
 (my $txt = $url) =~ s@(.*/|\?.*)@@g;
 
@@ -88,26 +282,61 @@ my $stdout = $crt eq '-';
 my $resp;
 my $fetched;
 
-unless ($opt_n and -e $txt) {
-  print STDERR "Downloading '$txt' ...\n" if (!$opt_q);
+my $oldsha1 = oldsha1($crt);
+
+report "SHA1 of old file: $oldsha1";
+
+report "Downloading '$txt' ...";
+
+if($curl && !$opt_n) {
+  my $https = $url;
+  $https =~ s/^http:/https:/;
+  report "Get certdata over HTTPS with curl!";
+  my $quiet = $opt_q ? "-s" : "";
+  my @out = `curl -w %{response_code} $quiet -O $https`;
+  if(@out && $out[0] == 200) {
+    $fetched = 1;
+  } else {
+    report "Failed downloading HTTPS with curl, trying HTTP with LWP";
+  }
+}
+
+unless ($fetched || ($opt_n and -e $txt)) {
   my $ua  = new LWP::UserAgent(agent => "$0/$version");
   $ua->env_proxy();
   $resp = $ua->mirror($url, $txt);
   if ($resp && $resp->code eq '304') {
-    print STDERR "Not modified\n" unless $opt_q;
+    report "Not modified";
     exit 0 if -e $crt && !$opt_f;
   } else {
       $fetched = 1;
   }
   if( !$resp || $resp->code !~ /^(?:200|304)$/ ) {
-      print STDERR "Unable to download latest data: "
-        . ($resp? $resp->code . ' - ' . $resp->message : "LWP failed") . "\n"
-        unless $opt_q;
+      report "Unable to download latest data: "
+        . ($resp? $resp->code . ' - ' . $resp->message : "LWP failed");
       exit 1 if -e $crt || ! -r $txt;
   }
 }
 
-my $currentdate = scalar gmtime($fetched ? $resp->last_modified : (stat($txt))[9]);
+my $filedate = $resp ? $resp->last_modified : (stat($txt))[9];
+my $datesrc = "as of";
+if(!$filedate) {
+    # mxr.mozilla.org gave us a time, hg.mozilla.org does not!
+    $filedate = time();
+    $datesrc="downloaded on";
+}
+
+# get the hash from the download file
+my $newsha1= sha1($txt);
+
+if(!$opt_f && $oldsha1 eq $newsha1) {
+    report "Downloaded file identical to previous run\'s source file. Exiting";
+    exit;
+}
+
+report "SHA1 of new file: $newsha1";
+
+my $currentdate = scalar gmtime($filedate);
 
 my $format = $opt_t ? "plain text and " : "";
 if( $stdout ) {
@@ -117,9 +346,9 @@ if( $stdout ) {
 }
 print CRT <<EOT;
 ##
-## $crt -- Bundle of CA Root Certificates
+## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: ${currentdate}
+## Certificate data from Mozilla ${datesrc}: ${currentdate}
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -131,10 +360,13 @@ print CRT <<EOT;
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
+## Conversion done with mk-ca-bundle.pl version $version.
+## SHA1: $newsha1
+##
 
 EOT
 
-print STDERR "Processing  '$txt' ...\n" if (!$opt_q);
+report "Processing  '$txt' ...";
 my $caname;
 my $certnum = 0;
 my $skipnum = 0;
@@ -164,7 +396,7 @@ while (<TXT>) {
   if ($start_of_cert && /^CKA_LABEL UTF8 \"(.*)\"/) {
     $caname = $1;
   }
-  my $untrusted = 0;
+  my %trust_purposes_by_level;
   if ($start_of_cert && /^CKA_VALUE MULTILINE_OCTAL/) {
     my $data;
     while (<TXT>) {
@@ -181,15 +413,21 @@ while (<TXT>) {
       last if (/^CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST/);
       chomp;
     }
-    # now scan the trust part for untrusted certs
+    # now scan the trust part to determine how we should trust this cert
     while (<TXT>) {
       last if (/^#/);
-      if (/^CKA_TRUST_SERVER_AUTH\s+CK_TRUST\s+CKT_NSS_NOT_TRUSTED$/
-          or /^CKA_TRUST_SERVER_AUTH\s+CK_TRUST\s+CKT_NSS_TRUST_UNKNOWN$/) {
-          $untrusted = 1;
+      if (/^CKA_TRUST_([A-Z_]+)\s+CK_TRUST\s+CKT_NSS_([A-Z_]+)\s*$/) {
+        if ( !is_in_list($1,@valid_mozilla_trust_purposes) ) {
+          report "Warning: Unrecognized trust purpose for cert: $caname. Trust purpose: $1. Trust Level: $2";
+        } elsif ( !is_in_list($2,@valid_mozilla_trust_levels) ) {
+          report "Warning: Unrecognized trust level for cert: $caname. Trust purpose: $1. Trust Level: $2";
+        } else {
+          push @{$trust_purposes_by_level{$2}}, $1;
+        }
       }
     }
-    if ($untrusted) {
+
+    if ( !should_output_cert(%trust_purposes_by_level) ) {
       $skipnum ++;
     } else {
       my $encoded = MIME::Base64::encode_base64($data, '');
@@ -198,11 +436,34 @@ while (<TXT>) {
               . $encoded
               . "-----END CERTIFICATE-----\n";
       print CRT "\n$caname\n";
-      print CRT ("=" x length($caname) . "\n");
+
+      my $maxStringLength = length($caname);
+      if ($opt_t) {
+        foreach my $key (keys %trust_purposes_by_level) {
+           my $string = $key . ": " . join(", ", @{$trust_purposes_by_level{$key}});
+           $maxStringLength = List::Util::max( length($string), $maxStringLength );
+           print CRT $string . "\n";
+        }
+      }
+      print CRT ("=" x $maxStringLength . "\n");
       if (!$opt_t) {
         print CRT $pem;
       } else {
-        my $pipe = "|$openssl x509 -md5 -fingerprint -text -inform PEM";
+        my $pipe = "";
+        foreach my $hash (@included_signature_algorithms) {
+          $pipe = "|$openssl x509 -" . $hash . " -fingerprint -noout -inform PEM";
+          if (!$stdout) {
+            $pipe .= " >> $crt.~";
+            close(CRT) or die "Couldn't close $crt.~: $!";
+          }
+          open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";
+          print TMP $pem;
+          close(TMP) or die "Couldn't close openssl pipe: $!";
+          if (!$stdout) {
+            open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
+          }
+        }
+        $pipe = "|$openssl x509 -text -inform PEM";
         if (!$stdout) {
           $pipe .= " >> $crt.~";
           close(CRT) or die "Couldn't close $crt.~: $!";
@@ -214,7 +475,7 @@ while (<TXT>) {
           open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
         }
       }
-      print STDERR "Parsing: $caname\n" if ($opt_v);
+      report "Parsing: $caname" if ($opt_v);
       $certnum ++;
       $start_of_cert = 0;
     }
@@ -235,8 +496,4 @@ unless( $stdout ) {
     rename "$crt.~", $crt or die "Failed to rename $crt.~ to $crt: $!\n";
 }
 unlink $txt if ($opt_u);
-print STDERR "Done ($certnum CA certs processed, $skipnum untrusted skipped).\n" if (!$opt_q);
-
-exit;
-
-
+report "Done ($certnum CA certs processed, $skipnum skipped).";
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 3eac18e76..271926dc5 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -45,6 +45,8 @@ set(SOUND_FILES
 	hello8000.wav
 	incoming_chat.wav
 	ringback.wav
+	dont_wait_too_long.mkv
+	toy-mono.wav
 )
 
 install(FILES ${SOUND_FILES}
diff --git a/share/Makefile.am b/share/Makefile.am
index 0b3fb0119..61145e90c 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,17 +1,20 @@
 
 SUBDIRS=C fr it ja cs xml
 
-LINPHONE_SOUNDS=ringback.wav hello8000.wav hello16000.wav incoming_chat.wav
-LINPHONE_RINGS=rings/orig.wav \
-				rings/oldphone.wav \
-				rings/oldphone-mono.wav \
-				rings/oldphone-mono-30s.caf \
-				rings/rock.wav \
-				rings/bigben.wav \
-				rings/toy-mono.wav \
-				rings/sweet.wav \
-				rings/synth.wav \
-				rings/tapping.wav
+LINPHONE_ONHOLD_MUSIC= 	toy-mono.wav \
+			dont_wait_too_long.mkv
+
+LINPHONE_SOUNDS=ringback.wav hello8000.wav hello16000.wav incoming_chat.wav $(LINPHONE_ONHOLD_MUSIC)
+
+LINPHONE_RINGS=		\
+			rings/oldphone-mono.wav \
+			rings/oldphone-mono-30s.caf \
+			rings/four_hands_together.mkv \
+			rings/house_keeping.mkv \
+			rings/its_a_game.mkv \
+			rings/leaving_dreams.mkv \
+			rings/notes_of_the_optimistic.mkv \
+			rings/soft_as_snow.mkv
 
 sounddir=$(datadir)/sounds/linphone
 
diff --git a/share/dont_wait_too_long.mkv b/share/dont_wait_too_long.mkv
new file mode 100644
index 000000000..d90034b79
Binary files /dev/null and b/share/dont_wait_too_long.mkv differ
diff --git a/share/rings/CMakeLists.txt b/share/rings/CMakeLists.txt
index 5a7efc8c9..e8f178fe2 100644
--- a/share/rings/CMakeLists.txt
+++ b/share/rings/CMakeLists.txt
@@ -21,18 +21,17 @@
 ############################################################################
 
 set(RING_FILES
-	bigben.wav
 	oldphone-mono-30s.caf
 	oldphone-mono.wav
-	oldphone.wav
-	orig.wav
-	rock.wav
-	sweet.wav
-	synth.wav
-	tapping.wav
-	toy-mono.wav
+	four_hands_together.mkv
+	house_keeping.mkv
+	its_a_game.mkv
+	leaving_dreams.mkv
+	notes_of_the_optimistic.mkv
+	soft_as_snow.mkv
 )
 
+
 install(FILES ${RING_FILES}
 	DESTINATION ${PACKAGE_RING_DIR}
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
diff --git a/share/rings/bigben.wav b/share/rings/bigben.wav
deleted file mode 100644
index f1ba850f6..000000000
Binary files a/share/rings/bigben.wav and /dev/null differ
diff --git a/share/rings/four_hands_together.mkv b/share/rings/four_hands_together.mkv
new file mode 100644
index 000000000..fef6c3ef8
Binary files /dev/null and b/share/rings/four_hands_together.mkv differ
diff --git a/share/rings/house_keeping.mkv b/share/rings/house_keeping.mkv
new file mode 100644
index 000000000..705c3616b
Binary files /dev/null and b/share/rings/house_keeping.mkv differ
diff --git a/share/rings/its_a_game.mkv b/share/rings/its_a_game.mkv
new file mode 100644
index 000000000..a40ebe9c5
Binary files /dev/null and b/share/rings/its_a_game.mkv differ
diff --git a/share/rings/leaving_dreams.mkv b/share/rings/leaving_dreams.mkv
new file mode 100644
index 000000000..f82cb46a4
Binary files /dev/null and b/share/rings/leaving_dreams.mkv differ
diff --git a/share/rings/notes_of_the_optimistic.mkv b/share/rings/notes_of_the_optimistic.mkv
new file mode 100644
index 000000000..a1d923389
Binary files /dev/null and b/share/rings/notes_of_the_optimistic.mkv differ
diff --git a/share/rings/oldphone.wav b/share/rings/oldphone.wav
deleted file mode 100644
index e3056cc5d..000000000
Binary files a/share/rings/oldphone.wav and /dev/null differ
diff --git a/share/rings/orig.wav b/share/rings/orig.wav
deleted file mode 100644
index af74b54af..000000000
Binary files a/share/rings/orig.wav and /dev/null differ
diff --git a/share/rings/rock.wav b/share/rings/rock.wav
deleted file mode 100644
index 12374c067..000000000
Binary files a/share/rings/rock.wav and /dev/null differ
diff --git a/share/rings/soft_as_snow.mkv b/share/rings/soft_as_snow.mkv
new file mode 100644
index 000000000..84d08ce0e
Binary files /dev/null and b/share/rings/soft_as_snow.mkv differ
diff --git a/share/rings/sweet.wav b/share/rings/sweet.wav
deleted file mode 100644
index e5145486d..000000000
Binary files a/share/rings/sweet.wav and /dev/null differ
diff --git a/share/rings/synth.wav b/share/rings/synth.wav
deleted file mode 100644
index 7142f7a51..000000000
Binary files a/share/rings/synth.wav and /dev/null differ
diff --git a/share/rings/tapping.wav b/share/rings/tapping.wav
deleted file mode 100644
index 862fd79fb..000000000
Binary files a/share/rings/tapping.wav and /dev/null differ
diff --git a/share/rings/toy-mono.wav b/share/toy-mono.wav
similarity index 100%
rename from share/rings/toy-mono.wav
rename to share/toy-mono.wav
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index b8108ad27..4e134789b 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -20,20 +20,154 @@
 #
 ############################################################################
 
-set(SOURCE_FILES
-	common/bc_tester_utils.c
+set(OTHER_LIBS_FOR_TESTER ${BCTOOLBOX_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${BELLESIP_LIBRARIES} ${XML2_LIBRARIES})
+if(INTL_FOUND)
+	list(APPEND OTHER_LIBS_FOR_TESTER ${INTL_LIBRARIES})
+endif()
+if(SQLITE3_FOUND)
+	list(APPEND OTHER_LIBS_FOR_TESTER ${SQLITE3_LIBRARIES})
+endif()
+if(ZLIB_FOUND)
+	list(APPEND OTHER_LIBS_FOR_TESTER ${ZLIB_LIBRARIES})
+endif()
+
+set(SOUND_FILES
+	sounds/ahbahouaismaisbon.wav
+	sounds/hello44100.wav
+	sounds/hello8000.mkv
+	sounds/hello8000_mkv_ref.wav
+	sounds/hello8000.wav
+	sounds/oldphone.wav
+	sounds/ringback.wav
+	sounds/sintel_trailer_opus_h264.mkv
+	sounds/sintel_trailer_opus_vp8.mkv
+	sounds/sintel_trailer_pcmu_h264.mkv
+	sounds/vrroom.wav
+)
+
+set(SIPP_FILES
+	sipp/call_invite_200ok_without_contact_header.xml
+	sipp/call_with_audio_mline_before_video_in_sdp.xml
+	sipp/call_with_multiple_audio_mline_in_sdp.xml
+	sipp/call_with_multiple_video_mline_in_sdp.xml
+	sipp/call_with_video_mline_before_audio_in_sdp.xml
+	sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml
+)
+
+set(CERTIFICATE_ALT_FILES
+	certificates/altname/agent.pem
+	certificates/altname/cafile.pem
+	certificates/altname/openssl-altname.cnf
+)
+
+set(CERTIFICATE_CN_FILES
+	certificates/cn/agent.pem
+	certificates/cn/cafile.pem
+	certificates/cn/openssl-cn.cnf
+)
+
+set(CERTIFICATE_CLIENT_FILES
+	certificates/client/cert.pem
+	certificates/client/key.pem
+)
+
+set(CERTIFICATE_FILES ${CERTIFICATE_ALT_FILES} ${CERTIFICATE_CN_FILES} ${CERTIFICATE_CLIENT_FILES})
+
+set(RC_FILES
+	rcfiles/carddav_rc
+	rcfiles/conference_focus_rc
+	rcfiles/empty_rc
+	rcfiles/friends_rc
+	rcfiles/laure_call_logs_rc
+	rcfiles/laure_rc_udp
+	rcfiles/laure_tcp_rc
+	rcfiles/marie_early_rc
+	rcfiles/marie_h264_rc
+	rcfiles/marie_nat64_rc
+	rcfiles/marie_quality_reporting_rc
+	rcfiles/marie_rc
+	rcfiles/marie2_rc
+	rcfiles/marie_rc_rtcp_xr
+	rcfiles/marie_remote_404_rc
+	rcfiles/marie_remote_default_values_rc
+	rcfiles/marie_remote_https_rc
+	rcfiles/marie_remote_invalid_rc
+	rcfiles/marie_remote_invalid_uri_rc
+	rcfiles/marie_remote_localfile2_rc
+	rcfiles/marie_remote_localfile_android_rc
+	rcfiles/marie_remote_localfile_rc
+	rcfiles/marie_remote_localfile_win10_rc
+	rcfiles/marie_remote_rc
+	rcfiles/marie_sips_rc
+	rcfiles/marie_transient_remote_rc
+	rcfiles/marie_v4proxy_rc
+	rcfiles/marie_zrtp_aes256_rc
+	rcfiles/marie_zrtp_b256_rc
+	rcfiles/marie_zrtp_srtpsuite_aes256_rc
+	rcfiles/michelle_rc_udp
+	rcfiles/multi_account_rc
+	rcfiles/pauline_alt_rc
+	rcfiles/pauline_as_friend_rc
+	rcfiles/pauline_h264_rc
+	rcfiles/pauline_nat64_rc
+	rcfiles/pauline_rc
+	rcfiles/pauline_rc_rtcp_xr
+	rcfiles/pauline_sips_rc
+	rcfiles/pauline_tcp_rc
+	rcfiles/pauline_tls_client_rc
+	rcfiles/pauline_tunnel_verify_server_certificate_rc
+	rcfiles/pauline_v4proxy_rc
+	rcfiles/pauline_wild_rc
+	rcfiles/pauline_zrtp_aes256_rc
+	rcfiles/pauline_zrtp_b256_rc
+	rcfiles/pauline_zrtp_srtpsuite_aes256_rc
+	rcfiles/remote_zero_length_params_rc
+	rcfiles/stun_rc
+	rcfiles/upnp_rc
+	rcfiles/zero_length_params_rc
+)
+
+set(IMAGE_FILES images/nowebcamCIF.jpg)
+
+set(VCARD_FILES
+	vcards/thousand_vcards.vcf
+	vcards/vcards.vcf
+)
+
+set(OTHER_FILES
+	tester_hosts
+	local_tester_hosts
+	messages.db
+)
+
+set(IOS_RESOURCES_FILES
+	${OTHER_FILES}
+	certificates
+	images
+	rcfiles
+	sipp
+	sounds
+	vcards
+)
+
+set(SOURCE_FILES_C
 	accountmanager.c
-	call_tester.c
+	audio_bypass_tester.c
+	call_multicast_tester.c
+	call_multi_tester.c
+	call_single_tester.c
+	call_video_tester.c
+	complex_sip_case_tester.c
 	dtmf_tester.c
 	eventapi_tester.c
 	flexisip_tester.c
 	liblinphone_tester.c
+	liblinphone_tester.h
 	log_collection_tester.c
 	message_tester.c
-	multi_call_tester.c
-	multicast_call_tester.c
 	offeranswer_tester.c
 	player_tester.c
+	presence_server_tester.c
 	presence_tester.c
 	proxy_config_tester.c
 	quality_reporting_tester.c
@@ -44,38 +178,127 @@ set(SOURCE_FILES
 	tester.c
 	tunnel_tester.c
 	upnp_tester.c
+	vcard_tester.c
 	video_tester.c
 )
 
-add_definitions(-DBC_CONFIG_FILE="config.h")
-
-if(IOS)
-
-add_library(linphonetester STATIC ${SOURCE_FILES})
-target_include_directories(linphonetester PUBLIC ${CUNIT_INCLUDE_DIRS} PRIVATE common)
-target_link_libraries(linphonetester linphone ${CUNIT_LIBRARIES})
-install(TARGETS linphonetester
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-)
-install(FILES "liblinphone_tester.h" "common/bc_tester_utils.h"
-	DESTINATION include/linphone
-	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-)
-
-else()
-
-add_executable(liblinphone_tester ${SOURCE_FILES})
-set_target_properties(liblinphone_tester PROPERTIES LINKER_LANGUAGE CXX)
-target_include_directories(liblinphone_tester PUBLIC ${CUNIT_INCLUDE_DIRS} PRIVATE common)
-target_link_libraries(liblinphone_tester linphone ${CUNIT_LIBRARIES})
-if (GTK2_FOUND)
-	target_compile_definitions(liblinphone_tester PRIVATE HAVE_GTK)
-	target_include_directories(liblinphone_tester PUBLIC ${GTK2_INCLUDE_DIRS})
-	target_link_libraries(liblinphone_tester linphone ${GTK2_LIBRARIES})
+set(SOURCE_FILES_OBJC )
+if(APPLE)
+	if (IOS)
+		list(APPEND SOURCE_FILES_OBJC liblinphone_tester_ios.m)
+	endif()
 endif()
 
+apply_compile_flags(SOURCE_FILES_C "CPP" "C")
+apply_compile_flags(SOURCE_FILES_OBJC "CPP" "OBJC")
+
+if(MSVC)
+	get_source_file_property(MESSAGE_TESTER_C_COMPILE_FLAGS message_tester.c COMPILE_FLAGS)
+	set(MESSAGE_TESTER_C_COMPILE_FLAGS "${MESSAGE_TESTER_C_COMPILE_FLAGS} /wd4996") # Disable "was declared deprecated" warnings
+	set_source_files_properties(message_tester.c PROPERTY COMPILE_FLAGS "${MESSAGE_TESTER_C_COMPILE_FLAGS}")
+	get_source_file_property(VCARD_TESTER_C_COMPILE_FLAGS vcard_tester.c COMPILE_FLAGS)
+	set(VCARD_TESTER_C_COMPILE_FLAGS "${VCARD_TESTER_C_COMPILE_FLAGS} /wd4996") # Disable "was declared deprecated" warnings
+	set_source_files_properties(vcard_tester.c PROPERTY COMPILE_FLAGS "${VCARD_TESTER_C_COMPILE_FLAGS}")
 endif()
 
+if(NOT IOS OR NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+	# Executable must be available on root path, not host one
+	find_program(SIPP_PROGRAM NAMES sipp sipp.exe ONLY_CMAKE_FIND_ROOT_PATH)
+	if(SIPP_PROGRAM)
+		add_definitions(-DHAVE_SIPP=1)
+		add_definitions(-DSIPP_COMMAND="${SIPP_PROGRAM}")
+	endif()
+endif()
+
+# on mobile platforms, we compile the tester as a library so that we can link with it directly from native applications
+if(ANDROID OR IOS)
+	if(ANDROID)
+		add_library(linphonetester SHARED ${SOURCE_FILES_C})
+		set_target_properties(linphonetester PROPERTIES OUTPUT_NAME "linphonetester-${CMAKE_SYSTEM_PROCESSOR}")
+	endif()
+	if(IOS)
+		add_library(linphonetester STATIC ${SOURCE_FILES_C})
+	endif()
+	target_include_directories(linphonetester PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS})
+	target_link_libraries(linphonetester ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})
+	install(TARGETS linphonetester
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+		)
+	install(FILES "liblinphone_tester.h"
+		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/linphone
+		PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+	)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+	add_library(linphone_tester_static STATIC ${SOURCE_FILES_C})
+	target_include_directories(linphone_tester_static PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS})
+	target_link_libraries(linphone_tester_static ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})
+
+	set(RUNTIME_COMPONENT_SOURCES
+		liblinphone_tester_windows.cpp
+		liblinphone_tester_windows.h
+	)
+	add_library(linphone_tester_runtime MODULE ${RUNTIME_COMPONENT_SOURCES})
+	target_compile_options(linphone_tester_runtime PRIVATE "/wd4996")
+	target_link_libraries(linphone_tester_runtime linphone_tester_static)
+	set_target_properties(linphone_tester_runtime PROPERTIES VS_WINRT_COMPONENT TRUE)
+	set_target_properties(linphone_tester_runtime PROPERTIES LIBRARY_OUTPUT_NAME "BelledonneCommunications.Linphone.Tester")
+	set_target_properties(linphone_tester_runtime PROPERTIES LINK_FLAGS "/WINMDFILE:BelledonneCommunications.Linphone.Tester.winmd")
+
+	install(TARGETS linphone_tester_runtime
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+	)
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/BelledonneCommunications.Linphone.Tester.winmd" DESTINATION lib)
+	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/BelledonneCommunications.Linphone.Tester.pdb
+			DESTINATION ${CMAKE_INSTALL_LIBDIR}
+			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+	)
+	endif()
+endif()
+
+# on iOS though, we also build the exectuable so that one can compile it from Xcode and run it directly
+if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+	if(IOS)
+		set_source_files_properties(${IOS_RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+		add_executable(liblinphone_tester MACOSX_BUNDLE ${IOS_RESOURCES_FILES} ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC})
+	else()
+		add_executable(liblinphone_tester ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC})
+	endif()
+	set_target_properties(liblinphone_tester PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+	set_target_properties(liblinphone_tester PROPERTIES LINKER_LANGUAGE CXX)
+	target_include_directories(liblinphone_tester PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS})
+	target_link_libraries(liblinphone_tester ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})
+	if (GTK2_FOUND)
+		target_compile_definitions(liblinphone_tester PRIVATE HAVE_GTK)
+		target_include_directories(liblinphone_tester PUBLIC ${GTK2_INCLUDE_DIRS})
+		target_link_libraries(liblinphone_tester ${GTK2_LIBRARIES})
+		if(GTKMACINTEGRATION_FOUND)
+			target_include_directories(liblinphone_tester PUBLIC ${GTKMACINTEGRATION_INCLUDE_DIRS})
+			target_link_libraries(liblinphone_tester ${GTKMACINTEGRATION_LIBRARIES})
+		endif()
+	endif()
+
+	if(NOT IOS)
+		install(TARGETS liblinphone_tester
+			RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+			LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+			ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+		)
+		install(FILES ${OTHER_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester")
+		install(FILES ${SOUND_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/sounds")
+		install(FILES ${SIPP_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/sipp")
+		install(FILES ${CERTIFICATE_ALT_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/certificates/altname")
+		install(FILES ${CERTIFICATE_CN_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/certificates/cn")
+		install(FILES ${CERTIFICATE_CLIENT_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/certificates/client")
+		install(FILES ${RC_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/rcfiles")
+		install(FILES ${IMAGE_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/images")
+		install(FILES ${VCARD_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/vcards")
+	endif()
+endif()
diff --git a/tester/Makefile.am b/tester/Makefile.am
index c3c3552b1..c965a7614 100644
--- a/tester/Makefile.am
+++ b/tester/Makefile.am
@@ -1,27 +1,141 @@
-EXTRA_DIST=	tester_hosts sounds images certificates rcfiles
+
+TESTER_SOUNDS = sounds/ahbahouaismaisbon.wav \
+				sounds/hello8000.wav  \
+				sounds/hello44100.wav  \
+				sounds/oldphone.wav \
+				sounds/sintel_trailer_opus_h264.mkv \
+				sounds/sintel_trailer_pcmu_h264.mkv \
+				sounds/hello8000.mkv \
+				sounds/hello8000_mkv_ref.wav\
+				sounds/ringback.wav  \
+				sounds/sintel_trailer_opus_vp8.mkv \
+				sounds/vrroom.wav
 
 
-if BUILD_CUNIT_TESTS
+SIPP_FILES = sipp/call_invite_200ok_without_contact_header.xml       \
+			sipp/call_with_multiple_audio_mline_in_sdp.xml          \
+			sipp/call_with_video_mline_before_audio_in_sdp.xml\
+			sipp/call_with_audio_mline_before_video_in_sdp.xml   \
+			sipp/call_with_multiple_video_mline_in_sdp.xml      \
+			sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml
+
+
+CERTIFICATE_ALT_FILES = certificates/altname/agent.pem           \
+					certificates/altname/cafile.pem          \
+					certificates/altname/openssl-altname.cnf
+
+CERTIFICATE_CN_FILES = certificates/cn/agent.pem      \
+					 certificates/cn/cafile.pem     \
+					 certificates/cn/openssl-cn.cnf
+
+CERTIFICATE_CLIENT_FILES = certificates/client/cert.pem \
+					certificates/client/key.pem
+
+CERTIFICATE_FILES = $(CERTIFICATE_ALT_FILES) $(CERTIFICATE_CN_FILES) $(CERTIFICATE_CLIENT_FILES)
+
+RCFILES = \
+					rcfiles/empty_rc\
+					rcfiles/laure_call_logs_rc\
+					rcfiles/laure_rc_udp\
+					rcfiles/marie_early_rc\
+					rcfiles/marie_h264_rc\
+					rcfiles/marie_quality_reporting_rc\
+					rcfiles/marie_rc\
+					rcfiles/marie2_rc\
+					rcfiles/marie_rc_rtcp_xr\
+					rcfiles/marie_remote_404_rc\
+					rcfiles/marie_remote_default_values_rc\
+					rcfiles/marie_remote_https_rc\
+					rcfiles/marie_remote_invalid_rc\
+					rcfiles/marie_remote_invalid_uri_rc\
+					rcfiles/marie_remote_localfile2_rc\
+					rcfiles/marie_remote_localfile_android_rc\
+					rcfiles/marie_remote_localfile_rc\
+					rcfiles/marie_remote_localfile_win10_rc\
+					rcfiles/marie_remote_rc\
+					rcfiles/marie_sips_rc\
+					rcfiles/marie_transient_remote_rc\
+					rcfiles/marie_zrtp_aes256_rc\
+					rcfiles/marie_zrtp_b256_rc\
+					rcfiles/marie_zrtp_srtpsuite_aes256_rc\
+					rcfiles/michelle_rc_udp\
+					rcfiles/multi_account_rc\
+					rcfiles/pauline_alt_rc\
+					rcfiles/pauline_h264_rc\
+					rcfiles/pauline_rc\
+					rcfiles/pauline_rc_rtcp_xr\
+					rcfiles/pauline_sips_rc\
+					rcfiles/pauline_tcp_rc\
+					rcfiles/pauline_tls_client_rc\
+					rcfiles/pauline_wild_rc\
+					rcfiles/pauline_zrtp_aes256_rc\
+					rcfiles/pauline_zrtp_b256_rc\
+					rcfiles/pauline_zrtp_srtpsuite_aes256_rc\
+					rcfiles/remote_zero_length_params_rc\
+					rcfiles/stun_rc\
+					rcfiles/upnp_rc\
+					rcfiles/zero_length_params_rc\
+					rcfiles/friends_rc\
+					rcfiles/carddav_rc
+
+IMAGE_FILES = images/nowebcamCIF.jpg
+
+VCARDS_FILE = vcards/vcards.vcf vcards/thousand_vcards.vcf
+
+EXTRA_DIST = tester_hosts\
+			messages.db\
+			$(TESTER_SOUNDS)\
+			$(SIPP_FILES)\
+			$(CERTIFICATE_FILES)\
+			$(RCFILES)\
+			$(IMAGE_FILES)\
+			$(VCARDS_FILE)
+
+if ENABLE_TESTS
+
+sounddir = $(datadir)/liblinphone_tester/sounds
+sound_DATA = $(TESTER_SOUNDS)
+sippdir = $(datadir)/liblinphone_tester/sipp
+sipp_DATA = $(SIPP_FILES)
+certificatesaltdir=$(datadir)/liblinphone_tester/certificates/altname
+certificatesalt_DATA = $(CERTIFICATE_ALT_FILES)
+certificatescndir=$(datadir)/liblinphone_tester/certificates/cn
+certificatescn_DATA = $(CERTIFICATE_CN_FILES)
+certificatesclientdir=$(datadir)/liblinphone_tester/certificates/client
+certificatesclient_DATA = $(CERTIFICATE_CLIENT_FILES)
+rcfilesdir = $(datadir)/liblinphone_tester/rcfiles
+rcfiles_DATA = $(RCFILES)
+imagesdir = $(datadir)/liblinphone_tester/images
+images_DATA = $(IMAGE_FILES)
+vcardsdir = $(datadir)/liblinphone_tester/vcards
+vcards_DATA = $(VCARDS_FILE)
 
 # there are 2 targets: liblinphonetester.la and the executable liblinphone_tester
 
 liblinphonedir = $(includedir)/linphone
 liblinphone_HEADERS = liblinphone_tester.h
 
+
 lib_LTLIBRARIES = liblinphonetester.la
 
+liblinphonetester_la_HEADERS = audio_bypass_wav_header.h
+
 liblinphonetester_la_SOURCES = \
 				accountmanager.c \
-				call_tester.c \
+				audio_bypass_tester.c \
+				call_multi_tester.c \
+				call_multicast_tester.c \
+				call_single_tester.c \
+				call_video_tester.c \
+				complex_sip_case_tester.c \
 				dtmf_tester.c \
 				eventapi_tester.c \
 				flexisip_tester.c \
 				log_collection_tester.c \
 				message_tester.c \
-				multi_call_tester.c \
-				multicast_call_tester.c \
 				offeranswer_tester.c \
 				player_tester.c \
+				presence_server_tester.c \
 				presence_tester.c \
 				proxy_config_tester.c \
 				quality_reporting_tester.c \
@@ -29,22 +143,27 @@ liblinphonetester_la_SOURCES = \
 				remote_provisioning_tester.c \
 				setup_tester.c \
 				stun_tester.c \
-				tunnel_tester.c \
 				tester.c \
+				tunnel_tester.c \
 				upnp_tester.c \
-				video_tester.c \
-				common/bc_tester_utils.c
+				vcard_tester.c \
+				video_tester.c
 
 liblinphonetester_ladir = $(includedir)/linphone
-liblinphonetester_la_HEADERS = common/bc_tester_utils.h
 
 liblinphonetester_la_LDFLAGS= -no-undefined
-liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(CUNIT_LIBS)
+liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(BCTOOLBOXTESTER_LIBS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coreapi -I$(top_srcdir)/tester/common
+liblinphone_tester_bindir = $(bindir)/liblinphone_tester
+liblinphone_testerdir = $(datadir)/liblinphone_tester
+
+dist_liblinphone_tester_DATA =  tester_hosts messages.db
+
+
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coreapi
 AM_CFLAGS    = -DBC_CONFIG_FILE=\"config.h\" $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) \
-		-DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(CUNIT_CFLAGS) \
-		$(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS)
+		-DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(BCTOOLBOXTESTER_CFLAGS) \
+		$(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS) $(BELCARD_CFLAGS)
 
 if BUILD_GTK_UI
 
@@ -53,9 +172,13 @@ AM_CFLAGS += $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) -DHAVE_GTK
 
 endif
 
-if !BUILD_IOS
+#AM_LDFLAGS=-Wl,-rpath -Wl,$(libdir)
 
-noinst_PROGRAMS = liblinphone_tester
+bin_PROGRAMS=
+
+if !BUILD_IOS
+#noinst_PROGRAMS = liblinphone_tester
+bin_PROGRAMS += liblinphone_tester
 
 liblinphone_tester_SOURCES = liblinphone_tester.c
 liblinphone_tester_LDADD   = $(top_builddir)/coreapi/liblinphone.la liblinphonetester.la -lm
@@ -66,9 +189,9 @@ endif
 test: liblinphone_tester
 	./liblinphone_tester  --config $(abs_srcdir) $(TEST_OPTIONS)
 
-else !BUILD_CUNIT_TESTS
+else !ENABLE_TESTS
 
 test:
-	@echo "CUnit must be installed to be able to run the tests!"
+	@echo "bctoolbox-tester must be installed to be able to run the tests!"
 
-endif !BUILD_CUNIT_TESTS
+endif !ENABLE_TESTS
diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index c3b6d1090..ada9094b3 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -23,14 +23,15 @@ struct _Account{
 	LinphoneAddress *identity;
 	LinphoneAddress *modified_identity;
 	char *password;
-	int created;
+	int registered;
 	int done;
-	int auth_requested;
+	int created;
+	char *phone_alias;
 };
 
 typedef struct _Account Account;
 
-Account *account_new(LinphoneAddress *identity, const char *unique_id){
+static Account *account_new(LinphoneAddress *identity, const char *unique_id){
 	char *modified_username;
 	Account *obj=ms_new0(Account,1);
 
@@ -38,6 +39,7 @@ Account *account_new(LinphoneAddress *identity, const char *unique_id){
 	belle_sip_object_inhibit_leak_detector(TRUE);
 	obj->identity=linphone_address_clone(identity);
 	obj->password=sal_get_random_token(8);
+	obj->phone_alias = NULL;
 	obj->modified_identity=linphone_address_clone(identity);
 	modified_username=ms_strdup_printf("%s_%s",linphone_address_get_username(identity), unique_id);
 	linphone_address_set_username(obj->modified_identity, modified_username);
@@ -55,7 +57,7 @@ void account_destroy(Account *obj){
 
 struct _AccountManager{
 	char *unique_id;
-	MSList *accounts;
+	bctbx_list_t *accounts;
 };
 
 typedef struct _AccountManager AccountManager;
@@ -73,7 +75,7 @@ AccountManager *account_manager_get(void){
 void account_manager_destroy(void){
 	if (the_am){
 		ms_free(the_am->unique_id);
-		ms_list_free_with_data(the_am->accounts,(void(*)(void*))account_destroy);
+		bctbx_list_free_with_data(the_am->accounts,(void(*)(void*))account_destroy);
 		ms_free(the_am);
 	}
 	the_am=NULL;
@@ -81,7 +83,7 @@ void account_manager_destroy(void){
 }
 
 Account *account_manager_get_account(AccountManager *m, const LinphoneAddress *identity){
-	MSList *it;
+	bctbx_list_t *it;
 
 	for(it=m->accounts;it!=NULL;it=it->next){
 		Account *a=(Account*)it->data;
@@ -95,9 +97,15 @@ Account *account_manager_get_account(AccountManager *m, const LinphoneAddress *i
 static void account_created_on_server_cb(LinphoneCore *lc, LinphoneProxyConfig *cfg, LinphoneRegistrationState state, const char *info){
 	Account *account=(Account*)linphone_core_get_user_data(lc);
 	switch(state){
-		case LinphoneRegistrationOk:
-			account->created=1;
-		break;
+		case LinphoneRegistrationOk: {
+			char * phrase = sal_op_get_error_info((SalOp*)cfg->op)->full_string;
+			if (phrase && strcasecmp("Test account created", phrase) == 0) {
+				account->created=1;
+			} else {
+				account->registered=1;
+			}
+			break;
+		}
 		case LinphoneRegistrationCleared:
 			account->done=1;
 		break;
@@ -106,12 +114,16 @@ static void account_created_on_server_cb(LinphoneCore *lc, LinphoneProxyConfig *
 	}
 }
 
+// TEMPORARY CODE: remove function below when flexisip is updated, this is not needed anymore!
+// The new flexisip now answer "200 Test account created" when creating a test account, and do not
+// challenge authentication anymore! so this code is not used for newer version
 static void account_created_auth_requested_cb(LinphoneCore *lc, const char *username, const char *realm, const char *domain){
 	Account *account=(Account*)linphone_core_get_user_data(lc);
-	account->auth_requested=1;
+	account->created=1;
 }
+// TEMPORARY CODE: remove line above when flexisip is updated, this is not needed anymore!
 
-void account_create_on_server(Account *account, const LinphoneProxyConfig *refcfg){
+void account_create_on_server(Account *account, const LinphoneProxyConfig *refcfg, const char* phone_alias){
 	LinphoneCoreVTable vtable={0};
 	LinphoneCore *lc;
 	LinphoneAddress *tmp_identity=linphone_address_clone(account->modified_identity);
@@ -120,10 +132,13 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	char *tmp;
 	LinphoneAddress *server_addr;
 	LCSipTransports tr;
+	char *chatdb;
 
 	vtable.registration_state_changed=account_created_on_server_cb;
+	// TEMPORARY CODE: remove line below when flexisip is updated, this is not needed anymore!
 	vtable.auth_info_requested=account_created_auth_requested_cb;
 	lc=configure_lc_from(&vtable,bc_tester_get_resource_dir_prefix(),NULL,account);
+	chatdb = ms_strdup(linphone_core_get_chat_database_path(lc));
 	tr.udp_port=LC_SIP_TRANSPORT_RANDOM;
 	tr.tcp_port=LC_SIP_TRANSPORT_RANDOM;
 	tr.tls_port=LC_SIP_TRANSPORT_RANDOM;
@@ -133,6 +148,7 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	linphone_address_set_secure(tmp_identity, FALSE);
 	linphone_address_set_password(tmp_identity,account->password);
 	linphone_address_set_header(tmp_identity,"X-Create-Account","yes");
+	if (phone_alias) linphone_address_set_header(tmp_identity, "X-Phone-Alias", phone_alias);
 	tmp=linphone_address_as_string(tmp_identity);
 	linphone_proxy_config_set_identity(cfg,tmp);
 	ms_free(tmp);
@@ -146,11 +162,12 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	linphone_proxy_config_set_server_addr(cfg,tmp);
 	ms_free(tmp);
 	linphone_address_unref(server_addr);
-	linphone_proxy_config_set_expires(cfg,3600);
+	linphone_proxy_config_set_expires(cfg,3*3600); //accounts are valid 3 hours
 
 	linphone_core_add_proxy_config(lc,cfg);
-
-	if (wait_for_until(lc,NULL,&account->auth_requested,1,10000)==FALSE){
+	/*wait 25 seconds, since the DNS SRV resolution may take a while - and
+	especially if router does NOT support DNS SRV and we have to wait its timeout*/
+	if (wait_for_until(lc,NULL,&account->created,1,25000)==FALSE){
 		ms_fatal("Account for %s could not be created on server.", linphone_proxy_config_get_identity(refcfg));
 	}
 	linphone_proxy_config_edit(cfg);
@@ -168,7 +185,7 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	linphone_core_add_auth_info(lc,ai);
 	linphone_auth_info_destroy(ai);
 
-	if (wait_for_until(lc,NULL,&account->created,1,3000)==FALSE){
+	if (wait_for_until(lc,NULL,&account->registered,1,3000)==FALSE){
 		ms_fatal("Account for %s is not working on server.", linphone_proxy_config_get_identity(refcfg));
 	}
 	linphone_core_remove_proxy_config(lc,cfg);
@@ -177,9 +194,11 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 		ms_error("Account creation could not clean the registration context.");
 	}
 	linphone_core_destroy(lc);
+	unlink(chatdb);
+	ms_free(chatdb);
 }
 
-LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyConfig *cfg){
+static LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyConfig *cfg,const char* phone_alias){
 	LinphoneCore *lc=linphone_proxy_config_get_core(cfg);
 	const char *identity=linphone_proxy_config_get_identity(cfg);
 	LinphoneAddress *id_addr=linphone_address_new(identity);
@@ -192,11 +211,16 @@ LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyC
 																		, linphone_address_get_username(id_addr)
 																		, linphone_address_get_domain(id_addr));
 
-	if (!account){
+	if (!account||(phone_alias&&(!account->phone_alias||strcmp(phone_alias,account->phone_alias)!=0))){
+		if (account) {
+			m->accounts=bctbx_list_remove(m->accounts,account);
+			account_destroy(account);
+		}
 		account=account_new(id_addr,m->unique_id);
+		account->phone_alias=ms_strdup(phone_alias);
 		ms_message("No account for %s exists, going to create one.",identity);
 		create_account=TRUE;
-		m->accounts=ms_list_append(m->accounts,account);
+		m->accounts=bctbx_list_append(m->accounts,account);
 	}
 	/*modify the username of the identity of the proxy config*/
 	linphone_address_set_username(id_addr, linphone_address_get_username(account->modified_identity));
@@ -205,7 +229,7 @@ LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyC
 	ms_free(tmp);
 
 	if (create_account){
-		account_create_on_server(account,cfg);
+		account_create_on_server(account,cfg,phone_alias);
 	}
 
 	/*remove previous auth info to avoid mismatching*/
@@ -223,11 +247,14 @@ LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyC
 }
 
 void linphone_core_manager_check_accounts(LinphoneCoreManager *m){
-	const MSList *it;
+	const bctbx_list_t *it;
 	AccountManager *am=account_manager_get();
-
+	int logmask = ortp_get_log_level_mask(NULL);
+	
+	if (!liblinphonetester_show_account_manager_logs) linphone_core_set_log_level_mask(ORTP_ERROR|ORTP_FATAL);
 	for(it=linphone_core_get_proxy_config_list(m->lc);it!=NULL;it=it->next){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig *)it->data;
-		account_manager_check_account(am,cfg);
+		account_manager_check_account(am,cfg,m->phone_alias);
 	}
+	if (!liblinphonetester_show_account_manager_logs) linphone_core_set_log_level_mask(logmask);
 }
diff --git a/tester/audio_bypass_tester.c b/tester/audio_bypass_tester.c
new file mode 100644
index 000000000..4b8e62b6b
--- /dev/null
+++ b/tester/audio_bypass_tester.c
@@ -0,0 +1,506 @@
+/*
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2013  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "liblinphone_tester.h"
+#include "private.h"
+#include "audio_bypass_wav_header.h" // This is a copy of mediastreamer2/src/audiofilters/wav_header.h
+
+/**********************************************************************
+ * This is a (simpler) copy of msfileplay filter in mediastreamer2   *
+ *********************************************************************/
+
+struct _PlayerData{
+	int fd;
+	MSPlayerState state;
+	int rate;
+	int nchannels;
+	int hsize;
+	int loop_after;
+	int pause_time;
+	int count;
+	int samplesize;
+	char *mime;
+	uint32_t ts;
+	bool_t swap;
+	bool_t is_raw;
+};
+
+typedef struct _PlayerData PlayerData;
+
+static void audio_bypass_snd_read_init(MSFilter *f) {
+	PlayerData *d=ms_new0(PlayerData,1);
+	d->fd=-1;
+	d->state=MSPlayerClosed;
+	d->swap=TRUE;
+	d->rate=44100;
+	d->nchannels=1;
+	d->samplesize=2;
+	d->mime = "L16";
+	d->hsize=0;
+	d->loop_after=-1; /*by default, don't loop*/
+	d->pause_time=0;
+	d->count=0;
+	d->ts=0;
+	d->is_raw=TRUE;
+	f->data=d;
+}
+
+int audio_bypass_read_wav_header_from_fd(wave_header_t *header,int fd){
+	int count;
+	int skip;
+	int hsize=0;
+	riff_t *riff_chunk=&header->riff_chunk;
+	format_t *format_chunk=&header->format_chunk;
+	data_t *data_chunk=&header->data_chunk;
+
+	unsigned long len=0;
+
+	len = read(fd, (char*)riff_chunk, sizeof(riff_t)) ;
+	if (len != sizeof(riff_t)){
+		goto not_a_wav;
+	}
+
+	if (0!=strncmp(riff_chunk->riff, "RIFF", 4) || 0!=strncmp(riff_chunk->wave, "WAVE", 4)){
+		goto not_a_wav;
+	}
+
+	len = read(fd, (char*)format_chunk, sizeof(format_t)) ;
+	if (len != sizeof(format_t)){
+		ms_warning("Wrong wav header: cannot read file");
+		goto not_a_wav;
+	}
+
+	if ((skip=le_uint32(format_chunk->len)-0x10)>0)
+	{
+		lseek(fd,skip,SEEK_CUR);
+	}
+	hsize=sizeof(wave_header_t)-0x10+le_uint32(format_chunk->len);
+
+	count=0;
+	do{
+		len = read(fd, data_chunk, sizeof(data_t)) ;
+		if (len != sizeof(data_t)){
+			ms_warning("Wrong wav header: cannot read file");
+			goto not_a_wav;
+		}
+		if (strncmp(data_chunk->data, "data", 4)!=0){
+			ms_warning("skipping chunk=%c%c%c%c len=%i", data_chunk->data[0],data_chunk->data[1],data_chunk->data[2],data_chunk->data[3], data_chunk->len);
+			lseek(fd,le_uint32(data_chunk->len),SEEK_CUR);
+			count++;
+			hsize+=len+le_uint32(data_chunk->len);
+		}else{
+			hsize+=len;
+			break;
+		}
+	}while(count<30);
+	return hsize;
+
+	not_a_wav:
+		/*rewind*/
+		lseek(fd,0,SEEK_SET);
+		return -1;
+}
+
+static int read_wav_header(PlayerData *d){
+	wave_header_t header;
+	format_t *format_chunk=&header.format_chunk;
+	int ret=audio_bypass_read_wav_header_from_fd(&header,d->fd);
+
+	d->samplesize=le_uint16(format_chunk->blockalign)/d->nchannels;
+	d->hsize=ret;
+
+	#ifdef WORDS_BIGENDIAN
+	if (le_uint16(format_chunk->blockalign)==le_uint16(format_chunk->channel) * 2)
+		d->swap=TRUE;
+	#endif
+	d->is_raw=FALSE;
+	return 0;
+}
+
+static void audio_bypass_snd_read_preprocess(MSFilter *f) {
+	PlayerData *d=(PlayerData*)f->data;
+	int fd;
+	const char *file=bc_tester_res("sounds/hello44100.wav");
+
+	if ((fd=open(file,O_RDONLY|O_BINARY))==-1){
+		ms_warning("MSFilePlayer[%p]: failed to open %s: %s",f,file,strerror(errno));
+		return;
+	}
+
+	d->state=MSPlayerPaused;
+	d->fd=fd;
+	d->ts=0;
+	if (read_wav_header(d)!=0 && strstr(file,".wav")){
+		ms_warning("File %s has .wav extension but wav header could be found.",file);
+	}
+	ms_filter_notify_no_arg(f,MS_FILTER_OUTPUT_FMT_CHANGED);
+	ms_message("MSFilePlayer[%p]: %s opened: rate=%i,channel=%i",f,file,d->rate,d->nchannels);
+
+	if (d->state==MSPlayerPaused)
+		d->state=MSPlayerPlaying;
+	return;
+}
+
+static void swap_bytes(unsigned char *bytes, int len){
+	int i;
+	unsigned char tmp;
+	for(i=0;i<len;i+=2){
+		tmp=bytes[i];
+		bytes[i]=bytes[i+1];
+		bytes[i+1]=tmp;
+	}
+}
+
+static void audio_bypass_snd_read_process(MSFilter *f) {
+	PlayerData *d=(PlayerData*)f->data;
+	int nsamples=(f->ticker->interval*d->rate*d->nchannels)/1000;
+	int bytes;
+	/*send an even number of samples each tick. At 22050Hz the number of samples per 10 ms chunk is odd.
+	Odd size buffer of samples cause troubles to alsa. Fixing in alsa is difficult, so workaround here.
+	*/
+	if (nsamples & 0x1 ) { //odd number of samples
+		if (d->count & 0x1 )
+			nsamples++;
+		else
+			nsamples--;
+	}
+	bytes=nsamples*d->samplesize;
+	d->count++;
+	ms_filter_lock(f);
+	if (d->state==MSPlayerPlaying){
+		{
+			int err;
+			mblk_t *om=allocb(bytes,0);
+			if (d->pause_time>0){
+				err=bytes;
+				memset(om->b_wptr,0,bytes);
+				d->pause_time-=f->ticker->interval;
+			}else{
+				err=read(d->fd,om->b_wptr,bytes);
+				if (d->swap) swap_bytes(om->b_wptr,bytes);
+			}
+			if (err>=0){
+				if (err!=0){
+					if (err<bytes)
+						memset(om->b_wptr+err,0,bytes-err);
+					om->b_wptr+=bytes;
+					mblk_set_timestamp_info(om,d->ts);
+					d->ts+=nsamples;
+					ms_queue_put(f->outputs[0],om);
+				}else freemsg(om);
+				if (err<bytes){
+					ms_filter_notify_no_arg(f,MS_PLAYER_EOF);
+					/*for compatibility:*/
+					lseek(d->fd,d->hsize,SEEK_SET);
+
+					/* special value for playing file only once */
+					if (d->loop_after<0)
+					{
+						d->state=MSPlayerPaused;
+						ms_filter_unlock(f);
+						return;
+					}
+
+					if (d->loop_after>=0){
+						d->pause_time=d->loop_after;
+					}
+				}
+			}else{
+				ms_warning("Fail to read %i bytes: %s",bytes,strerror(errno));
+			}
+		}
+	}
+	ms_filter_unlock(f);
+}
+
+static void audio_bypass_snd_read_postprocess(MSFilter *f) {
+	PlayerData *d=(PlayerData*)f->data;
+	ms_filter_lock(f);
+	if (d->state!=MSPlayerClosed){
+		d->state=MSPlayerPaused;
+		lseek(d->fd,d->hsize,SEEK_SET);
+	}
+	ms_filter_unlock(f);
+	if (d->fd!=-1)	close(d->fd);
+	d->fd=-1;
+	d->state=MSPlayerClosed;
+}
+
+static void audio_bypass_snd_read_uninit(MSFilter *f) {
+	PlayerData *d=(PlayerData*)f->data;
+	ms_free(d);
+}
+
+static int audio_bypass_snd_read_set_sample_rate(MSFilter *f, void *arg) { // This is to prevent ms2 to put a resampler between this filter and the rtpsend
+	return 0;
+}
+
+static int audio_bypass_snd_read_set_nchannels(MSFilter *f, void *arg) { // This is to prevent ms2 to put a resampler between this filter and the rtpsend
+	return 0;
+}
+
+static int audio_bypass_snd_read_get_sample_rate(MSFilter *f, void *arg) {
+	int *sample_rate = (int *)arg;
+	*sample_rate = 44100;
+	return 0;
+}
+
+static int audio_bypass_snd_read_get_nchannels(MSFilter *f, void *arg) {
+	int *nchannels = (int *)arg;
+	*nchannels = 1;
+	return 0;
+}
+
+static int audio_bypass_snd_read_get_fmt(MSFilter *f, void *arg) {
+	MSPinFormat *pinFmt = (MSPinFormat *)arg;
+	pinFmt->fmt = ms_factory_get_audio_format(f->factory, "L16", 44100, 1, NULL);
+	return 0;
+}
+
+static MSFilterMethod audio_bypass_snd_read_methods[] = {
+	{ MS_FILTER_SET_SAMPLE_RATE, audio_bypass_snd_read_set_sample_rate },
+	{ MS_FILTER_SET_NCHANNELS, audio_bypass_snd_read_set_nchannels },
+	{ MS_FILTER_GET_SAMPLE_RATE, audio_bypass_snd_read_get_sample_rate },
+	{ MS_FILTER_GET_NCHANNELS, audio_bypass_snd_read_get_nchannels },
+	{ MS_FILTER_GET_OUTPUT_FMT, audio_bypass_snd_read_get_fmt },
+	{ 0, NULL }
+};
+
+MSFilterDesc audio_bypass_snd_read_desc = {
+	MS_FILTER_PLUGIN_ID,
+	"AudioBypassReader",
+	"audio bypass source",
+	MS_FILTER_OTHER,
+	NULL,
+	0,
+	1,
+	audio_bypass_snd_read_init,
+	audio_bypass_snd_read_preprocess,
+	audio_bypass_snd_read_process,
+	audio_bypass_snd_read_postprocess,
+	audio_bypass_snd_read_uninit,
+	audio_bypass_snd_read_methods,
+	0
+};
+
+static void audio_bypass_snd_write_init(MSFilter *f) {
+
+}
+
+static void audio_bypass_snd_write_preprocess(MSFilter *f) {
+
+}
+
+static void audio_bypass_snd_write_process(MSFilter *f) {
+	mblk_t *m = ms_queue_get(f->inputs[0]);
+	ms_free(m);
+}
+
+static void audio_bypass_snd_write_postprocess(MSFilter *f) {
+
+}
+
+static void audio_bypass_snd_write_uninit(MSFilter *f) {
+
+}
+
+static int audio_bypass_snd_write_set_sample_rate(MSFilter *f, void *arg) { // This is to prevent ms2 to put a resampler between this filter and the rtprecv
+	return 0;
+}
+
+static int audio_bypass_snd_write_set_nchannels(MSFilter *f, void *arg) { // This is to prevent ms2 to put a resampler between this filter and the rtprecv
+	return 0;
+}
+
+static int audio_bypass_snd_write_get_sample_rate(MSFilter *f, void *arg) {
+	int *sample_rate = (int*)arg;
+	*sample_rate = 44100;
+	return 0;
+}
+
+static int audio_bypass_snd_write_get_nchannels(MSFilter *obj, void *arg) {
+	int *nchannels = (int*)arg;
+	*nchannels = 1;
+	return 0;
+}
+
+static int audio_bypass_snd_write_get_fmt(MSFilter *f, void *arg) {
+	MSPinFormat *pinFmt = (MSPinFormat *)arg;
+	pinFmt->fmt = ms_factory_get_audio_format(f->factory, "L16", 44100, 1, NULL);
+	return 0;
+}
+
+static MSFilterMethod audio_bypass_snd_write_methods[] = {
+	{ MS_FILTER_SET_SAMPLE_RATE, audio_bypass_snd_write_set_sample_rate },
+	{ MS_FILTER_SET_NCHANNELS, audio_bypass_snd_write_set_nchannels },
+	{ MS_FILTER_GET_SAMPLE_RATE, audio_bypass_snd_write_get_sample_rate },
+	{ MS_FILTER_GET_NCHANNELS, audio_bypass_snd_write_get_nchannels },
+	{ MS_FILTER_GET_OUTPUT_FMT, audio_bypass_snd_write_get_fmt },
+	{ 0, NULL }
+};
+
+MSFilterDesc audio_bypass_snd_write_desc = {
+	MS_FILTER_PLUGIN_ID,
+	"AudioBypassWriter",
+	"audio bypass output",
+	MS_FILTER_OTHER,
+	NULL,
+	1,
+	0,
+	audio_bypass_snd_write_init,
+	audio_bypass_snd_write_preprocess,
+	audio_bypass_snd_write_process,
+	audio_bypass_snd_write_postprocess,
+	audio_bypass_snd_write_uninit,
+	audio_bypass_snd_write_methods,
+	0
+};
+
+static MSFilter* audio_bypass_snd_card_create_reader(MSSndCard *sndcard) {
+	MSFactory *factory = ms_snd_card_get_factory(sndcard);
+	MSFilter *f = ms_factory_create_filter_from_desc(factory, &audio_bypass_snd_read_desc);
+	return f;
+}
+
+static MSFilter* audio_bypass_snd_card_create_writer(MSSndCard *sndcard) {
+	MSFactory *factory = ms_snd_card_get_factory(sndcard);
+	MSFilter *f = ms_factory_create_filter_from_desc(factory, &audio_bypass_snd_write_desc);
+	return f;
+}
+
+static void audio_bypass_snd_card_detect(MSSndCardManager *m);
+
+MSSndCardDesc audio_bypass_snd_card_desc = {
+	"audioBypass",
+	audio_bypass_snd_card_detect,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	audio_bypass_snd_card_create_reader,
+	audio_bypass_snd_card_create_writer,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static MSSndCard* create_audio_bypass_snd_card(void) {
+	MSSndCard* sndcard;
+	sndcard = ms_snd_card_new(&audio_bypass_snd_card_desc);
+	sndcard->data = NULL;
+	sndcard->name = ms_strdup("audio bypass sound card");
+	sndcard->capabilities = MS_SND_CARD_CAP_PLAYBACK | MS_SND_CARD_CAP_CAPTURE;
+	sndcard->latency = 0;
+	return sndcard;
+}
+
+#define AUDIO_BYPASS_SOUNDCARD "audioBypass: audio bypass sound card"
+
+static void audio_bypass_snd_card_detect(MSSndCardManager *m) {
+	ms_snd_card_manager_add_card(m, create_audio_bypass_snd_card());
+}
+
+static void only_enable_payload(LinphoneCore *lc, const char *mime, int rate, int channels) {
+	const MSList *elem = linphone_core_get_audio_codecs(lc);
+	PayloadType *pt;
+
+	for(; elem != NULL; elem = elem->next) {
+		pt = (PayloadType *)elem->data;
+		linphone_core_enable_payload_type(lc, pt, FALSE);
+	}
+	pt = linphone_core_find_payload_type(lc, mime, rate, channels);
+	if (BC_ASSERT_PTR_NOT_NULL(pt)) {
+		linphone_core_enable_payload_type(lc, pt, TRUE);
+	}
+}
+
+static void audio_bypass(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCore *marie_lc = marie->lc;
+	MSFactory *marie_factory = linphone_core_get_ms_factory(marie_lc);
+	MSSndCardManager *marie_sndcard_manager = ms_factory_get_snd_card_manager(marie_factory);
+
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
+	LinphoneCore *pauline_lc = pauline->lc;
+	MSFactory *pauline_factory = linphone_core_get_ms_factory(pauline_lc);
+	MSSndCardManager *pauline_sndcard_manager = ms_factory_get_snd_card_manager(pauline_factory);
+
+	bool_t call_ok;
+	char *hellopath = bc_tester_res("sounds/hello44100.wav");
+	char *recordpath = bc_tester_file("audiobypass-record.wav");
+	double similar=1;
+	const double threshold = 0.85;
+
+	lp_config_set_string(marie_lc->config, "sound", "features", "None");
+	lp_config_set_string(pauline_lc->config, "sound", "features", "None");
+
+	/*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/
+	unlink(recordpath);
+
+	// Enable L16 audio codec
+	only_enable_payload(marie_lc, "L16", 44100, 1);
+	only_enable_payload(pauline_lc, "L16", 44100, 1);
+
+	// Add our custom sound card
+	ms_snd_card_manager_register_desc(marie_sndcard_manager, &audio_bypass_snd_card_desc);
+	ms_snd_card_manager_register_desc(pauline_sndcard_manager, &audio_bypass_snd_card_desc);
+	linphone_core_reload_sound_devices(marie_lc);
+	linphone_core_reload_sound_devices(pauline_lc);
+	linphone_core_set_playback_device(marie_lc, AUDIO_BYPASS_SOUNDCARD);
+	linphone_core_set_playback_device(pauline_lc, AUDIO_BYPASS_SOUNDCARD);
+	linphone_core_set_capture_device(marie_lc, AUDIO_BYPASS_SOUNDCARD);
+	linphone_core_set_capture_device(pauline_lc, AUDIO_BYPASS_SOUNDCARD);
+	BC_ASSERT_STRING_EQUAL(linphone_core_get_capture_device(marie_lc), AUDIO_BYPASS_SOUNDCARD);
+	BC_ASSERT_STRING_EQUAL(linphone_core_get_capture_device(pauline_lc), AUDIO_BYPASS_SOUNDCARD);
+	BC_ASSERT_STRING_EQUAL(linphone_core_get_playback_device(marie_lc), AUDIO_BYPASS_SOUNDCARD);
+	BC_ASSERT_STRING_EQUAL(linphone_core_get_playback_device(pauline_lc), AUDIO_BYPASS_SOUNDCARD);
+
+	linphone_core_use_files(pauline_lc, TRUE);
+	linphone_core_set_play_file(pauline_lc, NULL);
+	linphone_core_set_record_file(pauline_lc, recordpath);
+
+	call_ok = call(marie, pauline);
+	BC_ASSERT_TRUE(call_ok);
+	if (!call_ok) goto end;
+
+	BC_ASSERT_STRING_EQUAL(linphone_call_params_get_used_audio_codec(linphone_call_get_current_params(linphone_core_get_current_call(marie_lc)))->mime_type, "L16");
+
+	wait_for_until(pauline_lc, marie_lc, NULL, 0, 4000); //hello44100.wav is 4 seconds long
+	end_call(marie, pauline);
+
+	BC_ASSERT_EQUAL(ms_audio_diff(hellopath, recordpath, &similar, &audio_cmp_params, NULL, NULL), 0, int, "%d");
+	BC_ASSERT_GREATER(similar, threshold, double, "%g");
+	BC_ASSERT_LOWER(similar, 1.0, double, "%g");
+
+end:
+	bc_free(recordpath);
+	bc_free(hellopath);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+test_t audio_bypass_tests[] = {
+	TEST_NO_TAG("Audio Bypass", audio_bypass)
+};
+
+test_suite_t audio_bypass_suite = { "Audio Bypass", NULL, NULL,
+	liblinphone_tester_before_each, liblinphone_tester_after_each,
+	sizeof(audio_bypass_tests) / sizeof(audio_bypass_tests[0]), audio_bypass_tests };
diff --git a/tester/audio_bypass_wav_header.h b/tester/audio_bypass_wav_header.h
new file mode 100644
index 000000000..e82df007b
--- /dev/null
+++ b/tester/audio_bypass_wav_header.h
@@ -0,0 +1,139 @@
+/*
+mediastreamer2 library - modular sound and video processing and streaming
+Copyright (C) 2006  Simon MORLAT (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+
+#ifndef waveheader_h
+#define waveheader_h
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifdef _WIN32
+#	include <io.h>
+#	ifndef R_OK
+#		define R_OK 0x2
+#	endif
+#	ifndef W_OK
+#		define W_OK 0x6
+#	endif
+#   ifndef F_OK
+#       define F_OK 0x0
+#   endif
+
+#	ifndef S_IRUSR
+#	define S_IRUSR S_IREAD
+#	endif
+
+#	ifndef S_IWUSR
+#	define S_IWUSR S_IWRITE
+#	endif
+
+#	define open _open
+#	define read _read
+#	define write _write
+#	define close _close
+#	define access _access
+#	define lseek _lseek
+#else /*_WIN32*/
+
+#	ifndef O_BINARY
+#	define O_BINARY 0
+#	endif
+
+#endif /*!_WIN32*/
+
+#ifdef swap16
+#else
+/* all integer in wav header must be read in least endian order */
+static MS2_INLINE uint16_t swap16(uint16_t a)
+{
+	return ((a & 0xFF) << 8) | ((a & 0xFF00) >> 8);
+}
+#endif
+
+#ifdef swap32
+#else
+static MS2_INLINE uint32_t swap32(uint32_t a)
+{
+	return ((a & 0xFF) << 24) | ((a & 0xFF00) << 8) |
+		((a & 0xFF0000) >> 8) | ((a & 0xFF000000) >> 24);
+}
+#endif
+
+#ifdef WORDS_BIGENDIAN
+#define le_uint32(a) (swap32((a)))
+#define le_uint16(a) (swap16((a)))
+#define le_int16(a) ( (int16_t) swap16((uint16_t)((a))) )
+#else
+#define le_uint32(a) (a)
+#define le_uint16(a) (a)
+#define le_int16(a) (a)
+#endif
+
+typedef struct _riff_t {
+	char riff[4] ;	/* "RIFF" (ASCII characters) */
+	uint32_t  len ;	/* Length of package (binary, little endian) */
+	char wave[4] ;	/* "WAVE" (ASCII characters) */
+} riff_t;
+
+/* The FORMAT chunk */
+
+typedef struct _format_t {
+	char  fmt[4] ;		/* "fmt_" (ASCII characters) */
+	uint32_t   len ;	/* length of FORMAT chunk (always 0x10) */
+	uint16_t  type;		/* codec type*/
+	uint16_t channel ;	/* Channel numbers (0x01 = mono, 0x02 = stereo) */
+	uint32_t   rate ;	/* Sample rate (binary, in Hz) */
+	uint32_t   bps ;	/* Average Bytes Per Second */
+	uint16_t blockalign ;	/*number of bytes per sample */
+	uint16_t bitpspl ;	/* bits per sample */
+} format_t;
+
+/* The DATA chunk */
+
+typedef struct _data_t {
+	char data[4] ;	/* "data" (ASCII characters) */
+	uint32_t  len ;	/* length of data */
+} data_t;
+
+typedef struct _wave_header_t
+{
+	riff_t riff_chunk;
+	format_t format_chunk;
+	data_t data_chunk;
+} wave_header_t;
+
+#ifndef _WIN32
+#define WAVE_FORMAT_PCM			0x0001
+#define WAVE_FORMAT_IEEE_FLOAT	0x0003
+#define WAVE_FORMAT_ALAW		0x0006
+#define WAVE_FORMAT_MULAW		0x0007
+#define WAVE_FORMAT_EXTENSIBLE	0xFFFE
+#endif
+
+#define wave_header_get_format_type(header)	le_uint16((header)->format_chunk.type)
+#define wave_header_get_rate(header)		le_uint32((header)->format_chunk.rate)
+#define wave_header_get_channel(header)		le_uint16((header)->format_chunk.channel)
+#define wave_header_get_bpsmpl(header) \
+	le_uint16((header)->format_chunk.blockalign)
+
+int ms_read_wav_header_from_fd(wave_header_t *header,int fd);
+
+#endif
diff --git a/tester/call_multi_tester.c b/tester/call_multi_tester.c
new file mode 100644
index 000000000..7a310ea24
--- /dev/null
+++ b/tester/call_multi_tester.c
@@ -0,0 +1,964 @@
+/*
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2013  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "linphonecore.h"
+#include "lpconfig.h"
+#include "private.h"
+#include "liblinphone_tester.h"
+#include "mediastreamer2/msutils.h"
+#include "belle-sip/sipstack.h"
+
+#ifdef _WIN32
+#define unlink _unlink
+#endif
+
+
+static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	bctbx_list_t *iterator;
+	bctbx_list_t* lcs;
+	LinphoneCall* pauline_called_by_marie;
+	LinphoneCall* pauline_called_by_laure=NULL;
+	LinphoneCallParams *laure_params=linphone_core_create_call_params(laure->lc, NULL);
+	LinphoneCallParams *marie_params=linphone_core_create_call_params(marie->lc, NULL);
+
+	if (enable_caller_privacy)
+		linphone_call_params_set_privacy(marie_params,LinphonePrivacyId);
+
+	lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+
+	BC_ASSERT_TRUE(call_with_caller_params(marie,pauline,marie_params));
+	linphone_call_params_destroy(marie_params);
+	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
+
+	if (enable_caller_privacy)
+		linphone_call_params_set_privacy(laure_params,LinphonePrivacyId);
+
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(laure->lc,pauline->identity,laure_params));
+	linphone_call_params_destroy(laure_params);
+
+	BC_ASSERT_TRUE(wait_for(laure->lc
+							,pauline->lc
+							,&pauline->stat.number_of_LinphoneCallIncomingReceived
+							,2));
+
+	BC_ASSERT_EQUAL(laure->stat.number_of_LinphoneCallOutgoingProgress,1, int, "%d");
+
+
+	BC_ASSERT_TRUE(wait_for(laure->lc
+							,pauline->lc
+							,&laure->stat.number_of_LinphoneCallOutgoingRinging
+							,1));
+
+	for (iterator=(bctbx_list_t *)linphone_core_get_calls(pauline->lc);iterator!=NULL;iterator=iterator->next) {
+		LinphoneCall *call=(LinphoneCall *)iterator->data;
+		if (call != pauline_called_by_marie) {
+			/*fine, this is the call waiting*/
+			pauline_called_by_laure=call;
+			linphone_core_accept_call(pauline->lc,pauline_called_by_laure);
+		}
+	}
+
+	BC_ASSERT_TRUE(wait_for(laure->lc
+							,pauline->lc
+							,&laure->stat.number_of_LinphoneCallConnected
+							,1));
+
+	BC_ASSERT_TRUE(wait_for(pauline->lc
+								,marie->lc
+								,&marie->stat.number_of_LinphoneCallPausedByRemote
+								,1));
+
+	if (pauline_called_by_laure && enable_caller_privacy )
+		BC_ASSERT_EQUAL(linphone_call_params_get_privacy(linphone_call_get_current_params(pauline_called_by_laure)),LinphonePrivacyId, int, "%d");
+	/*wait a bit for ACK to be sent*/
+	wait_for_list(lcs,NULL,0,1000);
+	linphone_core_terminate_all_calls(pauline->lc);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	bctbx_list_free(lcs);
+}
+static void call_waiting_indication(void) {
+	call_waiting_indication_with_param(FALSE);
+}
+
+static void call_waiting_indication_with_privacy(void) {
+	call_waiting_indication_with_param(TRUE);
+}
+
+static void second_call_rejection(bool_t second_without_audio){
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCall *pauline_call;
+	LinphoneCallParams *params;
+	LinphoneCall *marie_call;
+
+	/*start a call to pauline*/
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	BC_ASSERT_TRUE(wait_for(marie->lc
+			,pauline->lc
+			,&marie->stat.number_of_LinphoneCallOutgoingRinging
+			,1));
+
+	/*attempt to send a second call while the first one is not answered.
+	 * It must be rejected by the core, since the audio resources are already engaged for the first call*/
+	params = linphone_core_create_call_params(marie->lc, NULL);
+	linphone_call_params_enable_audio(params, !second_without_audio);
+	marie_call = linphone_core_invite_with_params(marie->lc, "sip:laure_non_exstent@test.linphone.org", params);
+
+	linphone_call_params_destroy(params);
+
+	if (second_without_audio){
+		BC_ASSERT_PTR_NOT_NULL(marie_call);
+		BC_ASSERT_TRUE(wait_for(marie->lc
+			,pauline->lc
+			,&marie->stat.number_of_LinphoneCallError
+			,1));
+
+	}else{
+		BC_ASSERT_PTR_NULL(marie_call);
+	}
+
+	pauline_call = linphone_core_get_current_call(pauline->lc);
+	BC_ASSERT_PTR_NOT_NULL(pauline_call);
+	if (pauline_call){
+		linphone_core_accept_call(pauline->lc, pauline_call);
+	}
+	BC_ASSERT_TRUE(wait_for(marie->lc
+			,pauline->lc
+			,&marie->stat.number_of_LinphoneCallStreamsRunning
+			,1));
+	BC_ASSERT_TRUE(wait_for(marie->lc
+			,pauline->lc
+			,&pauline->stat.number_of_LinphoneCallStreamsRunning
+			,1));
+	end_call(pauline, marie);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void second_call_rejected_if_first_one_in_progress(void){
+	second_call_rejection(FALSE);
+}
+
+static void second_call_allowed_if_not_using_audio(void){
+	second_call_rejection(TRUE);
+}
+
+static void incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallState state) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	bctbx_list_t* lcs;
+	LinphoneCallParams *laure_params=linphone_core_create_call_params(laure->lc, NULL);
+	LinphoneCallParams *marie_params=linphone_core_create_call_params(marie->lc, NULL);
+
+	lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+
+
+	if (state==LinphoneCallOutgoingRinging || state==LinphoneCallOutgoingEarlyMedia) {
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(marie->lc,pauline->identity,marie_params));
+
+		BC_ASSERT_TRUE(wait_for(marie->lc
+								,pauline->lc
+								,&pauline->stat.number_of_LinphoneCallIncomingReceived
+								,1));
+
+		if (state==LinphoneCallOutgoingEarlyMedia)
+			linphone_core_accept_early_media(pauline->lc,linphone_core_get_current_call(pauline->lc));
+
+		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallOutgoingProgress,1, int, "%d");
+		BC_ASSERT_TRUE(wait_for(marie->lc
+									,pauline->lc
+									,state==LinphoneCallOutgoingEarlyMedia?&marie->stat.number_of_LinphoneCallOutgoingEarlyMedia:&marie->stat.number_of_LinphoneCallOutgoingRinging
+									,1));
+	} else if (state==LinphoneCallOutgoingProgress) {
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address(marie->lc,pauline->identity));
+	} else {
+		ms_error("Unsupported state");
+		return;
+	}
+
+	BC_ASSERT_TRUE(call_with_caller_params(laure,marie,laure_params));
+
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
+
+
+	linphone_core_terminate_all_calls(marie->lc);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,2,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallReleased,1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallReleased,2,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallReleased,1,10000));
+
+	linphone_call_params_unref(laure_params);
+	linphone_call_params_unref(marie_params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	bctbx_list_free(lcs);
+}
+static void incoming_call_accepted_when_outgoing_call_in_progress(void) {
+	incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallOutgoingProgress);
+}
+static void incoming_call_accepted_when_outgoing_call_in_outgoing_ringing(void) {
+	incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallOutgoingRinging);
+}
+static void incoming_call_accepted_when_outgoing_call_in_outgoing_ringing_early_media(void) {
+	incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallOutgoingEarlyMedia);
+}
+
+static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManager* pauline, LinphoneCoreManager* laure, LinphoneCoreManager *focus) {
+	stats initial_marie_stat;
+	stats initial_pauline_stat;
+	stats initial_laure_stat;
+
+	LinphoneCall* marie_call_pauline;
+	LinphoneCall* pauline_called_by_marie;
+	LinphoneCall* marie_call_laure;
+	LinphoneConference *conference;
+	const bctbx_list_t* calls;
+	bool_t is_remote_conf;
+	bool_t focus_is_up = (focus && ((LinphoneConferenceServer *)focus)->reg_state == LinphoneRegistrationOk);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+	if (focus) lcs=bctbx_list_append(lcs,focus->lc);
+
+	is_remote_conf = (strcmp(lp_config_get_string(marie->lc->config, "misc", "conference_type", "local"), "remote") == 0);
+	if(is_remote_conf) BC_ASSERT_PTR_NOT_NULL(focus);
+
+	if (!BC_ASSERT_TRUE(call(marie,pauline))) goto end;
+	
+	marie_call_pauline=linphone_core_get_current_call(marie->lc);
+	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
+	BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
+
+	if (!BC_ASSERT_TRUE(call(marie,laure))) goto end;
+	initial_marie_stat=marie->stat;
+	initial_pauline_stat=pauline->stat;
+	initial_laure_stat=laure->stat;
+
+	marie_call_laure=linphone_core_get_current_call(marie->lc);
+
+	if (!BC_ASSERT_PTR_NOT_NULL(marie_call_laure)) goto end;
+	linphone_core_add_to_conference(marie->lc,marie_call_laure);
+	if(!is_remote_conf) {
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallUpdating,initial_marie_stat.number_of_LinphoneCallUpdating+1,5000));
+	} else {
+		if(focus_is_up) {
+			BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,initial_marie_stat.number_of_LinphoneCallStreamsRunning+1,5000));
+			BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,initial_marie_stat.number_of_LinphoneTransferCallConnected+1,5000));
+			BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,initial_marie_stat.number_of_LinphoneCallEnd+1,5000));
+		} else {
+			BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallError, initial_marie_stat.number_of_LinphoneCallError+1, 5000));
+			BC_ASSERT_PTR_NULL(linphone_core_get_conference(marie->lc));
+			BC_ASSERT_EQUAL(linphone_core_terminate_conference(marie->lc), -1, int, "%d");
+			linphone_core_terminate_call(marie->lc, marie_call_pauline);
+			linphone_core_terminate_call(marie->lc, marie_call_laure);
+			BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallEnd, initial_marie_stat.number_of_LinphoneCallEnd+2, 10000));
+			BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallEnd, initial_pauline_stat.number_of_LinphoneCallEnd+1, 5000));
+			BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallEnd, initial_laure_stat.number_of_LinphoneCallEnd+1, 5000));
+			BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallReleased, initial_marie_stat.number_of_LinphoneCallReleased+3, 10000));
+			BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallReleased, initial_pauline_stat.number_of_LinphoneCallReleased+1, 5000));
+			BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallReleased, initial_laure_stat.number_of_LinphoneCallReleased+1, 5000));
+			goto end;
+		}
+	}
+
+	linphone_core_add_to_conference(marie->lc,marie_call_pauline);
+
+	if(!is_remote_conf) {
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallResuming,initial_marie_stat.number_of_LinphoneCallResuming+1,2000));
+	} else {
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,initial_marie_stat.number_of_LinphoneTransferCallConnected+2,5000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,initial_marie_stat.number_of_LinphoneCallEnd+2,5000));
+	}
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,initial_pauline_stat.number_of_LinphoneCallStreamsRunning+1,5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,initial_laure_stat.number_of_LinphoneCallStreamsRunning+1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,initial_marie_stat.number_of_LinphoneCallStreamsRunning+2,3000));
+
+	BC_ASSERT_TRUE(linphone_core_is_in_conference(marie->lc));
+	BC_ASSERT_EQUAL(linphone_core_get_conference_size(marie->lc),3, int, "%d");
+
+	if(!is_remote_conf) {
+		BC_ASSERT_PTR_NULL(linphone_core_get_current_call(marie->lc));
+	} else {
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(marie->lc));
+	}
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(pauline->lc));
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(laure->lc));
+
+
+	/*
+	 * FIXME: check_ice cannot work as it is today because there is no current call for the party that hosts the conference
+	if (linphone_core_get_firewall_policy(marie->lc) == LinphonePolicyUseIce) {
+		if (linphone_core_get_firewall_policy(pauline->lc) == LinphonePolicyUseIce) {
+			check_ice(marie,pauline,LinphoneIceStateHostConnection);
+		}
+		if (linphone_core_get_firewall_policy(laure->lc) == LinphonePolicyUseIce) {
+			check_ice(marie,laure,LinphoneIceStateHostConnection);
+		}
+	}
+	*/
+	for (calls=linphone_core_get_calls(marie->lc);calls!=NULL;calls=calls->next) {
+		LinphoneCall *call=(LinphoneCall *)calls->data;
+		BC_ASSERT_EQUAL(linphone_core_get_media_encryption(marie->lc),linphone_call_params_get_media_encryption(linphone_call_get_current_params(call)),int,"%d");
+	}
+
+	BC_ASSERT_PTR_NOT_NULL(conference = linphone_core_get_conference(marie->lc));
+	if(conference) {
+		bctbx_list_t *participants = linphone_conference_get_participants(conference);
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(participants), 2, unsigned int, "%u");
+		bctbx_list_free_with_data(participants, (void(*)(void *))linphone_address_destroy);
+	}
+
+	linphone_core_terminate_conference(marie->lc);
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,is_remote_conf?2:1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,is_remote_conf?3:2,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,is_remote_conf?2:1,10000));
+	if(is_remote_conf) BC_ASSERT_TRUE(wait_for_list(lcs,&focus->stat.number_of_LinphoneCallEnd,3,10000));
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallReleased,is_remote_conf?2:1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallReleased,is_remote_conf?3:2,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallReleased,is_remote_conf?2:1,10000));
+	if(is_remote_conf) BC_ASSERT_TRUE(wait_for_list(lcs,&focus->stat.number_of_LinphoneCallReleased,3,10000));
+
+end:
+	bctbx_list_free(lcs);
+}
+
+static void simple_conference(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	simple_conference_base(marie,pauline,laure, NULL);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+}
+
+static void simple_encrypted_conference_with_ice(LinphoneMediaEncryption mode) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+
+	if (linphone_core_media_encryption_supported(marie->lc,mode)) {
+		linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
+		linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
+		linphone_core_set_firewall_policy(laure->lc,LinphonePolicyUseIce);
+
+		/**/
+
+		linphone_core_set_media_encryption(marie->lc,mode);
+		linphone_core_set_media_encryption(pauline->lc,mode);
+		linphone_core_set_media_encryption(laure->lc,mode);
+
+		simple_conference_base(marie,pauline,laure,NULL);
+	} else {
+		ms_warning("No [%s] support available",linphone_media_encryption_to_string(mode));
+		BC_PASS("Passed");
+	}
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+}
+
+static void simple_conference_with_ice(void) {
+	simple_encrypted_conference_with_ice(LinphoneMediaEncryptionNone);
+}
+static void simple_zrtp_conference_with_ice(void) {
+	simple_encrypted_conference_with_ice(LinphoneMediaEncryptionZRTP);
+}
+
+
+static void simple_call_transfer(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	LinphoneCall* pauline_called_by_marie;
+	LinphoneCall *marie_calling_pauline;
+	LinphoneCall *marie_calling_laure;
+
+	char* laure_identity=linphone_address_as_string(laure->identity);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+
+
+	BC_ASSERT_TRUE(call(marie,pauline));
+	marie_calling_pauline=linphone_core_get_current_call(marie->lc);
+	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
+
+	reset_counters(&marie->stat);
+	reset_counters(&pauline->stat);
+	reset_counters(&laure->stat);
+
+
+	linphone_core_transfer_call(pauline->lc,pauline_called_by_marie,laure_identity);
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallRefered,1,2000));
+	/*marie pausing pauline*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallPausing,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausedByRemote,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallPaused,1,2000));
+	/*marie calling laure*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
+
+	BC_ASSERT_PTR_NOT_NULL(linphone_call_get_transfer_target_call(marie_calling_pauline));
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
+	linphone_core_accept_call(laure->lc,linphone_core_get_current_call(laure->lc));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+
+	marie_calling_laure=linphone_core_get_current_call(marie->lc);
+	if (!BC_ASSERT_PTR_NOT_NULL(marie_calling_laure)) goto end;
+	BC_ASSERT_PTR_EQUAL(linphone_call_get_transferer_call(marie_calling_laure),marie_calling_pauline);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallConnected,1,2000));
+
+	/*terminate marie to pauline call*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallReleased,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallReleased,1,2000));
+
+	end_call(marie, laure);
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallReleased,1,2000));
+
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	bctbx_list_free(lcs);
+}
+
+static void unattended_call_transfer(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	LinphoneCall* pauline_called_by_marie;
+
+	char* laure_identity=linphone_address_as_string(laure->identity);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+
+
+	BC_ASSERT_TRUE(call(marie,pauline));
+	pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
+
+	reset_counters(&marie->stat);
+	reset_counters(&pauline->stat);
+	reset_counters(&laure->stat);
+
+	linphone_core_transfer_call(marie->lc,pauline_called_by_marie,laure_identity);
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
+
+	/*marie ends the call  */
+	linphone_core_terminate_call(marie->lc,pauline_called_by_marie);
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
+
+	/*Pauline starts the transfer*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
+	linphone_core_accept_call(laure->lc,linphone_core_get_current_call(laure->lc));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
+
+	end_call(laure, pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	bctbx_list_free(lcs);
+}
+
+static void unattended_call_transfer_with_error(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCall* pauline_called_by_marie;
+	bool_t call_ok=TRUE;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+
+	lcs=bctbx_list_append(lcs,pauline->lc);
+
+	BC_ASSERT_TRUE((call_ok=call(marie,pauline)));
+	if (call_ok){
+		pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
+
+		reset_counters(&marie->stat);
+		reset_counters(&pauline->stat);
+
+		linphone_core_transfer_call(marie->lc,pauline_called_by_marie,"unknown_user");
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
+
+		/*Pauline starts the transfer*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
+		/* and immediately get an error*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallError,1,2000));
+
+		/*the error must be reported back to marie*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallError,1,2000));
+
+		/*and pauline should resume the call automatically*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallResuming,1,2000));
+
+		/*and call should be resumed*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+
+		end_call(marie, pauline);
+	}
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	bctbx_list_free(lcs);
+}
+
+
+static void call_transfer_existing_call(bool_t outgoing_call) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	LinphoneCall* marie_call_pauline;
+	LinphoneCall* pauline_called_by_marie;
+	LinphoneCall* marie_call_laure;
+	LinphoneCall* laure_called_by_marie;
+	LinphoneCall* lcall;
+	bool_t call_ok=TRUE;
+	const bctbx_list_t* calls;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+
+	/*marie call pauline*/
+	BC_ASSERT_TRUE((call_ok=call(marie,pauline)));
+	if (call_ok){
+		marie_call_pauline=linphone_core_get_current_call(marie->lc);
+		pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
+		/*marie pause pauline*/
+		if (!BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie))) {
+			goto end;
+		}
+
+		if (outgoing_call) {
+			/*marie call laure*/
+			if (!BC_ASSERT_TRUE(call(marie,laure))) {
+				end_call(marie, pauline);
+				goto end;
+			}
+		} else {
+			/*laure call pauline*/
+			if (!BC_ASSERT_TRUE(call(laure,marie))) {
+				end_call(marie,pauline);
+				goto end;
+			}
+		}
+			
+		marie_call_laure=linphone_core_get_current_call(marie->lc);
+		laure_called_by_marie=linphone_core_get_current_call(laure->lc);
+
+		/*marie pause laure*/
+		BC_ASSERT_TRUE(pause_call_1(marie,marie_call_laure,laure,laure_called_by_marie));
+
+		reset_counters(&marie->stat);
+		reset_counters(&pauline->stat);
+		reset_counters(&laure->stat);
+
+
+		linphone_core_transfer_call_to_another(marie->lc,marie_call_pauline,marie_call_laure);
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
+
+		/*pauline pausing marie*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausing,1,4000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPaused,1,4000));
+		/*pauline calling laure*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
+
+		/*laure accept call*/
+		for(calls=linphone_core_get_calls(laure->lc);calls!=NULL;calls=calls->next) {
+			lcall = (LinphoneCall*)calls->data;
+			if (linphone_call_get_state(lcall) == LinphoneCallIncomingReceived) {
+				BC_ASSERT_PTR_EQUAL(linphone_call_get_replaced_call(lcall),laure_called_by_marie);
+				linphone_core_accept_call(laure->lc,lcall);
+				break;
+			}
+		}
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,1,2000));
+
+		/*terminate marie to pauline/laure call*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,2,2000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,2000));
+
+		end_call(pauline, laure);
+	}
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(laure);
+	linphone_core_manager_destroy(pauline);
+	bctbx_list_free(lcs);
+}
+static void call_transfer_existing_call_outgoing_call(void) {
+	call_transfer_existing_call(TRUE);
+}
+static void call_transfer_existing_call_incoming_call(void) {
+	call_transfer_existing_call(FALSE);
+}
+static void eject_from_3_participants_conference(LinphoneCoreManager *marie, LinphoneCoreManager *pauline, LinphoneCoreManager *laure, LinphoneCoreManager *focus) {
+	stats initial_marie_stat;
+	stats initial_pauline_stat;
+	stats initial_laure_stat;
+
+	LinphoneCall* marie_call_pauline;
+	LinphoneCall* pauline_called_by_marie;
+	LinphoneCall* marie_call_laure;
+	bool_t is_remote_conf;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+	if(focus) lcs=bctbx_list_append(lcs,focus->lc);
+
+	is_remote_conf = (strcmp(lp_config_get_string(marie->lc->config, "misc", "conference_type", "local"), "remote") == 0);
+	if(is_remote_conf) BC_ASSERT_PTR_NOT_NULL(focus);
+
+	BC_ASSERT_TRUE(call(marie,pauline));
+	marie_call_pauline=linphone_core_get_current_call(marie->lc);
+	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
+	BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
+
+	BC_ASSERT_TRUE(call(marie,laure));
+	initial_marie_stat=marie->stat;
+	initial_pauline_stat=pauline->stat;
+	initial_laure_stat=laure->stat;
+
+	marie_call_laure=linphone_core_get_current_call(marie->lc);
+
+	if (!BC_ASSERT_PTR_NOT_NULL(marie_call_laure)) goto end;
+
+	linphone_core_add_to_conference(marie->lc,marie_call_laure);
+
+	if(!is_remote_conf) BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallUpdating,initial_marie_stat.number_of_LinphoneCallUpdating+1,5000));
+	else {
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,initial_marie_stat.number_of_LinphoneTransferCallConnected+1,5000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,initial_marie_stat.number_of_LinphoneCallEnd+1,5000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,initial_laure_stat.number_of_LinphoneCallEnd+1,5000));
+	}
+
+	if (!BC_ASSERT_PTR_NOT_NULL(linphone_core_get_conference(marie->lc))) {
+		goto end;
+	}
+
+	linphone_core_add_to_conference(marie->lc,marie_call_pauline);
+
+	if(!is_remote_conf) BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallResuming,initial_marie_stat.number_of_LinphoneCallResuming+1,2000));
+	else {
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,initial_marie_stat.number_of_LinphoneTransferCallConnected+2,5000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,initial_marie_stat.number_of_LinphoneCallEnd+2,5000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,initial_pauline_stat.number_of_LinphoneCallEnd+1,5000));
+	}
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,initial_pauline_stat.number_of_LinphoneCallStreamsRunning+1,5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,initial_laure_stat.number_of_LinphoneCallStreamsRunning+1,2000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,initial_marie_stat.number_of_LinphoneCallStreamsRunning+2,3000));
+
+	BC_ASSERT_TRUE(linphone_core_is_in_conference(marie->lc));
+	BC_ASSERT_EQUAL(linphone_core_get_conference_size(marie->lc),3, int, "%d");
+
+	if(!is_remote_conf) BC_ASSERT_PTR_NULL(linphone_core_get_current_call(marie->lc));
+
+	if(!is_remote_conf) linphone_core_remove_from_conference(marie->lc, marie_call_pauline);
+	else {
+		LinphoneConference *conference = linphone_core_get_conference(marie->lc);
+		const LinphoneAddress *uri = linphone_call_get_remote_address(marie_call_pauline);
+		linphone_conference_remove_participant(conference, uri);
+	}
+
+	if(!is_remote_conf) {
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausedByRemote,1,10000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,3,10000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,5,10000));
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(marie->lc));
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(linphone_core_get_calls(marie->lc)), 2, unsigned int, "%u");
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(pauline->lc));
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(laure->lc));
+	} else {
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,initial_pauline_stat.number_of_LinphoneCallEnd+2,5000));
+	}
+
+	if(!is_remote_conf) {
+		end_call(laure, marie);
+		end_call(pauline, marie);
+
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
+	} else {
+		linphone_core_terminate_conference(marie->lc);
+		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,initial_laure_stat.number_of_LinphoneCallEnd+2,3000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,initial_marie_stat.number_of_LinphoneCallEnd+3,3000));
+	}
+end:
+	bctbx_list_free(lcs);
+}
+
+static void eject_from_3_participants_local_conference(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+
+	eject_from_3_participants_conference(marie, pauline, laure, NULL);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+}
+
+static void eject_from_4_participants_conference(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	LinphoneCoreManager* michelle = linphone_core_manager_new( "michelle_rc_udp");
+	int timeout_ms = 5000;
+	stats initial_laure_stat;
+	stats initial_michelle_stat;
+
+	LinphoneCall* marie_call_pauline;
+	LinphoneCall* pauline_called_by_marie;
+	LinphoneCall* marie_call_laure;
+	LinphoneCall* marie_call_michelle;
+	LinphoneCall* michelle_called_by_marie;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+	lcs=bctbx_list_append(lcs,michelle->lc);
+
+	BC_ASSERT_TRUE(call(marie,pauline));
+	marie_call_pauline=linphone_core_get_current_call(marie->lc);
+	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
+	BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
+
+	if (!BC_ASSERT_TRUE(call(marie,michelle)))
+		goto end;
+
+	marie_call_michelle=linphone_core_get_current_call(marie->lc);
+	michelle_called_by_marie=linphone_core_get_current_call(michelle->lc);
+	BC_ASSERT_TRUE(pause_call_1(marie,marie_call_michelle,michelle,michelle_called_by_marie));
+
+	BC_ASSERT_TRUE(call(marie,laure));
+	initial_laure_stat=laure->stat;
+	initial_michelle_stat=michelle->stat;
+
+	marie_call_laure=linphone_core_get_current_call(marie->lc);
+
+	if (!BC_ASSERT_PTR_NOT_NULL(marie_call_laure)) goto end;
+
+	linphone_core_add_to_conference(marie->lc,marie_call_laure);
+	linphone_core_add_to_conference(marie->lc,marie_call_michelle);
+	linphone_core_add_to_conference(marie->lc,marie_call_pauline);
+
+	while (linphone_core_get_conference_size(marie->lc)!=4&&timeout_ms) {
+		wait_for_list(lcs, NULL, 0, 100);
+		timeout_ms -= 100;
+	}
+	BC_ASSERT_TRUE(linphone_core_is_in_conference(marie->lc));
+	BC_ASSERT_EQUAL(linphone_core_get_conference_size(marie->lc),4, int, "%d");
+
+	BC_ASSERT_PTR_NULL(linphone_core_get_current_call(marie->lc));
+
+	linphone_core_remove_from_conference(marie->lc, marie_call_pauline);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausedByRemote,1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,initial_laure_stat.number_of_LinphoneCallStreamsRunning+1,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&michelle->stat.number_of_LinphoneCallStreamsRunning,initial_michelle_stat.number_of_LinphoneCallStreamsRunning+1,10000));
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,5,10000));
+	BC_ASSERT_PTR_NULL(linphone_core_get_current_call(marie->lc));
+	BC_ASSERT_TRUE(linphone_core_is_in_conference(marie->lc));
+	BC_ASSERT_EQUAL(linphone_core_get_conference_size(marie->lc),3, int, "%d");
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(linphone_core_get_calls(marie->lc)), 3, unsigned int, "%u");
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(pauline->lc));
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(laure->lc));
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(michelle->lc));
+
+	linphone_core_terminate_all_calls(laure->lc);
+	linphone_core_terminate_all_calls(pauline->lc);
+	linphone_core_terminate_all_calls(michelle->lc);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallEnd, 1, 10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallEnd, 1, 10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &michelle->stat.number_of_LinphoneCallEnd, 1, 10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallEnd, 3, 10000));
+
+	BC_ASSERT_PTR_NULL(linphone_core_get_conference(marie->lc));
+
+	BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallReleased, 1, 10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallReleased, 1, 10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &michelle->stat.number_of_LinphoneCallReleased, 1, 10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallEnd, 3, 10000));
+
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	linphone_core_manager_destroy(michelle);
+	bctbx_list_free(lcs);
+}
+
+
+void simple_remote_conference(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
+	LinphoneCoreManager *laure = linphone_core_manager_new("laure_rc_udp");
+	LinphoneConferenceServer *focus = linphone_conference_server_new("conference_focus_rc", TRUE);
+	LpConfig *marie_config = linphone_core_get_config(marie->lc);
+	LinphoneProxyConfig *focus_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)focus)->lc);
+	LinphoneProxyConfig *laure_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)laure)->lc);
+	const char *laure_proxy_uri = linphone_proxy_config_get_server_addr(laure_proxy_config);
+	const char *focus_uri = linphone_proxy_config_get_identity(focus_proxy_config);
+
+	lp_config_set_string(marie_config, "misc", "conference_type", "remote");
+	lp_config_set_string(marie_config, "misc", "conference_focus_addr", focus_uri);
+
+	linphone_proxy_config_edit(laure_proxy_config);
+	linphone_proxy_config_set_route(laure_proxy_config, laure_proxy_uri);
+	linphone_proxy_config_done(laure_proxy_config);
+
+	simple_conference_base(marie, pauline, laure, (LinphoneCoreManager *)focus);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	linphone_conference_server_destroy(focus);
+}
+
+void simple_remote_conference_shut_down_focus(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
+	LinphoneCoreManager *laure = linphone_core_manager_new("laure_rc_udp");
+	LinphoneConferenceServer *focus = linphone_conference_server_new("conference_focus_rc", FALSE);
+	LpConfig *marie_config = linphone_core_get_config(marie->lc);
+	LinphoneProxyConfig *focus_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)focus)->lc);
+	LinphoneProxyConfig *laure_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)laure)->lc);
+	const char *laure_proxy_uri = linphone_proxy_config_get_server_addr(laure_proxy_config);
+	const char *focus_uri = linphone_proxy_config_get_identity(focus_proxy_config);
+
+	lp_config_set_string(marie_config, "misc", "conference_type", "remote");
+	lp_config_set_string(marie_config, "misc", "conference_focus_addr", focus_uri);
+
+	linphone_proxy_config_edit(laure_proxy_config);
+	linphone_proxy_config_set_route(laure_proxy_config, laure_proxy_uri);
+	linphone_proxy_config_done(laure_proxy_config);
+
+	simple_conference_base(marie, pauline, laure, (LinphoneCoreManager *)focus);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	linphone_conference_server_destroy(focus);
+}
+
+void eject_from_3_participants_remote_conference(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+	LinphoneConferenceServer *focus = linphone_conference_server_new("conference_focus_rc", TRUE);
+	LpConfig *marie_config = linphone_core_get_config(marie->lc);
+	LinphoneProxyConfig *focus_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)focus)->lc);
+	LinphoneProxyConfig *laure_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)laure)->lc);
+	const char *laure_proxy_uri = linphone_proxy_config_get_server_addr(laure_proxy_config);
+	const char *focus_uri = linphone_proxy_config_get_identity(focus_proxy_config);
+
+	lp_config_set_string(marie_config, "misc", "conference_type", "remote");
+	lp_config_set_string(marie_config, "misc", "conference_focus_addr", focus_uri);
+
+	linphone_proxy_config_edit(laure_proxy_config);
+	linphone_proxy_config_set_route(laure_proxy_config, laure_proxy_uri);
+	linphone_proxy_config_done(laure_proxy_config);
+
+	eject_from_3_participants_conference(marie, pauline, laure, (LinphoneCoreManager *)focus);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	linphone_conference_server_destroy(focus);
+}
+
+test_t multi_call_tests[] = {
+	TEST_NO_TAG("Call waiting indication", call_waiting_indication),
+	TEST_NO_TAG("Call waiting indication with privacy", call_waiting_indication_with_privacy),
+	TEST_NO_TAG("Second call rejected if first one in progress", second_call_rejected_if_first_one_in_progress),
+	TEST_NO_TAG("Second call allowed if not using audio", second_call_allowed_if_not_using_audio),
+	TEST_NO_TAG("Incoming call accepted when outgoing call in progress", incoming_call_accepted_when_outgoing_call_in_progress),
+	TEST_NO_TAG("Incoming call accepted when outgoing call in outgoing ringing", incoming_call_accepted_when_outgoing_call_in_outgoing_ringing),
+	TEST_NO_TAG("Incoming call accepted when outgoing call in outgoing ringing early media", incoming_call_accepted_when_outgoing_call_in_outgoing_ringing_early_media),
+	TEST_NO_TAG("Simple conference", simple_conference),
+	TEST_ONE_TAG("Simple conference with ICE", simple_conference_with_ice, "ICE"),
+	TEST_ONE_TAG("Simple ZRTP conference with ICE", simple_zrtp_conference_with_ice, "ICE"),
+	TEST_NO_TAG("Eject from 3 participants conference", eject_from_3_participants_local_conference),
+	TEST_NO_TAG("Eject from 4 participants conference", eject_from_4_participants_conference),
+	TEST_NO_TAG("Simple call transfer", simple_call_transfer),
+	TEST_NO_TAG("Unattended call transfer", unattended_call_transfer),
+	TEST_NO_TAG("Unattended call transfer with error", unattended_call_transfer_with_error),
+	TEST_NO_TAG("Call transfer existing call outgoing call", call_transfer_existing_call_outgoing_call),
+	TEST_NO_TAG("Call transfer existing call incoming call", call_transfer_existing_call_incoming_call),
+	TEST_NO_TAG("Simple remote conference", simple_remote_conference),
+	TEST_NO_TAG("Simple remote conference with shut down focus", simple_remote_conference_shut_down_focus),
+	TEST_NO_TAG("Eject from 3 participants in remote conference", eject_from_3_participants_remote_conference),
+};
+
+test_suite_t multi_call_test_suite = {"Multi call", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+									  sizeof(multi_call_tests) / sizeof(multi_call_tests[0]), multi_call_tests};
diff --git a/tester/multicast_call_tester.c b/tester/call_multicast_tester.c
similarity index 80%
rename from tester/multicast_call_tester.c
rename to tester/call_multicast_tester.c
index 437867329..252de1256 100644
--- a/tester/multicast_call_tester.c
+++ b/tester/call_multicast_tester.c
@@ -24,12 +24,8 @@
 
 static void call_multicast_base(bool_t video) {
 	LinphoneCoreManager *marie, *pauline;
-	int begin;
-	int leaked_objects;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new( "pauline_tcp_rc");
 
@@ -67,21 +63,13 @@ static void call_multicast_base(bool_t video) {
 	}
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-	belle_sip_object_enable_leak_detector(FALSE);
-
 }
 
 static void call_multicast(void)  {
 	call_multicast_base(FALSE);
 }
-static void multicast_audio_with_pause_resume() {
-	call_paused_resumed_base(TRUE);
+static void multicast_audio_with_pause_resume(void) {
+	call_paused_resumed_base(TRUE,FALSE);
 }
 #ifdef VIDEO_ENABLED
 static void call_multicast_video(void)  {
@@ -90,16 +78,12 @@ static void call_multicast_video(void)  {
 #endif
 static void early_media_with_multicast_base(bool_t video) {
 	LinphoneCoreManager *marie, *pauline, *pauline2;
-	MSList* lcs = NULL;
+	bctbx_list_t* lcs = NULL;
 	int dummy=0;
-	int leaked_objects;
-	int begin;
 	LinphoneVideoPolicy marie_policy, pauline_policy;
 	LpConfig *marie_lp;
 	LinphoneCallParams *params;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
 	marie   = linphone_core_manager_new("marie_rc");
 	pauline = linphone_core_manager_new("pauline_tcp_rc");
 	pauline2 = linphone_core_manager_new("pauline_tcp_rc");
@@ -115,6 +99,22 @@ static void early_media_with_multicast_base(bool_t video) {
 		linphone_core_enable_video_capture(marie->lc, TRUE);
 		linphone_core_enable_video_display(marie->lc, FALSE);
 
+		// important: VP8 has really poor performances with the mire camera, at least
+		// on iOS - so when ever h264 is available, let's use it instead
+		if (linphone_core_find_payload_type(pauline->lc,"h264", -1, -1)!=NULL) {
+			disable_all_video_codecs_except_one(pauline->lc,"h264");
+			disable_all_video_codecs_except_one(pauline2->lc,"h264");
+			disable_all_video_codecs_except_one(marie->lc,"h264");
+		}
+
+		linphone_core_set_video_device(pauline->lc, liblinphone_tester_mire_id);
+		linphone_core_set_video_device(pauline2->lc, liblinphone_tester_mire_id);
+		linphone_core_set_video_device(marie->lc, liblinphone_tester_mire_id);
+
+		linphone_core_set_avpf_mode(pauline->lc, LinphoneAVPFEnabled);
+		linphone_core_set_avpf_mode(pauline2->lc, LinphoneAVPFEnabled);
+		linphone_core_set_avpf_mode(marie->lc, LinphoneAVPFEnabled);
+
 		marie_policy.automatically_initiate=TRUE;
 		marie_policy.automatically_accept=TRUE;
 		pauline_policy.automatically_initiate=TRUE;
@@ -130,9 +130,9 @@ static void early_media_with_multicast_base(bool_t video) {
 	linphone_core_enable_audio_multicast(marie->lc,TRUE);
 
 
-	lcs = ms_list_append(lcs,marie->lc);
-	lcs = ms_list_append(lcs,pauline->lc);
-	lcs = ms_list_append(lcs,pauline2->lc);
+	lcs = bctbx_list_append(lcs,marie->lc);
+	lcs = bctbx_list_append(lcs,pauline->lc);
+	lcs = bctbx_list_append(lcs,pauline2->lc);
 	/*
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
@@ -168,10 +168,10 @@ static void early_media_with_multicast_base(bool_t video) {
 		wait_for_list(lcs, &dummy, 1, 3000);
 
 		BC_ASSERT_GREATER(linphone_core_manager_get_max_audio_down_bw(pauline),70,int,"%i");
-		BC_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth<90);
+		BC_ASSERT_LOWER((int)linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth, 90, int, "%i");
 
 		BC_ASSERT_GREATER(linphone_core_manager_get_max_audio_down_bw(pauline2),70,int,"%i");
-		BC_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline2->lc))->download_bandwidth<90);
+		BC_ASSERT_LOWER((int)linphone_call_get_audio_stats(linphone_core_get_current_call(pauline2->lc))->download_bandwidth,90, int, "%i");
 
 		BC_ASSERT_TRUE(linphone_call_params_audio_multicast_enabled(linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc))));
 		BC_ASSERT_TRUE(linphone_call_params_audio_multicast_enabled(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc))));
@@ -197,7 +197,7 @@ static void early_media_with_multicast_base(bool_t video) {
 			BC_ASSERT_TRUE(linphone_call_params_video_multicast_enabled(linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc))));
 			BC_ASSERT_TRUE(linphone_call_params_video_multicast_enabled(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc))));
 		}
-		params=linphone_call_params_copy(linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)));
+		params = linphone_core_create_call_params(pauline->lc, linphone_core_get_current_call(pauline->lc));
 
 		linphone_call_params_enable_audio_multicast(params,FALSE);
 		linphone_call_params_enable_video_multicast(params,FALSE);
@@ -237,42 +237,31 @@ static void early_media_with_multicast_base(bool_t video) {
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(pauline2);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects,0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-	belle_sip_object_enable_leak_detector(FALSE);
 }
 
-static void early_media_with_multicast_audio() {
+static void early_media_with_multicast_audio(void) {
 	early_media_with_multicast_base(FALSE);
 }
-static void unicast_incoming_with_multicast_audio_on() {
+static void unicast_incoming_with_multicast_audio_on(void) {
 	simple_call_base(TRUE);
 }
 #ifdef VIDEO_ENABLED
-static void early_media_with_multicast_video() {
+static void early_media_with_multicast_video(void) {
 	early_media_with_multicast_base(TRUE);
 }
 #endif
 
 test_t multicast_call_tests[] = {
-	{ "Multicast audio call",call_multicast},
-	{ "Multicast call with pause/resume",multicast_audio_with_pause_resume},
-	{ "Early media multicast audio call",early_media_with_multicast_audio},
-	{ "Unicast incoming call with multicast activated",unicast_incoming_with_multicast_audio_on},
+	TEST_NO_TAG("Multicast audio call",call_multicast),
+	TEST_NO_TAG("Multicast call with pause/resume",multicast_audio_with_pause_resume),
+	TEST_NO_TAG("Early media multicast audio call",early_media_with_multicast_audio),
+	TEST_NO_TAG("Unicast incoming call with multicast activated",unicast_incoming_with_multicast_audio_on),
 #ifdef VIDEO_ENABLED
-	{ "Multicast video call",call_multicast_video},
-	{ "Early media multicast video call",early_media_with_multicast_video},
+	TEST_NO_TAG("Multicast video call",call_multicast_video),
+	TEST_NO_TAG("Early media multicast video call",early_media_with_multicast_video),
 #endif
 };
 
-test_suite_t multicast_call_test_suite = {
-	"Multicast Call",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(multicast_call_tests) / sizeof(multicast_call_tests[0]),
-	multicast_call_tests
-};
+test_suite_t multicast_call_test_suite = {"Multicast Call", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+										  sizeof(multicast_call_tests) / sizeof(multicast_call_tests[0]),
+										  multicast_call_tests};
diff --git a/tester/call_tester.c b/tester/call_single_tester.c
similarity index 60%
rename from tester/call_tester.c
rename to tester/call_single_tester.c
index 953632bb7..601b3ad34 100644
--- a/tester/call_tester.c
+++ b/tester/call_single_tester.c
@@ -34,15 +34,15 @@
 #endif
 
 static void srtp_call(void);
-static char *create_filepath(const char *dir, const char *filename, const char *ext);
 
 // prototype definition for call_recording()
 #ifdef ANDROID
 #ifdef HAVE_OPENH264
-extern void libmsopenh264_init(void);
+extern void libmsopenh264_init(MSFactory *factory);
 #endif
 #endif
 
+
 void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){
 	char* to=linphone_address_as_string(linphone_call_get_call_log(call)->to);
 	char* from=linphone_address_as_string(linphone_call_get_call_log(call)->from);
@@ -85,21 +85,23 @@ void call_stats_updated(LinphoneCore *lc, LinphoneCall *call, const LinphoneCall
 	counters->number_of_LinphoneCallStatsUpdated++;
 	if (lstats->updated & LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE) {
 		counters->number_of_rtcp_received++;
+		if (lstats->rtcp_received_via_mux){
+			counters->number_of_rtcp_received_via_mux++;
+		}
 	}
 	if (lstats->updated & LINPHONE_CALL_STATS_SENT_RTCP_UPDATE ) {
 		counters->number_of_rtcp_sent++;
 	}
 	if (lstats->updated & LINPHONE_CALL_STATS_PERIODICAL_UPDATE ) {
 		int tab_size = sizeof (counters->audio_download_bandwidth)/sizeof(int);
-		int index =  (counters->current_bandwidth_index++) % tab_size;
-
-		counters->current_audio_download_bandwidth = counters->audio_download_bandwidth + index;
-		counters->current_audio_upload_bandwidth = counters->audio_upload_bandwidth +index;
-
-		counters->audio_download_bandwidth[index] = linphone_call_get_audio_stats(call)->download_bandwidth;
-		counters->audio_upload_bandwidth[index] = linphone_call_get_audio_stats(call)->upload_bandwidth;
-		counters->video_download_bandwidth[index] = linphone_call_get_video_stats(call)->download_bandwidth;
-		counters->video_upload_bandwidth[index] = linphone_call_get_video_stats(call)->upload_bandwidth;
+		int index = (counters->current_bandwidth_index[lstats->type]++) % tab_size;
+		if (lstats->type == LINPHONE_CALL_STATS_AUDIO) {
+			counters->audio_download_bandwidth[index] = (int)linphone_call_get_audio_stats(call)->download_bandwidth;
+			counters->audio_upload_bandwidth[index] = (int)linphone_call_get_audio_stats(call)->upload_bandwidth;
+		} else {
+			counters->video_download_bandwidth[index] = (int)linphone_call_get_video_stats(call)->download_bandwidth;
+			counters->video_upload_bandwidth[index] = (int)linphone_call_get_video_stats(call)->upload_bandwidth;
+		}
 	}
 
 }
@@ -159,7 +161,7 @@ void linphone_call_iframe_decoded_cb(LinphoneCall *call,void * user_data) {
 void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreManager* callee) {
 	LinphoneCall *c1,*c2;
 	MSTimeSpec ts;
-
+	int max_time_to_wait;
 	c1=linphone_core_get_current_call(caller->lc);
 	c2=linphone_core_get_current_call(callee->lc);
 
@@ -169,25 +171,56 @@ void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreMana
 	if (!c1 || !c2) return;
 	linphone_call_ref(c1);
 	linphone_call_ref(c2);
-
 	liblinphone_tester_clock_start(&ts);
+	if (linphone_core_rtcp_enabled(caller->lc) && linphone_core_rtcp_enabled(callee->lc))
+		max_time_to_wait = 15000;
+	else
+		max_time_to_wait = 5000;
+
 	do {
 		if (linphone_call_get_audio_stats(c1)->round_trip_delay > 0.0
-				&& linphone_call_get_audio_stats(c2)->round_trip_delay > 0.0
-				&& (!linphone_call_log_video_enabled(linphone_call_get_call_log(c1)) || linphone_call_get_video_stats(c1)->round_trip_delay>0.0)
-				&& (!linphone_call_log_video_enabled(linphone_call_get_call_log(c2))  || linphone_call_get_video_stats(c2)->round_trip_delay>0.0)) {
+			&& linphone_call_get_audio_stats(c2)->round_trip_delay > 0.0
+			&& (!linphone_call_log_video_enabled(linphone_call_get_call_log(c1)) || linphone_call_get_video_stats(c1)->round_trip_delay>0.0)
+			&& (!linphone_call_log_video_enabled(linphone_call_get_call_log(c2))  || linphone_call_get_video_stats(c2)->round_trip_delay>0.0)) {
 			break;
 
 		}
 		wait_for_until(caller->lc,callee->lc,NULL,0,20); /*just to sleep while iterating*/
-	}while (!liblinphone_tester_clock_elapsed(&ts,15000));
-	BC_ASSERT_GREATER(linphone_call_get_audio_stats(c1)->round_trip_delay,0.0,float,"%f");
-	BC_ASSERT_GREATER(linphone_call_get_audio_stats(c2)->round_trip_delay,0.0,float,"%f");
-	if (linphone_call_log_video_enabled(linphone_call_get_call_log(c1))) {
-		BC_ASSERT_GREATER(linphone_call_get_video_stats(c1)->round_trip_delay,0.0,float,"%f");
-	}
-	if (linphone_call_log_video_enabled(linphone_call_get_call_log(c2))) {
-		BC_ASSERT_GREATER(linphone_call_get_video_stats(c2)->round_trip_delay,0.0,float,"%f");
+	}while (!liblinphone_tester_clock_elapsed(&ts,max_time_to_wait));
+
+	if (linphone_core_rtcp_enabled(caller->lc) && linphone_core_rtcp_enabled(callee->lc)) {
+		BC_ASSERT_GREATER(caller->stat.number_of_rtcp_received, 1, int, "%i");
+		BC_ASSERT_GREATER(callee->stat.number_of_rtcp_received, 1, int, "%i");
+		BC_ASSERT_GREATER(linphone_call_get_audio_stats(c1)->round_trip_delay,0.0,float,"%f");
+		BC_ASSERT_GREATER(linphone_call_get_audio_stats(c2)->round_trip_delay,0.0,float,"%f");
+		if (linphone_call_log_video_enabled(linphone_call_get_call_log(c1))) {
+			BC_ASSERT_GREATER(linphone_call_get_video_stats(c1)->round_trip_delay,0.0,float,"%f");
+		}
+		if (linphone_call_log_video_enabled(linphone_call_get_call_log(c2))) {
+			BC_ASSERT_GREATER(linphone_call_get_video_stats(c2)->round_trip_delay,0.0,float,"%f");
+		}
+	} else {
+		if (linphone_core_rtcp_enabled(caller->lc)) {
+			BC_ASSERT_EQUAL(linphone_call_get_audio_stats(c1)->rtp_stats.sent_rtcp_packets, 0, unsigned long long, "%llu");
+			BC_ASSERT_EQUAL(linphone_call_get_audio_stats(c2)->rtp_stats.recv_rtcp_packets, 0, unsigned long long, "%llu");
+			if (linphone_call_log_video_enabled(linphone_call_get_call_log(c1))) {
+				BC_ASSERT_EQUAL(linphone_call_get_video_stats(c1)->rtp_stats.sent_rtcp_packets, 0, unsigned long long, "%llu");
+			}
+			if (linphone_call_log_video_enabled(linphone_call_get_call_log(c2))) {
+				BC_ASSERT_EQUAL(linphone_call_get_video_stats(c2)->rtp_stats.recv_rtcp_packets, 0, unsigned long long, "%llu");
+			}
+		}
+		if (linphone_core_rtcp_enabled(callee->lc)) {
+		BC_ASSERT_EQUAL(linphone_call_get_audio_stats(c2)->rtp_stats.sent_rtcp_packets, 0, unsigned long long, "%llu");
+		BC_ASSERT_EQUAL(linphone_call_get_audio_stats(c1)->rtp_stats.recv_rtcp_packets, 0, unsigned long long, "%llu");
+			if (linphone_call_log_video_enabled(linphone_call_get_call_log(c1))) {
+				BC_ASSERT_EQUAL(linphone_call_get_video_stats(c1)->rtp_stats.recv_rtcp_packets, 0, unsigned long long, "%llu");
+			}
+			if (linphone_call_log_video_enabled(linphone_call_get_call_log(c2))) {
+				BC_ASSERT_EQUAL(linphone_call_get_video_stats(c2)->rtp_stats.sent_rtcp_packets, 0, unsigned long long, "%llu");
+			}
+		}
+
 	}
 	linphone_call_unref(c1);
 	linphone_call_unref(c2);
@@ -201,6 +234,17 @@ static void setup_sdp_handling(const LinphoneCallTestParams* params, LinphoneCor
 	}
 }
 
+/*
+ * CAUTION this function is error prone. you should not use it anymore in new tests.
+ * Creating callee call params before the call is actually received is not the good way
+ * to use the Liblinphone API. Indeed, call params used for receiving calls shall be created by linphone_core_create_call_params() by passing
+ * the call object for which params are to be created.
+ * This function should be used only in test case where the programmer exactly knows the caller params, and then can deduce how
+ * callee params will be set by linphone_core_create_call_params().
+ * This function was developped at a time where the use of the API about incoming params was not yet clarified.
+ * Tests relying on this function are then not testing the correct way to use the api (through linphone_core_create_call_params()), and so
+ * it is not a so good idea to build new tests based on this function.
+**/
 bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 						,LinphoneCoreManager* callee_mgr
 						, const LinphoneCallTestParams *caller_test_params
@@ -214,16 +258,23 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 	LinphoneCallParams *callee_params = callee_test_params->base;
 	bool_t did_receive_call;
 	LinphoneCall *callee_call=NULL;
+	LinphoneCall *caller_call=NULL;
+
+	/* TODO: This should be handled correctly inside the liblinphone library but meanwhile handle this here. */
+	linphone_core_manager_wait_for_stun_resolution(caller_mgr);
+	linphone_core_manager_wait_for_stun_resolution(callee_mgr);
 
 	setup_sdp_handling(caller_test_params, caller_mgr);
 	setup_sdp_handling(callee_test_params, callee_mgr);
 
 	if (!caller_params){
-		BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address(caller_mgr->lc,callee_mgr->identity));
+		BC_ASSERT_PTR_NOT_NULL((caller_call=linphone_core_invite_address(caller_mgr->lc,callee_mgr->identity)));
 	}else{
-		BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(caller_mgr->lc,callee_mgr->identity,caller_params));
+		BC_ASSERT_PTR_NOT_NULL((caller_call=linphone_core_invite_address_with_params(caller_mgr->lc,callee_mgr->identity,caller_params)));
 	}
 
+	BC_ASSERT_PTR_NULL(linphone_call_get_remote_params(caller_call)); /*assert that remote params are NULL when no response is received yet*/
+
 	did_receive_call = wait_for(callee_mgr->lc
 				,caller_mgr->lc
 				,&callee_mgr->stat.number_of_LinphoneCallIncomingReceived
@@ -254,10 +305,11 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 							||(caller_mgr->stat.number_of_LinphoneCallOutgoingEarlyMedia==initial_caller.number_of_LinphoneCallOutgoingEarlyMedia+1));
 
 
-	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call_remote_address(callee_mgr->lc));
+	if (linphone_core_get_calls_nb(callee_mgr->lc) == 1)
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call_remote_address(callee_mgr->lc)); /*only relevant if one call, otherwise, not always set*/
 	callee_call=linphone_core_get_call_by_remote_address2(callee_mgr->lc,caller_mgr->identity);
 
-	if(!linphone_core_get_current_call(caller_mgr->lc) || !linphone_core_get_current_call(callee_mgr->lc) || !linphone_core_get_current_call_remote_address(callee_mgr->lc)) {
+	if(!linphone_core_get_current_call(caller_mgr->lc) || (!callee_call && !linphone_core_get_current_call(callee_mgr->lc)) /*for privacy case*/) {
 		return 0;
 	} else if (caller_mgr->identity){
 		LinphoneAddress* callee_from=linphone_address_clone(caller_mgr->identity);
@@ -286,7 +338,7 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 	}
 
 	BC_ASSERT_TRUE(wait_for(callee_mgr->lc,caller_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallConnected,initial_callee.number_of_LinphoneCallConnected+1));
-	BC_ASSERT_TRUE(wait_for(callee_mgr->lc,caller_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallConnected,initial_callee.number_of_LinphoneCallConnected+1));
+	BC_ASSERT_TRUE(wait_for(callee_mgr->lc,caller_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallConnected,initial_caller.number_of_LinphoneCallConnected+1));
 
 	result = wait_for_until(callee_mgr->lc,caller_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallStreamsRunning,initial_caller.number_of_LinphoneCallStreamsRunning+1, 2000)
 			&&
@@ -296,13 +348,24 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 		|| linphone_core_get_media_encryption(callee_mgr->lc) != LinphoneMediaEncryptionNone) {
 		/*wait for encryption to be on, in case of zrtp or dtls, it can take a few seconds*/
 		if (	(linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionZRTP)
+				|| (linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionZRTP) /* is callee is ZRTP, wait for it */
 				|| (linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionDTLS))
 			wait_for(callee_mgr->lc,caller_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallEncryptedOn,initial_caller.number_of_LinphoneCallEncryptedOn+1);
 		if ((linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionZRTP)
 			|| (linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionDTLS)
+			|| (linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionZRTP)
 			|| (linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionDTLS) /*also take care of caller policy*/ )
 			wait_for(callee_mgr->lc,caller_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallEncryptedOn,initial_callee.number_of_LinphoneCallEncryptedOn+1);
-		{
+
+		/* when caller is encryptionNone but callee is ZRTP, we expect ZRTP to take place */
+		if ((linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionNone) 
+			&& (linphone_core_get_media_encryption(callee_mgr->lc) == LinphoneMediaEncryptionZRTP) 
+			&& linphone_core_media_encryption_supported(caller_mgr->lc, LinphoneMediaEncryptionZRTP)) {
+			const LinphoneCallParams* call_param = linphone_call_get_current_params(callee_call);
+			BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param), LinphoneMediaEncryptionZRTP, int, "%d");
+			call_param = linphone_call_get_current_params(linphone_core_get_current_call(caller_mgr->lc));
+			BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param), LinphoneMediaEncryptionZRTP, int, "%d");
+		}else { /* otherwise, final status shall stick to caller core parameter */
 			const LinphoneCallParams* call_param = linphone_call_get_current_params(callee_call);
 			BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller_mgr->lc), int, "%d");
 			call_param = linphone_call_get_current_params(linphone_core_get_current_call(caller_mgr->lc));
@@ -313,24 +376,63 @@ bool_t call_with_params2(LinphoneCoreManager* caller_mgr
 	/*wait ice re-invite*/
 	if (linphone_core_get_firewall_policy(caller_mgr->lc) == LinphonePolicyUseIce
 			&& linphone_core_get_firewall_policy(callee_mgr->lc) == LinphonePolicyUseIce
-			&& !linphone_core_sdp_200_ack_enabled(caller_mgr->lc)) { /*ice does not work with sdp less invite*/
+			&& !linphone_core_sdp_200_ack_enabled(caller_mgr->lc) /*ice does not work with sdp less invite*/
+			&& lp_config_get_int(callee_mgr->lc->config, "sip", "update_call_when_ice_completed", TRUE)
+			&& lp_config_get_int(caller_mgr->lc->config, "sip", "update_call_when_ice_completed", TRUE)
+			&& linphone_core_get_media_encryption(caller_mgr->lc) != LinphoneMediaEncryptionDTLS /*no ice-reinvite with DTLS*/) {
 		BC_ASSERT_TRUE(wait_for(callee_mgr->lc,caller_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallStreamsRunning,initial_caller.number_of_LinphoneCallStreamsRunning+2));
 		BC_ASSERT_TRUE(wait_for(callee_mgr->lc,caller_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallStreamsRunning,initial_callee.number_of_LinphoneCallStreamsRunning+2));
 
+	} else if (linphone_core_get_firewall_policy(caller_mgr->lc) == LinphonePolicyUseIce) {
+		/* check no ice re-invite received*/
+		BC_ASSERT_FALSE(wait_for_until(callee_mgr->lc,caller_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallStreamsRunning,initial_caller.number_of_LinphoneCallStreamsRunning+2,2000));
+		BC_ASSERT_FALSE(wait_for_until(callee_mgr->lc,caller_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallStreamsRunning,initial_callee.number_of_LinphoneCallStreamsRunning+2,2000));
+
+	}
+	if (linphone_core_get_media_encryption(caller_mgr->lc) == LinphoneMediaEncryptionDTLS ) {
+		if (linphone_core_get_current_call(caller_mgr->lc)->audiostream)
+			BC_ASSERT_TRUE(ms_media_stream_sessions_get_encryption_mandatory(&linphone_core_get_current_call(caller_mgr->lc)->audiostream->ms.sessions));
+#ifdef VIDEO_ENABLED
+		if (linphone_core_get_current_call(caller_mgr->lc)->videostream && video_stream_started(linphone_core_get_current_call(caller_mgr->lc)->videostream))
+			BC_ASSERT_TRUE(ms_media_stream_sessions_get_encryption_mandatory(&linphone_core_get_current_call(caller_mgr->lc)->videostream->ms.sessions));
+#endif
+
 	}
 	return result;
 }
 
+/*
+ * CAUTION this function is error prone. you should not use it anymore in new tests.
+ * Creating callee call params before the call is actually received is not the good way
+ * to use the Liblinphone API. Indeed, call params used for receiving calls shall be created by linphone_core_create_call_params() by passing
+ * the call object for which params are to be created.
+ * This function should be used only in test case where the programmer exactly knows the caller params, and then can deduce how
+ * callee params will be set by linphone_core_create_call_params().
+ * This function was developped at a time where the use of the API about incoming params was not yet clarified.
+ * Tests relying on this function are then not testing the correct way to use the api (through linphone_core_create_call_params()), and so
+ * it is not a so good idea to build new tests based on this function.
+**/
 bool_t call_with_params(LinphoneCoreManager* caller_mgr
 						,LinphoneCoreManager* callee_mgr
 						,const LinphoneCallParams *caller_params
 						,const LinphoneCallParams *callee_params){
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params =  {0};
 	caller_test_params.base = (LinphoneCallParams*)caller_params;
-	callee_test_params.base = (LinphoneCallParams*)caller_params;
+	callee_test_params.base = (LinphoneCallParams*)callee_params;
 	return call_with_params2(caller_mgr,callee_mgr,&caller_test_params,&callee_test_params,FALSE);
 }
 
+/*
+ * CAUTION this function is error prone. you should not use it anymore in new tests.
+ * Creating callee call params before the call is actually received is not the good way
+ * to use the Liblinphone API. Indeed, call params used for receiving calls shall be created by linphone_core_create_call_params() by passing
+ * the call object for which params are to be created.
+ * This function should be used only in test case where the programmer exactly knows the caller params, and then can deduce how
+ * callee params will be set by linphone_core_create_call_params().
+ * This function was developped at a time where the use of the API about incoming params was not yet clarified.
+ * Tests relying on this function are then not testing the correct way to use the api (through linphone_core_create_call_params()), and so
+ * it is not a so good idea to build new tests based on this function.
+**/
 bool_t call_with_test_params(LinphoneCoreManager* caller_mgr
 				,LinphoneCoreManager* callee_mgr
 				,const LinphoneCallTestParams *caller_test_params
@@ -347,25 +449,22 @@ bool_t call(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr){
 }
 
 void end_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2){
+	int previous_count_1 = m1->stat.number_of_LinphoneCallEnd;
+	int previous_count_2 = m2->stat.number_of_LinphoneCallEnd;
 	linphone_core_terminate_all_calls(m1->lc);
-	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m1->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m2->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m1->stat.number_of_LinphoneCallReleased,1));
-	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m2->stat.number_of_LinphoneCallReleased,1));
+	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m1->stat.number_of_LinphoneCallEnd,previous_count_1+1));
+	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m2->stat.number_of_LinphoneCallEnd,previous_count_2+1));
+	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m1->stat.number_of_LinphoneCallReleased,previous_count_1+1));
+	BC_ASSERT_TRUE(wait_for(m1->lc,m2->lc,&m2->stat.number_of_LinphoneCallReleased,previous_count_2+1));
 }
 
 void simple_call_base(bool_t enable_multicast_recv_side) {
-	int begin;
-	int leaked_objects;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	const LinphoneAddress *from;
 	LinphoneCall *pauline_call;
 	LinphoneProxyConfig* marie_cfg;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 
@@ -403,31 +502,109 @@ void simple_call_base(bool_t enable_multicast_recv_side) {
 		}
 	}
 
-
 	liblinphone_tester_check_rtcp(marie,pauline);
 	end_call(marie,pauline);
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(marie);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 }
 
-static void simple_call() {
+static void simple_call(void) {
 	simple_call_base(FALSE);
 }
 
+/*This test is added to reproduce a crash when a call is failed synchronously*/
+static void  simple_call_with_no_sip_transport(void){
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LCSipTransports tr={0};
+	LinphoneCall *call;
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	/*disable all transports so that the call will fail synchronously*/
+	linphone_core_set_sip_transports(marie->lc, &tr);
+
+	call = linphone_core_invite_address(marie->lc, pauline->identity);
+	BC_ASSERT_PTR_NULL(call);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(marie);
+}
+
+static void simple_call_with_udp(void) {
+	LinphoneCoreManager* michelle;
+	LinphoneCoreManager* laure;
+	const LinphoneAddress *from;
+	LinphoneCall *laure_call;
+	LinphoneProxyConfig* michelle_cfg;
+
+	michelle = linphone_core_manager_new( "michelle_rc_udp");
+	laure = linphone_core_manager_new("laure_rc_udp");
+
+	/* with the account manager, we might lose the identity */
+	michelle_cfg = linphone_core_get_default_proxy_config(michelle->lc);
+	{
+		LinphoneAddress* michelle_addr = linphone_address_clone(linphone_proxy_config_get_identity_address(michelle_cfg));
+		char* michelle_tmp_id = NULL;
+		linphone_address_set_display_name(michelle_addr, "Super michelle");
+		michelle_tmp_id = linphone_address_as_string(michelle_addr);
+
+		linphone_proxy_config_edit(michelle_cfg);
+		linphone_proxy_config_set_identity(michelle_cfg,michelle_tmp_id);
+		linphone_proxy_config_done(michelle_cfg);
+
+		ms_free(michelle_tmp_id);
+		linphone_address_destroy(michelle_addr);
+	}
+
+	BC_ASSERT_TRUE(call(michelle,laure));
+	laure_call=linphone_core_get_current_call(laure->lc);
+	BC_ASSERT_PTR_NOT_NULL(laure_call);
+	/*check that display name is correctly propagated in From */
+	if (laure_call){
+		from=linphone_call_get_remote_address(linphone_core_get_current_call(laure->lc));
+		BC_ASSERT_PTR_NOT_NULL(from);
+		if (from){
+			const char *dname=linphone_address_get_display_name(from);
+			BC_ASSERT_PTR_NOT_NULL(dname);
+			if (dname){
+				BC_ASSERT_STRING_EQUAL(dname, "Super michelle");
+			}
+		}
+	}
+
+	liblinphone_tester_check_rtcp(michelle,laure);
+	end_call(michelle,laure);
+	linphone_core_manager_destroy(laure);
+	linphone_core_manager_destroy(michelle);
+}
+
+static void automatic_call_termination(void) {
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+
+	if (!BC_ASSERT_TRUE(call(marie,pauline))) goto end;
+
+	liblinphone_tester_check_rtcp(marie,pauline);
+
+	linphone_core_destroy(pauline->lc);
+	pauline->lc = NULL;
+	/*marie shall receive the BYE*/
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(marie);
+}
+
 static void call_with_timeouted_bye(void) {
-	int begin;
-	int leaked_objects;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	belle_sip_timer_config_t timer_config;
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
 
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
@@ -440,7 +617,7 @@ static void call_with_timeouted_bye(void) {
 	timer_config.T3=0;
 	timer_config.T4=5000;
 
-	belle_sip_stack_set_timer_config(sal_get_belle_sip_stack(pauline->lc->sal),&timer_config);
+	belle_sip_stack_set_timer_config(sal_get_stack_impl(pauline->lc->sal),&timer_config);
 	linphone_core_terminate_all_calls(pauline->lc);
 
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
@@ -454,15 +631,9 @@ static void call_with_timeouted_bye(void) {
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 }
 
-static void direct_call_over_ipv6(){
+static void direct_call_over_ipv6(void){
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 
@@ -475,11 +646,7 @@ static void direct_call_over_ipv6(){
 		linphone_core_enable_ipv6(marie->lc,TRUE);
 		linphone_core_enable_ipv6(pauline->lc,TRUE);
 		linphone_core_set_default_proxy_config(marie->lc,NULL);
-		/*wait for register in v6 mode, however sip2.linphone.org has an ipv6 address but doesn't listen to it*/
-#if 0
-		BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 2, 2000));
-		BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &marie->stat.number_of_LinphoneRegistrationOk, 2, 2000));
-#endif
+		linphone_core_set_default_proxy_config(pauline->lc, NULL);
 
 		linphone_core_get_sip_transports_used(pauline->lc,&pauline_transports);
 		linphone_address_set_port(pauline_dest,pauline_transports.tcp_port);
@@ -499,18 +666,17 @@ static void direct_call_over_ipv6(){
 	}else ms_warning("Test skipped, no ipv6 available");
 }
 
-static void call_outbound_with_multiple_proxy() {
+static void call_outbound_with_multiple_proxy(void) {
 	LinphoneCoreManager* marie   = linphone_core_manager_new2( "marie_rc", FALSE);
 	LinphoneCoreManager* pauline = linphone_core_manager_new2( "pauline_tcp_rc", FALSE);
 
 	LinphoneProxyConfig* lpc = NULL;
-	LinphoneProxyConfig* registered_lpc = linphone_proxy_config_new();
+	LinphoneProxyConfig* registered_lpc = linphone_core_create_proxy_config(marie->lc);
 
-	linphone_core_get_default_proxy(marie->lc, &lpc);
+	lpc = linphone_core_get_default_proxy_config(marie->lc);
 	linphone_core_set_default_proxy(marie->lc,NULL);
 
-	BC_ASSERT_FATAL(lpc != NULL);
-	BC_ASSERT_FATAL(registered_lpc != NULL);
+	if (!BC_ASSERT_PTR_NOT_NULL(lpc) || !BC_ASSERT_PTR_NOT_NULL(registered_lpc)) return;
 
 	// create new LPC that will successfully register
 	linphone_proxy_config_set_identity(registered_lpc, linphone_proxy_config_get_identity(lpc));
@@ -519,27 +685,29 @@ static void call_outbound_with_multiple_proxy() {
 	linphone_proxy_config_enable_register(registered_lpc, TRUE);
 
 	linphone_core_add_proxy_config(marie->lc, registered_lpc);
+	linphone_proxy_config_unref(registered_lpc);
 
 	// set first LPC to unreacheable proxy addr
 	linphone_proxy_config_edit(lpc);
-	linphone_proxy_config_set_server_addr(lpc,"12.13.14.15:5223;transport=udp");
-	linphone_proxy_config_set_route(lpc, "12.13.14.15:5223;transport=udp;lr");
+	linphone_proxy_config_set_server_addr(lpc,"sip:linphone.org:9016;transport=udp");
+	linphone_proxy_config_set_route(lpc, "sip:linphone.org:9016;transport=udp;lr");
 	linphone_proxy_config_done(lpc);
 
-	BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 1, 2000));
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 1, 10000));
 
 	BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneRegistrationProgress, 2, 200));
-	BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneRegistrationOk, 1, 2000));
+	BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneRegistrationOk, 1, 10000));
 
 	// calling marie should go through the second proxy config
 	BC_ASSERT_TRUE(call(marie, pauline));
 
+	end_call(marie, pauline);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
 #if 0 /* TODO: activate test when the implementation is ready */
-static void multiple_answers_call() {
+static void multiple_answers_call(void) {
 	/* Scenario is this: pauline calls marie, which is registered 2 times.
 	   Both linphones answer at the same time, and only one should get the
 	   call running, the other should be terminated */
@@ -549,9 +717,9 @@ static void multiple_answers_call() {
 
 	LinphoneCall* call1, *call2;
 
-	MSList* lcs = ms_list_append(NULL,pauline->lc);
-	lcs = ms_list_append(lcs,marie1->lc);
-	lcs = ms_list_append(lcs,marie2->lc);
+	bctbx_list_t* lcs = bctbx_list_append(NULL,pauline->lc);
+	lcs = bctbx_list_append(lcs,marie1->lc);
+	lcs = bctbx_list_append(lcs,marie2->lc);
 
 
 	BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 1, 2000));
@@ -594,9 +762,9 @@ static void multiple_answers_call_with_media_relay(void) {
 
 	LinphoneCall* call1, *call2;
 
-	MSList* lcs = ms_list_append(NULL,pauline->lc);
-	lcs = ms_list_append(lcs,marie1->lc);
-	lcs = ms_list_append(lcs,marie2->lc);
+	bctbx_list_t* lcs = bctbx_list_append(NULL,pauline->lc);
+	lcs = bctbx_list_append(lcs,marie1->lc);
+	lcs = bctbx_list_append(lcs,marie2->lc);
 
 	linphone_core_set_user_agent(pauline->lc, "Natted Linphone", NULL);
 	linphone_core_set_user_agent(marie1->lc, "Natted Linphone", NULL);
@@ -614,20 +782,23 @@ static void multiple_answers_call_with_media_relay(void) {
 	call1 = linphone_core_get_current_call(marie1->lc);
 	call2 = linphone_core_get_current_call(marie2->lc);
 
-	BC_ASSERT_PTR_NOT_NULL_FATAL(call1);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(call2);
+	if (BC_ASSERT_PTR_NOT_NULL(call1) && BC_ASSERT_PTR_NOT_NULL(call2)) {
+		BC_ASSERT_EQUAL( linphone_core_accept_call(marie1->lc, call1), 0, int, "%d");
+		ms_sleep(1); /*sleep to make sure that the 200OK of marie1 reaches the server first*/
+		BC_ASSERT_EQUAL( linphone_core_accept_call(marie2->lc, call2), 0, int, "%d");
 
-	BC_ASSERT_EQUAL( linphone_core_accept_call(marie1->lc, call1), 0, int, "%d");
-	BC_ASSERT_EQUAL( linphone_core_accept_call(marie2->lc, call2), 0, int, "%d");
-
-	BC_ASSERT_TRUE( wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1, 2000) );
-	BC_ASSERT_TRUE( wait_for_list(lcs, &marie1->stat.number_of_LinphoneCallStreamsRunning, 1, 2000) );
-	BC_ASSERT_TRUE( wait_for_list(lcs, &marie2->stat.number_of_LinphoneCallEnd, 1, 2000) );
+		BC_ASSERT_TRUE( wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1, 2000) );
+		BC_ASSERT_TRUE( wait_for_list(lcs, &marie1->stat.number_of_LinphoneCallStreamsRunning, 1, 2000) );
+		/*the server will send a bye to marie2, as is 200Ok arrived second*/
+		BC_ASSERT_TRUE( wait_for_list(lcs, &marie2->stat.number_of_LinphoneCallEnd, 1, 4000) );
 
+		end_call(marie1, pauline);
+	}
 
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(marie1);
 	linphone_core_manager_destroy(marie2);
+	bctbx_list_free(lcs);
 }
 
 static void call_with_specified_codec_bitrate(void) {
@@ -640,7 +811,7 @@ static void call_with_specified_codec_bitrate(void) {
 	int max_bw=50;
 
 #ifdef __arm__
-	if (ms_get_cpu_count() <2) { /*2 opus codec channel + resampler is too much for a single core*/
+	if (ms_factory_get_cpu_count(marie->lc->factory) <2) { /*2 opus codec channel + resampler is too much for a single core*/
 #ifndef ANDROID
 		codec = "speex";
 		rate = 8000;
@@ -677,17 +848,56 @@ static void call_with_specified_codec_bitrate(void) {
 	/*wait a bit that bitstreams are stabilized*/
 	wait_for_until(marie->lc, pauline->lc, NULL, 0, 2000);
 
-	BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(marie), min_bw+5+min_bw*.1, int, "%i");
+	BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(marie), (int)(min_bw+5+min_bw*.1), int, "%i");
 	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(marie), 10, int, "%i"); /*check that at least something is received */
-	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(pauline), (max_bw-5-max_bw*.1), int, "%i");
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(pauline), (int)(max_bw-5-max_bw*.1), int, "%i");
+
+	end_call(pauline, marie);
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
+
+void disable_all_codecs(const bctbx_list_t* elem, LinphoneCoreManager* call){
+
+	PayloadType *pt;
+
+	for(;elem!=NULL;elem=elem->next){
+		pt=(PayloadType*)elem->data;
+		linphone_core_enable_payload_type(call->lc,pt,FALSE);
+	}
+}
+/***
+ Disable all audio codecs , sends an INVITE with RTP port 0 and payload 0.
+ Wait for SIP  488 unacceptable.
+ ***/
+static void call_with_no_audio_codec(void){
+
+	LinphoneCoreManager* callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* caller = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall* out_call ;
+
+	const bctbx_list_t* elem =linphone_core_get_audio_codecs(caller->lc);
+
+	disable_all_codecs(elem, caller);
+
+
+	out_call = linphone_core_invite_address(caller->lc,callee->identity);
+	linphone_call_ref(out_call);
+	BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallOutgoingInit, 1));
+
+
+	BC_ASSERT_TRUE(wait_for_until(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallError, 1, 6000));
+	BC_ASSERT_EQUAL(linphone_call_get_reason(out_call), LinphoneReasonNotAcceptable, int, "%d");
+	BC_ASSERT_EQUAL(callee->stat.number_of_LinphoneCallIncomingReceived, 0, int, "%d");
+
+	linphone_call_unref(out_call);
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+
+}
+
 static void simple_call_compatibility_mode(void) {
 	char route[256];
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
@@ -703,7 +913,7 @@ static void simple_call_compatibility_mode(void) {
 	char*tmp;
 	LCSipTransports transport;
 
-	linphone_core_get_default_proxy(lc_marie,&proxy);
+	proxy = linphone_core_get_default_proxy_config(lc_marie);
 	BC_ASSERT_PTR_NOT_NULL (proxy);
 	identity = linphone_proxy_config_get_identity_address(proxy);
 
@@ -745,9 +955,7 @@ static void simple_call_compatibility_mode(void) {
 		BC_ASSERT_TRUE(wait_for(lc_pauline,lc_marie,&stat_marie->number_of_LinphoneCallStreamsRunning,1));
 
 		wait_for(lc_pauline,lc_marie,&stat_marie->number_of_LinphoneCallStreamsRunning,3);
-		linphone_core_terminate_all_calls(lc_pauline);
-		BC_ASSERT_TRUE(wait_for(lc_pauline,lc_marie,&stat_pauline->number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(lc_pauline,lc_marie,&stat_marie->number_of_LinphoneCallEnd,1));
+		end_call(pauline, marie);
 	}
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -775,7 +983,7 @@ static void cancelled_call(void) {
 }
 
 void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate){
-	const MSList *elem=linphone_core_get_audio_codecs(lc);
+	const bctbx_list_t *elem=linphone_core_get_audio_codecs(lc);
 	PayloadType *pt;
 
 	for(;elem!=NULL;elem=elem->next){
@@ -783,24 +991,26 @@ void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int
 		linphone_core_enable_payload_type(lc,pt,FALSE);
 	}
 	pt=linphone_core_find_payload_type(lc,mime,rate,-1);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(pt);
-	linphone_core_enable_payload_type(lc,pt,TRUE);
+	if (BC_ASSERT_PTR_NOT_NULL(pt)) {
+		linphone_core_enable_payload_type(lc,pt,TRUE);
+	}
 }
 
-#ifdef VIDEO_ENABLED
 void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mime) {
-	const MSList *codecs = linphone_core_get_video_codecs(lc);
-	const MSList *it = NULL;
+#ifdef VIDEO_ENABLED
+	const bctbx_list_t *codecs = linphone_core_get_video_codecs(lc);
+	const bctbx_list_t *it = NULL;
 	PayloadType *pt = NULL;
 
 	for(it = codecs; it != NULL; it = it->next) {
 		linphone_core_enable_payload_type(lc, (PayloadType *)it->data, FALSE);
 	}
 	pt = linphone_core_find_payload_type(lc, mime, -1, -1);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(pt);
-	linphone_core_enable_payload_type(lc, pt, TRUE);
-}
+	if (BC_ASSERT_PTR_NOT_NULL(pt)) {
+		linphone_core_enable_payload_type(lc, pt, TRUE);
+	}
 #endif
+}
 
 static void call_with_dns_time_out(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new2( "empty_rc", FALSE);
@@ -884,7 +1094,7 @@ static void early_declined_call(void) {
 
 	BC_ASSERT_EQUAL(linphone_call_get_reason(out_call),LinphoneReasonBusy, int, "%d");
 	 */
-	if (ms_list_size(linphone_core_get_call_logs(pauline->lc))>0) {
+	if (bctbx_list_size(linphone_core_get_call_logs(pauline->lc))>0) {
 		BC_ASSERT_PTR_NOT_NULL(out_call_log=(LinphoneCallLog*)(linphone_core_get_call_logs(pauline->lc)->data));
 		BC_ASSERT_EQUAL(linphone_call_log_get_status(out_call_log),LinphoneCallAborted, int, "%d");
 	}
@@ -925,7 +1135,9 @@ static void call_declined(void) {
 		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallEnd,1, int, "%d");
 		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallEnd,1, int, "%d");
 		BC_ASSERT_EQUAL(linphone_call_get_reason(in_call),LinphoneReasonDeclined, int, "%d");
+		BC_ASSERT_EQUAL(linphone_call_log_get_status(linphone_call_get_call_log(in_call)),LinphoneCallDeclined, int, "%d");
 		BC_ASSERT_EQUAL(linphone_call_get_reason(out_call),LinphoneReasonDeclined, int, "%d");
+		BC_ASSERT_EQUAL(linphone_call_log_get_status(linphone_call_get_call_log(out_call)),LinphoneCallDeclined, int, "%d");
 		linphone_call_unref(in_call);
 	}
 	linphone_call_unref(out_call);
@@ -939,9 +1151,7 @@ static void call_terminated_by_caller(void) {
 
 	BC_ASSERT_TRUE(call(pauline,marie));
 
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	end_call(pauline, marie);
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -955,10 +1165,7 @@ static void call_with_no_sdp(void) {
 
 	BC_ASSERT_TRUE(call(marie,pauline));
 
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-
+	end_call(pauline, marie);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -983,70 +1190,30 @@ static void call_with_no_sdp_ack_without_sdp(void){
 	linphone_core_manager_destroy(pauline);
 }
 
-
-static bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee, LinphoneIceState state) {
-	LinphoneCall *c1,*c2;
-	bool_t audio_success=FALSE;
-	bool_t video_success=FALSE;
-	bool_t video_enabled;
-	MSTimeSpec ts;
-
-	c1=linphone_core_get_current_call(caller->lc);
-	c2=linphone_core_get_current_call(callee->lc);
-
+int check_nb_media_starts(LinphoneCoreManager *caller, LinphoneCoreManager *callee, unsigned int caller_nb_media_starts, unsigned int callee_nb_media_starts) {
+	int c1_ret = FALSE, c2_ret = FALSE;
+	LinphoneCall *c1 = linphone_core_get_current_call(caller->lc);
+	LinphoneCall *c2 = linphone_core_get_current_call(callee->lc);
 	BC_ASSERT_PTR_NOT_NULL(c1);
 	BC_ASSERT_PTR_NOT_NULL(c2);
 	if (!c1 || !c2) return FALSE;
-	linphone_call_ref(c1);
-	linphone_call_ref(c2);
-
-	BC_ASSERT_EQUAL(linphone_call_params_video_enabled(linphone_call_get_current_params(c1)),linphone_call_params_video_enabled(linphone_call_get_current_params(c2)), int, "%d");
-	video_enabled=linphone_call_params_video_enabled(linphone_call_get_current_params(c1));
-	liblinphone_tester_clock_start(&ts);
-	do{
-		if ((c1 != NULL) && (c2 != NULL)) {
-			if (linphone_call_get_audio_stats(c1)->ice_state==state &&
-				linphone_call_get_audio_stats(c2)->ice_state==state ){
-				audio_success=TRUE;
-				break;
-			}
-			linphone_core_iterate(caller->lc);
-			linphone_core_iterate(callee->lc);
-		}
-		ms_usleep(20000);
-	}while(!liblinphone_tester_clock_elapsed(&ts,10000));
-
-	if (video_enabled){
-		liblinphone_tester_clock_start(&ts);
-		do{
-			if ((c1 != NULL) && (c2 != NULL)) {
-				if (linphone_call_get_video_stats(c1)->ice_state==state &&
-					linphone_call_get_video_stats(c2)->ice_state==state ){
-					video_success=TRUE;
-					break;
-				}
-				linphone_core_iterate(caller->lc);
-				linphone_core_iterate(callee->lc);
-			}
-			ms_usleep(20000);
-		}while(!liblinphone_tester_clock_elapsed(&ts,10000));
-	}
-
-	 /*make sure encryption mode are preserved*/
+	
 	if (c1) {
-		const LinphoneCallParams* call_param = linphone_call_get_current_params(c1);
-		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc), int, "%d");
+		c1_ret = c1->nb_media_starts == caller_nb_media_starts;
+		BC_ASSERT_EQUAL(c1->nb_media_starts, caller_nb_media_starts, unsigned int, "%u");
 	}
 	if (c2) {
-		const LinphoneCallParams* call_param = linphone_call_get_current_params(c2);
-		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(callee->lc), int, "%d");
+		c2_ret = c2->nb_media_starts == callee_nb_media_starts;
+		BC_ASSERT_EQUAL(c2->nb_media_starts, callee_nb_media_starts, unsigned int, "%u");
 	}
-	linphone_call_unref(c1);
-	linphone_call_unref(c2);
-	return video_enabled ? audio_success && video_success : audio_success;
+	return c1_ret && c2_ret;
 }
 
-static void _call_with_ice_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t caller_with_ice, bool_t callee_with_ice, bool_t random_ports) {
+void _call_with_ice_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t caller_with_ice, bool_t callee_with_ice, bool_t random_ports, bool_t forced_relay) {
+
+	linphone_core_set_user_agent(pauline->lc, "Natted Linphone", NULL);
+	linphone_core_set_user_agent(marie->lc, "Natted Linphone", NULL);
+
 	if (callee_with_ice){
 		linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
 	}
@@ -1057,39 +1224,62 @@ static void _call_with_ice_base(LinphoneCoreManager* pauline,LinphoneCoreManager
 	if (random_ports){
 		linphone_core_set_audio_port(marie->lc,-1);
 		linphone_core_set_video_port(marie->lc,-1);
+		linphone_core_set_text_port(marie->lc, -1);
 		linphone_core_set_audio_port(pauline->lc,-1);
 		linphone_core_set_video_port(pauline->lc,-1);
+		linphone_core_set_text_port(pauline->lc, -1);
 	}
 
+	if (forced_relay == TRUE) {
+		linphone_core_enable_forced_ice_relay(marie->lc, TRUE);
+		linphone_core_enable_forced_ice_relay(pauline->lc, TRUE);
+	}
 
 	if (!BC_ASSERT_TRUE(call(pauline,marie)))
-		goto end;
+		return;
 
 	if (callee_with_ice && caller_with_ice) {
 		/*wait for the ICE reINVITE to complete*/
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
 
-		BC_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+		if (forced_relay == TRUE) {
+			BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateRelayConnection));
+		} else {
+			BC_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+		}
+		check_nb_media_starts(pauline, marie, 1, 1);
 	}
 
 	liblinphone_tester_check_rtcp(marie,pauline);
 	/*then close the call*/
-	linphone_core_terminate_all_calls(pauline->lc);
-end:
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-
+	end_call(pauline, marie);
 }
-static void _call_with_ice(bool_t caller_with_ice, bool_t callee_with_ice, bool_t random_ports) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	_call_with_ice_base(pauline,marie,caller_with_ice,callee_with_ice,random_ports);
+
+static void _call_with_ice(bool_t caller_with_ice, bool_t callee_with_ice, bool_t random_ports, bool_t forced_relay, bool_t ipv6) {
+	LinphoneCoreManager* marie = linphone_core_manager_new2("marie_rc", FALSE);
+	LinphoneCoreManager* pauline = linphone_core_manager_new2(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc", FALSE);
+	if (ipv6) {
+		linphone_core_enable_ipv6(marie->lc, TRUE);
+		linphone_core_enable_ipv6(pauline->lc, TRUE);
+	}
+	linphone_core_manager_start(marie, TRUE);
+	linphone_core_manager_start(pauline, TRUE);
+	_call_with_ice_base(pauline,marie,caller_with_ice,callee_with_ice,random_ports,forced_relay);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
+
 static void call_with_ice(void){
-	_call_with_ice(TRUE,TRUE,FALSE);
+	_call_with_ice(TRUE,TRUE,FALSE,FALSE,FALSE);
+}
+
+static void call_with_ice_ipv6(void) {
+	if (liblinphone_tester_ipv6_available()) {
+		_call_with_ice(TRUE, TRUE, FALSE, FALSE, TRUE);
+	} else {
+		ms_warning("Test skipped, no ipv6 available");
+	}
 }
 
 /*ICE is not expected to work in this case, however this should not crash*/
@@ -1103,24 +1293,74 @@ static void call_with_ice_no_sdp(void){
 
 	linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
 
-	call(pauline,marie);
+	BC_ASSERT_TRUE(call(pauline,marie));
 
 	liblinphone_tester_check_rtcp(marie,pauline);
 
+	end_call(pauline, marie);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
 static void call_with_ice_random_ports(void){
-	_call_with_ice(TRUE,TRUE,TRUE);
+	_call_with_ice(TRUE,TRUE,TRUE,FALSE,FALSE);
+}
+
+static void call_with_ice_forced_relay(void) {
+	_call_with_ice(TRUE, TRUE, TRUE, TRUE, FALSE);
 }
 
 static void ice_to_not_ice(void){
-	_call_with_ice(TRUE,FALSE,FALSE);
+	_call_with_ice(TRUE,FALSE,FALSE,FALSE,FALSE);
 }
 
 static void not_ice_to_ice(void){
-	_call_with_ice(FALSE,TRUE,FALSE);
+	_call_with_ice(FALSE,TRUE,FALSE,FALSE,FALSE);
+}
+
+static void ice_added_by_reinvite(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneNatPolicy *pol;
+	LinphoneCallParams *params;
+	LinphoneCall *c;
+	bool_t call_ok;
+	
+	lp_config_set_int(linphone_core_get_config(marie->lc), "net", "allow_late_ice", 1);
+	lp_config_set_int(linphone_core_get_config(pauline->lc), "net", "allow_late_ice", 1);
+	
+	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
+	if (!call_ok) goto end;
+	liblinphone_tester_check_rtcp(marie,pauline);
+	
+	/*enable ICE on both ends*/
+	pol = linphone_core_get_nat_policy(marie->lc);
+	linphone_nat_policy_enable_ice(pol, TRUE);
+	linphone_nat_policy_enable_stun(pol, TRUE);
+	linphone_core_set_nat_policy(marie->lc, pol);
+	
+	pol = linphone_core_get_nat_policy(pauline->lc);
+	linphone_nat_policy_enable_ice(pol, TRUE);
+	linphone_nat_policy_enable_stun(pol, TRUE);
+	linphone_core_set_nat_policy(pauline->lc, pol);
+	
+	c = linphone_core_get_current_call(marie->lc);
+	params = linphone_core_create_call_params(marie->lc, c);
+	linphone_core_update_call(marie->lc, c, params);
+	linphone_call_params_destroy(params);
+	
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallUpdatedByRemote,1));
+
+	/*wait for the ICE reINVITE*/
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,3));
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,3));
+	BC_ASSERT_TRUE(check_ice(marie, pauline, LinphoneIceStateHostConnection));
+	
+	end_call(pauline, marie);
+	
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
 }
 
 static void call_with_custom_headers(void) {
@@ -1143,12 +1383,12 @@ static void call_with_custom_headers(void) {
 	linphone_address_destroy(marie->identity);
 	marie->identity=marie_identity;
 
-	params=linphone_core_create_default_call_parameters(marie->lc);
+	params=linphone_core_create_call_params(marie->lc, NULL);
 	linphone_call_params_add_custom_header(params,"Weather","bad");
 	linphone_call_params_add_custom_header(params,"Working","yes");
 
-	BC_ASSERT_TRUE(call_with_caller_params(pauline,marie,params));
-	linphone_call_params_destroy(params);
+	if (!BC_ASSERT_TRUE(call_with_caller_params(pauline,marie,params))) goto end;
+	
 
 	call_marie=linphone_core_get_current_call(marie->lc);
 	call_pauline=linphone_core_get_current_call(pauline->lc);
@@ -1184,16 +1424,84 @@ static void call_with_custom_headers(void) {
 	ms_free(marie_remote_contact);
 	ms_free(marie_remote_contact_header);
 
+	end_call(pauline, marie);
+	
+end:
+	linphone_call_params_destroy(params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
 
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+static void call_with_custom_sdp_attributes_cb(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *message) {
+	if (cstate == LinphoneCallUpdatedByRemote) {
+		LinphoneCallParams *params;
+		const LinphoneCallParams *remote_params = linphone_call_get_remote_params(call);
+		const char *value = linphone_call_params_get_custom_sdp_attribute(remote_params, "weather");
+		BC_ASSERT_PTR_NOT_NULL(value);
+		if (value) BC_ASSERT_STRING_EQUAL(value, "sunny");
+		params = linphone_core_create_call_params(lc, call);
+		linphone_call_params_clear_custom_sdp_attributes(params);
+		linphone_call_params_clear_custom_sdp_media_attributes(params, LinphoneStreamTypeAudio);
+		linphone_call_params_add_custom_sdp_attribute(params, "working", "no");
+		BC_ASSERT_EQUAL(linphone_core_accept_call_update(lc, call, params), 0, int, "%i");
+		linphone_call_params_destroy(params);
+	}
+}
+
+static void call_with_custom_sdp_attributes(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall *call_marie, *call_pauline;
+	LinphoneCallParams *pauline_params;
+	const LinphoneCallParams *marie_remote_params;
+	const LinphoneCallParams *pauline_remote_params;
+	const char *value;
+	LinphoneCoreVTable *vtable;
+
+	pauline_params = linphone_core_create_call_params(pauline->lc, NULL);
+	linphone_call_params_add_custom_sdp_attribute(pauline_params, "weather", "bad");
+	linphone_call_params_add_custom_sdp_attribute(pauline_params, "working", "yes");
+	linphone_call_params_add_custom_sdp_media_attribute(pauline_params, LinphoneStreamTypeAudio, "sleeping", "almost");
+	BC_ASSERT_TRUE(call_with_caller_params(pauline, marie, pauline_params));
+	linphone_call_params_destroy(pauline_params);
+
+	call_marie = linphone_core_get_current_call(marie->lc);
+	call_pauline = linphone_core_get_current_call(pauline->lc);
+	BC_ASSERT_PTR_NOT_NULL(call_marie);
+	BC_ASSERT_PTR_NOT_NULL(call_pauline);
+
+	marie_remote_params = linphone_call_get_remote_params(call_marie);
+	value = linphone_call_params_get_custom_sdp_attribute(marie_remote_params, "weather");
+	BC_ASSERT_PTR_NOT_NULL(value);
+	if (value) BC_ASSERT_STRING_EQUAL(value, "bad");
+	value = linphone_call_params_get_custom_sdp_media_attribute(marie_remote_params, LinphoneStreamTypeAudio, "sleeping");
+	BC_ASSERT_PTR_NOT_NULL(value);
+	if (value) BC_ASSERT_STRING_EQUAL(value, "almost");
+
+	vtable = linphone_core_v_table_new();
+	vtable->call_state_changed = call_with_custom_sdp_attributes_cb;
+	linphone_core_add_listener(marie->lc, vtable);
+	pauline_params = linphone_core_create_call_params(pauline->lc, call_pauline);
+	linphone_call_params_clear_custom_sdp_attributes(pauline_params);
+	linphone_call_params_clear_custom_sdp_media_attributes(pauline_params, LinphoneStreamTypeAudio);
+	linphone_call_params_add_custom_sdp_attribute(pauline_params, "weather", "sunny");
+	linphone_core_update_call(pauline->lc, call_pauline, pauline_params);
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallUpdating, 1));
+	linphone_call_params_destroy(pauline_params);
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+	pauline_remote_params = linphone_call_get_remote_params(call_pauline);
+	value = linphone_call_params_get_custom_sdp_attribute(pauline_remote_params, "working");
+	BC_ASSERT_PTR_NOT_NULL(value);
+	if (value) BC_ASSERT_STRING_EQUAL(value, "no");
+
+	end_call(pauline, marie);
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-void call_paused_resumed_base(bool_t multicast) {
+void call_paused_resumed_base(bool_t multicast, bool_t with_losses) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCall* call_pauline;
@@ -1210,8 +1518,18 @@ void call_paused_resumed_base(bool_t multicast) {
 
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 3000);
 
+	if (with_losses) {
+		sal_set_send_error(marie->lc->sal,1500); /*to trash 200ok without generating error*/
+	}
 	linphone_core_pause_call(pauline->lc,call_pauline);
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausing,1));
+
+	if (with_losses) {
+		BC_ASSERT_FALSE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,1,1000));
+		sal_set_send_error(marie->lc->sal,0); /*to trash 200ok without generating error*/
+	}
+
+
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1));
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,1));
 
@@ -1226,31 +1544,50 @@ void call_paused_resumed_base(bool_t multicast) {
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 5000);
 
 	/*since RTCP streams are reset when call is paused/resumed, there should be no loss at all*/
-	stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
-	BC_ASSERT_EQUAL(stats->cum_packet_loss, 0, int, "%d");
+	if (BC_ASSERT_PTR_NOT_NULL(call_pauline->sessions->rtp_session)) {
+		stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
+		BC_ASSERT_EQUAL((int)stats->cum_packet_loss, 0, int, "%d");
+	}
 
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	if (with_losses) {
+		/* now we want to loose the ack*/
+		linphone_core_pause_call(pauline->lc,call_pauline);
+		sal_set_send_error(pauline->lc->sal,1500); /*to trash ACK without generating error*/
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausing,2));
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,2));
+		BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,2,1000));
+		/*now try to resume, it should be OK*/
+		sal_set_send_error(pauline->lc->sal,0);
+		linphone_core_resume_call(pauline->lc,call_pauline);
+		BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,3,2000));
+		BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,3,2000));
+	}
 
+
+	end_call(pauline, marie);
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
+
 static void call_paused_resumed(void) {
-	call_paused_resumed_base(FALSE);
+	call_paused_resumed_base(FALSE,FALSE);
 }
 
-static void call_paused_by_both() {
+static void call_paused_resumed_with_sip_packets_losses(void) {
+	call_paused_resumed_base(FALSE,TRUE);
+}
+
+static void call_paused_by_both(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCall* call_pauline, *call_marie;
 	const rtp_stats_t * stats;
-	MSList *lcs = NULL;
+	bctbx_list_t *lcs = NULL;
 	bool_t call_ok;
 
-	lcs = ms_list_append(lcs, pauline->lc);
-	lcs = ms_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+	lcs = bctbx_list_append(lcs, marie->lc);
 	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
 
 	if (!call_ok) goto end;
@@ -1272,14 +1609,13 @@ static void call_paused_by_both() {
 	linphone_core_pause_call(marie->lc, call_marie);
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausing,1));
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPaused,1));
-	
+
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
 	/*pauline must stay in paused state*/
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallPaused, 1, int, "%i");
 	check_media_direction(pauline, call_pauline, lcs, LinphoneMediaDirectionInactive, LinphoneMediaDirectionInvalid);
 	check_media_direction(marie, call_marie, lcs, LinphoneMediaDirectionInactive, LinphoneMediaDirectionInvalid);
-	
-	
+
 	/*now pauline wants to resume*/
 	linphone_core_resume_call(pauline->lc, call_pauline);
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallResuming,1));
@@ -1287,7 +1623,7 @@ static void call_paused_by_both() {
 	/*Marie must stay in paused state*/
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallPaused, 1, int, "%i");
-	
+
 	/*now marie wants to resume also*/
 	linphone_core_resume_call(marie->lc, call_marie);
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallResuming,1));
@@ -1298,14 +1634,14 @@ static void call_paused_by_both() {
 
 	/*since RTCP streams are reset when call is paused/resumed, there should be no loss at all*/
 	stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
-	BC_ASSERT_EQUAL(stats->cum_packet_loss, 0, int, "%d");
+	BC_ASSERT_EQUAL((int)stats->cum_packet_loss, 0, int, "%d");
 
 	end_call(marie, pauline);
 
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 #define CHECK_CURRENT_LOSS_RATE() \
@@ -1314,8 +1650,8 @@ end:
 	BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &pauline->stat.number_of_rtcp_sent, rtcp_count_current+1, 10000)); \
 	stats = rtp_session_get_stats(call_pauline->audiostream->ms.sessions.rtp_session); \
 	loss_percentage = stats->cum_packet_loss * 100.f / (stats->packet_recv + stats->cum_packet_loss); \
-	BC_ASSERT_LOWER(.75 * params.loss_rate , loss_percentage, float, "%f"); \
-	BC_ASSERT_LOWER(loss_percentage , 1.25 * params.loss_rate, float, "%f")
+	BC_ASSERT_GREATER(loss_percentage, .75f * params.loss_rate, float, "%f"); \
+	BC_ASSERT_LOWER(loss_percentage , 1.25f * params.loss_rate, float, "%f")
 
 static void call_paused_resumed_with_loss(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
@@ -1335,7 +1671,7 @@ static void call_paused_resumed_with_loss(void) {
 		rtp_session_enable_network_simulation(call_pauline->audiostream->ms.sessions.rtp_session,&params);
 
 		/*generate some traffic*/
-		wait_for_until(pauline->lc, marie->lc, NULL, 5, 6000);
+		wait_for_until(pauline->lc, marie->lc, NULL, 5, 10000);
 		CHECK_CURRENT_LOSS_RATE();
 
 		/*pause call*/
@@ -1344,21 +1680,19 @@ static void call_paused_resumed_with_loss(void) {
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1));
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,1));
 		/*stay in pause a little while in order to generate traffic*/
-		wait_for_until(pauline->lc, marie->lc, NULL, 5, 5000);
+		wait_for_until(pauline->lc, marie->lc, NULL, 5, 10000);
 		CHECK_CURRENT_LOSS_RATE();
 
 		/*resume*/
 		linphone_core_resume_call(pauline->lc,call_pauline);
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
-		wait_for_until(pauline->lc, marie->lc, NULL, 5, 6000);
+		wait_for_until(pauline->lc, marie->lc, NULL, 5, 10000);
 
 		/*since stats are NOT totally reset during pause, the stats->packet_recv is computed from
 		the start of call. This test ensures that the loss rate is consistent during the entire call.*/
 		CHECK_CURRENT_LOSS_RATE();
-		linphone_core_terminate_all_calls(marie->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(marie, pauline);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -1377,7 +1711,7 @@ bool_t pause_call_1(LinphoneCoreManager* mgr_1,LinphoneCall* call_1,LinphoneCore
 	return linphone_call_get_state(call_1) == LinphoneCallPaused && linphone_call_get_state(call_2)==LinphoneCallPausedByRemote;
 }
 #if 0
-void concurrent_paused_resumed_base() {
+void concurrent_paused_resumed_base(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCall* call_pauline,call_marie;
@@ -1448,11 +1782,9 @@ static void call_paused_resumed_from_callee(void) {
 
 	/*since RTCP streams are reset when call is paused/resumed, there should be no loss at all*/
 	stats = rtp_session_get_stats(call_marie->sessions->rtp_session);
-	BC_ASSERT_EQUAL(stats->cum_packet_loss, 0, int, "%d");
+	BC_ASSERT_EQUAL((int)stats->cum_packet_loss, 0, int, "%d");
 
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	end_call(pauline, marie);
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -1482,620 +1814,6 @@ static void audio_call_with_ice_no_matching_audio_codecs(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
-#ifdef VIDEO_ENABLED
-static LinphoneCall* setup_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t change_video_policy) {
-	LinphoneVideoPolicy  caller_policy;
-	LinphoneCallParams* callee_params;
-	LinphoneCall* call_obj;
-
-	if (!linphone_core_get_current_call(callee->lc) || linphone_call_get_state(linphone_core_get_current_call(callee->lc)) != LinphoneCallStreamsRunning
-			|| !linphone_core_get_current_call(caller->lc) || linphone_call_get_state(linphone_core_get_current_call(caller->lc)) != LinphoneCallStreamsRunning ) {
-		ms_warning("bad state for adding video");
-		return NULL;
-	}
-
-	if (change_video_policy) {
-		caller_policy.automatically_accept=TRUE;
-		caller_policy.automatically_initiate=TRUE;
-		linphone_core_set_video_policy(caller->lc,&caller_policy);
-	}
-	linphone_core_enable_video_capture(callee->lc, TRUE);
-	linphone_core_enable_video_display(callee->lc, TRUE);
-	linphone_core_enable_video_capture(caller->lc, TRUE);
-	linphone_core_enable_video_display(caller->lc, FALSE);
-
-	if ((call_obj = linphone_core_get_current_call(callee->lc))) {
-		callee_params = linphone_call_params_copy(linphone_call_get_current_params(call_obj));
-		/*add video*/
-		linphone_call_params_enable_video(callee_params,TRUE);
-		linphone_core_update_call(callee->lc,call_obj,callee_params);
-	}
-	return call_obj;
-}
-
-bool_t add_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t change_video_policy) {
-	stats initial_caller_stat=caller->stat;
-	stats initial_callee_stat=callee->stat;
-	const LinphoneVideoPolicy *video_policy;
-	LinphoneCall *call_obj;
-	if ((call_obj=setup_video(caller, callee, change_video_policy))){
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallUpdatedByRemote,initial_caller_stat.number_of_LinphoneCallUpdatedByRemote+1));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning+1));
-
-		video_policy = linphone_core_get_video_policy(caller->lc);
-		if (video_policy->automatically_accept) {
-			BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
-			BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
-		} else {
-			BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
-			BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
-		}
-		if (linphone_core_get_media_encryption(caller->lc) != LinphoneMediaEncryptionNone
-				&& linphone_core_get_media_encryption(callee->lc) != LinphoneMediaEncryptionNone) {
-			const LinphoneCallParams* call_param;
-
-			switch (linphone_core_get_media_encryption(caller->lc)) {
-			case LinphoneMediaEncryptionZRTP:
-			case LinphoneMediaEncryptionDTLS:
-				/*wait for encryption to be on, in case of zrtp/dtls, it can take a few seconds*/
-				wait_for(callee->lc,caller->lc,&caller->stat.number_of_LinphoneCallEncryptedOn,initial_caller_stat.number_of_LinphoneCallEncryptedOn+1);
-			break;
-			case LinphoneMediaEncryptionNone:
-			case LinphoneMediaEncryptionSRTP:
-				break;
-			}
-			switch (linphone_core_get_media_encryption(callee->lc)) {
-			case LinphoneMediaEncryptionZRTP:
-			case LinphoneMediaEncryptionDTLS:
-				wait_for(callee->lc,caller->lc,&callee->stat.number_of_LinphoneCallEncryptedOn,initial_callee_stat.number_of_LinphoneCallEncryptedOn+1);
-			break;
-			case LinphoneMediaEncryptionNone:
-			case LinphoneMediaEncryptionSRTP:
-				break;
-			}
-
-			call_param = linphone_call_get_current_params(linphone_core_get_current_call(callee->lc));
-			BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc), int, "%d");
-			call_param = linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
-			BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc), int, "%d");
-
-		}
-
-		if (video_policy->automatically_accept) {
-			linphone_call_set_next_video_frame_decoded_callback(call_obj,linphone_call_iframe_decoded_cb,callee->lc);
-			/*send vfu*/
-			linphone_call_send_vfu_request(call_obj);
-			return wait_for(caller->lc,callee->lc,&callee->stat.number_of_IframeDecoded,initial_callee_stat.number_of_IframeDecoded+1);
-		} else {
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static bool_t remove_video(LinphoneCoreManager *caller, LinphoneCoreManager *callee) {
-	LinphoneCallParams *callee_params;
-	LinphoneCall *call_obj;
-	stats initial_caller_stat = caller->stat;
-	stats initial_callee_stat = callee->stat;
-
-	if (!linphone_core_get_current_call(callee->lc)
-		|| (linphone_call_get_state(linphone_core_get_current_call(callee->lc)) != LinphoneCallStreamsRunning)
-		|| !linphone_core_get_current_call(caller->lc)
-		|| (linphone_call_get_state(linphone_core_get_current_call(caller->lc)) != LinphoneCallStreamsRunning)) {
-		ms_warning("bad state for removing video");
-		return FALSE;
-	}
-
-	if ((call_obj = linphone_core_get_current_call(callee->lc))) {
-		callee_params = linphone_call_params_copy(linphone_call_get_current_params(call_obj));
-
-		/* Remove video. */
-		linphone_call_params_enable_video(callee_params, FALSE);
-		linphone_core_update_call(callee->lc, call_obj, callee_params);
-
-		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallUpdatedByRemote, initial_caller_stat.number_of_LinphoneCallUpdatedByRemote + 1));
-		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &callee->stat.number_of_LinphoneCallUpdating, initial_callee_stat.number_of_LinphoneCallUpdating + 1));
-		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &callee->stat.number_of_LinphoneCallStreamsRunning, initial_callee_stat.number_of_LinphoneCallStreamsRunning + 1));
-		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallStreamsRunning, initial_caller_stat.number_of_LinphoneCallStreamsRunning + 1));
-
-		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
-		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
-
-		return TRUE;
-	}
-	return FALSE;
-}
-
-static void call_with_video_added(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	bool_t call_ok;
-
-	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
-	if (!call_ok) goto end;
-
-	BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-
-end:
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void call_with_video_added_2(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	bool_t call_ok;
-	/*in this variant marie is already in automatically accept*/
-	LinphoneVideoPolicy  marie_policy;
-	marie_policy.automatically_accept=TRUE;
-
-
-	linphone_core_set_video_policy(marie->lc,&marie_policy);
-	linphone_core_enable_video_capture(marie->lc, TRUE);
-	linphone_core_enable_video_display(marie->lc, FALSE);
-
-	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
-	if (!call_ok) goto end;
-
-	BC_ASSERT_TRUE(add_video(marie,pauline, TRUE));
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-end:
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void call_with_video_added_random_ports(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	bool_t call_ok;
-
-	linphone_core_set_audio_port(marie->lc,-1);
-	linphone_core_set_video_port(marie->lc,-1);
-	linphone_core_set_audio_port(pauline->lc,-1);
-	linphone_core_set_video_port(pauline->lc,-1);
-
-	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
-	if (!call_ok) goto end;
-
-	BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-end:
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void call_with_several_video_switches(void) {
-	int dummy = 0;
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	bool_t call_ok;
-	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
-
-	if (!call_ok) goto end;
-
-	BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
-	wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
-	BC_ASSERT_TRUE(remove_video(pauline,marie));
-	BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
-	wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
-	BC_ASSERT_TRUE(remove_video(pauline,marie));
-	/**/
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-end:
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void srtp_call_with_several_video_switches(void) {
-	int dummy = 0;
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	bool_t call_ok;
-
-	if (linphone_core_media_encryption_supported(marie->lc, LinphoneMediaEncryptionSRTP)) {
-		linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionSRTP);
-		linphone_core_set_media_encryption(pauline->lc, LinphoneMediaEncryptionSRTP);
-
-		BC_ASSERT_TRUE(call_ok=call(pauline,marie));
-		if (!call_ok) goto end;
-
-		BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
-		wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
-		BC_ASSERT_TRUE(remove_video(pauline,marie));
-		BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
-		wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
-		BC_ASSERT_TRUE(remove_video(pauline,marie));
-		/**/
-		linphone_core_terminate_all_calls(pauline->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-	} else {
-		ms_warning("Not tested because SRTP is not available.");
-	}
-end:
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void call_with_declined_video_base(bool_t using_policy) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	LinphoneCall* marie_call;
-	LinphoneCall* pauline_call;
-	LinphoneVideoPolicy marie_policy, pauline_policy;
-	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
-	bool_t call_ok;
-
-	linphone_core_enable_video_capture(marie->lc, TRUE);
-	linphone_core_enable_video_display(marie->lc, TRUE);
-	linphone_core_enable_video_capture(pauline->lc, TRUE);
-	linphone_core_enable_video_display(pauline->lc, FALSE);
-
-	if (using_policy) {
-		pauline_policy.automatically_initiate=TRUE;
-		pauline_policy.automatically_accept=FALSE;
-		marie_policy.automatically_initiate=FALSE;
-		marie_policy.automatically_accept=FALSE;
-
-		linphone_core_set_video_policy(marie->lc,&marie_policy);
-		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
-	}
-
-	caller_test_params.base=linphone_core_create_default_call_parameters(pauline->lc);
-	if (!using_policy)
-		linphone_call_params_enable_video(caller_test_params.base,TRUE);
-
-	if (!using_policy){
-		callee_test_params.base=linphone_core_create_default_call_parameters(marie->lc);
-		linphone_call_params_enable_video(callee_test_params.base,FALSE);
-	}
-
-	BC_ASSERT_TRUE((call_ok=call_with_params2(pauline,marie,&caller_test_params,&callee_test_params,using_policy)));
-	if (!call_ok) goto end;
-
-	linphone_call_params_destroy(caller_test_params.base);
-	if (callee_test_params.base) linphone_call_params_destroy(callee_test_params.base);
-	marie_call=linphone_core_get_current_call(marie->lc);
-	pauline_call=linphone_core_get_current_call(pauline->lc);
-
-	BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(marie_call)));
-	BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(pauline_call)));
-
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-
-end:
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-static void call_with_declined_video(void) {
-	call_with_declined_video_base(FALSE);
-}
-static void call_with_declined_video_using_policy(void) {
-	call_with_declined_video_base(TRUE);
-}
-
-void video_call_base_2(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) {
-	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
-	LinphoneCall* marie_call;
-	LinphoneCall* pauline_call;
-	LinphoneVideoPolicy marie_policy, pauline_policy;
-
-	linphone_core_enable_video_capture(marie->lc, TRUE);
-	linphone_core_enable_video_display(marie->lc, TRUE);
-	linphone_core_enable_video_capture(pauline->lc, TRUE);
-	linphone_core_enable_video_display(pauline->lc, FALSE);
-
-	if (using_policy) {
-		marie_policy.automatically_initiate=FALSE;
-		marie_policy.automatically_accept=TRUE;
-		pauline_policy.automatically_initiate=TRUE;
-		pauline_policy.automatically_accept=FALSE;
-
-		linphone_core_set_video_policy(marie->lc,&marie_policy);
-		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
-	}
-	if (callee_video_enabled) {
-		linphone_core_enable_video_display(marie->lc, TRUE);
-		linphone_core_enable_video_capture(marie->lc, TRUE);
-	} else {
-		linphone_core_enable_video_display(marie->lc, FALSE);
-		linphone_core_enable_video_capture(marie->lc, FALSE);
-	}
-	if (caller_video_enabled) {
-		linphone_core_enable_video_display(pauline->lc, TRUE);
-		linphone_core_enable_video_capture(pauline->lc, TRUE);
-	} else {
-		linphone_core_enable_video_display(pauline->lc, FALSE);
-		linphone_core_enable_video_capture(pauline->lc, FALSE);
-	}
-
-	if (mode==LinphoneMediaEncryptionDTLS) { /* for DTLS we must access certificates or at least have a directory to store them */
-		marie->lc->user_certificates_path = bc_tester_file("certificates-marie");
-		pauline->lc->user_certificates_path = bc_tester_file("certificates-pauline");
-		belle_sip_mkdir(marie->lc->user_certificates_path);
-		belle_sip_mkdir(pauline->lc->user_certificates_path);
-	}
-
-	linphone_core_set_media_encryption(marie->lc,mode);
-	linphone_core_set_media_encryption(pauline->lc,mode);
-
-	caller_test_params.base=linphone_core_create_default_call_parameters(pauline->lc);
-	if (!using_policy)
-		linphone_call_params_enable_video(caller_test_params.base,TRUE);
-
-	if (!using_policy){
-		callee_test_params.base=linphone_core_create_default_call_parameters(marie->lc);
-		linphone_call_params_enable_video(callee_test_params.base,TRUE);
-	}
-
-	BC_ASSERT_TRUE(call_with_params2(pauline,marie,&caller_test_params,&callee_test_params,using_policy));
-	marie_call=linphone_core_get_current_call(marie->lc);
-	pauline_call=linphone_core_get_current_call(pauline->lc);
-
-	linphone_call_params_destroy(caller_test_params.base);
-	if (callee_test_params.base) linphone_call_params_destroy(callee_test_params.base);
-
-	if (marie_call && pauline_call ) {
-		if (callee_video_enabled && caller_video_enabled) {
-			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(marie_call)));
-			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(pauline_call)));
-
-			/*check video path*/
-			linphone_call_set_next_video_frame_decoded_callback(marie_call,linphone_call_iframe_decoded_cb,marie->lc);
-			linphone_call_send_vfu_request(marie_call);
-			BC_ASSERT_TRUE( wait_for(marie->lc,pauline->lc,&marie->stat.number_of_IframeDecoded,1));
-		} else {
-			BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(marie_call)));
-			BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(pauline_call)));
-		}
-
-		liblinphone_tester_check_rtcp(marie,pauline);
-
-	}
-
-}
-static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) {
-	video_call_base_2(pauline,marie,using_policy,mode,callee_video_enabled,caller_video_enabled);
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-}
-static void video_call(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void video_call_zrtp(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionZRTP)) {
-		video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionZRTP,TRUE,TRUE);
-	} else
-		ms_message("Skipping video_call_zrtp");
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void video_call_dtls(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	if (linphone_core_media_encryption_supported(pauline->lc,LinphoneMediaEncryptionDTLS)) {
-		video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionDTLS,TRUE,TRUE);
-	} else
-		ms_message("Skipping video_call_dtls");
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-
-}
-
-static void video_call_using_policy(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,TRUE,TRUE);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void video_call_using_policy_with_callee_video_disabled(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,FALSE,TRUE);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void video_call_using_policy_with_caller_video_disabled(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,TRUE,FALSE);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void video_call_no_sdp(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	linphone_core_enable_sdp_200_ack(pauline->lc,TRUE);
-	video_call_base(pauline,marie,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void call_with_ice_video_to_novideo(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	LinphoneVideoPolicy vpol={0};
-	vpol.automatically_initiate=TRUE;
-	linphone_core_set_video_policy(pauline->lc,&vpol);
-	vpol.automatically_initiate=FALSE;
-	linphone_core_set_video_policy(marie->lc,&vpol);
-	_call_with_ice_base(pauline,marie,TRUE,TRUE,TRUE);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void _call_with_ice_video(LinphoneVideoPolicy caller_policy, LinphoneVideoPolicy callee_policy,
-	bool_t video_added_by_caller, bool_t video_added_by_callee, bool_t video_removed_by_caller, bool_t video_removed_by_callee) {
-	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	bool_t call_ok;
-
-	linphone_core_set_video_policy(pauline->lc, &caller_policy);
-	linphone_core_set_video_policy(marie->lc, &callee_policy);
-	linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
-	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
-
-	linphone_core_set_audio_port(marie->lc, -1);
-	linphone_core_set_video_port(marie->lc, -1);
-	linphone_core_set_audio_port(pauline->lc, -1);
-	linphone_core_set_video_port(pauline->lc, -1);
-
-	BC_ASSERT_TRUE(call_ok = call(pauline, marie));
-	if (!call_ok) goto end;
-	BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection));
-
-	/* Wait for ICE reINVITEs to complete. */
-	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2)
-		&& wait_for(pauline->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
-
-	if (video_added_by_caller) {
-		BC_ASSERT_TRUE(add_video(marie, pauline, FALSE));
-	} else if (video_added_by_callee) {
-		BC_ASSERT_TRUE(add_video(pauline, marie, FALSE));
-	}
-	if (video_added_by_caller || video_added_by_callee) {
-		BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection));
-	}
-
-	if (video_removed_by_caller) {
-		BC_ASSERT_TRUE(remove_video(marie, pauline));
-	} else if (video_removed_by_callee) {
-		BC_ASSERT_TRUE(remove_video(pauline, marie));
-	}
-	if (video_removed_by_caller || video_removed_by_callee) {
-		BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection));
-	}
-
-end:
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void call_with_ice_video_added(void) {
-	LinphoneVideoPolicy vpol = { TRUE, TRUE };
-	_call_with_ice_video(vpol, vpol, TRUE, FALSE, TRUE, FALSE);
-}
-
-static void call_with_ice_video_added_2(void) {
-	LinphoneVideoPolicy vpol = { TRUE, TRUE };
-	_call_with_ice_video(vpol, vpol, TRUE, FALSE, FALSE, TRUE);
-}
-
-static void call_with_ice_video_added_3(void) {
-	LinphoneVideoPolicy vpol = { TRUE, TRUE };
-	_call_with_ice_video(vpol, vpol, FALSE, TRUE, TRUE, FALSE);
-}
-
-static void call_with_ice_video_added_and_refused(void) {
-	LinphoneVideoPolicy caller_policy = { TRUE, TRUE };
-	LinphoneVideoPolicy callee_policy = { FALSE, FALSE };
-	_call_with_ice_video(caller_policy, callee_policy, TRUE, FALSE, FALSE, FALSE);
-}
-
-
-static void video_call_with_early_media_no_matching_audio_codecs(void) {
-	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	LinphoneCall *out_call, *pauline_call;
-	LinphoneVideoPolicy vpol={0};
-
-	linphone_core_enable_video_capture(marie->lc, TRUE);
-	linphone_core_enable_video_display(marie->lc, TRUE);
-	linphone_core_enable_video_capture(pauline->lc, TRUE);
-	linphone_core_enable_video_display(pauline->lc, FALSE);
-
-	vpol.automatically_initiate=TRUE;
-	vpol.automatically_accept=TRUE;
-	linphone_core_set_video_policy(pauline->lc,&vpol);
-	linphone_core_set_video_policy(marie->lc,&vpol);
-
-	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMU", 8000, 1), FALSE); /* Disable PCMU */
-	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMA", 8000, 1), TRUE); /* Enable PCMA */
-
-	out_call = linphone_core_invite_address(marie->lc, pauline->identity);
-	linphone_call_ref(out_call);
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingInit, 1));
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1));
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1));
-
-	pauline_call = linphone_core_get_current_call(pauline->lc);
-	if (!pauline_call) goto end;
-
-	linphone_core_accept_early_media(pauline->lc, pauline_call);
-
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingEarlyMedia, 1));
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia, 1));
-	/*audio stream shall not have been requested to start*/
-	BC_ASSERT_PTR_NULL(pauline_call->audiostream->soundread);
-
-	BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(out_call)));
-	BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(pauline_call)));
-
-	linphone_core_accept_call(pauline->lc, pauline_call);
-
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
-
-	linphone_core_terminate_call(marie->lc, out_call);
-
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
-	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
-
-end:
-	linphone_call_unref(out_call);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void video_call_limited_bandwidth(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-
-	linphone_core_set_download_bandwidth(pauline->lc, 100);
-	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
-
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-#endif /*VIDEO_ENABLED*/
-
 static void _call_with_media_relay(bool_t random_ports) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
@@ -2116,13 +1834,10 @@ static void _call_with_media_relay(bool_t random_ports) {
 	liblinphone_tester_check_rtcp(pauline,marie);
 
 #ifdef VIDEO_ENABLED
-	BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
+	BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
 	liblinphone_tester_check_rtcp(pauline,marie);
 #endif
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	end_call(pauline, marie);
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2142,7 +1857,7 @@ static void call_with_privacy(void) {
 	LinphoneCall *c1,*c2;
 	LinphoneCallParams *params;
 	LinphoneProxyConfig* pauline_proxy;
-	params=linphone_core_create_default_call_parameters(pauline->lc);
+	params=linphone_core_create_call_params(pauline->lc, NULL);
 	linphone_call_params_set_privacy(params,LinphonePrivacyId);
 
 	BC_ASSERT_TRUE(call_with_caller_params(pauline,marie,params));
@@ -2163,13 +1878,10 @@ static void call_with_privacy(void) {
 		BC_ASSERT_EQUAL(linphone_call_params_get_privacy(linphone_call_get_current_params(c2)),LinphonePrivacyId, int, "%d");
 	}
 
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	end_call(pauline, marie);
 
 	/*test proxy config privacy*/
-	linphone_core_get_default_proxy(pauline->lc,&pauline_proxy);
+	pauline_proxy = linphone_core_get_default_proxy_config(pauline->lc);
 	linphone_proxy_config_set_privacy(pauline_proxy,LinphonePrivacyId);
 
 	BC_ASSERT_TRUE(call(pauline,marie));
@@ -2187,9 +1899,7 @@ static void call_with_privacy(void) {
 		BC_ASSERT_EQUAL(linphone_call_params_get_privacy(linphone_call_get_current_params(c2)),LinphonePrivacyId, int, "%d");
 	}
 
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,2));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,2));
+	end_call(pauline, marie);
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2202,10 +1912,10 @@ static void call_with_privacy2(void) {
 	LinphoneCall *c1,*c2;
 	LinphoneCallParams *params;
 	LinphoneProxyConfig* pauline_proxy;
-	params=linphone_core_create_default_call_parameters(pauline->lc);
+	params=linphone_core_create_call_params(pauline->lc, NULL);
 	linphone_call_params_set_privacy(params,LinphonePrivacyId);
 
-	linphone_core_get_default_proxy(pauline->lc,&pauline_proxy);
+	pauline_proxy = linphone_core_get_default_proxy_config(pauline->lc);
 	linphone_proxy_config_edit(pauline_proxy);
 	linphone_proxy_config_enable_register(pauline_proxy,FALSE);
 	linphone_proxy_config_done(pauline_proxy);
@@ -2228,10 +1938,7 @@ static void call_with_privacy2(void) {
 		BC_ASSERT_EQUAL(linphone_call_params_get_privacy(linphone_call_get_current_params(c2)),LinphonePrivacyId, int, "%d");
 	}
 
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	end_call(pauline, marie);
 
 	/*test proxy config privacy*/
 	linphone_proxy_config_set_privacy(pauline_proxy,LinphonePrivacyId);
@@ -2248,60 +1955,45 @@ static void call_with_privacy2(void) {
 		BC_ASSERT_FALSE(linphone_address_weak_equal(linphone_call_get_remote_address(c2),pauline->identity));
 		BC_ASSERT_EQUAL(linphone_call_params_get_privacy(linphone_call_get_current_params(c2)),LinphonePrivacyId, int, "%d");
 	}
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,2));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,2));
+	end_call(marie, pauline);
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-static void srtp_call() {
+static void srtp_call(void) {
 	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 
-static void zrtp_call() {
+static void zrtp_call(void) {
 	call_base(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 
-static void zrtp_sas_call() {
+static void zrtp_sas_call(void) {
 	call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_b256_rc", "pauline_zrtp_b256_rc");
 	call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_b256_rc", "pauline_tcp_rc");
 }
 
-static void zrtp_cipher_call() {
+static void zrtp_cipher_call(void) {
 	call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_srtpsuite_aes256_rc", "pauline_zrtp_srtpsuite_aes256_rc");
 	call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_aes256_rc", "pauline_zrtp_aes256_rc");
 	call_base_with_configfile(LinphoneMediaEncryptionZRTP,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE, "marie_zrtp_aes256_rc", "pauline_tcp_rc");
 }
 
-static void zrtp_video_call() {
-	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE);
-}
 
-static void dtls_srtp_call() {
+
+static void dtls_srtp_call(void) {
 	call_base(LinphoneMediaEncryptionDTLS,FALSE,FALSE,LinphonePolicyNoFirewall,FALSE);
 }
 
-static void dtls_srtp_call_with_media_realy() {
+static void dtls_srtp_call_with_media_realy(void) {
 	call_base(LinphoneMediaEncryptionDTLS,FALSE,TRUE,LinphonePolicyNoFirewall,FALSE);
 }
 
-static void dtls_srtp_ice_call() {
+static void dtls_srtp_ice_call(void) {
 	call_base(LinphoneMediaEncryptionDTLS,FALSE,FALSE,LinphonePolicyUseIce,FALSE);
 }
-#ifdef VIDEO_ENABLED
-static void dtls_srtp_video_call() {
-	call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE);
-}
 
-static void dtls_srtp_ice_video_call() {
-	call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
-}
-static void dtls_srtp_ice_video_call_with_relay() {
-	call_base(LinphoneMediaEncryptionDTLS,TRUE,TRUE,LinphonePolicyUseIce,FALSE);
-}
-#endif
 static void call_with_declined_srtp(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
@@ -2310,9 +2002,7 @@ static void call_with_declined_srtp(void) {
 
 		BC_ASSERT_TRUE(call(pauline,marie));
 
-		linphone_core_terminate_all_calls(marie->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(marie, pauline);
 	} else {
 		ms_warning ("not tested because srtp not available");
 	}
@@ -2357,9 +2047,7 @@ static void call_srtp_paused_and_resumed(void) {
 	params = linphone_call_get_current_params(linphone_core_get_current_call(marie->lc));
 	BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(params) , LinphoneMediaEncryptionSRTP, int, "%d");
 
-	linphone_core_terminate_all_calls(marie->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	end_call(pauline, marie);
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -2375,7 +2063,7 @@ static void call_with_file_player(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphonePlayer *player;
 	char *hellopath = bc_tester_res("sounds/ahbahouaismaisbon.wav");
-	char *recordpath = create_filepath(bc_tester_get_writable_dir_prefix(), "record-call_with_file_player", "wav");
+	char *recordpath = bc_tester_file("record-call_with_file_player.wav");
 	bool_t call_ok;
 	int attempts;
 	double similar=1;
@@ -2413,7 +2101,7 @@ static void call_with_file_player(void) {
 		end_call(marie, pauline);
 		/*cannot run on iphone simulator because locks main loop beyond permitted time (should run
 		on another thread) */
-		BC_ASSERT_EQUAL(ms_audio_diff(hellopath,recordpath,&similar,audio_cmp_max_shift,NULL,NULL), 0, int, "%d");
+		BC_ASSERT_EQUAL(ms_audio_diff(hellopath,recordpath,&similar,&audio_cmp_params,NULL,NULL), 0, int, "%d");
 		if (similar>=threshold)
 			break;
 	}
@@ -2430,14 +2118,6 @@ end:
 	ms_free(hellopath);
 }
 
-static bool_t is_format_supported(LinphoneCore *lc, const char *fmt){
-	const char **formats=linphone_core_get_supported_file_formats(lc);
-	for(;*formats!=NULL;++formats){
-		if (strcasecmp(*formats,fmt)==0) return TRUE;
-	}
-	return FALSE;
-}
-
 static void call_with_mkv_file_player(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
@@ -2447,18 +2127,18 @@ static void call_with_mkv_file_player(void) {
 	char *recordpath;
 	bool_t call_ok;
 #if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR && !defined(ANDROID)
-	double similar;
+	double similar=0.0;
 	const double threshold = 0.9;
 #define DO_AUDIO_CMP
 #endif
 	hellowav = bc_tester_res("sounds/hello8000_mkv_ref.wav");
 	hellomkv = bc_tester_res("sounds/hello8000.mkv");
 
-	if (!is_format_supported(marie->lc,"mkv")){
+	if (!linphone_core_file_format_supported(marie->lc,"mkv")){
 		ms_warning("Test skipped, no mkv support.");
 		goto end;
 	}
-	recordpath = create_filepath(bc_tester_get_writable_dir_prefix(), "record-call_with_mkv_file_player", "wav");
+	recordpath = bc_tester_file("record-call_with_mkv_file_player.wav");
 	/*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/
 	unlink(recordpath);
 
@@ -2477,8 +2157,10 @@ static void call_with_mkv_file_player(void) {
 	BC_ASSERT_PTR_NOT_NULL(player);
 	if (player){
 		int res = linphone_player_open(player,hellomkv,on_eof,marie);
-		if(!ms_filter_codec_supported("opus")) {
+		//if(!ms_filter_codec_supported("opus")) {
+		if(!ms_factory_codec_supported(marie->lc->factory, "opus") && !ms_factory_codec_supported(pauline->lc->factory, "opus")){
 			BC_ASSERT_EQUAL(res, -1, int, "%d");
+			end_call(marie, pauline);
 			goto end;
 		}
 		BC_ASSERT_EQUAL(res, 0, int, "%d");
@@ -2490,7 +2172,7 @@ static void call_with_mkv_file_player(void) {
 	}
 	end_call(marie, pauline);
 #ifdef DO_AUDIO_CMP
-	BC_ASSERT_EQUAL(ms_audio_diff(hellowav,recordpath,&similar,audio_cmp_max_shift,NULL,NULL),0,int,"%d");
+	BC_ASSERT_EQUAL(ms_audio_diff(hellowav,recordpath,&similar,&audio_cmp_params,NULL,NULL),0,int,"%d");
 	BC_ASSERT_GREATER(similar,threshold,double,"%f");
 	BC_ASSERT_LOWER(similar,1.0,double,"%f");
 	if(similar>threshold && similar<=1.0) {
@@ -2514,6 +2196,15 @@ void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video
 	LinphoneCoreManager* pauline = linphone_core_manager_new(pauline_rc);
 	bool_t call_ok;
 
+	// important: VP8 has really poor performances with the mire camera, at least
+	// on iOS - so when ever h264 is available, let's use it instead
+	if (linphone_core_find_payload_type(pauline->lc,"h264", -1, -1)!=NULL) {
+		disable_all_video_codecs_except_one(pauline->lc,"h264");
+		disable_all_video_codecs_except_one(marie->lc,"h264");
+	}
+	linphone_core_set_video_device(pauline->lc,liblinphone_tester_mire_id);
+	linphone_core_set_video_device(marie->lc,liblinphone_tester_mire_id);
+
 	if (enable_relay) {
 		linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 		linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
@@ -2521,8 +2212,8 @@ void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video
 	if (enable_tunnel) {
 		int i;
 		LinphoneTunnelConfig * tunnel_config = linphone_tunnel_config_new();
-		linphone_tunnel_config_set_host(tunnel_config,"tunnel.linphone.org");
-		linphone_tunnel_config_set_port(tunnel_config,443);
+		linphone_tunnel_config_set_host(tunnel_config, "tunnel.linphone.org");
+		linphone_tunnel_config_set_port(tunnel_config, 443);
 		linphone_tunnel_add_server(linphone_core_get_tunnel(marie->lc),tunnel_config);
 		linphone_tunnel_enable_sip(linphone_core_get_tunnel(marie->lc),FALSE);
 		linphone_tunnel_set_mode(linphone_core_get_tunnel(marie->lc),LinphoneTunnelModeEnable);
@@ -2534,14 +2225,19 @@ void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video
 			ms_usleep(20000);
 		}
 		BC_ASSERT_TRUE(linphone_tunnel_connected(linphone_core_get_tunnel(marie->lc)));
-
+		linphone_tunnel_config_unref(tunnel_config);
 	}
+
 	if (linphone_core_media_encryption_supported(marie->lc,mode)) {
 		linphone_core_set_media_encryption(marie->lc,mode);
 		linphone_core_set_media_encryption(pauline->lc,mode);
 		if (mode==LinphoneMediaEncryptionDTLS) { /* for DTLS we must access certificates or at least have a directory to store them */
-			marie->lc->user_certificates_path = bc_tester_file("certificates-marie");
-			pauline->lc->user_certificates_path = bc_tester_file("certificates-pauline");
+			char *path = bc_tester_file("certificates-marie");
+			marie->lc->user_certificates_path = ms_strdup(path);
+			bc_free(path);
+			path = bc_tester_file("certificates-pauline");
+			pauline->lc->user_certificates_path = ms_strdup(path);
+			bc_free(path);
 			belle_sip_mkdir(marie->lc->user_certificates_path);
 			belle_sip_mkdir(pauline->lc->user_certificates_path);
 		}
@@ -2551,14 +2247,25 @@ void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video
 
 		BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
 		if (!call_ok) goto end;
-		if (linphone_core_get_media_encryption(pauline->lc) == LinphoneMediaEncryptionZRTP
-			&& linphone_core_get_media_encryption(pauline->lc) == LinphoneMediaEncryptionZRTP) {
+		/* if caller set ZRTP or (callee set ZRTP and caller has no encryption requested), ZRTP shall take place, wait for the SAS */
+		if ((linphone_core_get_media_encryption(pauline->lc) == LinphoneMediaEncryptionZRTP)
+			|| ((linphone_core_get_media_encryption(marie->lc) == LinphoneMediaEncryptionZRTP) && (linphone_core_get_media_encryption(pauline->lc) == LinphoneMediaEncryptionNone))) {
 			/*wait for SAS*/
 			int i;
 			for (i=0;i<100;i++) {
-				if (linphone_call_get_authentication_token(linphone_core_get_current_call(pauline->lc))
+				LinphoneCall *pauline_call = linphone_core_get_current_call(pauline->lc);
+				LinphoneCall *marie_call = linphone_core_get_current_call(marie->lc);
+
+				if (!pauline_call || !marie_call){
+					/*if one of the two calls was disapeering, don't crash, but report it*/
+					BC_ASSERT_PTR_NOT_NULL(pauline_call);
+					BC_ASSERT_PTR_NOT_NULL(marie_call);
+					break;
+				}
+
+				if (linphone_call_get_authentication_token(pauline_call)
 					&&
-					linphone_call_get_authentication_token(linphone_core_get_current_call(marie->lc))) {
+					linphone_call_get_authentication_token(marie_call)) {
 					/*check SAS*/
 					BC_ASSERT_STRING_EQUAL(linphone_call_get_authentication_token(linphone_core_get_current_call(pauline->lc))
 								,linphone_call_get_authentication_token(linphone_core_get_current_call(marie->lc)));
@@ -2569,7 +2276,6 @@ void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video
 				linphone_core_iterate(pauline->lc);
 				ms_usleep(20000);
 			}
-
 		}
 
 		if (policy == LinphonePolicyUseIce){
@@ -2579,24 +2285,19 @@ void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video
 #ifdef VIDEO_ENABLED
 		if (enable_video) {
 			if (linphone_core_video_supported(marie->lc)) {
-				add_video(pauline,marie, TRUE);
-				if (policy == LinphonePolicyUseIce)
-					BC_ASSERT_TRUE(check_ice(pauline,marie,enable_tunnel?LinphoneIceStateReflexiveConnection:LinphoneIceStateHostConnection));
-
+				BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
+				if (policy == LinphonePolicyUseIce){
+					BC_ASSERT_TRUE(check_ice(pauline, marie, enable_tunnel ? LinphoneIceStateReflexiveConnection
+																		   : LinphoneIceStateHostConnection));
+				}
 				liblinphone_tester_check_rtcp(marie,pauline);
-				/*wait for ice to found the direct path*/
-				BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_IframeDecoded,1));
+
 			} else {
 				ms_warning ("not tested because video not available");
 			}
 		}
 #endif
-
-
-
-		linphone_core_terminate_all_calls(marie->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(marie, pauline);
 	} else {
 		ms_warning ("not tested because %s not available", linphone_media_encryption_to_string(mode));
 	}
@@ -2609,15 +2310,6 @@ void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_r
 	call_base_with_configfile(mode, enable_video, enable_relay, policy, enable_tunnel, "marie_rc", "pauline_tcp_rc");
 }
 
-#ifdef VIDEO_ENABLED
-static void srtp_video_ice_call(void) {
-	call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
-}
-static void zrtp_video_ice_call(void) {
-	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
-}
-#endif
-
 static void srtp_ice_call(void) {
 	call_base(LinphoneMediaEncryptionSRTP,FALSE,FALSE,LinphonePolicyUseIce,FALSE);
 }
@@ -2636,9 +2328,11 @@ static void dtls_ice_call_with_relay(void) {
 static void early_media_call(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_early_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bool_t call_ok;
 
-	BC_ASSERT_TRUE(call(pauline,marie));
+	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
 
+	if (!call_ok) goto end;
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallIncomingEarlyMedia,1, int, "%d");
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1, int, "%d");
 
@@ -2647,13 +2341,46 @@ static void early_media_call(void) {
 	/*added because a bug related to early-media caused the Connected state to be reached two times*/
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallConnected,1, int, "%d");
 
+	end_call(pauline, marie);
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
 
-	linphone_core_terminate_all_calls(marie->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+static void early_media_call_with_ice(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_early_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall *marie_call;
+	bctbx_list_t *lcs = NULL;
 
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
 
+	/*in this test, pauline has ICE activated, marie not, but marie proposes early media.
+	 * We want to check that ICE processing is not disturbing early media*/
+	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
 
+	linphone_core_invite_address(pauline->lc, marie->identity);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallIncomingReceived,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallIncomingEarlyMedia,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,1000));
+
+	wait_for_until(pauline->lc,marie->lc,NULL,0,1000);
+
+	marie_call = linphone_core_get_current_call(marie->lc);
+
+	if (!marie_call) goto end;
+
+	linphone_core_accept_call(marie->lc, marie_call);
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallConnected,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallConnected,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallStreamsRunning,1,3000));
+
+	end_call(marie, pauline);
+end:
+	bctbx_list_free(lcs);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -2661,15 +2388,15 @@ static void early_media_call(void) {
 static void early_media_call_with_ringing(void){
 	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
-	MSList* lcs = NULL;
+	bctbx_list_t* lcs = NULL;
 	LinphoneCall* marie_call;
 	LinphoneCallLog *marie_call_log;
 	uint64_t connected_time=0;
 	uint64_t ended_time=0;
 	int dummy=0;
 
-	lcs = ms_list_append(lcs,marie->lc);
-	lcs = ms_list_append(lcs,pauline->lc);
+	lcs = bctbx_list_append(lcs,marie->lc);
+	lcs = bctbx_list_append(lcs,pauline->lc);
 	/*
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
@@ -2703,13 +2430,10 @@ static void early_media_call_with_ringing(void){
 		/*just to have a call duration !=0*/
 		wait_for_list(lcs,&dummy,1,2000);
 
-		linphone_core_terminate_all_calls(pauline->lc);
-
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+		end_call(pauline, marie);
 		ended_time=ms_get_cur_time_ms();
 		BC_ASSERT_LOWER( labs((long)((linphone_call_log_get_duration(marie_call_log)*1000) - (int64_t)(ended_time - connected_time))), 1000, long, "%ld");
-		ms_list_free(lcs);
+		bctbx_list_free(lcs);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -2719,12 +2443,12 @@ static void early_media_call_with_ringing(void){
 static void early_media_call_with_update_base(bool_t media_change){
 	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	MSList* lcs = NULL;
+	bctbx_list_t* lcs = NULL;
 	LinphoneCall *marie_call, *pauline_call;
 	LinphoneCallParams *pauline_params;
 
-	lcs = ms_list_append(lcs,marie->lc);
-	lcs = ms_list_append(lcs,pauline->lc);
+	lcs = bctbx_list_append(lcs,marie->lc);
+	lcs = bctbx_list_append(lcs,pauline->lc);
 	if (media_change) {
 		disable_all_audio_codecs_except_one(marie->lc,"pcmu",-1);
 		disable_all_audio_codecs_except_one(pauline->lc,"pcmu",-1);
@@ -2756,6 +2480,7 @@ static void early_media_call_with_update_base(bool_t media_change){
 
 	linphone_call_params_set_session_name(pauline_params,UPDATED_SESSION_NAME);
 	linphone_core_update_call(pauline->lc, pauline_call, pauline_params);
+	linphone_call_params_destroy(pauline_params);
 	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallEarlyUpdating,1,2000));
 	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallEarlyUpdatedByRemote,1,2000));
 	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,2000));
@@ -2776,14 +2501,11 @@ static void early_media_call_with_update_base(bool_t media_change){
 
 	liblinphone_tester_check_rtcp(marie, pauline);
 
-	linphone_core_terminate_all_calls(pauline->lc);
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+	end_call(pauline, marie);
 
 end:
 
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -2825,11 +2547,7 @@ static void call_established_with_rejected_info(void) {
 
 		check_call_state(pauline,LinphoneCallStreamsRunning);
 		check_call_state(marie,LinphoneCallStreamsRunning);
-
-
-		linphone_core_terminate_all_calls(pauline->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(pauline, marie);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -2906,11 +2624,7 @@ static void call_established_with_complex_rejected_operation(void) {
 		BC_ASSERT_EQUAL(linphone_call_get_reason(linphone_core_get_current_call(pauline->lc)),LinphoneReasonTemporarilyUnavailable, int, "%d");
 		BC_ASSERT_EQUAL(linphone_call_get_reason(linphone_core_get_current_call(pauline->lc)),LinphoneReasonTemporarilyUnavailable, int, "%d");
 
-
-
-		linphone_core_terminate_all_calls(pauline->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(pauline, marie);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -2958,11 +2672,7 @@ static void call_established_with_rejected_info_during_reinvite(void) {
 
 
 		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
-
-
-		linphone_core_terminate_all_calls(pauline->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(pauline, marie);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -2993,11 +2703,7 @@ static void call_established_with_rejected_reinvite(void) {
 		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallStreamsRunning,1, int, "%d");
 		check_call_state(pauline,LinphoneCallStreamsRunning);
 		check_call_state(marie,LinphoneCallStreamsRunning);
-
-
-		linphone_core_terminate_all_calls(pauline->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(pauline, marie);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -3032,11 +2738,7 @@ static void call_established_with_rejected_incoming_reinvite(void) {
 		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallStreamsRunning,1, int, "%d");
 		check_call_state(pauline,LinphoneCallStreamsRunning);
 		check_call_state(marie,LinphoneCallStreamsRunning);
-
-
-		linphone_core_terminate_all_calls(pauline->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(pauline, marie);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -3046,14 +2748,14 @@ static void call_established_with_rejected_incoming_reinvite(void) {
 static void call_redirect(void){
 	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	LinphoneCoreManager* laure   = linphone_core_manager_new("laure_rc");
-	MSList* lcs = NULL;
-	char *margaux_url = NULL;
+	LinphoneCoreManager* laure   = linphone_core_manager_new("laure_rc_udp");
+	bctbx_list_t* lcs = NULL;
+	char *laure_url = NULL;
 	LinphoneCall* marie_call;
 
-	lcs = ms_list_append(lcs,marie->lc);
-	lcs = ms_list_append(lcs,pauline->lc);
-	lcs = ms_list_append(lcs,laure->lc);
+	lcs = bctbx_list_append(lcs,marie->lc);
+	lcs = bctbx_list_append(lcs,pauline->lc);
+	lcs = bctbx_list_append(lcs,laure->lc);
 	/*
 		Marie calls Pauline, which will redirect the call to Laure via a 302
 	*/
@@ -3063,33 +2765,30 @@ static void call_redirect(void){
 	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,6000));
 
 	if (linphone_core_get_current_call(pauline->lc)){
-		margaux_url = linphone_address_as_string(laure->identity);
-		linphone_core_redirect_call(pauline->lc, linphone_core_get_current_call(pauline->lc), margaux_url);
-		ms_free(margaux_url);
+		laure_url = linphone_address_as_string(laure->identity);
+		linphone_core_redirect_call(pauline->lc, linphone_core_get_current_call(pauline->lc), laure_url);
+		ms_free(laure_url);
 
 		/* laure should be ringing now */
 		BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallIncomingReceived,1,6000));
 		/* pauline should have ended the call */
 		BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallEnd,1,1000));
 		/* the call should still be ringing on marie's side */
-		BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1,1000));
+		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallOutgoingRinging, 1, int, "%i");
 
 		linphone_core_accept_call(laure->lc, linphone_core_get_current_call(laure->lc));
 
-		BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
-		BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallStreamsRunning, 1,1000));
+		BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1,5000));
+		BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallStreamsRunning, 1,5000));
 
 		BC_ASSERT_PTR_EQUAL(marie_call, linphone_core_get_current_call(marie->lc));
 
 		liblinphone_tester_check_rtcp(marie, laure);
 
-		linphone_core_terminate_all_calls(laure->lc);
-
-		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,5000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,5000));
+		end_call(laure, marie);
 	}
 
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -3135,10 +2834,7 @@ static void call_established_with_rejected_reinvite_with_error_base(bool_t trans
 		if (!trans_pending)
 			sal_enable_unconditional_answer(marie->lc->sal,FALSE);
 
-
-		linphone_core_terminate_all_calls(pauline->lc);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+		end_call(pauline, marie);
 	}
 
 	linphone_core_manager_destroy(marie);
@@ -3159,6 +2855,7 @@ static void call_rejected_because_wrong_credentials_with_params(const char* user
 	LinphoneAuthInfo* wrong_auth_info=linphone_auth_info_clone(good_auth_info);
 	bool_t result=FALSE;
 	linphone_auth_info_set_passwd(wrong_auth_info,"passecretdutout");
+	linphone_auth_info_set_ha1(wrong_auth_info, NULL);
 	linphone_core_clear_all_auth_info(marie->lc);
 
 	if (user_agent) {
@@ -3190,133 +2887,46 @@ static void call_rejected_because_wrong_credentials_with_params(const char* user
 	linphone_core_manager_destroy(marie);
 }
 
-static void call_rejected_because_wrong_credentials() {
+static void call_rejected_because_wrong_credentials(void) {
 	call_rejected_because_wrong_credentials_with_params(NULL,TRUE);
 }
 
-static void call_rejected_without_403_because_wrong_credentials() {
+static void call_rejected_without_403_because_wrong_credentials(void) {
 	call_rejected_because_wrong_credentials_with_params("tester-no-403",TRUE);
 }
 
-static void call_rejected_without_403_because_wrong_credentials_no_auth_req_cb() {
+static void call_rejected_without_403_because_wrong_credentials_no_auth_req_cb(void) {
 	call_rejected_because_wrong_credentials_with_params("tester-no-403",FALSE);
 }
 
-#ifdef VIDEO_ENABLED
-/*this is call forking with early media managed at client side (not by flexisip server)*/
-static void multiple_early_media(void) {
-	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
-	LinphoneCoreManager* marie1 = linphone_core_manager_new("marie_early_rc");
-	LinphoneCoreManager* marie2 = linphone_core_manager_new("marie_early_rc");
-	MSList *lcs=NULL;
-	LinphoneCallParams *params=linphone_core_create_default_call_parameters(pauline->lc);
-	LinphoneVideoPolicy pol;
-	LinphoneCall *marie1_call;
-	LinphoneCall *marie2_call;
-	LinphoneCall *pauline_call;
-	LinphoneInfoMessage *info;
-	int dummy=0;
-	pol.automatically_accept=1;
-	pol.automatically_initiate=1;
-
-	linphone_core_enable_video(pauline->lc,TRUE,TRUE);
-
-	linphone_core_enable_video(marie1->lc,TRUE,TRUE);
-	linphone_core_set_video_policy(marie1->lc,&pol);
-
-	linphone_core_enable_video(marie2->lc,TRUE,TRUE);
-	linphone_core_set_video_policy(marie2->lc,&pol);
-	linphone_core_set_audio_port_range(marie2->lc,40200,40300);
-	linphone_core_set_video_port_range(marie2->lc,40400,40500);
-
-	lcs=ms_list_append(lcs,marie1->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-
-	linphone_call_params_enable_early_media_sending(params,TRUE);
-	linphone_call_params_enable_video(params,TRUE);
-
-	linphone_core_invite_address_with_params(pauline->lc,marie1->identity,params);
-	linphone_call_params_destroy(params);
-
-	BC_ASSERT_TRUE(wait_for_list(lcs, &marie1->stat.number_of_LinphoneCallIncomingEarlyMedia,1,3000));
-	BC_ASSERT_TRUE(wait_for_list(lcs, &marie2->stat.number_of_LinphoneCallIncomingEarlyMedia,1,3000));
-	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,3000));
-
-	pauline_call=linphone_core_get_current_call(pauline->lc);
-	marie1_call=linphone_core_get_current_call(marie1->lc);
-	marie2_call=linphone_core_get_current_call(marie2->lc);
-
-	BC_ASSERT_PTR_NOT_NULL(pauline_call);
-	BC_ASSERT_PTR_NOT_NULL(marie1_call);
-	BC_ASSERT_PTR_NOT_NULL(marie2_call);
-
-	if (pauline_call && marie1_call && marie2_call){
-
-		/*wait a bit that streams are established*/
-		wait_for_list(lcs,&dummy,1,6000);
-		BC_ASSERT_GREATER(linphone_core_manager_get_max_audio_down_bw(pauline),70,int,"%i");
-		BC_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>70);
-		BC_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth>70);
-
-		linphone_core_accept_call(marie1->lc,linphone_core_get_current_call(marie1->lc));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallStreamsRunning,1,3000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,3000));
-
-		/*marie2 should get her call terminated*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallEnd,1,1000));
-
-		/*wait a bit that streams are established*/
-		wait_for_list(lcs,&dummy,1,3000);
-		BC_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth>71);
-		BC_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth>71);
-
-		/*send an INFO in reverse side to check that dialogs are properly established*/
-		info=linphone_core_create_info_message(marie1->lc);
-		linphone_call_send_info_message(marie1_call,info);
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_inforeceived,1,3000));
-	}
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,3000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallEnd,1,3000));
-
-	ms_list_free(lcs);
-	linphone_core_manager_destroy(marie1);
-	linphone_core_manager_destroy(marie2);
-	linphone_core_manager_destroy(pauline);
-}
-#endif
-
-void check_media_direction(LinphoneCoreManager* mgr, LinphoneCall *call, MSList* lcs,LinphoneMediaDirection audio_dir, LinphoneMediaDirection video_dir) {
+void check_media_direction(LinphoneCoreManager* mgr, LinphoneCall *call, bctbx_list_t* lcs,LinphoneMediaDirection audio_dir, LinphoneMediaDirection video_dir) {
 	BC_ASSERT_PTR_NOT_NULL(call);
 	if  (call) {
-		const LinphoneCallParams *params = linphone_call_get_current_params(call);
+		const LinphoneCallParams *params;
+		wait_for_list(lcs,NULL,0,5000); /*on some device, it may take 3 to 4s to get audio from mic*/
+		params = linphone_call_get_current_params(call);
 #ifdef VIDEO_ENABLED
 		if (video_dir != LinphoneMediaDirectionInvalid){
 			int current_recv_iframe = mgr->stat.number_of_IframeDecoded;
 			int expected_recv_iframe=0;
-			int dummy = 0;
 
 			if (video_dir != LinphoneMediaDirectionInactive){
 				BC_ASSERT_TRUE(linphone_call_params_video_enabled(params));
+				BC_ASSERT_EQUAL(linphone_call_params_get_video_direction(params), video_dir, int, "%d");
+				linphone_call_set_next_video_frame_decoded_callback(call,linphone_call_iframe_decoded_cb,mgr->lc);
+				linphone_call_send_vfu_request(call);
 			}
-			BC_ASSERT_EQUAL(linphone_call_params_get_video_direction(params), video_dir, int, "%d");
-			linphone_call_set_next_video_frame_decoded_callback(call,linphone_call_iframe_decoded_cb,mgr->lc);
-			linphone_call_send_vfu_request(call);
-
-
-			wait_for_list(lcs,&dummy,1,2000); /*on some device, it may take 3 to 4s to get audio from mic*/
 
 			switch (video_dir) {
 			case LinphoneMediaDirectionInactive:
-				BC_ASSERT_TRUE(linphone_call_get_video_stats(call)->upload_bandwidth<5);
+				BC_ASSERT_LOWER((int)linphone_call_get_video_stats(call)->upload_bandwidth, 5, int, "%i");
+				break;
 			case LinphoneMediaDirectionSendOnly:
 				expected_recv_iframe = 0;
-				BC_ASSERT_TRUE(linphone_call_get_video_stats(call)->download_bandwidth<5);
+				BC_ASSERT_LOWER((int)linphone_call_get_video_stats(call)->download_bandwidth, 5, int, "%i");
 				break;
 			case LinphoneMediaDirectionRecvOnly:
-				BC_ASSERT_TRUE(linphone_call_get_video_stats(call)->upload_bandwidth<5);
+				BC_ASSERT_LOWER((int)linphone_call_get_video_stats(call)->upload_bandwidth, 5, int, "%i");
 			case LinphoneMediaDirectionSendRecv:
 				expected_recv_iframe = 1;
 				break;
@@ -3331,16 +2941,18 @@ void check_media_direction(LinphoneCoreManager* mgr, LinphoneCall *call, MSList*
 			BC_ASSERT_EQUAL(linphone_call_params_get_audio_direction(params), audio_dir, int, "%d");
 			switch (audio_dir) {
 				case LinphoneMediaDirectionInactive:
-					BC_ASSERT_TRUE(linphone_call_get_audio_stats(call)->upload_bandwidth<5);
+					BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_up_bw(mgr), 5, int, "%i");
+					BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(mgr), 5, int, "%i");
+					break;
 				case LinphoneMediaDirectionSendOnly:
-					BC_ASSERT_TRUE(linphone_call_get_video_stats(call)->download_bandwidth<5);
-					if (audio_dir == LinphoneMediaDirectionSendOnly) BC_ASSERT_TRUE(wait_for_list(lcs,mgr->stat.current_audio_upload_bandwidth,70,4000));
+					BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_up_bw(mgr), 70, int, "%i");
 					break;
 				case LinphoneMediaDirectionRecvOnly:
-					BC_ASSERT_TRUE(linphone_call_get_audio_stats(call)->upload_bandwidth<5);
+					BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_up_bw(mgr), 5, int, "%i");
+					break;
 				case LinphoneMediaDirectionSendRecv:
-					BC_ASSERT_TRUE(wait_for_list(lcs,mgr->stat.current_audio_download_bandwidth,70,4000));
-					if (audio_dir == LinphoneMediaDirectionSendRecv) BC_ASSERT_TRUE(wait_for_list(lcs,mgr->stat.current_audio_upload_bandwidth,70,4000));
+					BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(mgr), 70, int, "%i");
+					BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_up_bw(mgr), 70, int, "%i");
 					break;
 				default:
 					break;
@@ -3349,143 +2961,8 @@ void check_media_direction(LinphoneCoreManager* mgr, LinphoneCall *call, MSList*
 	}
 
 }
-#ifdef VIDEO_ENABLED
-static void accept_call_in_send_only_base(LinphoneCoreManager* pauline, LinphoneCoreManager *marie, MSList *lcs) {
-#define DEFAULT_WAIT_FOR 10000
-	LinphoneCallParams *params;
-	LinphoneVideoPolicy pol;
-	LinphoneCall *call;
-	pol.automatically_accept=1;
-	pol.automatically_initiate=1;
 
-	linphone_core_enable_video(pauline->lc,TRUE,TRUE);
-	linphone_core_set_video_policy(pauline->lc,&pol);
-	linphone_core_set_video_device(pauline->lc,liblinphone_tester_mire_id);
-
-	linphone_core_enable_video(marie->lc,TRUE,TRUE);
-	linphone_core_set_video_policy(marie->lc,&pol);
-	linphone_core_set_video_device(marie->lc,liblinphone_tester_mire_id);
-
-	linphone_call_set_next_video_frame_decoded_callback(linphone_core_invite_address(pauline->lc,marie->identity)
-														,linphone_call_iframe_decoded_cb
-														,pauline->lc);
-
-
-	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallIncomingReceived,1,DEFAULT_WAIT_FOR));
-
-	{
-		char* remote_uri = linphone_address_as_string_uri_only(pauline->identity);
-		call = linphone_core_find_call_from_uri(marie->lc,remote_uri);
-		ms_free(remote_uri);
-	}
-
-	if  (call) {
-		params=linphone_core_create_default_call_parameters(marie->lc);
-		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendOnly);
-		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionSendOnly);
-		linphone_core_accept_call_with_params(marie->lc,call,params);
-		linphone_call_params_destroy(params);
-
-		BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning,1,DEFAULT_WAIT_FOR));
-		BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallPausedByRemote,1,DEFAULT_WAIT_FOR));
-
-		check_media_direction(marie,call,lcs,LinphoneMediaDirectionSendOnly,LinphoneMediaDirectionSendOnly);
-	}
-
-
-	call=linphone_core_get_current_call(pauline->lc);
-	if  (call) {
-		check_media_direction(pauline,call,lcs,LinphoneMediaDirectionRecvOnly,LinphoneMediaDirectionRecvOnly);
-	}
-
-}
-static void accept_call_in_send_base(bool_t caller_has_ice) {
-	int begin;
-	int leaked_objects;
-	LinphoneCoreManager *pauline, *marie;
-	MSList *lcs=NULL;;
-
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
-	marie = linphone_core_manager_new("marie_rc");
-	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	if (caller_has_ice) {
-		linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
-	}
-
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,marie->lc);
-
-	accept_call_in_send_only_base(pauline,marie,lcs);
-
-
-	end_call(marie,pauline);
-	ms_free(lcs);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-}
-
-static void accept_call_in_send_only(void)  {
-	accept_call_in_send_base(FALSE);
-}
-
-static void accept_call_in_send_only_with_ice(void)  {
-	accept_call_in_send_base(TRUE);
-}
-
-void two_accepted_call_in_send_only() {
-	int begin;
-	int leaked_objects;
-	LinphoneCoreManager *pauline, *marie, *laure;
-	MSList *lcs=NULL;
-
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
-	marie = linphone_core_manager_new("marie_rc");
-	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	laure = linphone_core_manager_new("laure_rc");
-
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-	accept_call_in_send_only_base(pauline,marie,lcs);
-
-
-	reset_counters(&marie->stat);
-	accept_call_in_send_only_base(laure,marie,lcs);
-
-	end_call(marie,pauline);
-	end_call(laure,marie);
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-
-}
-#endif
-
-static char *create_filepath(const char *dir, const char *filename, const char *ext) {
-	return ms_strdup_printf("%s/%s.%s",dir,filename,ext);
-}
-
-static void record_call(const char *filename, bool_t enableVideo) {
+void record_call(const char *filename, bool_t enableVideo, const char *video_codec) {
 	LinphoneCoreManager *marie = NULL;
 	LinphoneCoreManager *pauline = NULL;
 	LinphoneCallParams *marieParams = NULL;
@@ -3496,25 +2973,34 @@ static void record_call(const char *filename, bool_t enableVideo) {
 	int dummy=0, i;
 	bool_t call_succeeded = FALSE;
 
-#if defined(HAVE_OPENH264) && defined(ANDROID)
-	ms_init();
-	libmsopenh264_init();
-#endif
-
-
 	marie = linphone_core_manager_new("marie_h264_rc");
 	pauline = linphone_core_manager_new("pauline_h264_rc");
-	marieParams = linphone_core_create_default_call_parameters(marie->lc);
-	paulineParams = linphone_core_create_default_call_parameters(pauline->lc);
+
+	// important: VP8 has really poor performances with the mire camera, at least
+	// on iOS - so when ever h264 is available, let's use it instead
+	if (linphone_core_find_payload_type(pauline->lc,"h264", -1, -1)!=NULL) {
+		disable_all_video_codecs_except_one(pauline->lc,"h264");
+		disable_all_video_codecs_except_one(marie->lc,"h264");
+	}
+
+#if defined(HAVE_OPENH264) && defined(ANDROID)
+	libmsopenh264_init(linphone_core_get_ms_factory(marie->lc));
+	linphone_core_reload_ms_plugins(marie->lc, NULL);
+	libmsopenh264_init(linphone_core_get_ms_factory(pauline->lc));
+	linphone_core_reload_ms_plugins(pauline->lc, NULL);
+#endif
+	marieParams = linphone_core_create_call_params(marie->lc, NULL);
+	paulineParams = linphone_core_create_call_params(pauline->lc, NULL);
 
 #ifdef VIDEO_ENABLED
+	linphone_core_set_video_device(pauline->lc, liblinphone_tester_mire_id);
 	if(enableVideo) {
-		if((linphone_core_find_payload_type(marie->lc, "H264", -1, -1) != NULL)
-				&& (linphone_core_find_payload_type(pauline->lc, "H264", -1, -1) != NULL)) {
+		if(linphone_core_find_payload_type(marie->lc, video_codec, -1, -1)
+				&& linphone_core_find_payload_type(pauline->lc, video_codec, -1, -1)) {
 			linphone_call_params_enable_video(marieParams, TRUE);
 			linphone_call_params_enable_video(paulineParams, TRUE);
-			disable_all_video_codecs_except_one(marie->lc, "H264");
-			disable_all_video_codecs_except_one(pauline->lc, "H264");
+			disable_all_video_codecs_except_one(marie->lc, video_codec);
+			disable_all_video_codecs_except_one(pauline->lc, video_codec);
 		} else {
 			ms_warning("call_recording(): the H264 payload has not been found. Only sound will be recorded");
 		}
@@ -3524,7 +3010,9 @@ static void record_call(const char *filename, bool_t enableVideo) {
 	formats = linphone_core_get_supported_file_formats(marie->lc);
 
 	for(i=0, format = formats[0]; format != NULL; i++, format = formats[i]) {
-		filepath = create_filepath(bc_tester_get_writable_dir_prefix(), filename, format);
+		char* totalname = ms_strdup_printf("%s.%s", filename, format);
+		filepath = bc_tester_file(totalname);
+		ms_free(totalname);
 		remove(filepath);
 		linphone_call_params_set_record_file(marieParams, filepath);
 		BC_ASSERT_TRUE(call_succeeded = call_with_params(marie, pauline, marieParams, paulineParams));
@@ -3535,70 +3023,27 @@ static void record_call(const char *filename, bool_t enableVideo) {
 			wait_for_until(marie->lc,pauline->lc,&dummy,1,5000);
 			linphone_call_stop_recording(callInst);
 			end_call(marie, pauline);
-			BC_ASSERT_EQUAL(access(filepath, F_OK), 0, int, "%d");
+			BC_ASSERT_EQUAL(ortp_file_exist(filepath), 0, int, "%d");
 		}
 		remove(filepath);
 		ms_free(filepath);
 	}
+	linphone_call_params_destroy(paulineParams);
+	linphone_call_params_destroy(marieParams);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-#if defined(HAVE_OPENH264) && defined(ANDROID)
-	ms_exit();
-#endif
 }
 
 static void audio_call_recording_test(void) {
-	record_call("recording", FALSE);
+	record_call("recording", FALSE, NULL);
 }
 
-#ifdef VIDEO_ENABLED
-static void video_call_recording_test(void) {
-	record_call("recording", TRUE);
-}
-
-static void video_call_snapshot(void) {
-	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	LinphoneCallParams *marieParams = linphone_core_create_default_call_parameters(marie->lc);
-	LinphoneCallParams *paulineParams = linphone_core_create_default_call_parameters(pauline->lc);
-	LinphoneCall *callInst = NULL;
-	char *filename = create_filepath(bc_tester_get_writable_dir_prefix(), "snapshot", "jpeg");
-	int dummy = 0;
-	bool_t call_succeeded = FALSE;
-
-	linphone_core_enable_video_capture(marie->lc, TRUE);
-	linphone_core_enable_video_display(marie->lc, TRUE);
-	linphone_core_enable_video_capture(pauline->lc, TRUE);
-	linphone_core_enable_video_display(pauline->lc, FALSE);
-	linphone_call_params_enable_video(marieParams, TRUE);
-	linphone_call_params_enable_video(paulineParams, TRUE);
-
-	BC_ASSERT_TRUE(call_succeeded = call_with_params(marie, pauline, marieParams, paulineParams));
-	BC_ASSERT_PTR_NOT_NULL(callInst = linphone_core_get_current_call(marie->lc));
-	if((call_succeeded == TRUE) && (callInst != NULL)) {
-		linphone_call_take_video_snapshot(callInst, filename);
-		wait_for_until(marie->lc, pauline->lc, &dummy, 1, 5000);
-		BC_ASSERT_EQUAL(access(filename, F_OK), 0, int, "%d");
-		remove(filename);
-	}
-	ms_free(filename);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-#endif
-
 static void call_with_in_dialog_update(void) {
-	int begin;
-	int leaked_objects;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	LinphoneCallParams *params;
 	bool_t call_ok;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
@@ -3618,25 +3063,51 @@ static void call_with_in_dialog_update(void) {
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 }
+static void call_with_very_early_call_update(void) {
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LinphoneCallParams *params;
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	linphone_core_invite_address(marie->lc,pauline->identity);
+
+	BC_ASSERT_TRUE (wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallIncomingReceived,1));
+	BC_ASSERT_TRUE(linphone_core_inc_invite_pending(pauline->lc));
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallOutgoingProgress,1, int, "%d");
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallOutgoingRinging,1));
+
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call_remote_address(pauline->lc));
+	if (linphone_core_get_current_call_remote_address(pauline->lc)) {
+		linphone_core_accept_call(pauline->lc,linphone_core_get_current_call(pauline->lc));
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,1));
+	}
+
+	if(linphone_core_get_current_call(pauline->lc)) {
+		params=linphone_core_create_call_params(pauline->lc,linphone_core_get_current_call(pauline->lc));
+		linphone_core_update_call(pauline->lc,linphone_core_get_current_call(pauline->lc),params);
+		linphone_call_params_destroy(params);
+	}
+
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallUpdating,1));
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdatedByRemote,1));
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
+	end_call(marie,pauline);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+
 static void call_with_in_dialog_codec_change_base(bool_t no_sdp) {
-	int begin;
-	int leaked_objects;
 	int dummy=0;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	LinphoneCallParams *params;
 	bool_t call_ok;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
@@ -3667,12 +3138,6 @@ static void call_with_in_dialog_codec_change_base(bool_t no_sdp) {
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 }
 static void call_with_in_dialog_codec_change(void) {
 	call_with_in_dialog_codec_change_base(FALSE);
@@ -3680,41 +3145,38 @@ static void call_with_in_dialog_codec_change(void) {
 static void call_with_in_dialog_codec_change_no_sdp(void) {
 	call_with_in_dialog_codec_change_base(TRUE);
 }
+
 static void call_with_custom_supported_tags(void) {
-	int begin;
-	int leaked_objects;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	const LinphoneCallParams *remote_params;
 	const char *recv_supported;
-	bool_t call_ok;
-
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
+	LinphoneCall *pauline_call;
 
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 
 	linphone_core_add_supported_tag(marie->lc,"pouet-tag");
-	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
-	if (!call_ok) goto end;
-	liblinphone_tester_check_rtcp(marie,pauline);
-	remote_params=linphone_call_get_remote_params(linphone_core_get_current_call(pauline->lc));
+	linphone_core_add_supported_tag(marie->lc,"truc-tag");
+	linphone_core_add_supported_tag(marie->lc,"machin-tag");
+
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived,1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging,1));
+	pauline_call = linphone_core_get_current_call(pauline->lc);
+	if (!pauline_call) goto end;
+
+	remote_params=linphone_call_get_remote_params(pauline_call);
 	recv_supported=linphone_call_params_get_custom_header(remote_params,"supported");
 	BC_ASSERT_PTR_NOT_NULL(recv_supported);
 	if (recv_supported){
-		BC_ASSERT_PTR_NOT_NULL(strstr(recv_supported,"pouet-tag"));
+		BC_ASSERT_PTR_NOT_NULL(strstr(recv_supported,"pouet-tag, truc-tag, machin-tag"));
 	}
+
 	end_call(marie,pauline);
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 }
 
 static void call_log_from_taken_from_p_asserted_id(void) {
@@ -3722,14 +3184,14 @@ static void call_log_from_taken_from_p_asserted_id(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCall *c1,*c2;
 	LinphoneCallParams *params;
-	const char* paulie_asserted_id ="\"Paupauche\" <sip:pauline@super.net>";
-	LinphoneAddress *paulie_asserted_id_addr = linphone_address_new(paulie_asserted_id);
+	const char* pauline_asserted_id ="\"Paupauche\" <sip:pauline@super.net>";
+	LinphoneAddress *pauline_asserted_id_addr = linphone_address_new(pauline_asserted_id);
 	LpConfig *marie_lp;
 	bool_t call_ok;
 
-	params=linphone_core_create_default_call_parameters(pauline->lc);
+	params=linphone_core_create_call_params(pauline->lc, NULL);
 
-	linphone_call_params_add_custom_header(params,"P-Asserted-Identity",paulie_asserted_id);
+	linphone_call_params_add_custom_header(params,"P-Asserted-Identity",pauline_asserted_id);
 	/*fixme, should be able to add several time the same header linphone_call_params_add_custom_header(params,"P-Asserted-Identity","\"Paupauche\" <tel:+12345>");*/
 
 	marie_lp = linphone_core_get_config(marie->lc);
@@ -3747,20 +3209,16 @@ static void call_log_from_taken_from_p_asserted_id(void) {
 	BC_ASSERT_PTR_NOT_NULL(c2);
 
 	/*make sure remote identity is hidden*/
-	BC_ASSERT_TRUE(linphone_address_weak_equal(linphone_call_get_remote_address(c2),paulie_asserted_id_addr));
-
-
-
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
+	BC_ASSERT_TRUE(linphone_address_weak_equal(linphone_call_get_remote_address(c2),pauline_asserted_id_addr));
+	linphone_address_destroy(pauline_asserted_id_addr);
+	end_call(pauline, marie);
 end:
 	linphone_call_params_destroy(params);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-static void incoming_invite_with_invalid_sdp() {
+static void incoming_invite_with_invalid_sdp(void) {
 	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
@@ -3777,7 +3235,7 @@ static void incoming_invite_with_invalid_sdp() {
 	linphone_core_manager_destroy(caller);
 }
 
-static void outgoing_invite_with_invalid_sdp() {
+static void outgoing_invite_with_invalid_sdp(void) {
 	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
 	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
@@ -3796,107 +3254,22 @@ static void outgoing_invite_with_invalid_sdp() {
 	linphone_core_manager_destroy(caller);
 }
 
-static void incoming_reinvite_with_invalid_ack_sdp(){
-#ifdef VIDEO_ENABLED
-	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
-	LinphoneCall * inc_call;
-	BC_ASSERT_TRUE(call(caller,callee));
-	inc_call = linphone_core_get_current_call(callee->lc);
-
-	BC_ASSERT_PTR_NOT_NULL(inc_call);
-	if (inc_call) {
-		const LinphoneCallParams *caller_params;
-		stats initial_caller_stat=caller->stat;
-		stats initial_callee_stat=callee->stat;
-		sal_call_set_sdp_handling(inc_call->op, SalOpSDPSimulateError); /* will force a parse error for the ACK SDP*/
-		BC_ASSERT_PTR_NOT_NULL(setup_video(caller, callee, TRUE));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning));
-		/*Basically the negotiation failed but since the call was already running, we expect it to restore to
-		the previous state so error stats should not be changed*/
-		BC_ASSERT_EQUAL(callee->stat.number_of_LinphoneCallError,initial_callee_stat.number_of_LinphoneCallError, int, "%d");
-		/*and remote should have received an update notification*/
-		BC_ASSERT_EQUAL(caller->stat.number_of_LinphoneCallUpdatedByRemote,initial_caller_stat.number_of_LinphoneCallUpdatedByRemote+1, int, "%d");
-
-
-		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
-		caller_params = linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,(int*)&caller_params->has_video,FALSE));
-
-		sal_call_set_sdp_handling(inc_call->op, SalOpSDPNormal);
-	}
-	linphone_core_terminate_all_calls(caller->lc);
-	BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallEnd,1));
-
-	linphone_core_manager_destroy(callee);
-	linphone_core_manager_destroy(caller);
-#else
-	ms_warning("not tested because video not available");
-#endif
-}
-
-static void outgoing_reinvite_with_invalid_ack_sdp()  {
-#ifdef VIDEO_ENABLED
-	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
-	LinphoneCall * out_call;
-	BC_ASSERT_TRUE(call(caller,callee));
-	out_call = linphone_core_get_current_call(caller->lc);
-
-	BC_ASSERT_PTR_NOT_NULL(out_call);
-	if (out_call) {
-		stats initial_caller_stat=caller->stat;
-		stats initial_callee_stat=callee->stat;
-		sal_call_set_sdp_handling(out_call->op, SalOpSDPSimulateError); /* will force a parse error for the ACK SDP*/
-		BC_ASSERT_PTR_NOT_NULL(setup_video(caller, callee, TRUE));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
-		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning));
-		/*Basically the negotiation failed but since the call was already running, we expect it to restore to
-		the previous state so error stats should not be changed*/
-		BC_ASSERT_EQUAL(callee->stat.number_of_LinphoneCallError,initial_callee_stat.number_of_LinphoneCallError, int, "%d");
-		/*and remote should not have received any update notification*/
-		BC_ASSERT_EQUAL(caller->stat.number_of_LinphoneCallUpdatedByRemote,initial_caller_stat.number_of_LinphoneCallUpdatedByRemote, int, "%d");
-
-		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
-		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
-
-		sal_call_set_sdp_handling(out_call->op, SalOpSDPNormal);
-	}
-	linphone_core_terminate_all_calls(caller->lc);
-	BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallEnd,1));
-	BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallEnd,1));
-
-	linphone_core_manager_destroy(callee);
-	linphone_core_manager_destroy(caller);
-#else
-	ms_warning("not tested because video not available");
-#endif
-}
-
-
-static void call_with_paused_no_sdp_on_resume() {
-	int begin;
-	int leaked_objects;
+static void call_with_paused_no_sdp_on_resume(void) {
 	int dummy=0;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	LinphoneCall* call_marie = NULL;
-
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
+	bool_t call_ok;
 
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	BC_ASSERT_TRUE(call(pauline,marie));
+	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
+	if (!call_ok) goto end;
+
 	liblinphone_tester_check_rtcp(marie,pauline);
 
 	call_marie = linphone_core_get_current_call(marie->lc);
 	BC_ASSERT_PTR_NOT_NULL(call_marie);
-	if (!call_marie) goto end;
 
 	ms_message("== Call is OK ==");
 
@@ -3924,22 +3297,17 @@ static void call_with_paused_no_sdp_on_resume() {
 	wait_for_until(marie->lc, pauline->lc, &dummy, 1, 3000);
 	BC_ASSERT_GREATER(linphone_core_manager_get_max_audio_down_bw(marie),70,int,"%i");
 	BC_ASSERT_TRUE(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->download_bandwidth>70);
-end:
 	end_call(marie,pauline);
+end:
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 }
 
-static void early_media_without_sdp_in_200_base( bool_t use_video, bool_t use_ice ){
+void early_media_without_sdp_in_200_base( bool_t use_video, bool_t use_ice ){
 	LinphoneCoreManager* marie   = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	MSList* lcs = NULL;
+	bctbx_list_t* lcs = NULL;
 	LinphoneCall* marie_call;
 	LinphoneCallParams* params = NULL;
 	LinphoneCallLog *marie_call_log;
@@ -3947,15 +3315,15 @@ static void early_media_without_sdp_in_200_base( bool_t use_video, bool_t use_ic
 	uint64_t ended_time=0;
 	int dummy=0;
 
-	lcs = ms_list_append(lcs,marie->lc);
-	lcs = ms_list_append(lcs,pauline->lc);
+	lcs = bctbx_list_append(lcs,marie->lc);
+	lcs = bctbx_list_append(lcs,pauline->lc);
 	if (use_ice){
 		linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
 	}
 	/*
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
-	params = linphone_core_create_default_call_parameters(marie->lc);
+	params = linphone_core_create_call_params(marie->lc, NULL);
 
 	if( use_video){
 
@@ -3968,6 +3336,7 @@ static void early_media_without_sdp_in_200_base( bool_t use_video, bool_t use_ic
 	}
 
 	marie_call = linphone_core_invite_address_with_params(marie->lc, pauline->identity, params);
+	linphone_call_params_destroy(params);
 	marie_call_log = linphone_call_get_call_log(marie_call);
 
 	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,3000));
@@ -3998,43 +3367,30 @@ static void early_media_without_sdp_in_200_base( bool_t use_video, bool_t use_ic
 		/*just to have a call duration !=0*/
 		wait_for_list(lcs,&dummy,1,2000);
 
-		linphone_core_terminate_all_calls(pauline->lc);
-
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+		end_call(pauline, marie);
 		ended_time=ms_get_cur_time_ms();
 		BC_ASSERT_LOWER(labs((long)((linphone_call_log_get_duration(marie_call_log)*1000) - (int64_t)(ended_time - connected_time))), 1000, long, "%ld");
-		ms_list_free(lcs);
 	}
-
+	bctbx_list_free(lcs);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-static void call_with_early_media_and_no_sdp_in_200_with_video(){
-	early_media_without_sdp_in_200_base(TRUE, FALSE);
-}
-
-static void call_with_early_media_and_no_sdp_in_200(){
+static void call_with_early_media_and_no_sdp_in_200(void){
 	early_media_without_sdp_in_200_base(FALSE, FALSE);
 }
 
-static void call_with_early_media_ice_and_no_sdp_in_200(){
+static void call_with_early_media_ice_and_no_sdp_in_200(void){
 	early_media_without_sdp_in_200_base(FALSE, TRUE);
 }
 
 static void call_with_generic_cn(void) {
-	int begin;
-	int leaked_objects;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	LinphoneCall *pauline_call;
 	char *audio_file_with_silence=bc_tester_res("sounds/ahbahouaismaisbon.wav");
 	char *recorded_file=bc_tester_file("result.wav");
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 
@@ -4073,15 +3429,11 @@ static void call_with_generic_cn(void) {
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 	ms_free(audio_file_with_silence);
-	ms_free(recorded_file);
+	bc_free(recorded_file);
 }
-void static call_state_changed_2(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){
+
+static void call_state_changed_2(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){
 	LCSipTransports sip_tr;
 	if (cstate==LinphoneCallReleased) {
 		/*to make sure transport is changed*/
@@ -4092,7 +3444,8 @@ void static call_state_changed_2(LinphoneCore *lc, LinphoneCall *call, LinphoneC
 		linphone_core_set_sip_transports(lc,&sip_tr);
 	}
 }
-void static call_state_changed_3(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){
+
+static void call_state_changed_3(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg){
 /*just to check multi listener in such situation*/
 	char* to=linphone_address_as_string(linphone_call_get_call_log(call)->to);
 	char* from=linphone_address_as_string(linphone_call_get_call_log(call)->from);
@@ -4104,16 +3457,11 @@ void static call_state_changed_3(LinphoneCore *lc, LinphoneCall *call, LinphoneC
 	ms_free(from);
 }
 
-
 static void call_with_transport_change_base(bool_t succesfull_call) {
-	int begin;
-	int leaked_objects;
 	LCSipTransports sip_tr;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	LinphoneCoreVTable * v_table;
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
 	v_table = linphone_core_v_table_new();
 	v_table->call_state_changed=call_state_changed_2;
 	marie = linphone_core_manager_new("marie_rc");
@@ -4129,7 +3477,7 @@ static void call_with_transport_change_base(bool_t succesfull_call) {
 	linphone_core_set_sip_transports(marie->lc,&sip_tr);
 	if (succesfull_call) {
 		BC_ASSERT_TRUE(call(marie,pauline));
-		linphone_core_terminate_all_calls(marie->lc);
+		end_call(marie, pauline);
 	}
 	else
 		linphone_core_invite(marie->lc,"nexiste_pas");
@@ -4143,13 +3491,6 @@ static void call_with_transport_change_base(bool_t succesfull_call) {
 	}
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects,0,int,"%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-
 }
 static void call_with_transport_change_after_released(void) {
 	call_with_transport_change_base(TRUE);
@@ -4157,119 +3498,15 @@ static void call_with_transport_change_after_released(void) {
 static void unsucessfull_call_with_transport_change_after_released(void) {
 	call_with_transport_change_base(FALSE);
 }
-#ifdef VIDEO_ENABLED
-
-static void video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryption mode, bool_t no_sdp) {
-	int begin;
-	int leaked_objects;
-	LinphoneCoreManager* marie;
-	LinphoneCoreManager* pauline;
-	LinphoneCallParams *params;
-	const LinphoneCallParams *current_params;
-	MSList *lcs=NULL;
-
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
-	marie = linphone_core_manager_new( "marie_rc");
-	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	linphone_core_set_avpf_mode(pauline->lc,TRUE);
-	linphone_core_set_video_device(pauline->lc,liblinphone_tester_mire_id);
-	linphone_core_set_video_device(marie->lc,liblinphone_tester_mire_id);
-	linphone_core_set_avpf_mode(marie->lc,TRUE);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,marie->lc);
-
-	video_call_base_2(marie,pauline,TRUE,mode,TRUE,TRUE);
-
-	if (linphone_core_get_current_call(marie->lc)) {
-		params=linphone_core_create_call_params(marie->lc,linphone_core_get_current_call(marie->lc));
-		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionInactive);
-		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionInactive);
-
-		linphone_core_update_call(marie->lc, linphone_core_get_current_call(marie->lc),params);
-		linphone_call_params_destroy(params);
-
-		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,1));
-		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
-		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,1));
-
-		check_media_direction(marie,linphone_core_get_current_call(marie->lc),lcs,LinphoneMediaDirectionInactive,LinphoneMediaDirectionInactive);
-		check_media_direction(pauline,linphone_core_get_current_call(pauline->lc), lcs, LinphoneMediaDirectionInactive, LinphoneMediaDirectionInactive);
-
-		if (no_sdp) {
-			linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
-		}
-
-		params=linphone_core_create_call_params(marie->lc,linphone_core_get_current_call(marie->lc));
-		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendRecv);
-		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionSendRecv);
-		linphone_core_update_call(marie->lc,linphone_core_get_current_call(marie->lc),params);
-		linphone_call_params_destroy(params);
-		
-		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,3));
-		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
-
-		check_media_direction(marie,linphone_core_get_current_call(marie->lc),lcs,LinphoneMediaDirectionSendRecv,LinphoneMediaDirectionSendRecv);
-		check_media_direction(pauline,linphone_core_get_current_call(pauline->lc),lcs,LinphoneMediaDirectionSendRecv,LinphoneMediaDirectionSendRecv);
-
-		/*assert that after pause and resume, SRTP is still being used*/
-		current_params = linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc));
-		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(current_params) , mode, int, "%d");
-		current_params = linphone_call_get_current_params(linphone_core_get_current_call(marie->lc));
-		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(current_params) , mode, int, "%d");
-
-	}
-	end_call(marie,pauline);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-}
-
-static void video_call_with_re_invite_inactive_followed_by_re_invite() {
-	video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionNone,FALSE);
-}
-
-static void video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp() {
-	video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionNone, TRUE);
-}
-static void srtp_video_call_with_re_invite_inactive_followed_by_re_invite() {
-	if (ms_srtp_supported())
-		video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionSRTP,FALSE);
-	else
-		ms_message("srtp_video_call_with_re_invite_inactive_followed_by_re_invite skipped, missing srtp support");
-}
-static void srtp_video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp() {
-	if (ms_srtp_supported())
-		video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionSRTP, TRUE);
-	else
-		ms_message("srtp_video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp skipped, missing srtp support");
-}
-static void video_call_ice_params() {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-
-	linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
-	linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
-	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-#endif
 
+#if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR && !defined(ANDROID)
 static void completion_cb(void *user_data, int percentage){
 	fprintf(stdout,"%i %% completed\r",percentage);
 	fflush(stdout);
 }
+#endif
 
 static void simple_stereo_call(const char *codec_name, int clock_rate, int bitrate_override, bool_t stereo) {
-	int begin;
-	int leaked_objects;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	PayloadType *pt;
@@ -4277,8 +3514,7 @@ static void simple_stereo_call(const char *codec_name, int clock_rate, int bitra
 	char *recordpath = bc_tester_file("stereo-record.wav");
 	bool_t audio_cmp_failed = FALSE;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
+	unlink(recordpath);
 
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
@@ -4304,8 +3540,8 @@ static void simple_stereo_call(const char *codec_name, int clock_rate, int bitra
 	linphone_core_set_record_file(pauline->lc, recordpath);
 
 	/*stereo is supported only without volume control, echo canceller...*/
-	lp_config_set_string(marie->lc->config,"sound","features","NONE");
-	lp_config_set_string(pauline->lc->config,"sound","features","NONE");
+	lp_config_set_string(marie->lc->config,"sound","features","REMOTE_PLAYING");
+	lp_config_set_string(pauline->lc->config,"sound","features","REMOTE_PLAYING");
 
 	if (!BC_ASSERT_TRUE(call(pauline,marie))) goto end;
 	wait_for_until(marie->lc, pauline->lc, NULL, 0, 6000);
@@ -4317,14 +3553,14 @@ static void simple_stereo_call(const char *codec_name, int clock_rate, int bitra
 	}else{
 #if !defined(__arm__) && !defined(__arm64__) && !TARGET_IPHONE_SIMULATOR && !defined(ANDROID)
 		double similar;
-		double min_threshold = .7f;
+		double min_threshold = .75f; /*should be above 0.8 in best conditions*/
 		double max_threshold = 1.f;
 		if (!stereo){
-			/*when opus doesn't transmit stereo, the cross correlation is around 0.54 : as expected, it is not as good as in full stereo mode*/
+			/*when opus doesn't transmit stereo, the cross correlation is around 0.6 : as expected, it is not as good as in full stereo mode*/
 			min_threshold = .4f;
-			max_threshold = .6f;
+			max_threshold = .68f;
 		}
-		BC_ASSERT_EQUAL(ms_audio_diff(recordpath, stereo_file,&similar,audio_cmp_max_shift,completion_cb,NULL), 0, int, "%d");
+		BC_ASSERT_EQUAL(ms_audio_diff(stereo_file, recordpath,&similar,&audio_cmp_params,completion_cb,NULL), 0, int, "%d");
 		BC_ASSERT_GREATER(similar, min_threshold, double, "%g");
 		BC_ASSERT_LOWER(similar, max_threshold, double, "%g");
 		if (similar<min_threshold || similar>max_threshold){
@@ -4337,13 +3573,7 @@ end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	ms_free(stereo_file);
-	ms_free(recordpath);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
+	bc_free(recordpath);
 }
 
 static void simple_stereo_call_l16(void){
@@ -4355,40 +3585,51 @@ static void simple_stereo_call_opus(void){
 }
 
 static void call_with_complex_late_offering(void){
-	LinphoneCallParams *params;	
+	LinphoneCallParams *params;
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline =  linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCall* call_pauline;
 	LinphoneCall* call_marie;
-	LinphoneVideoPolicy vpol = {TRUE, TRUE};
+	LinphoneVideoPolicy vpol;
 	bool_t call_ok;
-	
-	linphone_core_enable_video(pauline->lc, TRUE, TRUE);
-	linphone_core_enable_video(marie->lc, TRUE, TRUE);
+
+	vpol.automatically_initiate = vpol.automatically_accept = TRUE;
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
 	linphone_core_set_video_policy(pauline->lc, &vpol);
 	linphone_core_set_video_policy(marie->lc, &vpol);
+
+		// important: VP8 has really poor performances with the mire camera, at least
+	// on iOS - so when ever h264 is available, let's use it instead
+	if (linphone_core_find_payload_type(pauline->lc,"h264", -1, -1)!=NULL) {
+		disable_all_video_codecs_except_one(pauline->lc,"h264");
+		disable_all_video_codecs_except_one(marie->lc,"h264");
+	}
+
 	linphone_core_set_video_device(pauline->lc,liblinphone_tester_mire_id);
 	linphone_core_set_video_device(marie->lc,liblinphone_tester_mire_id);
-	
+
 	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
 	if (!call_ok) goto end;
-	
+
 	call_pauline = linphone_core_get_current_call(pauline->lc);
 	call_marie = linphone_core_get_current_call(marie->lc);
-	
+
 	//Invite inactive Audio/video (Marie pause Pauline)
 	ms_message("CONTEXT: Marie sends INVITE with SDP with all streams inactive");
 	params=linphone_core_create_call_params(marie->lc,call_marie);
 	linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionInactive);
 	linphone_call_params_set_video_direction(params,LinphoneMediaDirectionInactive);
-	
+
 	linphone_core_update_call(marie->lc, call_marie ,params);
 	linphone_call_params_destroy(params);
-	
+
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,1));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,1));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
-	
+
 	//Marie sends INVITE without SDP
 	ms_message("CONTEXT: Marie sends INVITE without SDP for setting streams in send-only mode");
 	linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
@@ -4402,7 +3643,7 @@ static void call_with_complex_late_offering(void){
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,2));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,3));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,2));
-	
+
 	linphone_core_enable_sdp_200_ack(marie->lc,FALSE);
 
 	//Pauline pause Marie
@@ -4411,7 +3652,7 @@ static void call_with_complex_late_offering(void){
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausing,1));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPaused,1));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1));
-	
+
 	//Pauline resume Marie
 	ms_message("CONTEXT: Pauline resumes the call");
 	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
@@ -4419,22 +3660,22 @@ static void call_with_complex_late_offering(void){
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,4));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallResuming,1));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,3));
-	
+
 	wait_for_until(pauline->lc, marie->lc, NULL, 0, 2000);
-		
+
 	//Marie invite inactive Audio/Video
 	ms_message("CONTEXT: Marie sends INVITE with SDP with all streams inactive");
 	params=linphone_core_create_call_params(marie->lc,call_marie);
 	linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionInactive);
 	linphone_call_params_set_video_direction(params,LinphoneMediaDirectionInactive);
-	
+
 	linphone_core_update_call(marie->lc, call_marie,params);
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,3));
 	linphone_call_params_destroy(params);
-	
+
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,4));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,5));
-	
+
 	//Marie sends INVITE without SDP
 	ms_message("CONTEXT: Marie sends INVITE without SDP in the purpose of re-enabling streams in sendrecv mode");
 	linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
@@ -4447,17 +3688,15 @@ static void call_with_complex_late_offering(void){
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallUpdatedByRemote,1));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,5));
-	
+
 	linphone_core_enable_sdp_200_ack(marie->lc,FALSE);
-	
-	
+
 	end_call(marie,pauline);
-	
+
 end:
-	
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-	
 }
 
 static void simple_mono_call_opus(void){
@@ -4478,13 +3717,12 @@ static void call_with_fqdn_in_sdp(void) {
 	lp = linphone_core_get_config(pauline->lc);
 	lp_config_set_string(lp,"rtp","bind_address","localhost");
 
-
 	BC_ASSERT_TRUE(call_ok=call(marie,pauline));
 	if (!call_ok) goto end;
 	liblinphone_tester_check_rtcp(pauline,marie);
 
 #ifdef VIDEO_ENABLED
-	BC_ASSERT_TRUE(add_video(pauline,marie, TRUE));
+	BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
 	liblinphone_tester_check_rtcp(pauline,marie);
 #endif
 	end_call(pauline, marie);
@@ -4498,11 +3736,11 @@ static void call_with_rtp_io_mode(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphonePlayer *player;
 	char *hellopath = bc_tester_res("sounds/ahbahouaismaisbon.wav");
-	char *recordpath = create_filepath(bc_tester_get_writable_dir_prefix(), "record-call_with_rtp_io_mode", "wav");
+	char *recordpath = bc_tester_file("record-call_with_rtp_io_mode.wav");
 	bool_t call_ok;
 	int attempts;
 	double similar=1;
-	const double threshold = 0.9;
+	const double threshold = 0.85;
 
 	/*this test is actually attempted three times in case of failure, because the audio comparison at the end is very sensitive to
 	 * jitter buffer drifts, which sometimes happen if the machine is unable to run the test in good realtime conditions */
@@ -4542,7 +3780,7 @@ static void call_with_rtp_io_mode(void) {
 		wait_for_until(pauline->lc,marie->lc,NULL,0,1000);
 		end_call(pauline,marie);
 
-		BC_ASSERT_EQUAL(ms_audio_diff(hellopath, recordpath, &similar, audio_cmp_max_shift, NULL, NULL), 0, int, "%d");
+		BC_ASSERT_EQUAL(ms_audio_diff(hellopath, recordpath, &similar, &audio_cmp_params, NULL, NULL), 0, int, "%d");
 		if (similar>=threshold) break;
 	}
 	BC_ASSERT_GREATER(similar, threshold, double, "%g");
@@ -4599,10 +3837,8 @@ static void call_with_generic_nack_rtcp_feedback(void) {
 			ORTP_EVENT_RTCP_PACKET_RECEIVED, RTCP_RTPFB, (OrtpEvDispatcherCb)generic_nack_received, &marie->stat);
 	}
 
-	BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_rtcp_generic_nack, 5, 5000));
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_rtcp_generic_nack, 5, 8000));
+	end_call(pauline, marie);
 
 end:
 	linphone_core_manager_destroy(marie);
@@ -4614,6 +3850,8 @@ end:
 typedef struct _RtpTransportModifierData {
 	uint64_t packetSentCount;
 	uint64_t packetReceivedCount;
+	MSQueue to_send;
+	MSQueue to_recv;
 } RtpTransportModifierData;
 
 const char *XOR_KEY = "BELLEDONNECOMMUNICATIONS";
@@ -4623,31 +3861,16 @@ const char *XOR_KEY = "BELLEDONNECOMMUNICATIONS";
 static int rtptm_on_send(RtpTransportModifier *rtptm, mblk_t *msg) {
 	RtpTransportModifierData *data = rtptm->data;
 	rtp_header_t *rtp = (rtp_header_t*)msg->b_rptr;
-	int i = 0;
-	unsigned char *src;
-	int size = 0;
-	
+
 	if (rtp->version == 0) {
 		// This is probably a STUN packet, so don't count it (oRTP won't) and don't encrypt it either
-		return msgdsize(msg);
+		return (int)msgdsize(msg);
 	}
-	
-	// Mediastream can create a mblk_t with only the RTP header and setting the b_cont pointer to the actual RTP content buffer
-	// In this scenario, the result of rtp_get_payload will be 0, and we won't be able to do our XOR encryption on the payload
-	// The call to msgpullup will trigger a memcpy of the header and the payload in the same buffer in the msg mblk_t
-	msgpullup(msg, -1);
-	// Now that the mblk_t buffer directly contains the header and the payload, we can get the size of the payload and a pointer to it's start (we don't encrypt the RTP header)
-	size = rtp_get_payload(msg, &src);
-	
-	// Just for fun, let's do a XOR encryption
-	for (i = 0; i < size; i++) {
-		src[i] ^= (unsigned char) XOR_KEY[i % strlen(XOR_KEY)];
-	}
-	
+	/*ms_message("rtptm_on_send: rtpm=%p seq=%u", rtptm, (int)ntohs(rtp_get_seqnumber(msg)));*/
+
 	data->packetSentCount += 1;
-	
-	/* /!\ DO NOT RETURN 0 or the packet will never leave /!\ */
-	return msgdsize(msg);
+	ms_queue_put(&data->to_send, dupmsg(msg));
+	return 0; // Return 0 to drop the packet, it will be injected later
 }
 
 // Callback called when a packet is on it's way to be received
@@ -4655,28 +3878,58 @@ static int rtptm_on_send(RtpTransportModifier *rtptm, mblk_t *msg) {
 static int rtptm_on_receive(RtpTransportModifier *rtptm, mblk_t *msg) {
 	RtpTransportModifierData *data = rtptm->data;
 	rtp_header_t *rtp = (rtp_header_t*)msg->b_rptr;
-	int i = 0;
-	unsigned char *src;
-	int size = 0;
-	
+
 	if (rtp->version == 0) {
 		// This is probably a STUN packet, so don't count it (oRTP won't) and don't decrypt it either
-		return msgdsize(msg);
+		return (int)msgdsize(msg);
 	}
-	
-	// On the receiving side, there is no need for a msgpullup, the mblk_t contains the header and the payload in the same buffer
-	// We just ask for the size and a pointer to the payload buffer
-	size = rtp_get_payload(msg, &src);
-	
-	// Since we did a XOR encryption on the send side, we have to do it again to decrypt the payload
-	for (i = 0; i < size; i++) {
-		src[i] ^= (unsigned char) XOR_KEY[i % strlen(XOR_KEY)];
-	}
-	
+
 	data->packetReceivedCount += 1;
-	
-	/* /!\ DO NOT RETURN 0 or the packet will be dropped /!\ */
-	return msgdsize(msg);
+	ms_queue_put(&data->to_recv, dupmsg(msg));
+	return 0; // Return 0 to drop the packet, it will be injected later
+}
+
+static void rtptm_on_schedule(RtpTransportModifier *rtptm) {
+	RtpTransportModifierData *data = rtptm->data;
+	mblk_t *msg = NULL;
+
+	while ((msg = ms_queue_get(&data->to_send)) != NULL) {
+		int size = 0;
+		unsigned char *src;
+		int i = 0;
+
+		// Mediastream can create a mblk_t with only the RTP header and setting the b_cont pointer to the actual RTP content buffer
+		// In this scenario, the result of rtp_get_payload will be 0, and we won't be able to do our XOR encryption on the payload
+		// The call to msgpullup will trigger a memcpy of the header and the payload in the same buffer in the msg mblk_t
+		msgpullup(msg, -1);
+		// Now that the mblk_t buffer directly contains the header and the payload, we can get the size of the payload and a pointer to it's start (we don't encrypt the RTP header)
+		size = rtp_get_payload(msg, &src);
+
+		// Just for fun, let's do a XOR encryption
+		for (i = 0; i < size; i++) {
+			src[i] ^= (unsigned char) XOR_KEY[i % strlen(XOR_KEY)];
+		}
+
+		meta_rtp_transport_modifier_inject_packet_to_send(rtptm->transport, rtptm, msg, 0);
+	}
+
+	msg = NULL;
+	while ((msg = ms_queue_get(&data->to_recv)) != NULL) {
+		int size = 0;
+		unsigned char *src;
+		int i = 0;
+
+		// On the receiving side, there is no need for a msgpullup, the mblk_t contains the header and the payload in the same buffer
+		// We just ask for the size and a pointer to the payload buffer
+		size = rtp_get_payload(msg, &src);
+
+		// Since we did a XOR encryption on the send side, we have to do it again to decrypt the payload
+		for (i = 0; i < size; i++) {
+			src[i] ^= (unsigned char) XOR_KEY[i % strlen(XOR_KEY)];
+		}
+
+		meta_rtp_transport_modifier_inject_packet_to_recv(rtptm->transport, rtptm, msg, 0);
+	}
 }
 
 // This callback is called when the transport modifier is being destroyed
@@ -4686,28 +3939,31 @@ static void rtptm_destroy(RtpTransportModifier *rtptm)  {
 }
 
 // This is the callback called when the state of the call change
-void static call_state_changed_4(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg) {
+static void call_state_changed_4(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg) {
 	int i = 0;
-	
+
 	// To add a custom RTP transport modifier, we have to do it before the call is running, but after the RTP session is created.
 	if (cstate == LinphoneCallIncomingReceived || cstate == LinphoneCallOutgoingProgress) {
 		RtpTransport *rtpt = NULL;
 		RtpTransportModifierData *data = ms_new0(RtpTransportModifierData, 1);
 		RtpTransportModifier *rtptm = ms_new0(RtpTransportModifier, 1);
+		ms_queue_init(&data->to_send);
+		ms_queue_init(&data->to_recv);
 		rtptm->data = data;
 		rtptm->t_process_on_send = rtptm_on_send;
 		rtptm->t_process_on_receive = rtptm_on_receive;
+		rtptm->t_process_on_schedule = rtptm_on_schedule;
 		rtptm->t_destroy = rtptm_destroy;
-		
+
 		// Here we iterate on each meta rtp transport available
 		for (i = 0; i < linphone_call_get_stream_count(call); i++) {
 			MSFormatType type;
-			
+
 			rtpt = linphone_call_get_meta_rtp_transport(call, i);
-			
+
 			// If we wanted, we also could get the RTCP meta transports like this:
 			// rtcpt = linphone_call_get_meta_rtcp_transport(call, i);
-			
+
 			// If you want to know which stream meta RTP transport is the current one, you can use
 			type = linphone_call_get_stream_type(call, i);
 			// Currently there is only MSAudio and MSVideo types, but this could change later
@@ -4717,7 +3973,6 @@ void static call_state_changed_4(LinphoneCore *lc, LinphoneCall *call, LinphoneC
 			} else if (type == MSVideo) {
 				// Because the call of this test is audio only, we don't have to append our modifier to the meta RTP transport from the video stream
 			}
-			
 		}
 		// We save the pointer to our RtpTransportModifier in the call user_data to be able to get to it later
 		call->user_data = rtptm;
@@ -4740,10 +3995,10 @@ static void custom_rtp_modifier(bool_t pauseResumeTest, bool_t recordTest) {
 	// The following are only used for the record test
 	LinphonePlayer *player;
 	char *hellopath = bc_tester_res("sounds/ahbahouaismaisbon.wav"); // File to be played
-	char *recordpath = create_filepath(bc_tester_get_writable_dir_prefix(), "record-call_with_file_player", "wav"); // File to record the received sound
+	char *recordpath = bc_tester_file("record-call_with_file_player.wav"); // File to record the received sound
 	double similar = 1; // The factor of similarity between the played file and the one recorded
-	const double threshold = 0.9; // Minimum similarity value to consider the record file equal to the one sent
-	
+	const double threshold = 0.85; // Minimum similarity value to consider the record file equal to the one sent
+
 	// We create a new vtable to listen only to the call state changes, in order to plug our RTP Transport Modifier when the call will be established
 	v_table = linphone_core_v_table_new();
 	v_table->call_state_changed = call_state_changed_4;
@@ -4751,11 +4006,12 @@ static void custom_rtp_modifier(bool_t pauseResumeTest, bool_t recordTest) {
 	v_table = linphone_core_v_table_new();
 	v_table->call_state_changed = call_state_changed_4;
 	linphone_core_add_listener(marie->lc,v_table);
-	
+
+
 	if (recordTest) { // When we do the record test, we need a file player to play the content of a sound file
 		/*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/
 		unlink(recordpath);
-		
+
 		linphone_core_use_files(pauline->lc,TRUE);
 		linphone_core_set_play_file(pauline->lc,NULL);
 		linphone_core_set_record_file(pauline->lc,NULL);
@@ -4770,16 +4026,16 @@ static void custom_rtp_modifier(bool_t pauseResumeTest, bool_t recordTest) {
 	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
 
 	if (!call_ok) goto end;
-	
+
 	// Ref the call to keep the pointer valid even after the call is release
 	call_pauline = linphone_call_ref(linphone_core_get_current_call(pauline->lc));
 	call_marie = linphone_call_ref(linphone_core_get_current_call(marie->lc));
-	
+
 	// This is for the pause/resume test, we don't do it in the call record test to be able to check the recorded call matches the file played
 	if (pauseResumeTest) {
 		// This only wait for 3 seconds in order to generate traffic for the test
 		wait_for_until(pauline->lc, marie->lc, NULL, 5, 3000);
-	
+
 		linphone_core_pause_call(pauline->lc,call_pauline);
 		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallPausing, 1));
 		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneCallPausedByRemote, 1));
@@ -4792,13 +4048,13 @@ static void custom_rtp_modifier(bool_t pauseResumeTest, bool_t recordTest) {
 
 		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
 		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
-	
+
 		/*same here: wait a while for a bit of a traffic, we need to receive a RTCP packet*/
 		wait_for_until(pauline->lc, marie->lc, NULL, 5, 5000);
 
 		/*since RTCP streams are reset when call is paused/resumed, there should be no loss at all*/
 		stats = rtp_session_get_stats(call_pauline->sessions->rtp_session);
-		BC_ASSERT_EQUAL(stats->cum_packet_loss, 0, int, "%d");
+		BC_ASSERT_EQUAL((int)stats->cum_packet_loss, 0, int, "%d");
 
 		end_call(pauline, marie);
 	} else if (recordTest) {
@@ -4815,10 +4071,10 @@ static void custom_rtp_modifier(bool_t pauseResumeTest, bool_t recordTest) {
 		wait_for_until(pauline->lc, marie->lc, NULL, 0, 1000);
 
 		end_call(pauline, marie);
-		
+
 		// Now we compute a similarity factor between the original file and the one we recorded on the callee side
-		BC_ASSERT_EQUAL(ms_audio_diff(hellopath, recordpath, &similar, audio_cmp_max_shift, NULL, NULL), 0, int, "%d");
-		
+		BC_ASSERT_EQUAL(ms_audio_diff(hellopath, recordpath, &similar, &audio_cmp_params, NULL, NULL), 0, int, "%d");
+
 		BC_ASSERT_GREATER(similar, threshold, double, "%g");
 		BC_ASSERT_LOWER(similar, 1.0, double, "%g");
 		if (similar >= threshold && similar <= 1.0) {
@@ -4828,26 +4084,26 @@ static void custom_rtp_modifier(bool_t pauseResumeTest, bool_t recordTest) {
 	} else {
 		// This only wait for 3 seconds in order to generate traffic for the test
 		wait_for_until(pauline->lc, marie->lc, NULL, 5, 3000);
-		
+
 		// We termine the call and check the stats to see if the call is correctly ended on both sides
 		end_call(pauline, marie);
 	}
-	
+
 	// Now we can go fetch our custom structure and check the number of packets sent/received is the same on both sides
 	rtptm_marie = (RtpTransportModifier *)call_marie->user_data;
 	rtptm_pauline = (RtpTransportModifier *)call_pauline->user_data;
 	data_marie = (RtpTransportModifierData *)rtptm_marie->data;
 	data_pauline = (RtpTransportModifierData *)rtptm_pauline->data;
-	
+
 	BC_ASSERT_PTR_NOT_NULL(data_marie);
 	BC_ASSERT_PTR_NOT_NULL(data_pauline);
 	ms_message("Marie sent %i RTP packets and received %i (through our modifier)", (int)data_marie->packetSentCount, (int)data_marie->packetReceivedCount);
 	ms_message("Pauline sent %i RTP packets and received %i (through our modifier)", (int)data_pauline->packetSentCount, (int)data_pauline->packetReceivedCount);
 	// There will be a few RTP packets sent on marie's side before the call is ended at pauline's request, so we need the threshold
 	BC_ASSERT_TRUE(data_marie->packetSentCount - data_pauline->packetReceivedCount < 50);
-	BC_ASSERT_TRUE(data_marie->packetReceivedCount == data_pauline->packetSentCount);
+	BC_ASSERT_TRUE(data_pauline->packetSentCount - data_marie->packetReceivedCount < 50);
 	// At this point, we know each packet that has been processed in the send callback of our RTP modifier also go through the recv callback of the remote.
-	
+
 	// Now we want to ensure that all sent RTP packets actually go through our RTP transport modifier and thus no packet leave without being processed (by any operation we might want to do on it)
 	{
 		const LinphoneCallStats *marie_stats = linphone_call_get_audio_stats(call_marie);
@@ -4856,9 +4112,10 @@ static void custom_rtp_modifier(bool_t pauseResumeTest, bool_t recordTest) {
 		rtp_stats_t pauline_rtp_stats = linphone_call_stats_get_rtp_stats(pauline_stats);
 		ms_message("Marie sent %i RTP packets and received %i (for real)", (int)marie_rtp_stats.packet_sent, (int)marie_rtp_stats.packet_recv);
 		ms_message("Pauline sent %i RTP packets and received %i (for real)", (int)pauline_rtp_stats.packet_sent, (int)pauline_rtp_stats.packet_recv);
-		BC_ASSERT_TRUE(data_marie->packetReceivedCount == marie_rtp_stats.packet_recv);
-		BC_ASSERT_TRUE(data_marie->packetSentCount == marie_rtp_stats.packet_sent);
-		BC_ASSERT_TRUE(data_pauline->packetReceivedCount == pauline_rtp_stats.packet_recv);
+		BC_ASSERT_EQUAL(data_marie->packetReceivedCount, marie_rtp_stats.packet_recv, unsigned long long, "%llu");
+		BC_ASSERT_EQUAL(data_marie->packetSentCount, marie_rtp_stats.packet_sent, unsigned long long, "%llu");
+		// There can be a small difference between the number of packets received in the modifier and the number processed in reception because the processing is asynchronous
+		BC_ASSERT_TRUE(data_pauline->packetReceivedCount - pauline_rtp_stats.packet_recv < 20);
 		BC_ASSERT_TRUE(data_pauline->packetSentCount == pauline_rtp_stats.packet_sent);
 	}
 
@@ -4872,7 +4129,7 @@ end:
 		ms_free(data_marie);
 	}
 	ms_free(rtptm_marie);
-	
+
 	// Unref the previously ref calls
 	if (call_marie) {
 		linphone_call_unref(call_marie);
@@ -4880,11 +4137,11 @@ end:
 	if (call_pauline) {
 		linphone_call_unref(call_pauline);
 	}
-	
+
 	// The test is finished, the linphone core are no longer needed, we can safely free them
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-	
+
 	ms_free(recordpath);
 	ms_free(hellopath);
 }
@@ -4901,145 +4158,1265 @@ static void call_record_with_custom_rtp_modifier(void) {
 	custom_rtp_modifier(FALSE, TRUE);
 }
 
-test_t call_tests[] = {
-	{ "Early declined call", early_declined_call },
-	{ "Call declined", call_declined },
-	{ "Cancelled call", cancelled_call },
-	{ "Early cancelled call", early_cancelled_call},
-	{ "Call with DNS timeout", call_with_dns_time_out },
-	{ "Cancelled ringing call", cancelled_ringing_call },
-	{ "Call busy when calling self", call_busy_when_calling_self},
-	{ "Simple call", simple_call },
-	{ "Call with timeouted bye", call_with_timeouted_bye },
-	{ "Direct call over IPv6", direct_call_over_ipv6},
-	{ "Outbound call with multiple proxy possible", call_outbound_with_multiple_proxy },
-	{ "Audio call recording", audio_call_recording_test },
-#if 0 /* not yet activated because not implemented */
-	{ "Multiple answers to a call", multiple_answers_call },
+static void recovered_call_on_network_switch_in_early_state_1(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(marie->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableTrue, 2);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 2));
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void recovered_call_on_network_switch_in_early_state_2(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	//linphone_core_iterate(pauline->lc);
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(marie->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableTrue, 2);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void recovered_call_on_network_switch_in_early_state_3(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	linphone_core_set_network_reachable(pauline->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(pauline->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableTrue, 2);
+
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000);
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void recovered_call_on_network_switch_in_early_state_4(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
+
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	linphone_core_set_network_reachable(pauline->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(pauline->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableTrue, 2);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	BC_ASSERT_TRUE(sal_call_dialog_request_pending(incoming_call->op));
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000);
+	BC_ASSERT_FALSE(sal_call_dialog_request_pending(incoming_call->op));
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void recovered_call_on_network_switch_during_reinvite_1(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCall *outgoing_call;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
+
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	outgoing_call = linphone_core_get_current_call(marie->lc);
+	linphone_core_pause_call(marie->lc, outgoing_call);
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(marie->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableTrue, 2);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallPaused, 1));
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void configure_video_policies_for_network_switch(LinphoneCore *marie, LinphoneCore *pauline) {
+	LinphoneVideoPolicy policy;
+	policy.automatically_accept = FALSE;
+	policy.automatically_initiate = FALSE;
+
+	linphone_core_enable_video_capture(marie, TRUE);
+	linphone_core_enable_video_display(marie, TRUE);
+	linphone_core_enable_video_capture(pauline, TRUE);
+	linphone_core_enable_video_display(pauline, TRUE);
+	linphone_core_set_video_policy(marie, &policy);
+	linphone_core_set_video_policy(pauline, &policy);
+	lp_config_set_int(pauline->config, "sip", "defer_update_default", TRUE);
+}
+
+static void recovered_call_on_network_switch_during_reinvite_2(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCall *outgoing_call;
+	LinphoneCallParams *params;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
+
+	configure_video_policies_for_network_switch(marie->lc, pauline->lc);
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	outgoing_call = linphone_core_get_current_call(marie->lc);
+	params = linphone_core_create_call_params(marie->lc, outgoing_call);
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_update_call(marie->lc, outgoing_call, params);
+	linphone_call_params_unref(params);
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(marie->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableTrue, 2);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneRegistrationOk, 2));
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000);
+	params = linphone_core_create_call_params(pauline->lc, incoming_call);
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_accept_call_update(pauline->lc, incoming_call, params);
+	linphone_call_params_unref(params);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000);
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void recovered_call_on_network_switch_during_reinvite_3(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCall *outgoing_call;
+	LinphoneCallParams *params;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
+
+	configure_video_policies_for_network_switch(marie->lc, pauline->lc);
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	outgoing_call = linphone_core_get_current_call(marie->lc);
+	params = linphone_core_create_call_params(marie->lc, outgoing_call);
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_update_call(marie->lc, outgoing_call, params);
+	linphone_call_params_unref(params);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+
+	linphone_core_set_network_reachable(pauline->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(pauline->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableTrue, 2);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneRegistrationOk, 2));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+
+	params = linphone_core_create_call_params(marie->lc, outgoing_call);
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_update_call(marie->lc, outgoing_call, params);
+	linphone_call_params_unref(params);
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000);
+	params = linphone_core_create_call_params(pauline->lc, incoming_call);
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_accept_call_update(pauline->lc, incoming_call, params);
+	linphone_call_params_unref(params);
+
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000);
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void recovered_call_on_network_switch_during_reinvite_4(void) {
+	LinphoneCall *incoming_call;
+	LinphoneCall *outgoing_call;
+	LinphoneCallParams *params;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
+
+	configure_video_policies_for_network_switch(marie->lc, pauline->lc);
+	linphone_core_invite_address(marie->lc, pauline->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1))) goto end;
+
+	incoming_call = linphone_core_get_current_call(pauline->lc);
+	linphone_core_accept_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	outgoing_call = linphone_core_get_current_call(marie->lc);
+	params = linphone_core_create_call_params(marie->lc, outgoing_call);
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_update_call(marie->lc, outgoing_call, params);
+	linphone_call_params_unref(params);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+
+	params = linphone_core_create_call_params(pauline->lc, incoming_call);
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_accept_call_update(pauline->lc, incoming_call, params);
+	linphone_call_params_unref(params);
+	linphone_core_set_network_reachable(pauline->lc, FALSE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableFalse, 1);
+	linphone_core_set_network_reachable(pauline->lc, TRUE);
+	wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableTrue, 2);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneRegistrationOk, 2));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+
+	wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000);
+	linphone_core_terminate_call(pauline->lc, incoming_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallReleased, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallReleased, 1));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void _call_with_network_switch(bool_t use_ice, bool_t with_socket_refresh, bool_t enable_rtt) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCallParams *pauline_params = NULL;
+	bctbx_list_t *lcs = NULL;
+	bool_t call_ok;
+
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+
+	if (use_ice){
+		linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
+		linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
+	}
+	if (with_socket_refresh){
+		lp_config_set_int(linphone_core_get_config(marie->lc), "net", "recreate_sockets_when_network_is_up", 1);
+		lp_config_set_int(linphone_core_get_config(pauline->lc), "net", "recreate_sockets_when_network_is_up", 1);
+	}
+	if (enable_rtt) {
+		pauline_params = linphone_core_create_call_params(pauline->lc, NULL);
+		linphone_call_params_enable_realtime_text(pauline_params, TRUE);
+	}
+
+	BC_ASSERT_TRUE((call_ok=call_with_params(pauline, marie, pauline_params, NULL)));
+	if (!call_ok) goto end;
+
+	wait_for_until(marie->lc, pauline->lc, NULL, 0, 2000);
+	if (use_ice) {
+		/*wait for ICE reINVITE to complete*/
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+		BC_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+	}
+
+	/*marie looses the network and reconnects*/
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	wait_for_until(marie->lc, pauline->lc, NULL, 0, 1000);
+
+	/*marie will reconnect and register*/
+	linphone_core_set_network_reachable(marie->lc, TRUE);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneRegistrationOk, 2));
+
+	if (use_ice){
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdating, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 3));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 3));
+		/*now comes the ICE reINVITE*/
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdating, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 4));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 4));
+	}else{
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdating, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+	}
+
+	/*check that media is back*/
+	check_media_direction(marie, linphone_core_get_current_call(marie->lc), lcs, LinphoneMediaDirectionSendRecv, LinphoneMediaDirectionInvalid);
+	liblinphone_tester_check_rtcp(pauline, marie);
+	if (use_ice) BC_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+
+	/*pauline shall be able to end the call without problem now*/
+	end_call(pauline, marie);
+end:
+	if (pauline_params) {
+		linphone_call_params_unref(pauline_params);
+	}
+	bctbx_list_free(lcs);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_network_switch(void){
+	_call_with_network_switch(FALSE, FALSE, FALSE);
+}
+
+static void call_with_network_switch_and_ice(void){
+	_call_with_network_switch(TRUE, FALSE, FALSE);
+}
+
+static void call_with_network_switch_ice_and_rtt(void) {
+	_call_with_network_switch(TRUE, FALSE, TRUE);
+}
+
+static void call_with_network_switch_and_socket_refresh(void){
+	_call_with_network_switch(TRUE, TRUE, FALSE);
+}
+
+static void call_with_network_switch_no_recovery(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCallParams *pauline_params = NULL;
+	bctbx_list_t *lcs = NULL;
+	bool_t call_ok;
+
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+	
+	linphone_core_set_nortp_timeout(marie->lc, 50000);
+
+	BC_ASSERT_TRUE((call_ok=call_with_params(pauline, marie, pauline_params, NULL)));
+	if (!call_ok) goto end;
+
+	wait_for_until(marie->lc, pauline->lc, NULL, 0, 2000);
+
+	/*marie looses the network and reconnects*/
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	/*but meanwhile pauline terminates the call.*/
+	linphone_core_terminate_call(pauline->lc, linphone_core_get_current_call(pauline->lc));
+	/*
+	 * We have to wait 32 seconds so that the BYE transaction is terminated, and dialog removed.
+	 * This is the condition to receive a 481 when marie sends the reINVITE.*/
+	wait_for_list(lcs, NULL, 0, 32500);
+	
+	/*marie will reconnect, register, and send an automatic reINVITE to try to repair the call*/
+	linphone_core_set_network_reachable(marie->lc, TRUE);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneRegistrationOk, 2));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdating, 1));
+	/*This reINVITE should of course fail, so marie's call should be terminated.*/
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
+	
+end:
+	if (pauline_params) {
+		linphone_call_params_unref(pauline_params);
+	}
+	bctbx_list_free(lcs);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_sip_and_rtp_independant_switches(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bctbx_list_t *lcs = NULL;
+	bool_t call_ok;
+	bool_t use_ice = TRUE;
+	bool_t with_socket_refresh = TRUE;
+
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+
+	if (use_ice){
+		linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
+		linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
+	}
+	if (with_socket_refresh){
+		lp_config_set_int(linphone_core_get_config(marie->lc), "net", "recreate_sockets_when_network_is_up", 1);
+		lp_config_set_int(linphone_core_get_config(pauline->lc), "net", "recreate_sockets_when_network_is_up", 1);
+	}
+
+	linphone_core_set_media_network_reachable(marie->lc, TRUE);
+
+	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
+	if (!call_ok) goto end;
+
+	wait_for_until(marie->lc, pauline->lc, NULL, 0, 2000);
+	if (use_ice) {
+		/*wait for ICE reINVITE to complete*/
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+		BC_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+	}
+	/*marie looses the SIP network and reconnects*/
+	linphone_core_set_sip_network_reachable(marie->lc, FALSE);
+	linphone_core_set_media_network_reachable(marie->lc, FALSE);
+	wait_for_until(marie->lc, pauline->lc, NULL, 0, 1000);
+
+	/*marie will reconnect and register*/
+	linphone_core_set_sip_network_reachable(marie->lc, TRUE);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneRegistrationOk, 2));
+	wait_for_until(marie->lc, pauline->lc, NULL, 0, 5000);
+	/*at this stage, no reINVITE is expected to be send*/
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallUpdating, 0, int, "%i");
+
+	/*now we notify the a reconnection of media network*/
+	linphone_core_set_media_network_reachable(marie->lc, TRUE);
+
+	if (use_ice){
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdating, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 3));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 3));
+		/*now comes the ICE reINVITE*/
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdating, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 4));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 4));
+	}else{
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallUpdating, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallUpdatedByRemote, 1));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+		BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+	}
+
+	/*check that media is back*/
+	check_media_direction(marie, linphone_core_get_current_call(marie->lc), lcs, LinphoneMediaDirectionSendRecv, LinphoneMediaDirectionInvalid);
+	liblinphone_tester_check_rtcp(pauline, marie);
+	if (use_ice) BC_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+
+	/*pauline shall be able to end the call without problem now*/
+	end_call(pauline, marie);
+end:
+	bctbx_list_free(lcs);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+
+#ifdef SQLITE_STORAGE_ENABLED
+
+static void call_logs_if_no_db_set(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new("laure_call_logs_rc");
+	BC_ASSERT_TRUE(bctbx_list_size(laure->lc->call_logs) == 10);
+
+	BC_ASSERT_TRUE(call(marie, laure));
+	wait_for_until(marie->lc, laure->lc, NULL, 5, 1000);
+	end_call(marie, laure);
+
+	BC_ASSERT_TRUE(bctbx_list_size(laure->lc->call_logs) == 11);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(laure);
+}
+
+static void call_logs_migrate(void) {
+	LinphoneCoreManager* laure = linphone_core_manager_new("laure_call_logs_rc");
+	char *logs_db = bc_tester_file("call_logs.db");
+	size_t i = 0;
+	int incoming_count = 0, outgoing_count = 0, missed_count = 0, aborted_count = 0, decline_count = 0, video_enabled_count = 0;
+
+	unlink(logs_db);
+	BC_ASSERT_TRUE(bctbx_list_size(laure->lc->call_logs) == 10);
+
+	linphone_core_set_call_logs_database_path(laure->lc, logs_db);
+	BC_ASSERT_TRUE(linphone_core_get_call_history_size(laure->lc) == 10);
+
+	for (; i < bctbx_list_size(laure->lc->call_logs); i++) {
+		LinphoneCallLog *log = bctbx_list_nth_data(laure->lc->call_logs, (int)i);
+		LinphoneCallStatus state = linphone_call_log_get_status(log);
+		LinphoneCallDir direction = linphone_call_log_get_dir(log);
+
+		if (state == LinphoneCallAborted) {
+			aborted_count += 1;
+		} else if (state == LinphoneCallMissed) {
+			missed_count += 1;
+		} else if (state == LinphoneCallDeclined) {
+			decline_count += 1;
+		}
+
+		if (direction == LinphoneCallOutgoing) {
+			outgoing_count += 1;
+		} else {
+			incoming_count += 1;
+		}
+
+		if (linphone_call_log_video_enabled(log)) {
+			video_enabled_count += 1;
+		}
+	}
+	BC_ASSERT_TRUE(incoming_count == 5);
+	BC_ASSERT_TRUE(outgoing_count == 5);
+	BC_ASSERT_TRUE(missed_count == 1);
+	BC_ASSERT_TRUE(aborted_count == 3);
+	BC_ASSERT_TRUE(decline_count == 2);
+	BC_ASSERT_TRUE(video_enabled_count == 3);
+
+	{
+		LinphoneCallLog *log = linphone_core_get_last_outgoing_call_log(laure->lc);
+		BC_ASSERT_PTR_NOT_NULL(log);
+		if (log) {
+			BC_ASSERT_EQUAL((int)log->start_date_time, 1441738272, int, "%d");
+			linphone_call_log_unref(log);
+			log = NULL;
+		}
+	}
+
+	laure->lc->call_logs = bctbx_list_free_with_data(laure->lc->call_logs, (void (*)(void*))linphone_call_log_unref);
+	call_logs_read_from_config_file(laure->lc);
+	BC_ASSERT_TRUE(bctbx_list_size(laure->lc->call_logs) == 0);
+
+	unlink(logs_db);
+	ms_free(logs_db);
+	linphone_core_manager_destroy(laure);
+}
+
+static void call_logs_sqlite_storage(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	char *logs_db = bc_tester_file("call_logs.db");
+	bctbx_list_t *logs = NULL;
+	LinphoneCallLog *call_log = NULL;
+	LinphoneAddress *laure = NULL;
+	time_t user_data_time = time(NULL);
+	time_t start_time = 0;
+	unlink(logs_db);
+
+	linphone_core_set_call_logs_database_path(marie->lc, logs_db);
+	BC_ASSERT_TRUE(linphone_core_get_call_history_size(marie->lc) == 0);
+
+	BC_ASSERT_TRUE(call(marie, pauline));
+	wait_for_until(marie->lc, pauline->lc, NULL, 5, 500);
+	call_log = linphone_call_get_call_log(linphone_core_get_current_call(marie->lc));
+	start_time = linphone_call_log_get_start_date(call_log);
+	linphone_call_log_set_user_data(call_log, &user_data_time);
+	linphone_call_log_set_ref_key(call_log, "ref_key");
+	end_call(marie, pauline);
+	BC_ASSERT_TRUE(linphone_core_get_call_history_size(marie->lc) == 1);
+
+	logs = linphone_core_get_call_history_for_address(marie->lc, linphone_proxy_config_get_identity_address(linphone_core_get_default_proxy_config(pauline->lc)));
+	BC_ASSERT_TRUE(bctbx_list_size(logs) == 1);
+	bctbx_list_free_with_data(logs, (void (*)(void*))linphone_call_log_unref);
+
+	laure = linphone_address_new("\"Laure\" <sip:laure@sip.example.org>");
+	logs = linphone_core_get_call_history_for_address(marie->lc, laure);
+	BC_ASSERT_TRUE(bctbx_list_size(logs) == 0);
+	linphone_address_destroy(laure);
+
+	logs = linphone_core_get_call_history_for_address(marie->lc, linphone_proxy_config_get_identity_address(linphone_core_get_default_proxy_config(pauline->lc)));
+	if (BC_ASSERT_TRUE(bctbx_list_size(logs) == 1)) {
+		const char *call_id;
+		const char *ref_key = linphone_call_log_get_ref_key(call_log);
+		call_log = logs->data;
+		BC_ASSERT_EQUAL(linphone_call_log_get_dir(call_log), LinphoneCallOutgoing, int, "%d");
+		BC_ASSERT_LOWER(linphone_call_log_get_duration(call_log), 2, int, "%d");
+		BC_ASSERT_TRUE(linphone_address_equal(
+			linphone_call_log_get_from_address(call_log),
+			linphone_proxy_config_get_identity_address(linphone_core_get_default_proxy_config(marie->lc))));
+		BC_ASSERT_TRUE(linphone_address_equal(
+			linphone_call_log_get_to_address(call_log),
+			linphone_proxy_config_get_identity_address(linphone_core_get_default_proxy_config(pauline->lc))));
+		BC_ASSERT_PTR_NOT_NULL(linphone_call_log_get_local_stats(call_log));
+		BC_ASSERT_GREATER(linphone_call_log_get_quality(call_log), -1, float, "%.1f");
+		BC_ASSERT_PTR_NOT_NULL(ref_key);
+		if (ref_key) {
+			BC_ASSERT_STRING_EQUAL(ref_key, "ref_key");
+		}
+		BC_ASSERT_PTR_EQUAL(linphone_call_log_get_user_data(call_log), &user_data_time);
+
+		call_id = linphone_call_log_get_call_id(call_log);
+		BC_ASSERT_PTR_NOT_NULL(call_id);
+		{
+			LinphoneCallLog* find_call_log = linphone_core_find_call_log_from_call_id(marie->lc, call_id);
+			BC_ASSERT_PTR_NOT_NULL(find_call_log);
+			if (find_call_log) linphone_call_log_unref(find_call_log);
+		}
+
+		BC_ASSERT_TRUE(linphone_address_equal(
+			linphone_call_log_get_remote_address(call_log),
+			linphone_proxy_config_get_identity_address(linphone_core_get_default_proxy_config(pauline->lc))));
+		BC_ASSERT_PTR_NOT_NULL(linphone_call_log_get_remote_stats(call_log));
+
+		BC_ASSERT_EQUAL(linphone_call_log_get_start_date(call_log), start_time, unsigned long long, "%llu");
+		BC_ASSERT_EQUAL(linphone_call_log_get_status(call_log), LinphoneCallSuccess, int, "%d");
+	}
+
+	linphone_core_delete_call_log(marie->lc, (LinphoneCallLog *)bctbx_list_nth_data(logs, 0));
+	bctbx_list_free_with_data(logs, (void (*)(void*))linphone_call_log_unref);
+	BC_ASSERT_TRUE(linphone_core_get_call_history_size(marie->lc) == 0);
+
+	reset_counters(&marie->stat);
+	reset_counters(&pauline->stat);
+	BC_ASSERT_TRUE(call(marie, pauline));
+	end_call(marie, pauline);
+
+	reset_counters(&marie->stat);
+	reset_counters(&pauline->stat);
+	BC_ASSERT_TRUE(call(marie, pauline));
+	end_call(marie, pauline);
+	BC_ASSERT_TRUE(linphone_core_get_call_history_size(marie->lc) == 2);
+
+	linphone_core_delete_call_history(marie->lc);
+	BC_ASSERT_TRUE(linphone_core_get_call_history_size(marie->lc) == 0);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	unlink(logs_db);
+	ms_free(logs_db);
+}
+
 #endif
-	{ "Multiple answers to a call with media relay", multiple_answers_call_with_media_relay },
-	{ "Call with media relay", call_with_media_relay},
-	{ "Call with media relay (random ports)", call_with_media_relay_random_ports},
-	{ "Simple call compatibility mode", simple_call_compatibility_mode },
-	{ "Early-media call", early_media_call },
-	{ "Early-media call with ringing", early_media_call_with_ringing },
-	{ "Early-media call with updated media session", early_media_call_with_session_update},
-	{ "Early-media call with updated codec", early_media_call_with_codec_update},
-	{ "Call terminated by caller", call_terminated_by_caller },
-	{ "Call without SDP", call_with_no_sdp},
-	{ "Call without SDP and ACK without SDP", call_with_no_sdp_ack_without_sdp},
-	{ "Call paused resumed", call_paused_resumed },
-	{ "Call paused by both parties", call_paused_by_both },
-	{ "Call paused resumed with loss", call_paused_resumed_with_loss },
-	{ "Call paused resumed from callee", call_paused_resumed_from_callee },
-	{ "SRTP call", srtp_call },
-	{ "ZRTP call",zrtp_call},
-	{ "ZRTP SAS call",zrtp_sas_call},
-	{ "ZRTP Cipher call",zrtp_cipher_call},
-	{ "DTLS SRTP call",dtls_srtp_call},
-	{ "DTLS SRTP call with media relay", dtls_srtp_call_with_media_realy},
-	{ "ZRTP video call",zrtp_video_call},
-	{ "SRTP call with declined srtp", call_with_declined_srtp },
-	{ "SRTP call paused and resumed", call_srtp_paused_and_resumed },
-	{ "Call with file player", call_with_file_player},
-	{ "Call with mkv file player", call_with_mkv_file_player},
-	{ "Audio call with ICE no matching audio codecs", audio_call_with_ice_no_matching_audio_codecs },
-#ifdef VIDEO_ENABLED
-	{ "Simple video call",video_call},
-	{ "Simple ZRTP video call",video_call_zrtp},
-	{ "Simple DTLS video call",video_call_dtls},
-	{ "Simple video call using policy",video_call_using_policy},
-	{ "Video call using policy with callee video disabled", video_call_using_policy_with_callee_video_disabled },
-	{ "Video call using policy with caller video disabled", video_call_using_policy_with_caller_video_disabled },
-	{ "Video call without SDP",video_call_no_sdp},
-	{ "SRTP ice video call", srtp_video_ice_call },
-	{ "ZRTP ice video call", zrtp_video_ice_call },
-	{ "Call with video added", call_with_video_added },
-	{ "Call with video added 2", call_with_video_added_2 },
-	{ "Call with video added (random ports)", call_with_video_added_random_ports },
-	{ "Call with several video switches", call_with_several_video_switches },
-	{ "SRTP call with several video switches", srtp_call_with_several_video_switches },
-	{ "Call with video declined", call_with_declined_video},
-	{ "Call with video declined using policy", call_with_declined_video_using_policy},
-	{ "Call with multiple early media", multiple_early_media },
-	{ "Call with ICE from video to non-video", call_with_ice_video_to_novideo},
-	{ "Call with ICE and video added", call_with_ice_video_added },
-	{ "Call with ICE and video added 2", call_with_ice_video_added_2 },
-	{ "Call with ICE and video added 3", call_with_ice_video_added_3 },
-	{ "Call with ICE and video added and refused", call_with_ice_video_added_and_refused },
-	{ "Video call with ICE accepted using call params",video_call_ice_params},
-	{ "Video call recording", video_call_recording_test },
-	{ "Snapshot", video_call_snapshot },
-	{ "Video call with early media and no matching audio codecs", video_call_with_early_media_no_matching_audio_codecs },
-	{ "DTLS SRTP video call",dtls_srtp_video_call},
-	{ "DTLS SRTP ice video call",dtls_srtp_ice_video_call},
-	{ "DTLS SRTP ice video call with relay",dtls_srtp_ice_video_call_with_relay},
-	{ "Video call with limited bandwidth", video_call_limited_bandwidth},
-	{ "Video call accepted in send only", accept_call_in_send_only},
-	{ "Video call accepted in send only with ice", accept_call_in_send_only_with_ice},
-	{ "2 Video call accepted in send only", two_accepted_call_in_send_only},
-	{ "Video call with re-invite(inactive) followed by re-invite", video_call_with_re_invite_inactive_followed_by_re_invite},
-	{ "Video call with re-invite(inactive) followed by re-invite(no sdp)", video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp},
-	{ "SRTP Video call with re-invite(inactive) followed by re-invite", srtp_video_call_with_re_invite_inactive_followed_by_re_invite},
-	{ "SRTP Video call with re-invite(inactive) followed by re-invite(no sdp)", srtp_video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp},
-	#endif
-	{ "SRTP ice call", srtp_ice_call },
-	{ "ZRTP ice call", zrtp_ice_call },
-	{ "ZRTP ice call with relay", zrtp_ice_call_with_relay},
-	{ "DTLS SRTP ice call",dtls_srtp_ice_call},
-	{ "DTLS ice call with relay", dtls_ice_call_with_relay},
-	{ "Call with privacy", call_with_privacy },
-	{ "Call with privacy 2", call_with_privacy2 },
-	{ "Call rejected because of wrong credential", call_rejected_because_wrong_credentials},
-	{ "Call rejected without 403 because of wrong credential", call_rejected_without_403_because_wrong_credentials},
-	{ "Call rejected without 403 because of wrong credential and no auth req cb", call_rejected_without_403_because_wrong_credentials_no_auth_req_cb},
-	{ "Call with ICE", call_with_ice },
-	{ "Call with ICE without SDP", call_with_ice_no_sdp },
-	{ "Call with ICE (random ports)", call_with_ice_random_ports },
-	{ "Call from ICE to not ICE",ice_to_not_ice},
-	{ "Call from not ICE to ICE",not_ice_to_ice},
-	{ "Call with custom headers",call_with_custom_headers},
-	{ "Call established with rejected INFO",call_established_with_rejected_info},
-	{ "Call established with rejected RE-INVITE",call_established_with_rejected_reinvite},
-	{ "Call established with rejected incoming RE-INVITE", call_established_with_rejected_incoming_reinvite },
-	{ "Call established with rejected RE-INVITE in error", call_established_with_rejected_reinvite_with_error},
-	{ "Call established with rejected RE-INVITE with trans pending error", call_established_with_rejected_reinvite_with_trans_pending_error},
-	{ "Call established with complex rejected operation",call_established_with_complex_rejected_operation},
-	{ "Call established with rejected info during re-invite",call_established_with_rejected_info_during_reinvite},
-	{ "Call redirected by callee", call_redirect},
-	{ "Call with specified codec bitrate", call_with_specified_codec_bitrate},
-	{ "Call with in-dialog UPDATE request", call_with_in_dialog_update },
-	{ "Call with in-dialog codec change", call_with_in_dialog_codec_change },
-	{ "Call with in-dialog codec change no sdp", call_with_in_dialog_codec_change_no_sdp },
-	{ "Call with pause no SDP on resume", call_with_paused_no_sdp_on_resume },
-	{ "Call with early media and no SDP in 200 Ok", call_with_early_media_and_no_sdp_in_200 },
-	{ "Call with early media and no SDP in 200 Ok with video", call_with_early_media_and_no_sdp_in_200_with_video },
-	{ "Call with ICE and no SDP in 200 OK", call_with_early_media_ice_and_no_sdp_in_200},
-	{ "Call with custom supported tags", call_with_custom_supported_tags },
-	{ "Call log from taken from asserted id",call_log_from_taken_from_p_asserted_id},
-	{ "Incoming INVITE with invalid SDP",incoming_invite_with_invalid_sdp},
-	{ "Outgoing INVITE with invalid ACK SDP",outgoing_invite_with_invalid_sdp},
-	{ "Incoming REINVITE with invalid SDP in ACK",incoming_reinvite_with_invalid_ack_sdp},
-	{ "Outgoing REINVITE with invalid SDP in ACK",outgoing_reinvite_with_invalid_ack_sdp},
-	{ "Call with generic CN", call_with_generic_cn },
-	{ "Call with transport change after released", call_with_transport_change_after_released },
-	{ "Unsuccessful call with transport change after released",unsucessfull_call_with_transport_change_after_released},
-	{ "Simple stereo call with L16", simple_stereo_call_l16 },
-	{ "Simple stereo call with opus", simple_stereo_call_opus },
-	{ "Simple mono call with opus", simple_mono_call_opus },
-	{ "Call with FQDN in SDP", call_with_fqdn_in_sdp},
-	{ "Call with RTP IO mode", call_with_rtp_io_mode },
-	{ "Call with generic NACK RTCP feedback", call_with_generic_nack_rtcp_feedback },
-	{ "Call with complex late offering", call_with_complex_late_offering },
-	{ "Call with custom RTP Modifier", call_with_custom_rtp_modifier },
-	{ "Call paused resumed with custom RTP Modifier", call_paused_resumed_with_custom_rtp_modifier },
-	{ "Call record with custom RTP Modifier", call_record_with_custom_rtp_modifier }
+
+
+static void call_with_http_proxy(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_rc");
+	bool_t call_ok;
+	LinphoneCall *marie_call;
+	LinphoneAddress *contact_addr;
+	struct addrinfo *res=NULL;
+	struct addrinfo hints = {0};
+	char ip[NI_MAXHOST];
+	int err;
+
+	if (!transport_supported(LinphoneTransportTls)) {
+		ms_message("Test skipped because no tls support");
+		goto end;
+	}
+	hints.ai_family = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+
+	err = getaddrinfo("sip.linphone.org","8888", &hints, &res);
+	if (err !=0){
+		ms_error("call_with_http_proxy(): getaddrinfo() error: %s", gai_strerror(err));
+	}
+	BC_ASSERT_PTR_NOT_NULL(res);
+	if (!res) goto end;
+
+	BC_ASSERT_EQUAL(err=getnameinfo(res->ai_addr, (socklen_t)res->ai_addrlen, ip, sizeof(ip)-1, NULL, 0, NI_NUMERICHOST), 0, int, "%i");
+	if (err != 0){
+		ms_error("call_with_http_proxy(): getnameinfo() error: %s", gai_strerror(err));
+		goto end;
+	}
+
+	freeaddrinfo(res);
+
+	linphone_core_set_http_proxy_host(pauline->lc,"sip.linphone.org");
+	linphone_core_set_network_reachable(pauline->lc, FALSE); /*to make sure channel is restarted*/
+	linphone_core_set_network_reachable(pauline->lc, TRUE);
+
+	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
+	if (!call_ok) goto end;
+
+	marie_call = linphone_core_get_current_call(marie->lc);
+	contact_addr = linphone_address_new(linphone_call_get_remote_contact(marie_call));
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_domain(contact_addr),ip);
+	linphone_address_destroy(contact_addr);
+	end_call(marie, pauline);
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void _call_with_rtcp_mux(bool_t caller_rtcp_mux, bool_t callee_rtcp_mux, bool_t with_ice,bool_t with_ice_reinvite){
+	LinphoneCoreManager * marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	const LinphoneCallParams *params;
+	bctbx_list_t *lcs = NULL;
+
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+
+	if (caller_rtcp_mux){
+		lp_config_set_int(linphone_core_get_config(marie->lc), "rtp", "rtcp_mux", 1);
+	}
+	if (callee_rtcp_mux){
+		lp_config_set_int(linphone_core_get_config(pauline->lc), "rtp", "rtcp_mux", 1);
+	}
+	if (with_ice){
+		linphone_core_set_user_agent(pauline->lc, "Natted Linphone", NULL);
+		linphone_core_set_user_agent(marie->lc, "Natted Linphone", NULL);
+		linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
+		linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
+	}
+	if (!with_ice_reinvite) {
+		lp_config_set_int(linphone_core_get_config(pauline->lc), "sip", "update_call_when_ice_completed", 0);
+		lp_config_set_int(linphone_core_get_config(marie->lc), "sip", "update_call_when_ice_completed", 0);
+	}
+
+	if (!BC_ASSERT_TRUE(call(marie,pauline))) goto end;
+
+	params = linphone_call_get_remote_params(linphone_core_get_current_call(pauline->lc));
+	BC_ASSERT_TRUE(caller_rtcp_mux == (linphone_call_params_get_custom_sdp_media_attribute(params, LinphoneStreamTypeAudio, "rtcp-mux") != NULL));
+	if (caller_rtcp_mux){
+		params = linphone_call_get_remote_params(linphone_core_get_current_call(marie->lc));
+		BC_ASSERT_TRUE(callee_rtcp_mux == (linphone_call_params_get_custom_sdp_media_attribute(params, LinphoneStreamTypeAudio, "rtcp-mux") != NULL));
+	}
+
+	if (with_ice){
+		check_ice(marie, pauline, LinphoneIceStateHostConnection);
+	}
+	liblinphone_tester_check_rtcp(marie,pauline);
+
+	if (caller_rtcp_mux && callee_rtcp_mux){
+		BC_ASSERT_EQUAL(marie->stat.number_of_rtcp_received_via_mux, marie->stat.number_of_rtcp_received, int, "%i");
+
+		BC_ASSERT_EQUAL(pauline->stat.number_of_rtcp_received_via_mux, pauline->stat.number_of_rtcp_received, int, "%i");
+
+	}else{
+		BC_ASSERT_TRUE(marie->stat.number_of_rtcp_received_via_mux == 0);
+		BC_ASSERT_TRUE(pauline->stat.number_of_rtcp_received_via_mux == 0);
+	}
+
+	check_media_direction(pauline, linphone_core_get_current_call(pauline->lc), lcs, LinphoneMediaDirectionSendRecv, LinphoneMediaDirectionInvalid);
+	end_call(marie,pauline);
+
+end:
+	bctbx_list_free(lcs);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(marie);
+}
+
+static void call_with_rtcp_mux(void){
+	_call_with_rtcp_mux(TRUE, TRUE, FALSE,TRUE);
+}
+
+static void call_with_rtcp_mux_not_accepted(void){
+	_call_with_rtcp_mux(TRUE, FALSE, FALSE,TRUE);
+}
+
+static void call_with_ice_and_rtcp_mux(void){
+	_call_with_rtcp_mux(TRUE, TRUE, TRUE,TRUE);
+}
+
+static void call_with_ice_and_rtcp_mux_without_reinvite(void){
+	_call_with_rtcp_mux(TRUE, TRUE, TRUE,FALSE);
+}
+
+static void call_with_zrtp_configured_calling_base(LinphoneCoreManager *marie, LinphoneCoreManager *pauline) {
+	if (ms_zrtp_available()) {
+		bool_t call_ok;
+
+		linphone_core_set_media_encryption(pauline->lc, LinphoneMediaEncryptionZRTP);
+		BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
+
+		liblinphone_tester_check_rtcp(marie,pauline);
+
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)))
+					, LinphoneMediaEncryptionZRTP, int, "%i");
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)))
+					, LinphoneMediaEncryptionZRTP, int, "%i");
+		end_call(pauline, marie);
+	} else {
+		ms_warning("Test skipped, ZRTP not available");
+	}
+
+}
+
+static void call_with_zrtp_configured_callee_base(LinphoneCoreManager *marie, LinphoneCoreManager *pauline) {
+	if (ms_zrtp_available()) {
+		bool_t call_ok;
+
+		linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionZRTP);
+		BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
+
+		liblinphone_tester_check_rtcp(marie,pauline);
+
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)))
+					, LinphoneMediaEncryptionZRTP, int, "%i");
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc)))
+					, LinphoneMediaEncryptionZRTP, int, "%i");
+		end_call(pauline, marie);
+	} else {
+		ms_warning("Test skipped, ZRTP not available");
+	}
+}
+
+
+/*
+ * this test checks the 'dont_default_to_stun_candidates' mode, where the c= line is left to host
+ * ip instead of stun candidate when ice is enabled*/
+static void call_with_ice_with_default_candidate_not_stun(void){
+	LinphoneCoreManager * marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	char localip[LINPHONE_IPADDR_SIZE];
+	bool_t call_ok;
+
+	lp_config_set_int(marie->lc->config, "net", "dont_default_to_stun_candidates", 1);
+	linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
+	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
+	linphone_core_get_local_ip(marie->lc, AF_INET, NULL, localip);
+	call_ok = call(marie, pauline);
+	if (call_ok){
+		check_ice(marie, pauline, LinphoneIceStateHostConnection);
+		BC_ASSERT_STRING_EQUAL(marie->lc->current_call->localdesc->addr, localip);
+		BC_ASSERT_STRING_EQUAL(pauline->lc->current_call->resultdesc->addr, localip);
+		BC_ASSERT_STRING_EQUAL(marie->lc->current_call->localdesc->streams[0].rtp_addr, localip);
+		BC_ASSERT_STRING_EQUAL(pauline->lc->current_call->resultdesc->streams[0].rtp_addr, "");
+	}
+	end_call(marie, pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_ice_without_stun(void){
+	LinphoneCoreManager * marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_set_stun_server(marie->lc, NULL);
+	linphone_core_set_stun_server(pauline->lc, NULL);
+	_call_with_ice_base(marie, pauline, TRUE, TRUE, TRUE, FALSE);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_ice_without_stun2(void){
+	LinphoneCoreManager * marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	//linphone_core_set_stun_server(marie->lc, NULL);
+	linphone_core_set_stun_server(pauline->lc, NULL);
+	_call_with_ice_base(marie, pauline, TRUE, TRUE, TRUE, FALSE);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_zrtp_configured_calling_side(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	call_with_zrtp_configured_calling_base(marie,pauline);
+
+	/* now set other encryptions mode for receiver(marie), we shall always fall back to caller preference: ZRTP */
+	linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionDTLS);
+	call_with_zrtp_configured_calling_base(marie,pauline);
+
+	linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionSRTP);
+	call_with_zrtp_configured_calling_base(marie,pauline);
+
+
+	linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionNone);
+
+	linphone_core_set_user_agent(pauline->lc, "Natted Linphone", NULL);
+	linphone_core_set_user_agent(marie->lc, "Natted Linphone", NULL);
+	call_with_zrtp_configured_calling_base(marie,pauline);
+
+	linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
+	linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
+	call_with_zrtp_configured_calling_base(marie,pauline);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+
+}
+
+static void call_with_zrtp_configured_callee_side(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	call_with_zrtp_configured_callee_base(marie,pauline);
+
+	linphone_core_set_user_agent(pauline->lc, "Natted Linphone", NULL);
+	linphone_core_set_user_agent(marie->lc, "Natted Linphone", NULL);
+	call_with_zrtp_configured_callee_base(marie,pauline);
+
+	linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
+	linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
+	call_with_zrtp_configured_callee_base(marie,pauline);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static bool_t quick_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2){
+	linphone_core_invite_address(m1->lc, m2->identity);
+	if (!BC_ASSERT_TRUE(wait_for(m1->lc, m2->lc, &m2->stat.number_of_LinphoneCallIncomingReceived, 1)))
+		return FALSE;
+	linphone_core_accept_call(m2->lc, linphone_core_get_current_call(m2->lc));
+	if (!BC_ASSERT_TRUE(wait_for(m1->lc, m2->lc, &m2->stat.number_of_LinphoneCallStreamsRunning, 1)))
+		return FALSE;
+	if (!BC_ASSERT_TRUE(wait_for(m1->lc, m2->lc, &m1->stat.number_of_LinphoneCallStreamsRunning, 1)))
+		return FALSE;
+	return TRUE;
+}
+
+static void call_with_encryption_mandatory(bool_t caller_has_encryption_mandatory){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	/*marie doesn't support ZRTP at all*/
+	marie->lc->zrtp_not_available_simulation=1;
+	
+	/*pauline requests encryption to be mandatory*/
+	linphone_core_set_media_encryption(pauline->lc, LinphoneMediaEncryptionZRTP);
+	linphone_core_set_media_encryption_mandatory(pauline->lc, TRUE);
+	
+	if (!caller_has_encryption_mandatory){
+		if (!BC_ASSERT_TRUE(quick_call(marie, pauline))) goto end;
+	}else{
+		if (!BC_ASSERT_TRUE(quick_call(pauline, marie))) goto end;
+	}
+	wait_for_until(pauline->lc, marie->lc, NULL, 0, 2000);
+	
+	/*assert that no RTP packets have been sent or received by Pauline*/
+	/*testing packet_sent doesn't work, because packets dropped by the transport layer are counted as if they were sent.*/
+#if 0
+	BC_ASSERT_EQUAL(linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->rtp_stats.packet_sent, 0, int, "%i");
+#endif
+	/*however we can trust packet_recv from the other party instead */
+	BC_ASSERT_EQUAL((int)linphone_call_get_audio_stats(linphone_core_get_current_call(marie->lc))->rtp_stats.packet_recv, 0, int, "%i");
+	BC_ASSERT_EQUAL((int)linphone_call_get_audio_stats(linphone_core_get_current_call(pauline->lc))->rtp_stats.packet_recv, 0, int, "%i");
+	end_call(marie, pauline);
+
+	end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_from_plain_rtp_to_zrtp(void){
+	call_with_encryption_mandatory(FALSE);
+}
+
+static void call_from_zrtp_to_plain_rtp(void){
+	call_with_encryption_mandatory(TRUE);
+}
+
+static void v6_to_v4_call_without_relay(void){
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	bctbx_list_t *lcs = NULL;
+	
+	if (liblinphone_tester_ipv4_available() && liblinphone_tester_ipv6_available()){
+		marie = linphone_core_manager_new("marie_rc");
+		pauline = linphone_core_manager_new2("pauline_tcp_rc", FALSE);
+		
+		lcs = bctbx_list_append(lcs, marie->lc);
+		lcs = bctbx_list_append(lcs, pauline->lc);
+		linphone_core_enable_ipv6(pauline->lc, FALSE);
+		linphone_core_manager_start(pauline, TRUE);
+
+		if (BC_ASSERT_TRUE(call(marie,pauline))){
+			check_media_direction(marie, linphone_core_get_current_call(marie->lc), lcs, LinphoneMediaDirectionSendRecv, LinphoneMediaDirectionInvalid);
+
+			liblinphone_tester_check_rtcp(marie,pauline);
+			end_call(marie,pauline);
+		}
+		linphone_core_manager_destroy(marie);
+		linphone_core_manager_destroy(pauline);
+		bctbx_list_free(lcs);
+		
+	}else ms_warning("Test skipped, dual stack not available");
+}
+
+static void v6_call_over_nat_64(void){
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+
+	if (!liblinphone_tester_ipv4_available() && liblinphone_tester_ipv6_available()){
+
+		marie = linphone_core_manager_new("marie_nat64_rc");
+		pauline = linphone_core_manager_new("pauline_nat64_rc");
+
+		linphone_core_set_user_agent(pauline->lc, "Natted Linphone", NULL);
+		linphone_core_set_user_agent(marie->lc, "Natted Linphone", NULL);
+
+		BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk, 1, 2000));
+		BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &marie->stat.number_of_LinphoneRegistrationOk, 1, 2000));
+
+
+		BC_ASSERT_TRUE(call(marie,pauline));
+
+		liblinphone_tester_check_rtcp(marie,pauline);
+		end_call(marie,pauline);
+		linphone_core_manager_destroy(marie);
+		linphone_core_manager_destroy(pauline);
+
+	}else ms_warning("Test skipped, no ipv6 nat64 available");
+}
+
+static void call_with_ice_in_ipv4_with_v6_enabled(void) {
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+
+	if (liblinphone_tester_ipv4_available() && liblinphone_tester_ipv6_available()){
+		marie = linphone_core_manager_new("marie_v4proxy_rc");
+		pauline = linphone_core_manager_new("pauline_v4proxy_rc");
+
+		_call_with_ice_base(marie,pauline,TRUE,TRUE,TRUE,TRUE);
+		linphone_core_manager_destroy(marie);
+		linphone_core_manager_destroy(pauline);
+	} else ms_warning("Test skipped, need both ipv6 and v4 available");
+}
+
+static void call_with_ice_ipv4_to_ipv6(void) {
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+
+	if (liblinphone_tester_ipv4_available() && liblinphone_tester_ipv6_available()){
+		marie = linphone_core_manager_new("marie_v4proxy_rc");
+		pauline = linphone_core_manager_new("pauline_tcp_rc");
+
+		_call_with_ice_base(marie,pauline,TRUE,TRUE,TRUE,TRUE);
+		linphone_core_manager_destroy(marie);
+		linphone_core_manager_destroy(pauline);
+	} else ms_warning("Test skipped, need both ipv6 and v4 available");
+}
+
+static void call_with_ice_ipv6_to_ipv4(void) {
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+
+	if (liblinphone_tester_ipv4_available() && liblinphone_tester_ipv6_available()){
+		marie = linphone_core_manager_new("marie_rc");
+		pauline = linphone_core_manager_new("pauline_v4proxy_rc");
+
+		_call_with_ice_base(marie, pauline,TRUE,TRUE,TRUE,TRUE);
+		linphone_core_manager_destroy(marie);
+		linphone_core_manager_destroy(pauline);
+	} else ms_warning("Test skipped, need both ipv6 and v4 available");
+}
+
+static void call_with_ice_ipv6_to_ipv6(void) {
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+
+	if (liblinphone_tester_ipv4_available() && liblinphone_tester_ipv6_available()){
+		marie = linphone_core_manager_new("marie_rc");
+		pauline = linphone_core_manager_new("pauline_tcp_rc");
+
+		_call_with_ice_base(marie, pauline,TRUE,TRUE,TRUE,TRUE);
+		linphone_core_manager_destroy(marie);
+		linphone_core_manager_destroy(pauline);
+	} else ms_warning("Test skipped, need both ipv6 and v4 available");
+}
+
+test_t call_tests[] = {
+	TEST_NO_TAG("Early declined call", early_declined_call),
+	TEST_NO_TAG("Call declined", call_declined),
+	TEST_NO_TAG("Cancelled call", cancelled_call),
+	TEST_NO_TAG("Early cancelled call", early_cancelled_call),
+	TEST_NO_TAG("Call with DNS timeout", call_with_dns_time_out),
+	TEST_NO_TAG("Cancelled ringing call", cancelled_ringing_call),
+	TEST_NO_TAG("Call busy when calling self", call_busy_when_calling_self),
+	TEST_NO_TAG("Simple call", simple_call),
+	TEST_NO_TAG("Simple call with no SIP transport", simple_call_with_no_sip_transport),
+	TEST_NO_TAG("Simple call with UDP", simple_call_with_udp),
+	TEST_ONE_TAG("Call terminated automatically by linphone_core_destroy", automatic_call_termination, "LeaksMemory"),
+	TEST_NO_TAG("Call with http proxy", call_with_http_proxy),
+	TEST_NO_TAG("Call with timeouted bye", call_with_timeouted_bye),
+	TEST_NO_TAG("Direct call over IPv6", direct_call_over_ipv6),
+	TEST_NO_TAG("Call IPv6 to IPv4 without relay", v6_to_v4_call_without_relay),
+	TEST_NO_TAG("IPv6 call over NAT64", v6_call_over_nat_64),
+	TEST_ONE_TAG("Call with ICE in IPv4 with IPv6 enabled", call_with_ice_in_ipv4_with_v6_enabled, "ICE"),
+	TEST_ONE_TAG("Call with ICE IPv4 to IPv6", call_with_ice_ipv4_to_ipv6, "ICE"),
+	TEST_ONE_TAG("Call with ICE IPv6 to IPv4", call_with_ice_ipv6_to_ipv4, "ICE"),
+	TEST_ONE_TAG("Call with ICE IPv6 to IPv6", call_with_ice_ipv6_to_ipv6, "ICE"),
+	TEST_NO_TAG("Outbound call with multiple proxy possible", call_outbound_with_multiple_proxy),
+	TEST_NO_TAG("Audio call recording", audio_call_recording_test),
+#if 0 /* not yet activated because not implemented */
+	TEST_NO_TAG("Multiple answers to a call", multiple_answers_call),
+#endif
+	TEST_NO_TAG("Multiple answers to a call with media relay", multiple_answers_call_with_media_relay),
+	TEST_NO_TAG("Call with media relay", call_with_media_relay),
+	TEST_NO_TAG("Call with media relay (random ports)", call_with_media_relay_random_ports),
+	TEST_NO_TAG("Simple call compatibility mode", simple_call_compatibility_mode),
+	TEST_NO_TAG("Early-media call", early_media_call),
+	TEST_ONE_TAG("Early-media call with ICE", early_media_call_with_ice, "ICE"),
+	TEST_NO_TAG("Early-media call with ringing", early_media_call_with_ringing),
+	TEST_NO_TAG("Early-media call with updated media session", early_media_call_with_session_update),
+	TEST_NO_TAG("Early-media call with updated codec", early_media_call_with_codec_update),
+	TEST_NO_TAG("Call terminated by caller", call_terminated_by_caller),
+	TEST_NO_TAG("Call without SDP", call_with_no_sdp),
+	TEST_NO_TAG("Call without SDP and ACK without SDP", call_with_no_sdp_ack_without_sdp),
+	TEST_NO_TAG("Call paused resumed", call_paused_resumed),
+	TEST_NO_TAG("Call paused resumed with sip packets looses", call_paused_resumed_with_sip_packets_losses),
+	TEST_NO_TAG("Call paused by both parties", call_paused_by_both),
+	TEST_NO_TAG("Call paused resumed with loss", call_paused_resumed_with_loss),
+	TEST_NO_TAG("Call paused resumed from callee", call_paused_resumed_from_callee),
+	TEST_NO_TAG("SRTP call", srtp_call),
+	TEST_NO_TAG("ZRTP call", zrtp_call),
+	TEST_NO_TAG("ZRTP SAS call", zrtp_sas_call),
+	TEST_NO_TAG("ZRTP Cipher call", zrtp_cipher_call),
+	TEST_NO_TAG("DTLS SRTP call", dtls_srtp_call),
+	TEST_NO_TAG("DTLS SRTP call with media relay", dtls_srtp_call_with_media_realy),
+	TEST_NO_TAG("SRTP call with declined srtp", call_with_declined_srtp),
+	TEST_NO_TAG("SRTP call paused and resumed", call_srtp_paused_and_resumed),
+	TEST_NO_TAG("Call with file player", call_with_file_player),
+	TEST_NO_TAG("Call with mkv file player", call_with_mkv_file_player),
+	TEST_ONE_TAG("Audio call with ICE no matching audio codecs", audio_call_with_ice_no_matching_audio_codecs, "ICE"),
+	TEST_ONE_TAG("SRTP ice call", srtp_ice_call, "ICE"),
+	TEST_ONE_TAG("ZRTP ice call", zrtp_ice_call, "ICE"),
+	TEST_ONE_TAG("ZRTP ice call with relay", zrtp_ice_call_with_relay, "ICE"),
+	TEST_ONE_TAG("DTLS SRTP ice call", dtls_srtp_ice_call, "ICE"),
+	TEST_ONE_TAG("DTLS ice call with relay", dtls_ice_call_with_relay, "ICE"),
+	TEST_NO_TAG("Call with privacy", call_with_privacy),
+	TEST_NO_TAG("Call with privacy 2", call_with_privacy2),
+	TEST_NO_TAG("Call rejected because of wrong credential", call_rejected_because_wrong_credentials),
+	TEST_NO_TAG("Call rejected without 403 because of wrong credential", call_rejected_without_403_because_wrong_credentials),
+	TEST_NO_TAG("Call rejected without 403 because of wrong credential and no auth req cb", call_rejected_without_403_because_wrong_credentials_no_auth_req_cb),
+	TEST_ONE_TAG("Call with ICE", call_with_ice, "ICE"),
+	TEST_ONE_TAG("Call with ICE IPv6", call_with_ice_ipv6, "ICE"),
+	TEST_ONE_TAG("Call with ICE without SDP", call_with_ice_no_sdp, "ICE"),
+	TEST_ONE_TAG("Call with ICE (random ports)", call_with_ice_random_ports, "ICE"),
+	TEST_ONE_TAG("Call with ICE (forced relay)", call_with_ice_forced_relay, "ICE"),
+	TEST_ONE_TAG("Call from ICE to not ICE", ice_to_not_ice, "ICE"),
+	TEST_ONE_TAG("Call from not ICE to ICE", not_ice_to_ice, "ICE"),
+	TEST_ONE_TAG("Call with ICE added by reINVITE", ice_added_by_reinvite, "ICE"),
+	TEST_NO_TAG("Call with custom headers", call_with_custom_headers),
+	TEST_NO_TAG("Call with custom SDP attributes", call_with_custom_sdp_attributes),
+	TEST_NO_TAG("Call established with rejected INFO", call_established_with_rejected_info),
+	TEST_NO_TAG("Call established with rejected RE-INVITE", call_established_with_rejected_reinvite),
+	TEST_NO_TAG("Call established with rejected incoming RE-INVITE", call_established_with_rejected_incoming_reinvite),
+	TEST_NO_TAG("Call established with rejected RE-INVITE in error", call_established_with_rejected_reinvite_with_error),
+	TEST_NO_TAG("Call established with rejected RE-INVITE with trans pending error", call_established_with_rejected_reinvite_with_trans_pending_error),
+	TEST_NO_TAG("Call established with complex rejected operation", call_established_with_complex_rejected_operation),
+	TEST_NO_TAG("Call established with rejected info during re-invite", call_established_with_rejected_info_during_reinvite),
+	TEST_NO_TAG("Call redirected by callee", call_redirect),
+	TEST_NO_TAG("Call with specified codec bitrate", call_with_specified_codec_bitrate),
+	TEST_NO_TAG("Call with no audio codec", call_with_no_audio_codec),
+	TEST_NO_TAG("Call with in-dialog UPDATE request", call_with_in_dialog_update),
+	TEST_NO_TAG("Call with in-dialog very early call request", call_with_very_early_call_update),
+	TEST_NO_TAG("Call with in-dialog codec change", call_with_in_dialog_codec_change),
+	TEST_NO_TAG("Call with in-dialog codec change no sdp", call_with_in_dialog_codec_change_no_sdp),
+	TEST_NO_TAG("Call with pause no SDP on resume", call_with_paused_no_sdp_on_resume),
+	TEST_NO_TAG("Call with early media and no SDP in 200 Ok", call_with_early_media_and_no_sdp_in_200),
+	TEST_ONE_TAG("Call with ICE and no SDP in 200 OK", call_with_early_media_ice_and_no_sdp_in_200, "ICE"),
+	TEST_NO_TAG("Call with custom supported tags", call_with_custom_supported_tags),
+	TEST_NO_TAG("Call log from taken from asserted id", call_log_from_taken_from_p_asserted_id),
+	TEST_NO_TAG("Incoming INVITE with invalid SDP", incoming_invite_with_invalid_sdp),
+	TEST_NO_TAG("Outgoing INVITE with invalid ACK SDP", outgoing_invite_with_invalid_sdp),
+	TEST_NO_TAG("Call with generic CN", call_with_generic_cn),
+	TEST_NO_TAG("Call with transport change after released", call_with_transport_change_after_released),
+	TEST_NO_TAG("Unsuccessful call with transport change after released", unsucessfull_call_with_transport_change_after_released),
+	TEST_NO_TAG("Simple stereo call with L16", simple_stereo_call_l16),
+	TEST_NO_TAG("Simple stereo call with opus", simple_stereo_call_opus),
+	TEST_NO_TAG("Simple mono call with opus", simple_mono_call_opus),
+	TEST_NO_TAG("Call with FQDN in SDP", call_with_fqdn_in_sdp),
+	TEST_NO_TAG("Call with RTP IO mode", call_with_rtp_io_mode),
+	TEST_NO_TAG("Call with generic NACK RTCP feedback", call_with_generic_nack_rtcp_feedback),
+	TEST_NO_TAG("Call with complex late offering", call_with_complex_late_offering),
+#ifdef SQLITE_STORAGE_ENABLED
+	TEST_NO_TAG("Call log working if no db set", call_logs_if_no_db_set),
+	TEST_NO_TAG("Call log storage migration from rc to db", call_logs_migrate),
+	TEST_NO_TAG("Call log storage in sqlite database", call_logs_sqlite_storage),
+#endif
+	TEST_NO_TAG("Call with custom RTP Modifier", call_with_custom_rtp_modifier),
+	TEST_NO_TAG("Call paused resumed with custom RTP Modifier", call_paused_resumed_with_custom_rtp_modifier),
+	TEST_NO_TAG("Call record with custom RTP Modifier", call_record_with_custom_rtp_modifier),
+	TEST_NO_TAG("Call with network switch", call_with_network_switch),
+	TEST_NO_TAG("Call with network switch and no recovery possible", call_with_network_switch_no_recovery),
+	TEST_NO_TAG("Recovered call on network switch in early state 1", recovered_call_on_network_switch_in_early_state_1),
+	TEST_NO_TAG("Recovered call on network switch in early state 2", recovered_call_on_network_switch_in_early_state_2),
+	TEST_NO_TAG("Recovered call on network switch in early state 3", recovered_call_on_network_switch_in_early_state_3),
+	TEST_NO_TAG("Recovered call on network switch in early state 4", recovered_call_on_network_switch_in_early_state_4),
+	TEST_NO_TAG("Recovered call on network switch during re-invite 1", recovered_call_on_network_switch_during_reinvite_1),
+	TEST_NO_TAG("Recovered call on network switch during re-invite 2", recovered_call_on_network_switch_during_reinvite_2),
+	TEST_NO_TAG("Recovered call on network switch during re-invite 3", recovered_call_on_network_switch_during_reinvite_3),
+	TEST_NO_TAG("Recovered call on network switch during re-invite 4", recovered_call_on_network_switch_during_reinvite_4),
+	TEST_ONE_TAG("Call with network switch and ICE", call_with_network_switch_and_ice, "ICE"),
+	TEST_ONE_TAG("Call with network switch, ICE and RTT", call_with_network_switch_ice_and_rtt, "ICE"),
+	TEST_NO_TAG("Call with network switch with socket refresh", call_with_network_switch_and_socket_refresh),
+	TEST_NO_TAG("Call with SIP and RTP independant switches", call_with_sip_and_rtp_independant_switches),
+	TEST_NO_TAG("Call with rtcp-mux", call_with_rtcp_mux),
+	TEST_NO_TAG("Call with rtcp-mux not accepted", call_with_rtcp_mux_not_accepted),
+	TEST_ONE_TAG("Call with ICE and rtcp-mux", call_with_ice_and_rtcp_mux, "ICE"),
+	TEST_ONE_TAG("Call with ICE and rtcp-mux without ICE re-invite", call_with_ice_and_rtcp_mux_without_reinvite, "ICE"),
+	TEST_ONE_TAG("Call with ICE with default candidate not stun", call_with_ice_with_default_candidate_not_stun, "ICE"),
+	TEST_ONE_TAG("Call with ICE without stun server", call_with_ice_without_stun, "ICE"),
+	TEST_ONE_TAG("Call with ICE without stun server one side", call_with_ice_without_stun2, "ICE"),
+	TEST_NO_TAG("Call with ZRTP configured calling side only", call_with_zrtp_configured_calling_side),
+	TEST_NO_TAG("Call with ZRTP configured receiver side only", call_with_zrtp_configured_callee_side),
+	TEST_NO_TAG("Call from plain RTP to ZRTP mandatory should be silent", call_from_plain_rtp_to_zrtp),
+	TEST_NO_TAG("Call ZRTP mandatory to plain RTP should be silent", call_from_zrtp_to_plain_rtp)
 };
 
-test_suite_t call_test_suite = {
-	"Single Call",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(call_tests) / sizeof(call_tests[0]),
-	call_tests
-};
+test_suite_t call_test_suite = {"Single Call", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								sizeof(call_tests) / sizeof(call_tests[0]), call_tests};
diff --git a/tester/call_video_tester.c b/tester/call_video_tester.c
new file mode 100644
index 000000000..62a19ae23
--- /dev/null
+++ b/tester/call_video_tester.c
@@ -0,0 +1,1901 @@
+/*
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2013  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "linphonecore.h"
+#include "liblinphone_tester.h"
+#include "private.h"
+
+#ifdef VIDEO_ENABLED
+static void call_paused_resumed_with_video_base_call_cb(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *message) {
+	if (cstate == LinphoneCallUpdatedByRemote) {
+		LinphoneCallParams *params = linphone_core_create_call_params(lc, call);
+		linphone_call_params_enable_video(params, TRUE);
+		ms_message (" New state LinphoneCallUpdatedByRemote on call [%p], accepting with video on",call);
+		BC_ASSERT_NOT_EQUAL(linphone_core_accept_call_update(lc, call, params), 0, int, "%i");
+		linphone_call_params_destroy(params);
+	}
+}
+/*this test makes sure that pause/resume will not bring up video by accident*/
+static void call_paused_resumed_with_video_base(bool_t sdp_200_ack
+												,bool_t use_video_policy_for_re_invite_sdp_200
+												,bool_t resume_in_audio_send_only_video_inactive_first
+												,bool_t with_call_accept){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall* call_pauline, *call_marie;
+	bctbx_list_t *lcs = NULL;
+	LinphoneVideoPolicy vpol;
+	bool_t call_ok;
+	LinphoneCoreVTable *vtable = linphone_core_v_table_new();
+	vtable->call_state_changed = call_paused_resumed_with_video_base_call_cb;
+	lcs = bctbx_list_append(lcs, pauline->lc);
+	lcs = bctbx_list_append(lcs, marie->lc);
+
+	vpol.automatically_accept = FALSE;
+	vpol.automatically_initiate = TRUE; /* needed to present a video mline*/
+
+	linphone_core_set_video_policy(marie->lc, &vpol);
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+
+	vpol.automatically_accept = FALSE;
+	vpol.automatically_initiate = TRUE;
+
+	linphone_core_set_video_policy(pauline->lc, &vpol);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+
+	BC_ASSERT_TRUE((call_ok=call(marie, pauline)));
+
+	if (!call_ok) goto end;
+
+	call_pauline = linphone_core_get_current_call(pauline->lc);
+	call_marie = linphone_core_get_current_call(marie->lc);
+
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
+
+	linphone_core_pause_call(pauline->lc,call_pauline);
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPausing,1));
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,1));
+	BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_remote_params(call_marie)));
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallPaused,1));
+
+	/*stay in pause a little while in order to generate traffic*/
+	wait_for_until(pauline->lc, marie->lc, NULL, 5, 2000);
+
+	/*check if video stream is still offered even if disabled*/
+
+	BC_ASSERT_EQUAL(call_pauline->localdesc->nb_streams, 2, int, "%i");
+	BC_ASSERT_EQUAL(call_marie->localdesc->nb_streams, 2, int, "%i");
+
+	linphone_core_enable_sdp_200_ack(pauline->lc,sdp_200_ack);
+
+	if (use_video_policy_for_re_invite_sdp_200) {
+		LpConfig *marie_lp;
+		marie_lp = linphone_core_get_config(marie->lc);
+		lp_config_set_int(marie_lp,"sip","sdp_200_ack_follow_video_policy",1);
+	}
+	/*now pauline wants to resume*/
+	if (resume_in_audio_send_only_video_inactive_first) {
+		LinphoneCallParams *params = linphone_core_create_call_params(pauline->lc, call_pauline);
+		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionInactive);
+		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendOnly);
+		linphone_core_update_call(pauline->lc,call_pauline,params);
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallPausedByRemote,2));
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallUpdating,1));
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
+		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionSendRecv);
+		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendRecv);
+		if (with_call_accept) {
+			linphone_core_add_listener(marie->lc, vtable);
+		}
+		linphone_core_update_call(pauline->lc,call_pauline,params);
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,3));
+		linphone_call_params_destroy(params);
+	} else {
+		linphone_core_resume_call(pauline->lc, call_pauline);
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallResuming,1));
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
+	}
+
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
+
+	if (use_video_policy_for_re_invite_sdp_200) {
+		/*make sure video was offered*/
+		BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_remote_params(call_pauline)));
+	} else {
+		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(call_pauline)));
+		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(call_marie)));
+	}
+	end_call(marie, pauline);
+
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	bctbx_list_free(lcs);
+}
+static void call_paused_resumed_with_video(void){
+	call_paused_resumed_with_video_base(FALSE, FALSE,FALSE,FALSE);
+}
+
+static void call_paused_resumed_with_no_sdp_ack(void){
+	call_paused_resumed_with_video_base(TRUE, FALSE,FALSE,FALSE);
+}
+static void call_paused_resumed_with_no_sdp_ack_using_video_policy(void){
+	call_paused_resumed_with_video_base(TRUE, TRUE,FALSE,FALSE);
+}
+static void call_paused_updated_resumed_with_no_sdp_ack_using_video_policy(void){
+	call_paused_resumed_with_video_base(TRUE, TRUE,TRUE,FALSE);
+}
+static void call_paused_updated_resumed_with_no_sdp_ack_using_video_policy_and_accept_call_update(void){
+	call_paused_resumed_with_video_base(TRUE, TRUE,TRUE,TRUE);
+}
+
+static void zrtp_video_call(void) {
+	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE);
+}
+
+static void call_state_changed_callback_to_accept_video(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState state, const char *message){
+	LinphoneCoreVTable *vtable;
+	if (state == LinphoneCallUpdatedByRemote){		
+		LinphoneCallParams *params = linphone_core_create_call_params(lc, call);
+		linphone_call_params_enable_video(params, TRUE);
+		linphone_core_accept_call_update(lc, call, params);
+		linphone_call_params_destroy(params);
+	}
+	ms_message("video acceptance listener about to be dropped");
+	vtable = belle_sip_object_data_get(BELLE_SIP_OBJECT(call),
+						"call_state_changed_callback_to_accept_video");
+	linphone_core_remove_listener(lc, vtable);
+	belle_sip_object_data_set(BELLE_SIP_OBJECT(call), "call_state_changed_callback_to_accept_video", NULL, NULL);
+}
+
+static LinphoneCall* _request_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t accept_with_params) {
+	LinphoneCallParams* callee_params;
+	LinphoneCall* call_obj;
+
+	if (!linphone_core_get_current_call(callee->lc) || linphone_call_get_state(linphone_core_get_current_call(callee->lc)) != LinphoneCallStreamsRunning
+			|| !linphone_core_get_current_call(caller->lc) || linphone_call_get_state(linphone_core_get_current_call(caller->lc)) != LinphoneCallStreamsRunning ) {
+		ms_warning("bad state for adding video");
+		return NULL;
+	}
+	/*Assert the sanity of the developer, that is not expected to request video if video is already active.*/
+	if (!BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))))){
+		BC_FAIL("Video was requested while it was already active. This test doesn't look very sane.");
+	}
+	
+	if (accept_with_params) {
+		LinphoneCoreVTable *vtable = linphone_core_v_table_new();
+		vtable->call_state_changed = call_state_changed_callback_to_accept_video;
+		linphone_core_add_listener(caller->lc, vtable);
+		belle_sip_object_data_set(BELLE_SIP_OBJECT(linphone_core_get_current_call(caller->lc)), "call_state_changed_callback_to_accept_video",
+					  vtable, (void (*)(void*))linphone_core_v_table_destroy);
+	}
+	linphone_core_enable_video_capture(callee->lc, TRUE);
+	linphone_core_enable_video_display(callee->lc, TRUE);
+	linphone_core_enable_video_capture(caller->lc, TRUE);
+	linphone_core_enable_video_display(caller->lc, FALSE);
+
+	if ((call_obj = linphone_core_get_current_call(callee->lc))) {
+		callee_params = linphone_core_create_call_params(callee->lc, call_obj);
+		/*add video*/
+		linphone_call_params_enable_video(callee_params,TRUE);
+		linphone_core_update_call(callee->lc,call_obj,callee_params);
+		linphone_call_params_destroy(callee_params);
+	}
+	return call_obj;
+}
+
+/*
+ * This function requests the addon of a video stream, initiated by "callee" and potentiall accepted by "caller",
+ * and asserts a number of things after this is done.
+ * However the video addon may fail due to video policy, so that there is no insurance that video is actually added.
+ * This function returns TRUE if video was succesfully added, FALSE otherwise or if video is already there.
+ **/
+bool_t request_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t accept_with_params) {
+	stats initial_caller_stat=caller->stat;
+	stats initial_callee_stat=callee->stat;
+	const LinphoneVideoPolicy *video_policy;
+	LinphoneCall *call_obj;
+	bool_t video_added = FALSE;
+	
+	if ((call_obj=_request_video(caller, callee, accept_with_params))){
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallUpdatedByRemote,initial_caller_stat.number_of_LinphoneCallUpdatedByRemote+1));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning+1));
+
+		video_policy = linphone_core_get_video_policy(caller->lc);
+		if (video_policy->automatically_accept || accept_with_params) {
+			video_added = BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
+			video_added = 
+			BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))))
+			&& video_added;
+		} else {
+			BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
+			BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
+		}
+		if (linphone_core_get_media_encryption(caller->lc) != LinphoneMediaEncryptionNone
+				&& linphone_core_get_media_encryption(callee->lc) != LinphoneMediaEncryptionNone) {
+			const LinphoneCallParams* call_param;
+
+			switch (linphone_core_get_media_encryption(caller->lc)) {
+			case LinphoneMediaEncryptionZRTP:
+			case LinphoneMediaEncryptionDTLS:
+				/*wait for encryption to be on, in case of zrtp/dtls, it can take a few seconds*/
+				wait_for(callee->lc,caller->lc,&caller->stat.number_of_LinphoneCallEncryptedOn,initial_caller_stat.number_of_LinphoneCallEncryptedOn+1);
+			break;
+			case LinphoneMediaEncryptionNone:
+			case LinphoneMediaEncryptionSRTP:
+				break;
+			}
+			switch (linphone_core_get_media_encryption(callee->lc)) {
+			case LinphoneMediaEncryptionZRTP:
+			case LinphoneMediaEncryptionDTLS:
+				wait_for(callee->lc,caller->lc,&callee->stat.number_of_LinphoneCallEncryptedOn,initial_callee_stat.number_of_LinphoneCallEncryptedOn+1);
+			break;
+			case LinphoneMediaEncryptionNone:
+			case LinphoneMediaEncryptionSRTP:
+				break;
+			}
+
+			call_param = linphone_call_get_current_params(linphone_core_get_current_call(callee->lc));
+			BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc), int, "%d");
+			call_param = linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
+			BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc), int, "%d");
+
+		}
+
+		if (video_added) {
+			linphone_call_set_next_video_frame_decoded_callback(call_obj,linphone_call_iframe_decoded_cb,callee->lc);
+			/*send vfu*/
+			linphone_call_send_vfu_request(call_obj);
+			BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_IframeDecoded,initial_callee_stat.number_of_IframeDecoded+1));
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+static bool_t remove_video(LinphoneCoreManager *caller, LinphoneCoreManager *callee) {
+	LinphoneCallParams *callee_params;
+	LinphoneCall *call_obj;
+	stats initial_caller_stat = caller->stat;
+	stats initial_callee_stat = callee->stat;
+
+	if (!linphone_core_get_current_call(callee->lc)
+		|| (linphone_call_get_state(linphone_core_get_current_call(callee->lc)) != LinphoneCallStreamsRunning)
+		|| !linphone_core_get_current_call(caller->lc)
+		|| (linphone_call_get_state(linphone_core_get_current_call(caller->lc)) != LinphoneCallStreamsRunning)) {
+		ms_warning("bad state for removing video");
+		return FALSE;
+	}
+
+	if ((call_obj = linphone_core_get_current_call(callee->lc))) {
+		
+		if (!BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(call_obj)))){
+			BC_FAIL("Video was asked to be dropped while it was not active. This test doesn't look very sane.");
+			return FALSE;
+		}
+		
+		callee_params = linphone_core_create_call_params(callee->lc, call_obj);
+		/* Remove video. */
+		linphone_call_params_enable_video(callee_params, FALSE);
+		linphone_core_update_call(callee->lc, call_obj, callee_params);
+		linphone_call_params_destroy(callee_params);
+
+		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallUpdatedByRemote, initial_caller_stat.number_of_LinphoneCallUpdatedByRemote + 1));
+		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &callee->stat.number_of_LinphoneCallUpdating, initial_callee_stat.number_of_LinphoneCallUpdating + 1));
+		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &callee->stat.number_of_LinphoneCallStreamsRunning, initial_callee_stat.number_of_LinphoneCallStreamsRunning + 1));
+		BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallStreamsRunning, initial_caller_stat.number_of_LinphoneCallStreamsRunning + 1));
+
+		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
+		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
+
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void call_with_video_added(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bool_t call_ok;
+
+	BC_ASSERT_TRUE((call_ok=call(pauline,marie)));
+	if (!call_ok) goto end;
+
+	BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
+
+	end_call(pauline, marie);
+
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_video_added_2(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bool_t call_ok;
+	/*in this variant marie is already in automatically accept*/
+	LinphoneVideoPolicy  marie_policy;
+	marie_policy.automatically_accept=TRUE;
+
+
+	linphone_core_set_video_policy(marie->lc,&marie_policy);
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, FALSE);
+
+	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
+	if (!call_ok) goto end;
+
+	BC_ASSERT_TRUE(request_video(marie,pauline, TRUE));
+
+	end_call(pauline, marie);
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_video_added_random_ports(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bool_t call_ok;
+
+	linphone_core_set_audio_port(marie->lc,-1);
+	linphone_core_set_video_port(marie->lc,-1);
+	linphone_core_set_audio_port(pauline->lc,-1);
+	linphone_core_set_video_port(pauline->lc,-1);
+
+	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
+	if (!call_ok) goto end;
+
+	BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
+	end_call(pauline, marie);
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_several_video_switches(void) {
+	int dummy = 0;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bool_t call_ok;
+	BC_ASSERT_TRUE(call_ok=call(pauline,marie));
+
+	if (!call_ok) goto end;
+
+	BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
+	wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
+	BC_ASSERT_TRUE(remove_video(pauline,marie));
+	BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
+	wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
+	BC_ASSERT_TRUE(remove_video(pauline,marie));
+	/**/
+	end_call(pauline, marie);
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void srtp_call_with_several_video_switches(void) {
+	int dummy = 0;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bool_t call_ok;
+
+	if (linphone_core_media_encryption_supported(marie->lc, LinphoneMediaEncryptionSRTP)) {
+		linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionSRTP);
+		linphone_core_set_media_encryption(pauline->lc, LinphoneMediaEncryptionSRTP);
+
+		BC_ASSERT_TRUE(call_ok=call(pauline,marie));
+		if (!call_ok) goto end;
+
+		BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
+		wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
+		BC_ASSERT_TRUE(remove_video(pauline,marie));
+		BC_ASSERT_TRUE(request_video(pauline,marie, TRUE));
+		wait_for_until(pauline->lc,marie->lc,&dummy,1,1000); /* Wait for VFU request exchanges to be finished. */
+		BC_ASSERT_TRUE(remove_video(pauline,marie));
+		/**/
+		end_call(pauline, marie);
+	} else {
+		ms_warning("Not tested because SRTP is not available.");
+	}
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_declined_video_base(bool_t using_policy) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall* marie_call;
+	LinphoneCall* pauline_call;
+	LinphoneVideoPolicy marie_policy, pauline_policy;
+	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
+	bool_t call_ok;
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, FALSE);
+
+	if (using_policy) {
+		pauline_policy.automatically_initiate=TRUE;
+		pauline_policy.automatically_accept=FALSE;
+		marie_policy.automatically_initiate=FALSE;
+		marie_policy.automatically_accept=FALSE;
+
+		linphone_core_set_video_policy(marie->lc,&marie_policy);
+		linphone_core_set_video_policy(pauline->lc,&pauline_policy);
+	}
+
+	caller_test_params.base=linphone_core_create_call_params(pauline->lc, NULL);
+	if (!using_policy)
+		linphone_call_params_enable_video(caller_test_params.base,TRUE);
+
+	if (!using_policy){
+		callee_test_params.base=linphone_core_create_call_params(marie->lc, NULL);
+		linphone_call_params_enable_video(callee_test_params.base,FALSE);
+	}
+
+	BC_ASSERT_TRUE((call_ok=call_with_params2(pauline,marie,&caller_test_params,&callee_test_params,using_policy)));
+	if (!call_ok) goto end;
+
+	linphone_call_params_destroy(caller_test_params.base);
+	if (callee_test_params.base) linphone_call_params_destroy(callee_test_params.base);
+	marie_call=linphone_core_get_current_call(marie->lc);
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+
+	BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(marie_call)));
+	BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(pauline_call)));
+
+	end_call(pauline, marie);
+
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+static void call_with_declined_video(void) {
+	call_with_declined_video_base(FALSE);
+}
+
+static void call_with_declined_video_despite_policy(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall* marie_call;
+	LinphoneCall* pauline_call;
+	LinphoneVideoPolicy marie_policy, pauline_policy;
+	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
+	bool_t call_ok;
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, FALSE);
+
+	pauline_policy.automatically_initiate=TRUE;
+	pauline_policy.automatically_accept=TRUE;
+	marie_policy.automatically_initiate=TRUE;
+	marie_policy.automatically_accept=TRUE;
+
+	linphone_core_set_video_policy(marie->lc,&marie_policy);
+	linphone_core_set_video_policy(pauline->lc,&pauline_policy);
+
+	caller_test_params.base=linphone_core_create_call_params(pauline->lc, NULL);
+
+	callee_test_params.base=linphone_core_create_call_params(marie->lc, NULL);
+	linphone_call_params_enable_video(callee_test_params.base,FALSE);
+
+	BC_ASSERT_TRUE((call_ok=call_with_params2(pauline,marie,&caller_test_params,&callee_test_params,FALSE)));
+	if (!call_ok) goto end;
+
+	linphone_call_params_destroy(caller_test_params.base);
+	if (callee_test_params.base) linphone_call_params_destroy(callee_test_params.base);
+	marie_call=linphone_core_get_current_call(marie->lc);
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+
+	BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(marie_call)));
+	BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(pauline_call)));
+
+	end_call(pauline, marie);
+
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_declined_video_using_policy(void) {
+	call_with_declined_video_base(TRUE);
+}
+
+
+void video_call_base_2(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) {
+	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
+	LinphoneCall* callee_call;
+	LinphoneCall* caller_call;
+	LinphoneVideoPolicy callee_policy, caller_policy;
+
+	if (using_policy) {
+		callee_policy.automatically_initiate=FALSE;
+		callee_policy.automatically_accept=TRUE;
+		caller_policy.automatically_initiate=TRUE;
+		caller_policy.automatically_accept=FALSE;
+
+		linphone_core_set_video_policy(callee->lc,&callee_policy);
+		linphone_core_set_video_policy(caller->lc,&caller_policy);
+	}
+
+	linphone_core_enable_video_display(callee->lc, callee_video_enabled);
+	linphone_core_enable_video_capture(callee->lc, callee_video_enabled);
+
+	linphone_core_enable_video_display(caller->lc, caller_video_enabled);
+	linphone_core_enable_video_capture(caller->lc, caller_video_enabled);
+
+	if (mode==LinphoneMediaEncryptionDTLS) { /* for DTLS we must access certificates or at least have a directory to store them */
+		char *path = bc_tester_file("certificates-marie");
+		callee->lc->user_certificates_path = ms_strdup(path);
+		bc_free(path);
+		path = bc_tester_file("certificates-pauline");
+		caller->lc->user_certificates_path = ms_strdup(path);
+		bc_free(path);
+		belle_sip_mkdir(callee->lc->user_certificates_path);
+		belle_sip_mkdir(caller->lc->user_certificates_path);
+	}
+
+	linphone_core_set_media_encryption(callee->lc,mode);
+	linphone_core_set_media_encryption(caller->lc,mode);
+
+	caller_test_params.base=linphone_core_create_call_params(caller->lc, NULL);
+	if (!using_policy)
+		linphone_call_params_enable_video(caller_test_params.base,TRUE);
+
+	if (!using_policy){
+		callee_test_params.base=linphone_core_create_call_params(callee->lc, NULL);
+		linphone_call_params_enable_video(callee_test_params.base,TRUE);
+	}
+
+	BC_ASSERT_TRUE(call_with_params2(caller,callee,&caller_test_params,&callee_test_params,using_policy));
+	callee_call=linphone_core_get_current_call(callee->lc);
+	caller_call=linphone_core_get_current_call(caller->lc);
+
+	linphone_call_params_destroy(caller_test_params.base);
+	if (callee_test_params.base) linphone_call_params_destroy(callee_test_params.base);
+
+	if (callee_call && caller_call ) {
+		if (callee_video_enabled && caller_video_enabled) {
+			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(callee_call)));
+			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(caller_call)));
+
+			/*check video path*/
+			linphone_call_set_next_video_frame_decoded_callback(callee_call,linphone_call_iframe_decoded_cb,callee->lc);
+			linphone_call_send_vfu_request(callee_call);
+			BC_ASSERT_TRUE( wait_for(callee->lc,caller->lc,&callee->stat.number_of_IframeDecoded,1));
+		} else {
+			BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(callee_call)));
+			BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(caller_call)));
+		}
+		liblinphone_tester_check_rtcp(callee,caller);
+	}
+}
+
+
+static void check_fir(LinphoneCoreManager* caller,LinphoneCoreManager* callee ){
+	LinphoneCall* callee_call;
+	LinphoneCall* caller_call;
+
+	callee_call=linphone_core_get_current_call(callee->lc);
+	caller_call=linphone_core_get_current_call(caller->lc);
+
+	/*check video path is established in both directions.
+	 Indeed, FIR are ignored until the first RTP packet is received, because SSRC is not known.*/
+	linphone_call_set_next_video_frame_decoded_callback(callee_call,linphone_call_iframe_decoded_cb,callee->lc);
+	linphone_call_set_next_video_frame_decoded_callback(caller_call,linphone_call_iframe_decoded_cb,caller->lc);
+
+	BC_ASSERT_TRUE( wait_for(callee->lc,caller->lc,&callee->stat.number_of_IframeDecoded,1));
+	BC_ASSERT_TRUE( wait_for(callee->lc,caller->lc,&caller->stat.number_of_IframeDecoded,1));
+
+	linphone_call_send_vfu_request(callee_call);
+
+	if (rtp_session_avpf_enabled(callee_call->sessions->rtp_session)){
+		BC_ASSERT_TRUE(wait_for(callee->lc,caller->lc,&caller_call->videostream->ms_video_stat.counter_rcvd_fir, 1));
+	}else{
+		BC_ASSERT_TRUE(wait_for(callee->lc,caller->lc,&caller_call->videostream->ms_video_stat.counter_rcvd_fir, 0));
+	}
+	ms_message ("check_fir : [%p] received  %d FIR  ",&caller_call ,caller_call->videostream->ms_video_stat.counter_rcvd_fir);
+	ms_message ("check_fir : [%p] stat number of iframe decoded  %d ",&callee_call, callee->stat.number_of_IframeDecoded);
+
+	linphone_call_set_next_video_frame_decoded_callback(caller_call,linphone_call_iframe_decoded_cb,caller->lc);
+	linphone_call_send_vfu_request(caller_call);
+	BC_ASSERT_TRUE( wait_for(callee->lc,caller->lc,&caller->stat.number_of_IframeDecoded,1));
+
+	if (rtp_session_avpf_enabled(caller_call->sessions->rtp_session)) {
+		if (rtp_session_avpf_enabled(callee_call->sessions->rtp_session)){
+			BC_ASSERT_TRUE(wait_for(callee->lc,caller->lc,&callee_call->videostream->ms_video_stat.counter_rcvd_fir, 1));
+		}
+	}else{
+		BC_ASSERT_TRUE(wait_for(callee->lc,caller->lc,&callee_call->videostream->ms_video_stat.counter_rcvd_fir, 0));
+	}
+	ms_message ("check_fir : [%p] received  %d FIR  ",&callee_call ,callee_call->videostream->ms_video_stat.counter_rcvd_fir);
+	ms_message ("check_fir : [%p] stat number of iframe decoded  %d ",&caller_call, caller->stat.number_of_IframeDecoded);
+
+}
+
+void video_call_base_3(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) {
+	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
+
+	LinphoneCall* callee_call;
+	LinphoneCall* caller_call;
+	LinphoneVideoPolicy callee_policy, caller_policy;
+
+	if (using_policy) {
+		callee_policy.automatically_initiate=FALSE;
+		callee_policy.automatically_accept=TRUE;
+		caller_policy.automatically_initiate=TRUE;
+		caller_policy.automatically_accept=FALSE;
+
+		linphone_core_set_video_policy(callee->lc,&callee_policy);
+		linphone_core_set_video_policy(caller->lc,&caller_policy);
+	}
+
+	linphone_core_enable_video_display(callee->lc, callee_video_enabled);
+	linphone_core_enable_video_capture(callee->lc, callee_video_enabled);
+
+	linphone_core_enable_video_display(caller->lc, caller_video_enabled);
+	linphone_core_enable_video_capture(caller->lc, caller_video_enabled);
+
+	if (mode==LinphoneMediaEncryptionDTLS) { /* for DTLS we must access certificates or at least have a directory to store them */
+		char *path = bc_tester_file("certificates-marie");
+		callee->lc->user_certificates_path = ms_strdup(path);
+		bc_free(path);
+		path = bc_tester_file("certificates-pauline");
+		caller->lc->user_certificates_path = ms_strdup(path);
+		bc_free(path);
+		belle_sip_mkdir(callee->lc->user_certificates_path);
+		belle_sip_mkdir(caller->lc->user_certificates_path);
+	}
+
+	linphone_core_set_media_encryption(callee->lc,mode);
+	linphone_core_set_media_encryption(caller->lc,mode);
+	/* Create call params */
+	caller_test_params.base=linphone_core_create_call_params(caller->lc, NULL);
+
+	if (!using_policy)
+		linphone_call_params_enable_video(caller_test_params.base,TRUE);
+
+	if (!using_policy){
+		callee_test_params.base=linphone_core_create_call_params(callee->lc, NULL);
+		linphone_call_params_enable_video(callee_test_params.base,TRUE);
+	}
+
+	BC_ASSERT_TRUE(call_with_params2(caller,callee,&caller_test_params,&callee_test_params,using_policy));
+	callee_call=linphone_core_get_current_call(callee->lc);
+	caller_call=linphone_core_get_current_call(caller->lc);
+
+	linphone_call_params_destroy(caller_test_params.base);
+	if (callee_test_params.base) linphone_call_params_destroy(callee_test_params.base);
+
+	if (callee_call && caller_call ) {
+		if (callee_video_enabled && caller_video_enabled) {
+			check_fir(caller,callee);
+		} else {
+			BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(callee_call)));
+			BC_ASSERT_FALSE(linphone_call_log_video_enabled(linphone_call_get_call_log(caller_call)));
+		}
+		liblinphone_tester_check_rtcp(callee,caller);
+	}
+}
+
+
+
+static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) {
+	video_call_base_2(pauline,marie,using_policy,mode,callee_video_enabled,caller_video_enabled);
+	end_call(pauline, marie);
+}
+
+static void video_call(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_without_rtcp(void) {
+	LpConfig   *lp;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	lp = linphone_core_get_config(marie->lc);
+	lp_config_set_int(lp,"rtp","rtcp_enabled",0);
+
+	lp = linphone_core_get_config(pauline->lc);
+	lp_config_set_int(lp,"rtp","rtcp_enabled",0);
+
+	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_disable_implicit_AVPF_on_callee(void) {
+	LinphoneCoreManager* callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* caller = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+	LpConfig   *callee_lp;
+	const LinphoneCallParams *params, *params2;
+
+	callee_lp = linphone_core_get_config(callee->lc);
+	lp_config_set_int(callee_lp,"rtp","rtcp_fb_implicit_rtcp_fb",0);
+
+	video_call_base_3(caller,callee,TRUE,LinphoneMediaEncryptionNone,TRUE,TRUE);
+	if(BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(callee->lc))) {
+		params = linphone_call_get_current_params(linphone_core_get_current_call(callee->lc));
+		BC_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), "RTP/AVP");
+	}
+	if(BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(caller->lc))) {
+		params2 =linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
+		BC_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params2), "RTP/AVP");
+	}
+	end_call(caller, callee);
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+}
+
+
+static void video_call_disable_implicit_AVPF_on_caller(void) {
+	LinphoneCoreManager *callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *caller = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+	LpConfig   *caller_lp;
+	const LinphoneCallParams *params, *params2;
+
+	caller_lp = linphone_core_get_config(caller->lc);
+	lp_config_set_int(caller_lp, "rtp", "rtcp_fb_implicit_rtcp_fb", 0);
+
+	video_call_base_3(caller, callee, TRUE, LinphoneMediaEncryptionNone, TRUE, TRUE);
+	params = linphone_call_get_current_params(linphone_core_get_current_call(callee->lc));
+	BC_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params), "RTP/AVP");
+	params2 = linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
+	BC_ASSERT_STRING_EQUAL(linphone_call_params_get_rtp_profile(params2), "RTP/AVP");
+	end_call(caller, callee);
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+
+}
+
+static void video_call_AVPF_to_implicit_AVPF(void) {
+	LinphoneCoreManager *callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *caller = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_set_avpf_mode(caller->lc, LinphoneAVPFEnabled);
+	video_call_base_3(caller, callee, TRUE, LinphoneMediaEncryptionNone, TRUE, TRUE);
+	end_call(caller, callee);
+
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+
+}
+
+static void video_call_implicit_AVPF_to_AVPF(void) {
+	LinphoneCoreManager *callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *caller = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_set_avpf_mode(callee->lc, LinphoneAVPFEnabled);
+	video_call_base_3(caller, callee, TRUE, LinphoneMediaEncryptionNone, TRUE, TRUE);
+	end_call(caller, callee);
+
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+
+}
+
+static void video_call_using_policy_AVPF_implicit_caller_and_callee(void) {
+	LinphoneCoreManager *callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *caller = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+	video_call_base_3(caller, callee, FALSE, LinphoneMediaEncryptionNone, TRUE, TRUE);
+	end_call(caller, callee);
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+}
+
+static void video_call_base_avpf(LinphoneCoreManager *caller, LinphoneCoreManager *callee, bool_t using_policy, LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled) {
+	linphone_core_set_avpf_mode(caller->lc, LinphoneAVPFEnabled);
+	linphone_core_set_avpf_mode(callee->lc, LinphoneAVPFEnabled);
+	video_call_base_3(caller, callee, using_policy, mode, callee_video_enabled, caller_video_enabled);
+	end_call(caller, callee);
+}
+
+static void video_call_avpf(void) {
+	LinphoneCoreManager *callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *caller = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	video_call_base_avpf(caller, callee, FALSE, LinphoneMediaEncryptionNone, TRUE, TRUE);
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+
+}
+
+static void video_call_zrtp(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionZRTP)) {
+		video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionZRTP,TRUE,TRUE);
+	} else
+		ms_message("Skipping video_call_zrtp");
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_dtls(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	if (linphone_core_media_encryption_supported(pauline->lc,LinphoneMediaEncryptionDTLS)) {
+		video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionDTLS,TRUE,TRUE);
+	} else
+		ms_message("Skipping video_call_dtls");
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+
+}
+
+
+
+static void video_call_using_policy(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+	video_call_base(pauline,marie,TRUE,LinphoneMediaEncryptionNone,TRUE,TRUE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_using_policy_with_callee_video_disabled(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,FALSE,TRUE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_using_policy_with_caller_video_disabled(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,TRUE,FALSE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_no_sdp(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	linphone_core_enable_sdp_200_ack(pauline->lc,TRUE);
+	video_call_base(pauline,marie,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_ice_video_to_novideo(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneVideoPolicy vpol={0};
+	vpol.automatically_initiate=TRUE;
+	linphone_core_set_video_policy(pauline->lc,&vpol);
+	vpol.automatically_initiate=FALSE;
+	linphone_core_set_video_policy(marie->lc,&vpol);
+	_call_with_ice_base(pauline,marie,TRUE,TRUE,TRUE,FALSE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+/*
+ * This function aims at testing ICE together with video enablement policies, and video enablements/disablements by either
+ * caller or callee.
+ * It doesn't use linphone_core_accept_call_with_params() to accept video despite of default policies.
+ */
+static void _call_with_ice_video(LinphoneVideoPolicy caller_policy, LinphoneVideoPolicy callee_policy,
+	bool_t video_added_by_caller, bool_t video_added_by_callee, bool_t video_removed_by_caller, bool_t video_removed_by_callee) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	unsigned int nb_media_starts = 1;
+	const LinphoneCallParams *marie_remote_params;
+	const LinphoneCallParams *pauline_current_params;
+	
+	/*
+	 * Pauline is the caller
+	 * Marie is the callee
+	 */
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	linphone_core_set_video_policy(pauline->lc, &caller_policy);
+	linphone_core_set_video_policy(marie->lc, &callee_policy);
+	linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
+	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
+	
+	linphone_core_manager_wait_for_stun_resolution(marie);
+	linphone_core_manager_wait_for_stun_resolution(pauline);
+
+	/* This is to activate media relay on Flexisip server.
+	 * Indeed, we want to test ICE with relay candidates as well, even though
+	 * they will not be used at the end.*/
+	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
+	linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
+	
+	linphone_core_set_audio_port(marie->lc, -1);
+	linphone_core_set_video_port(marie->lc, -1);
+	linphone_core_set_audio_port(pauline->lc, -1);
+	linphone_core_set_video_port(pauline->lc, -1);
+
+	
+	linphone_core_invite_address(pauline->lc, marie->identity);
+	if (!BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	marie_remote_params = linphone_call_get_remote_params(linphone_core_get_current_call(marie->lc));
+	BC_ASSERT_PTR_NOT_NULL(marie_remote_params);
+	if (marie_remote_params){
+		BC_ASSERT_TRUE(linphone_call_params_video_enabled(marie_remote_params) == caller_policy.automatically_initiate);
+	}
+	
+	linphone_core_accept_call(marie->lc, linphone_core_get_current_call(marie->lc));
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1)
+		&& wait_for(pauline->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+	
+	pauline_current_params = linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc));
+	BC_ASSERT_PTR_NOT_NULL(pauline_current_params);
+	if (pauline_current_params){
+		BC_ASSERT_TRUE(linphone_call_params_video_enabled(pauline_current_params) == 
+			(caller_policy.automatically_initiate && callee_policy.automatically_accept));
+	}
+	
+	/* Wait for ICE reINVITEs to complete. */
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2)
+		&& wait_for(pauline->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+	BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection));
+	BC_ASSERT_TRUE(check_nb_media_starts(pauline, marie, nb_media_starts, nb_media_starts));
+	
+	
+	if (caller_policy.automatically_initiate && callee_policy.automatically_accept && (video_added_by_caller || video_added_by_callee)){
+		BC_FAIL("Tired developer detected. You have requested the test to add video while it is already established from the beginning of the call.");
+	}else{
+		if (video_added_by_caller) {
+			BC_ASSERT_TRUE(request_video(marie, pauline, FALSE) == callee_policy.automatically_accept);
+		} else if (video_added_by_callee) {
+			BC_ASSERT_TRUE(request_video(pauline, marie, FALSE) == caller_policy.automatically_accept);
+		}
+		if (video_added_by_caller || video_added_by_callee) {
+			BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection));
+			if (linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)))){
+				/* Wait for ICE reINVITEs to complete if video was really added */
+				BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 4)
+					&& wait_for(pauline->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 4));
+				/*the video addon should have triggered a media start, but the ICE reINVITE shall not*/
+				nb_media_starts++;
+				BC_ASSERT_TRUE(check_nb_media_starts(pauline, marie, nb_media_starts, nb_media_starts));
+			}
+		}
+	}
+
+	if (video_removed_by_caller) {
+		BC_ASSERT_TRUE(remove_video(marie, pauline));
+	} else if (video_removed_by_callee) {
+		BC_ASSERT_TRUE(remove_video(pauline, marie));
+	}
+	if (video_removed_by_caller || video_removed_by_callee) {
+		BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection));
+		nb_media_starts++;
+		BC_ASSERT_TRUE(check_nb_media_starts(pauline, marie, nb_media_starts, nb_media_starts));
+		
+	}
+
+	end_call(pauline, marie);
+
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void call_with_ice_video_added(void) {
+	/*
+	 * Scenario: video is not active at the beginning of the call, caller requests it but callee declines it
+	 */
+	LinphoneVideoPolicy vpol = { FALSE, FALSE };
+	_call_with_ice_video(vpol, vpol, TRUE, FALSE, FALSE, FALSE);
+}
+
+static void call_with_ice_video_added_2(void) {
+	LinphoneVideoPolicy vpol = {FALSE, FALSE};
+	/*
+	 * Scenario: video is not active at the beginning of the call, callee requests it but caller declines it
+	 */
+	_call_with_ice_video(vpol, vpol, FALSE, TRUE, FALSE, FALSE);
+}
+
+static void call_with_ice_video_added_3(void) {
+	LinphoneVideoPolicy caller_policy = { FALSE, FALSE };
+	LinphoneVideoPolicy callee_policy = { TRUE, TRUE };
+	/*
+	 * Scenario: video is not active at the beginning of the call, caller requests it and callee accepts.
+	 * Finally caller removes it.
+	 */
+	_call_with_ice_video(caller_policy, callee_policy, TRUE, FALSE, TRUE, FALSE);
+}
+
+static void call_with_ice_video_added_4(void) {
+	LinphoneVideoPolicy caller_policy = { TRUE, TRUE };
+	LinphoneVideoPolicy callee_policy = { FALSE, FALSE };
+	/*
+	 * Scenario: video is not active at the beginning of the call, callee requests it and caller accepts.
+	 * Finally caller removes it.
+	 */
+	_call_with_ice_video(caller_policy, callee_policy, FALSE, TRUE, TRUE, FALSE);
+}
+
+static void call_with_ice_video_added_5(void) {
+	LinphoneVideoPolicy caller_policy = { TRUE, TRUE };
+	LinphoneVideoPolicy callee_policy = { FALSE, FALSE };
+	/*
+	 * Scenario: video is not active at the beginning of the call, callee requests it and caller accepts.
+	 * Finally callee removes it.
+	 */
+	_call_with_ice_video(caller_policy, callee_policy, FALSE, TRUE, FALSE, TRUE);
+}
+
+static void call_with_ice_video_added_6(void) {
+	LinphoneVideoPolicy caller_policy = { TRUE, TRUE };
+	LinphoneVideoPolicy callee_policy = { TRUE, TRUE };
+	/*
+	 * Scenario: video is active at the beginning of the call, caller removes it.
+	 */
+	_call_with_ice_video(caller_policy, callee_policy, FALSE, FALSE, TRUE, FALSE);
+}
+
+static void call_with_ice_video_added_7(void) {
+	LinphoneVideoPolicy caller_policy = { TRUE, TRUE };
+	LinphoneVideoPolicy callee_policy = { TRUE, TRUE };
+	/*
+	 * Scenario: video is active at the beginning of the call, callee removes it.
+	 */
+	_call_with_ice_video(caller_policy, callee_policy, FALSE, FALSE, FALSE, TRUE);
+}
+
+static void call_with_ice_video_and_rtt(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	bool_t call_ok;
+	LinphoneVideoPolicy policy;
+	LinphoneCallParams *params = NULL;
+	LinphoneCall *marie_call = NULL;
+
+	policy.automatically_initiate = policy.automatically_accept = TRUE;
+	linphone_core_set_video_policy(pauline->lc, &policy);
+	linphone_core_set_video_policy(marie->lc, &policy);
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, FALSE);
+	linphone_core_enable_video_capture(pauline->lc, FALSE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
+	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
+
+	linphone_core_set_audio_port(marie->lc, -1);
+	linphone_core_set_video_port(marie->lc, -1);
+	linphone_core_set_text_port(marie->lc, -1);
+	linphone_core_set_audio_port(pauline->lc, -1);
+	linphone_core_set_video_port(pauline->lc, -1);
+	linphone_core_set_text_port(pauline->lc, -1);
+
+	params = linphone_core_create_call_params(pauline->lc, NULL);
+	linphone_call_params_enable_realtime_text(params, TRUE);
+	BC_ASSERT_TRUE(call_ok = call_with_caller_params(pauline, marie, params));
+	if (!call_ok) goto end;
+	BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection));
+
+	marie_call = linphone_core_get_current_call(marie->lc);
+	BC_ASSERT_TRUE(linphone_call_params_audio_enabled(linphone_call_get_current_params(marie_call)));
+	BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(marie_call)));
+	BC_ASSERT_TRUE(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(marie_call)));
+
+	end_call(pauline, marie);
+end:
+	linphone_call_params_destroy(params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+
+static void video_call_with_early_media_no_matching_audio_codecs(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall *out_call, *pauline_call;
+	LinphoneVideoPolicy vpol={0};
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, FALSE);
+
+	vpol.automatically_initiate=TRUE;
+	vpol.automatically_accept=TRUE;
+	linphone_core_set_video_policy(pauline->lc,&vpol);
+	linphone_core_set_video_policy(marie->lc,&vpol);
+
+	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMU", 8000, 1), FALSE); /* Disable PCMU */
+	linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMA", 8000, 1), TRUE); /* Enable PCMA */
+
+	out_call = linphone_core_invite_address(marie->lc, pauline->identity);
+	linphone_call_ref(out_call);
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingInit, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1));
+
+	pauline_call = linphone_core_get_current_call(pauline->lc);
+	if (!pauline_call) goto end;
+
+	linphone_core_accept_early_media(pauline->lc, pauline_call);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallIncomingEarlyMedia, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia, 1));
+	/*audio stream shall not have been requested to start*/
+	BC_ASSERT_PTR_NULL(pauline_call->audiostream->soundread);
+
+	BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(out_call)));
+	BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(pauline_call)));
+
+	linphone_core_accept_call(pauline->lc, pauline_call);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
+
+	end_call(marie, pauline);
+
+end:
+	linphone_call_unref(out_call);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_limited_bandwidth(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_set_download_bandwidth(pauline->lc, 100);
+	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void dtls_srtp_video_call(void) {
+	call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyNoFirewall,FALSE);
+}
+
+static void dtls_srtp_ice_video_call(void) {
+	call_base(LinphoneMediaEncryptionDTLS,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
+}
+static void dtls_srtp_ice_video_call_with_relay(void) {
+	call_base(LinphoneMediaEncryptionDTLS,TRUE,TRUE,LinphonePolicyUseIce,FALSE);
+}
+static void srtp_video_ice_call(void) {
+	call_base(LinphoneMediaEncryptionSRTP,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
+}
+static void zrtp_video_ice_call(void) {
+	call_base(LinphoneMediaEncryptionZRTP,TRUE,FALSE,LinphonePolicyUseIce,FALSE);
+}
+
+static void accept_call_in_send_only_base(LinphoneCoreManager* pauline, LinphoneCoreManager *marie, bctbx_list_t *lcs) {
+#define DEFAULT_WAIT_FOR 10000
+	LinphoneCallParams *params;
+	LinphoneVideoPolicy pol;
+	LinphoneCall *call;
+	pol.automatically_accept=1;
+	pol.automatically_initiate=1;
+
+	// important: VP8 has really poor performances with the mire camera, at least
+	// on iOS - so when ever h264 is available, let's use it instead
+	if (linphone_core_find_payload_type(pauline->lc,"h264", -1, -1)!=NULL) {
+		disable_all_video_codecs_except_one(pauline->lc,"h264");
+		disable_all_video_codecs_except_one(marie->lc,"h264");
+	}
+
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	linphone_core_set_video_policy(pauline->lc,&pol);
+	linphone_core_set_video_device(pauline->lc,liblinphone_tester_mire_id);
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_set_video_policy(marie->lc,&pol);
+	linphone_core_set_video_device(marie->lc,liblinphone_tester_mire_id);
+
+	linphone_call_set_next_video_frame_decoded_callback(linphone_core_invite_address(pauline->lc,marie->identity)
+														,linphone_call_iframe_decoded_cb
+														,pauline->lc);
+
+
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallIncomingReceived,1,DEFAULT_WAIT_FOR));
+
+	{
+		char* remote_uri = linphone_address_as_string_uri_only(pauline->identity);
+		call = linphone_core_find_call_from_uri(marie->lc,remote_uri);
+		ms_free(remote_uri);
+	}
+
+	if  (call) {
+		params=linphone_core_create_call_params(marie->lc, NULL);
+		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendOnly);
+		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionSendOnly);
+		linphone_core_accept_call_with_params(marie->lc,call,params);
+		linphone_call_params_destroy(params);
+
+		BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning,1,DEFAULT_WAIT_FOR));
+		BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallPausedByRemote,1,DEFAULT_WAIT_FOR));
+
+		check_media_direction(marie,call,lcs,LinphoneMediaDirectionSendOnly,LinphoneMediaDirectionSendOnly);
+	}
+
+
+	call=linphone_core_get_current_call(pauline->lc);
+	if  (call) {
+		check_media_direction(pauline,call,lcs,LinphoneMediaDirectionRecvOnly,LinphoneMediaDirectionRecvOnly);
+	}
+
+}
+static void accept_call_in_send_base(bool_t caller_has_ice) {
+	LinphoneCoreManager *pauline, *marie;
+	bctbx_list_t *lcs=NULL;;
+
+	marie = linphone_core_manager_new("marie_rc");
+	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	if (caller_has_ice) {
+		linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
+	}
+
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+
+	accept_call_in_send_only_base(pauline,marie,lcs);
+
+
+	end_call(marie,pauline);
+	bctbx_list_free(lcs);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void accept_call_in_send_only(void)  {
+	accept_call_in_send_base(FALSE);
+}
+
+static void accept_call_in_send_only_with_ice(void)  {
+	accept_call_in_send_base(TRUE);
+}
+
+void two_accepted_call_in_send_only(void) {
+	LinphoneCoreManager *pauline, *marie, *laure;
+	bctbx_list_t *lcs=NULL;
+
+	marie = linphone_core_manager_new("marie_rc");
+	linphone_core_use_files(marie->lc, TRUE);
+	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	laure = linphone_core_manager_new("laure_rc_udp");
+
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+
+	accept_call_in_send_only_base(pauline,marie,lcs);
+
+	reset_counters(&marie->stat);
+	accept_call_in_send_only_base(laure,marie,lcs);
+
+	end_call(pauline, marie);
+	end_call(laure, marie);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+	bctbx_list_free(lcs);
+}
+
+static void video_early_media_call(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_early_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
+	LinphoneCall *pauline_to_marie;
+
+	linphone_core_set_video_device(pauline->lc, "Mire: Mire (synthetic moving picture)");
+
+	video_call_base_3(pauline, marie, TRUE, LinphoneMediaEncryptionNone, TRUE, TRUE);
+
+	BC_ASSERT_PTR_NOT_NULL(pauline_to_marie = linphone_core_get_current_call(pauline->lc));
+	if(pauline_to_marie) {
+		BC_ASSERT_EQUAL(pauline_to_marie->videostream->source->desc->id, MS_MIRE_ID, int, "%d");
+	}
+
+	end_call(pauline, marie);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+/*this is call forking with early media managed at client side (not by flexisip server)*/
+static void multiple_early_media(void) {
+	LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc");
+	LinphoneCoreManager* marie1 = linphone_core_manager_new("marie_early_rc");
+	LinphoneCoreManager* marie2 = linphone_core_manager_new("marie_early_rc");
+	bctbx_list_t *lcs=NULL;
+	LinphoneCallParams *params=linphone_core_create_call_params(pauline->lc, NULL);
+	LinphoneVideoPolicy pol;
+	LinphoneCall *marie1_call;
+	LinphoneCall *marie2_call;
+	LinphoneCall *pauline_call;
+	LinphoneInfoMessage *info;
+	int dummy=0;
+	pol.automatically_accept=1;
+	pol.automatically_initiate=1;
+
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+
+	linphone_core_enable_video_capture(marie1->lc, TRUE);
+	linphone_core_enable_video_display(marie1->lc, TRUE);
+	linphone_core_set_video_policy(marie1->lc,&pol);
+
+	linphone_core_enable_video_capture(marie2->lc, TRUE);
+	linphone_core_enable_video_display(marie2->lc, TRUE);
+	linphone_core_set_video_policy(marie2->lc,&pol);
+	linphone_core_set_audio_port_range(marie2->lc,40200,40300);
+	linphone_core_set_video_port_range(marie2->lc,40400,40500);
+
+	lcs=bctbx_list_append(lcs,marie1->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+
+	linphone_call_params_enable_early_media_sending(params,TRUE);
+	linphone_call_params_enable_video(params,TRUE);
+
+	linphone_core_invite_address_with_params(pauline->lc,marie1->identity,params);
+	linphone_call_params_destroy(params);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie1->stat.number_of_LinphoneCallIncomingEarlyMedia,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &marie2->stat.number_of_LinphoneCallIncomingEarlyMedia,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,3000));
+
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+	marie1_call=linphone_core_get_current_call(marie1->lc);
+	marie2_call=linphone_core_get_current_call(marie2->lc);
+
+	BC_ASSERT_PTR_NOT_NULL(pauline_call);
+	BC_ASSERT_PTR_NOT_NULL(marie1_call);
+	BC_ASSERT_PTR_NOT_NULL(marie2_call);
+
+	if (pauline_call && marie1_call && marie2_call){
+
+		/*wait a bit that streams are established*/
+		wait_for_list(lcs,&dummy,1,6000);
+		BC_ASSERT_GREATER(linphone_core_manager_get_max_audio_down_bw(pauline),70,int,"%i");
+		BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(marie1), 70, int, "%i");
+		BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(marie2), 70, int, "%i");
+
+		linphone_core_accept_call(marie1->lc,linphone_core_get_current_call(marie1->lc));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie1->stat.number_of_LinphoneCallStreamsRunning,1,3000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,3000));
+
+		/*marie2 should get her call terminated*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneCallEnd,1,1000));
+
+		/*wait a bit that streams are established*/
+		wait_for_list(lcs,&dummy,1,3000);
+		BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(pauline), 71, int, "%i");
+		BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(marie1), 71, int, "%i");
+
+		/*send an INFO in reverse side to check that dialogs are properly established*/
+		info=linphone_core_create_info_message(marie1->lc);
+		linphone_call_send_info_message(marie1_call,info);
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_inforeceived,1,3000));
+	}
+
+	end_call(pauline, marie1);
+
+	bctbx_list_free(lcs);
+	linphone_core_manager_destroy(marie1);
+	linphone_core_manager_destroy(marie2);
+	linphone_core_manager_destroy(pauline);
+}
+static void video_call_ice_params(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
+	linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
+	video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void audio_call_with_ice_with_video_policy_enabled(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneVideoPolicy vpol;
+
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	vpol.automatically_accept = vpol.automatically_initiate = TRUE;
+	linphone_core_set_video_policy(marie->lc, &vpol);
+	vpol.automatically_accept = vpol.automatically_initiate = FALSE;
+	linphone_core_set_video_policy(pauline->lc, &vpol);
+
+	linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
+	linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
+
+	linphone_core_invite_address(pauline->lc, marie->identity);
+	if (!BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallIncomingReceived, 1))) goto end;
+	linphone_core_accept_call(marie->lc, linphone_core_get_current_call(marie->lc));
+	/*
+	LinphoneCallParams *params;
+	params = linphone_core_create_call_params(marie->lc, linphone_core_get_current_call(marie->lc));
+	linphone_call_params_enable_video(params, TRUE);
+	linphone_core_accept_call_with_params(marie->lc, linphone_core_get_current_call(marie->lc), params);
+	linphone_call_params_destroy(params);*/
+
+	/*wait for call to be established and ICE reINVITEs to be done */
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+
+	linphone_core_pause_call(marie->lc, linphone_core_get_current_call(marie->lc));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallPausedByRemote, 1));
+	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallPaused, 1));
+
+	end_call(marie, pauline);
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+
+static void classic_video_entry_phone_setup(void) {
+	LinphoneCoreManager *callee_mgr = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *caller_mgr = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCallParams *early_media_params = NULL;
+	LinphoneCallParams *in_call_params = NULL;
+	LinphoneCall *callee_call = NULL;
+	LinphoneVideoPolicy vpol;
+	bctbx_list_t *lcs = NULL;
+	int retry = 0;
+	bool_t ok;
+
+	vpol.automatically_initiate = vpol.automatically_accept = TRUE;
+	lcs = bctbx_list_append(lcs, caller_mgr->lc);
+	lcs = bctbx_list_append(lcs, callee_mgr->lc);
+
+	linphone_core_enable_video_capture(caller_mgr->lc, TRUE);
+	linphone_core_enable_video_display(caller_mgr->lc, TRUE);
+	linphone_core_enable_video_capture(callee_mgr->lc, TRUE);
+	linphone_core_enable_video_display(callee_mgr->lc, TRUE);
+	linphone_core_set_avpf_mode(caller_mgr->lc, LinphoneAVPFEnabled);
+	linphone_core_set_avpf_mode(callee_mgr->lc, LinphoneAVPFEnabled);
+	linphone_core_set_video_policy(caller_mgr->lc, &vpol);
+	linphone_core_set_video_policy(callee_mgr->lc, &vpol);
+
+	// important: VP8 has really poor performances with the mire camera, at least
+	// on iOS - so when ever h264 is available, let's use it instead
+	if (linphone_core_find_payload_type(caller_mgr->lc,"h264", -1, -1)!=NULL) {
+		disable_all_video_codecs_except_one(caller_mgr->lc,"h264");
+		disable_all_video_codecs_except_one(callee_mgr->lc,"h264");
+	}
+
+	linphone_core_set_video_device(caller_mgr->lc, liblinphone_tester_mire_id);
+	linphone_core_set_video_device(callee_mgr->lc, liblinphone_tester_mire_id);
+
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address(caller_mgr->lc, callee_mgr->identity));
+
+	ok = wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallIncomingReceived, 1);
+	BC_ASSERT_TRUE(ok);
+	if (!ok) goto end;
+	BC_ASSERT_TRUE(caller_mgr->stat.number_of_LinphoneCallOutgoingProgress == 1);
+
+	callee_call = linphone_core_get_call_by_remote_address2(callee_mgr->lc, caller_mgr->identity);
+	early_media_params = linphone_core_create_call_params(callee_mgr->lc, callee_call);
+	linphone_call_params_set_audio_direction(early_media_params, LinphoneMediaDirectionInactive);
+	linphone_call_params_set_video_direction(early_media_params, LinphoneMediaDirectionRecvOnly);
+	linphone_core_accept_early_media_with_params(callee_mgr->lc, callee_call, early_media_params);
+	linphone_call_params_destroy(early_media_params);
+
+	while ((caller_mgr->stat.number_of_LinphoneCallOutgoingEarlyMedia != 1) && (retry++ < 100)) {
+		linphone_core_iterate(caller_mgr->lc);
+		linphone_core_iterate(callee_mgr->lc);
+		ms_usleep(20000);
+	}
+	BC_ASSERT_TRUE(caller_mgr->stat.number_of_LinphoneCallOutgoingEarlyMedia == 1);
+	BC_ASSERT_TRUE(callee_mgr->stat.number_of_LinphoneCallIncomingEarlyMedia == 1);
+
+	check_media_direction(callee_mgr, callee_call, lcs, LinphoneMediaDirectionInactive, LinphoneMediaDirectionRecvOnly);
+	callee_call = linphone_core_get_call_by_remote_address2(callee_mgr->lc, caller_mgr->identity);
+	in_call_params = linphone_core_create_call_params(callee_mgr->lc, callee_call);
+	linphone_call_params_set_audio_direction(in_call_params, LinphoneMediaDirectionSendRecv);
+	linphone_call_params_set_video_direction(in_call_params, LinphoneMediaDirectionSendRecv);
+	linphone_core_accept_call_with_params(callee_mgr->lc, callee_call, in_call_params);
+	linphone_call_params_destroy(in_call_params);
+
+	BC_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallConnected, 1));
+	BC_ASSERT_TRUE(wait_for(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallConnected, 1));
+
+	ok = wait_for_until(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallStreamsRunning, 1, 2000)
+		&& wait_for_until(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallStreamsRunning, 1, 2000);
+	BC_ASSERT_TRUE(ok);
+	if (!ok) goto end;
+	check_media_direction(callee_mgr, callee_call, lcs, LinphoneMediaDirectionSendRecv, LinphoneMediaDirectionSendRecv);
+
+	callee_call = linphone_core_get_current_call(callee_mgr->lc);
+	in_call_params = linphone_core_create_call_params(callee_mgr->lc, callee_call);
+	linphone_call_params_set_audio_direction(in_call_params, LinphoneMediaDirectionRecvOnly);
+	linphone_call_params_set_video_direction(in_call_params, LinphoneMediaDirectionSendOnly);
+	linphone_core_update_call(callee_mgr->lc, callee_call, in_call_params);
+	linphone_call_params_destroy(in_call_params);
+
+	ok = wait_for_until(callee_mgr->lc, caller_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallStreamsRunning, 2, 2000)
+		&& wait_for_until(callee_mgr->lc, caller_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallStreamsRunning, 2, 2000);
+	BC_ASSERT_TRUE(ok);
+	if (!ok) goto end;
+	callee_call = linphone_core_get_current_call(callee_mgr->lc);
+	check_media_direction(callee_mgr, callee_call, lcs, LinphoneMediaDirectionRecvOnly, LinphoneMediaDirectionSendOnly);
+
+	end_call(caller_mgr, callee_mgr);
+
+end:
+	linphone_core_manager_destroy(callee_mgr);
+	linphone_core_manager_destroy(caller_mgr);
+	bctbx_list_free(lcs);
+}
+static void video_call_recording_h264_test(void) {
+	record_call("recording", TRUE, "H264");
+}
+
+static void video_call_recording_vp8_test(void) {
+	record_call("recording", TRUE, "VP8");
+}
+
+static void video_call_snapshot(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCallParams *marieParams = linphone_core_create_call_params(marie->lc, NULL);
+	LinphoneCallParams *paulineParams = linphone_core_create_call_params(pauline->lc, NULL);
+	LinphoneCall *callInst = NULL;
+	char *filename = bc_tester_file("snapshot.jpeg");
+	int dummy = 0;
+	bool_t call_succeeded = FALSE;
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, FALSE);
+	linphone_call_params_enable_video(marieParams, TRUE);
+	linphone_call_params_enable_video(paulineParams, TRUE);
+
+	BC_ASSERT_TRUE(call_succeeded = call_with_params(marie, pauline, marieParams, paulineParams));
+	BC_ASSERT_PTR_NOT_NULL(callInst = linphone_core_get_current_call(marie->lc));
+	if((call_succeeded == TRUE) && (callInst != NULL)) {
+		int jpeg_support = linphone_call_take_video_snapshot(callInst, filename);
+		if (jpeg_support < 0) {
+			ms_warning("No jpegwriter support!");
+		} else {
+			wait_for_until(marie->lc, pauline->lc, &dummy, 1, 5000);
+			BC_ASSERT_EQUAL(ortp_file_exist(filename), 0, int, "%d");
+			remove(filename);
+		}
+		end_call(marie, pauline);
+	}
+	ms_free(filename);
+	linphone_call_params_unref(marieParams);
+	linphone_call_params_unref(paulineParams);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryption mode, bool_t no_sdp) {
+	LinphoneCoreManager* marie;
+	LinphoneCoreManager* pauline;
+	LinphoneCallParams *params;
+	const LinphoneCallParams *current_params;
+	bctbx_list_t *lcs=NULL;
+	bool_t calls_ok;
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+
+	linphone_core_set_avpf_mode(pauline->lc,TRUE);
+
+	// important: VP8 has really poor performances with the mire camera, at least
+	// on iOS - so when ever h264 is available, let's use it instead
+	if (linphone_core_find_payload_type(pauline->lc,"h264", -1, -1)!=NULL) {
+		disable_all_video_codecs_except_one(pauline->lc,"h264");
+		disable_all_video_codecs_except_one(marie->lc,"h264");
+	}
+	linphone_core_set_video_device(pauline->lc,liblinphone_tester_mire_id);
+	linphone_core_set_video_device(marie->lc,liblinphone_tester_mire_id);
+	linphone_core_set_avpf_mode(marie->lc,TRUE);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+
+	video_call_base_2(marie,pauline,TRUE,mode,TRUE,TRUE);
+
+	calls_ok = linphone_core_get_current_call(marie->lc) != NULL && linphone_core_get_current_call(pauline->lc) != NULL;
+	BC_ASSERT_TRUE(calls_ok);
+
+	if (calls_ok) {
+		params=linphone_core_create_call_params(marie->lc,linphone_core_get_current_call(marie->lc));
+		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionInactive);
+		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionInactive);
+
+		linphone_core_update_call(marie->lc, linphone_core_get_current_call(marie->lc),params);
+		linphone_call_params_destroy(params);
+
+		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallUpdating,1));
+		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
+		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallPausedByRemote,1));
+
+		check_media_direction(marie,linphone_core_get_current_call(marie->lc),lcs,LinphoneMediaDirectionInactive,LinphoneMediaDirectionInactive);
+		check_media_direction(pauline,linphone_core_get_current_call(pauline->lc), lcs, LinphoneMediaDirectionInactive, LinphoneMediaDirectionInactive);
+
+		if (no_sdp) {
+			linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
+		}
+
+		params=linphone_core_create_call_params(marie->lc,linphone_core_get_current_call(marie->lc));
+		linphone_call_params_set_audio_direction(params,LinphoneMediaDirectionSendRecv);
+		linphone_call_params_set_video_direction(params,LinphoneMediaDirectionSendRecv);
+		linphone_core_update_call(marie->lc,linphone_core_get_current_call(marie->lc),params);
+		linphone_call_params_destroy(params);
+
+		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,3));
+		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
+
+		check_media_direction(marie,linphone_core_get_current_call(marie->lc),lcs,LinphoneMediaDirectionSendRecv,LinphoneMediaDirectionSendRecv);
+		check_media_direction(pauline,linphone_core_get_current_call(pauline->lc),lcs,LinphoneMediaDirectionSendRecv,LinphoneMediaDirectionSendRecv);
+
+		/*assert that after pause and resume, SRTP is still being used*/
+		current_params = linphone_call_get_current_params(linphone_core_get_current_call(pauline->lc));
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(current_params) , mode, int, "%d");
+		current_params = linphone_call_get_current_params(linphone_core_get_current_call(marie->lc));
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(current_params) , mode, int, "%d");
+
+	}
+	end_call(marie,pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void video_call_with_re_invite_inactive_followed_by_re_invite(void) {
+	video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionNone,FALSE);
+}
+
+static void video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp(void) {
+	video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionNone, TRUE);
+}
+
+static void srtp_video_call_with_re_invite_inactive_followed_by_re_invite(void) {
+	if (ms_srtp_supported())
+		video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionSRTP,FALSE);
+	else
+		ms_message("srtp_video_call_with_re_invite_inactive_followed_by_re_invite skipped, missing srtp support");
+}
+
+static void srtp_video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp(void) {
+	if (ms_srtp_supported())
+		video_call_with_re_invite_inactive_followed_by_re_invite_base(LinphoneMediaEncryptionSRTP, TRUE);
+	else
+		ms_message("srtp_video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp skipped, missing srtp support");
+}
+
+static void incoming_reinvite_with_invalid_ack_sdp(void){
+	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
+	LinphoneCall * inc_call;
+	BC_ASSERT_TRUE(call(caller,callee));
+	inc_call = linphone_core_get_current_call(callee->lc);
+
+	BC_ASSERT_PTR_NOT_NULL(inc_call);
+	if (inc_call) {
+		const LinphoneCallParams *caller_params;
+		stats initial_caller_stat=caller->stat;
+		stats initial_callee_stat=callee->stat;
+		sal_call_set_sdp_handling(inc_call->op, SalOpSDPSimulateError); /* will force a parse error for the ACK SDP*/
+		BC_ASSERT_PTR_NOT_NULL(_request_video(caller, callee, TRUE));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning));
+		/*Basically the negotiation failed but since the call was already running, we expect it to restore to
+		the previous state so error stats should not be changed*/
+		BC_ASSERT_EQUAL(callee->stat.number_of_LinphoneCallError,initial_callee_stat.number_of_LinphoneCallError, int, "%d");
+		/*and remote should have received an update notification*/
+		BC_ASSERT_EQUAL(caller->stat.number_of_LinphoneCallUpdatedByRemote,initial_caller_stat.number_of_LinphoneCallUpdatedByRemote+1, int, "%d");
+
+
+		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
+		caller_params = linphone_call_get_current_params(linphone_core_get_current_call(caller->lc));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,(int*)&caller_params->has_video,FALSE));
+
+		sal_call_set_sdp_handling(inc_call->op, SalOpSDPNormal);
+	}
+	end_call(caller, callee);
+
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+}
+
+static void outgoing_reinvite_with_invalid_ack_sdp(void)  {
+	LinphoneCoreManager* caller = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* callee = linphone_core_manager_new( "marie_rc");
+	LinphoneCall * out_call;
+	BC_ASSERT_TRUE(call(caller,callee));
+	out_call = linphone_core_get_current_call(caller->lc);
+
+	BC_ASSERT_PTR_NOT_NULL(out_call);
+	if (out_call) {
+		stats initial_caller_stat=caller->stat;
+		stats initial_callee_stat=callee->stat;
+		sal_call_set_sdp_handling(out_call->op, SalOpSDPSimulateError); /* will force a parse error for the ACK SDP*/
+		BC_ASSERT_PTR_NOT_NULL(_request_video(caller, callee, TRUE));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallUpdating,initial_callee_stat.number_of_LinphoneCallUpdating+1));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&callee->stat.number_of_LinphoneCallStreamsRunning,initial_callee_stat.number_of_LinphoneCallStreamsRunning+1));
+		BC_ASSERT_TRUE(wait_for(caller->lc,callee->lc,&caller->stat.number_of_LinphoneCallStreamsRunning,initial_caller_stat.number_of_LinphoneCallStreamsRunning));
+		/*Basically the negotiation failed but since the call was already running, we expect it to restore to
+		the previous state so error stats should not be changed*/
+		BC_ASSERT_EQUAL(callee->stat.number_of_LinphoneCallError,initial_callee_stat.number_of_LinphoneCallError, int, "%d");
+		/*and remote should not have received any update notification*/
+		BC_ASSERT_EQUAL(caller->stat.number_of_LinphoneCallUpdatedByRemote,initial_caller_stat.number_of_LinphoneCallUpdatedByRemote, int, "%d");
+
+		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(callee->lc))));
+		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(caller->lc))));
+
+		sal_call_set_sdp_handling(out_call->op, SalOpSDPNormal);
+	}
+	end_call(caller, callee);
+
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+}
+
+#endif
+static void video_call_with_no_audio_and_no_video_codec(void){
+	LinphoneCoreManager* callee = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* caller = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCall* out_call ;
+	LinphoneVideoPolicy callee_policy, caller_policy;
+	LinphoneCallTestParams caller_test_params = {0}, callee_test_params = {0};
+
+	const bctbx_list_t* elem_video =linphone_core_get_video_codecs(caller->lc);
+
+	const bctbx_list_t* elem_audio =linphone_core_get_audio_codecs(caller->lc);
+
+	disable_all_codecs(elem_audio, caller);
+	disable_all_codecs(elem_video, caller);
+
+	callee_policy.automatically_initiate=FALSE;
+	callee_policy.automatically_accept=TRUE;
+	caller_policy.automatically_initiate=TRUE;
+	caller_policy.automatically_accept=FALSE;
+
+	linphone_core_set_video_policy(callee->lc,&callee_policy);
+	linphone_core_set_video_policy(caller->lc,&caller_policy);
+
+
+	linphone_core_enable_video_display(callee->lc, TRUE);
+	linphone_core_enable_video_capture(callee->lc, TRUE);
+
+	linphone_core_enable_video_display(caller->lc, TRUE);
+	linphone_core_enable_video_capture(caller->lc, TRUE);
+
+	/* Create call params */
+	caller_test_params.base = linphone_core_create_call_params(caller->lc, NULL);
+
+
+	out_call = linphone_core_invite_address_with_params(caller->lc, callee->identity,caller_test_params.base);
+	linphone_call_ref(out_call);
+
+	linphone_call_params_destroy(caller_test_params.base);
+	if (callee_test_params.base) linphone_call_params_destroy(callee_test_params.base);
+
+
+	BC_ASSERT_TRUE(wait_for(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallOutgoingInit, 1));
+
+	BC_ASSERT_TRUE(wait_for_until(caller->lc, callee->lc, &caller->stat.number_of_LinphoneCallError, 1, 6000));
+	BC_ASSERT_EQUAL(linphone_call_get_reason(out_call), LinphoneReasonNotAcceptable, int, "%d");
+	BC_ASSERT_EQUAL(callee->stat.number_of_LinphoneCallIncomingReceived, 0, int, "%d");
+
+	linphone_call_unref(out_call);
+	linphone_core_manager_destroy(callee);
+	linphone_core_manager_destroy(caller);
+}
+
+static void call_with_early_media_and_no_sdp_in_200_with_video(void){
+	early_media_without_sdp_in_200_base(TRUE, FALSE);
+}
+
+test_t call_video_tests[] = {
+#ifdef VIDEO_ENABLED
+	TEST_NO_TAG("Call paused resumed with video", call_paused_resumed_with_video),
+	TEST_NO_TAG("Call paused resumed with video no sdp ack", call_paused_resumed_with_no_sdp_ack),
+	TEST_NO_TAG("Call paused resumed with video no sdk ack using video policy for resume offers", call_paused_resumed_with_no_sdp_ack_using_video_policy),
+	TEST_NO_TAG("Call paused, updated and resumed with video no sdk ack using video policy for resume offers", call_paused_updated_resumed_with_no_sdp_ack_using_video_policy),
+	TEST_NO_TAG("Call paused, updated and resumed with video no sdk ack using video policy for resume offers with accept call update", call_paused_updated_resumed_with_no_sdp_ack_using_video_policy_and_accept_call_update),
+	TEST_NO_TAG("ZRTP video call", zrtp_video_call),
+	TEST_NO_TAG("Simple video call AVPF", video_call_avpf),
+	TEST_NO_TAG("Simple video call implicit AVPF both", video_call_using_policy_AVPF_implicit_caller_and_callee),
+	TEST_NO_TAG("Simple video call disable implicit AVPF on callee", video_call_disable_implicit_AVPF_on_callee),
+	TEST_NO_TAG("Simple video call disable implicit AVPF on caller", video_call_disable_implicit_AVPF_on_caller),
+	TEST_NO_TAG("Simple video call AVPF to implicit AVPF", video_call_AVPF_to_implicit_AVPF),
+	TEST_NO_TAG("Simple video call implicit AVPF to AVPF", video_call_implicit_AVPF_to_AVPF),
+	TEST_NO_TAG("Simple video call", video_call),
+	TEST_NO_TAG("Simple video call without rtcp",video_call_without_rtcp),
+	TEST_NO_TAG("Simple ZRTP video call", video_call_zrtp),
+	TEST_NO_TAG("Simple DTLS video call", video_call_dtls),
+	TEST_NO_TAG("Simple video call using policy", video_call_using_policy),
+	TEST_NO_TAG("Video call using policy with callee video disabled", video_call_using_policy_with_callee_video_disabled),
+	TEST_NO_TAG("Video call using policy with caller video disabled", video_call_using_policy_with_caller_video_disabled),
+	TEST_NO_TAG("Video call without SDP", video_call_no_sdp),
+	TEST_ONE_TAG("SRTP ice video call", srtp_video_ice_call, "ICE"),
+	TEST_ONE_TAG("ZRTP ice video call", zrtp_video_ice_call, "ICE"),
+	TEST_NO_TAG("Call with video added", call_with_video_added),
+	TEST_NO_TAG("Call with video added 2", call_with_video_added_2),
+	TEST_NO_TAG("Call with video added (random ports)", call_with_video_added_random_ports),
+	TEST_NO_TAG("Call with several video switches", call_with_several_video_switches),
+	TEST_NO_TAG("SRTP call with several video switches", srtp_call_with_several_video_switches),
+	TEST_NO_TAG("Call with video declined", call_with_declined_video),
+	TEST_NO_TAG("Call with video declined despite policy", call_with_declined_video_despite_policy),
+	TEST_NO_TAG("Call with video declined using policy", call_with_declined_video_using_policy),
+	TEST_NO_TAG("Video early-media call", video_early_media_call),
+	TEST_NO_TAG("Call with multiple early media", multiple_early_media),
+	TEST_ONE_TAG("Call with ICE from video to non-video", call_with_ice_video_to_novideo, "ICE"),
+	TEST_ONE_TAG("Call with ICE and video added", call_with_ice_video_added, "ICE"),
+	TEST_ONE_TAG("Call with ICE and video added 2", call_with_ice_video_added_2, "ICE"),
+	TEST_ONE_TAG("Call with ICE and video added 3", call_with_ice_video_added_3, "ICE"),
+	TEST_ONE_TAG("Call with ICE and video added 4", call_with_ice_video_added_4, "ICE"),
+	TEST_ONE_TAG("Call with ICE and video added 5", call_with_ice_video_added_5, "ICE"),
+	TEST_ONE_TAG("Call with ICE and video added 6", call_with_ice_video_added_6, "ICE"),
+	TEST_ONE_TAG("Call with ICE and video added 7", call_with_ice_video_added_7, "ICE"),
+	TEST_ONE_TAG("Call with ICE, video and realtime text", call_with_ice_video_and_rtt, "ICE"),
+	TEST_ONE_TAG("Video call with ICE accepted using call params", video_call_ice_params, "ICE"),
+	TEST_ONE_TAG("Audio call with ICE paused with caller video policy enabled", audio_call_with_ice_with_video_policy_enabled, "ICE"),
+	TEST_NO_TAG("Video call recording (H264)", video_call_recording_h264_test),
+	TEST_NO_TAG("Video call recording (VP8)", video_call_recording_vp8_test),
+	TEST_NO_TAG("Snapshot", video_call_snapshot),
+	TEST_NO_TAG("Video call with early media and no matching audio codecs", video_call_with_early_media_no_matching_audio_codecs),
+	TEST_NO_TAG("DTLS SRTP video call", dtls_srtp_video_call),
+	TEST_ONE_TAG("DTLS SRTP ice video call", dtls_srtp_ice_video_call, "ICE"),
+	TEST_ONE_TAG("DTLS SRTP ice video call with relay", dtls_srtp_ice_video_call_with_relay, "ICE"),
+	TEST_NO_TAG("Video call with limited bandwidth", video_call_limited_bandwidth),
+	TEST_NO_TAG("Video call accepted in send only", accept_call_in_send_only),
+	TEST_ONE_TAG("Video call accepted in send only with ice", accept_call_in_send_only_with_ice, "ICE"),
+	TEST_NO_TAG("2 Video call accepted in send only", two_accepted_call_in_send_only),
+	TEST_NO_TAG("Video call with re-invite(inactive) followed by re-invite", video_call_with_re_invite_inactive_followed_by_re_invite),
+	TEST_NO_TAG("Video call with re-invite(inactive) followed by re-invite(no sdp)", video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp),
+	TEST_NO_TAG("SRTP Video call with re-invite(inactive) followed by re-invite", srtp_video_call_with_re_invite_inactive_followed_by_re_invite),
+	TEST_NO_TAG("SRTP Video call with re-invite(inactive) followed by re-invite(no sdp)", srtp_video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp),
+	TEST_NO_TAG("Classic video entry phone setup", classic_video_entry_phone_setup),
+	TEST_NO_TAG("Incoming REINVITE with invalid SDP in ACK", incoming_reinvite_with_invalid_ack_sdp),
+	TEST_NO_TAG("Outgoing REINVITE with invalid SDP in ACK", outgoing_reinvite_with_invalid_ack_sdp),
+#endif
+	TEST_NO_TAG("Video call with no audio and no video codec", video_call_with_no_audio_and_no_video_codec),
+	TEST_NO_TAG("Call with early media and no SDP in 200 Ok with video", call_with_early_media_and_no_sdp_in_200_with_video),
+};
+
+test_suite_t call_video_test_suite = {"Video Call", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								sizeof(call_video_tests) / sizeof(call_video_tests[0]), call_video_tests};
diff --git a/tester/certificates/client/cert.pem b/tester/certificates/client/cert.pem
new file mode 100644
index 000000000..0893135ad
--- /dev/null
+++ b/tester/certificates/client/cert.pem
@@ -0,0 +1,75 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 14 (0xe)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=FR, ST=Some-State, L=Grenoble, O=Belledonne Communications, OU=LAB, CN=Jehan Monnier/emailAddress=jehan.monnier@belledonne-communications.com
+        Validity
+            Not Before: Sep 20 14:00:00 2016 GMT
+            Not After : Sep 20 14:00:00 2017 GMT
+        Subject: C=FR, ST=Rhone-Alpes Auvergne, L=Grenoble, O=Belledonne Communications, CN=sip:sip.example.org/emailAddress=info@belledonne-communications.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:9e:31:b6:30:07:0e:de:8b:dd:41:66:ec:52:84:
+                    37:2c:bf:98:bc:8f:d3:8e:0d:0f:97:de:b0:4a:c6:
+                    26:c3:c5:29:4d:4e:ed:6c:0c:fe:06:61:49:16:67:
+                    23:90:c9:5b:00:49:f0:e0:5e:42:81:2a:73:c7:c7:
+                    11:9e:41:53:28:46:73:d1:12:8a:bb:bf:e7:f5:84:
+                    6a:06:e6:5c:02:de:95:1d:a0:fc:a5:f7:bf:e8:c8:
+                    c9:95:9f:07:c3:96:96:09:4d:11:f4:48:a3:89:49:
+                    30:c0:6b:e6:ad:a4:0f:b7:5a:f2:20:78:2c:35:da:
+                    fe:4c:83:70:93:65:09:b1:bb:17:46:72:1d:22:c1:
+                    07:b3:4d:93:cd:cf:8a:6d:12:7f:54:b3:48:df:d6:
+                    02:6f:f2:9c:a0:6c:5e:09:6b:26:63:94:09:cf:0c:
+                    42:e6:fa:99:08:c1:9f:18:4b:54:fb:2c:0a:cc:c0:
+                    b2:a6:1d:47:d9:1d:f2:53:e2:27:f8:71:41:f6:45:
+                    e6:50:dd:47:4b:71:a2:bb:94:74:0e:e1:c4:fd:f6:
+                    c3:41:c5:4c:1e:f9:8b:9c:c7:7e:80:59:f9:5b:e7:
+                    ab:76:fd:5a:9d:d8:bd:6f:f9:58:78:e4:72:82:44:
+                    85:32:7d:c2:27:f6:52:69:69:e8:e6:70:00:aa:64:
+                    45:6f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                CB:57:BF:89:AF:D9:DB:CC:E0:F8:79:71:AD:7F:03:63:20:0A:49:63
+            X509v3 Authority Key Identifier: 
+                keyid:06:5F:5D:C7:16:AF:62:F8:2D:6E:71:03:88:A0:D6:1D:2B:04:7F:BA
+
+    Signature Algorithm: sha256WithRSAEncryption
+         3e:6c:d5:87:db:04:2b:1b:73:93:9e:ea:fe:10:4a:38:9b:3e:
+         63:8f:f2:8d:8a:d0:bc:b2:4a:63:e0:3c:31:71:00:cf:81:4a:
+         ae:4c:51:fc:5d:51:b7:0a:86:48:5b:1f:a6:cc:ca:d2:c3:95:
+         da:4b:34:dc:8c:dd:1b:27:fb:d2:a8:e4:5e:5a:cc:01:f0:63:
+         58:74:72:1b:5f:c9:51:87:49:dd:ff:13:77:4c:2f:59:38:7f:
+         0a:48:94:17:67:b9:7e:6a:1f:c8:29:67:e0:d4:79:c9:8c:5b:
+         25:09:1d:46:f2:3a:e4:29:85:73:32:c5:94:72:59:31:57:9c:
+         65:d5
+-----BEGIN CERTIFICATE-----
+MIID5jCCA0+gAwIBAgIBDjANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMCRlIx
+EzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAcMCEdyZW5vYmxlMSIwIAYDVQQK
+DBlCZWxsZWRvbm5lIENvbW11bmljYXRpb25zMQwwCgYDVQQLDANMQUIxFjAUBgNV
+BAMMDUplaGFuIE1vbm5pZXIxOjA4BgkqhkiG9w0BCQEWK2plaGFuLm1vbm5pZXJA
+YmVsbGVkb25uZS1jb21tdW5pY2F0aW9ucy5jb20wHhcNMTYwOTIwMTQwMDAwWhcN
+MTcwOTIwMTQwMDAwWjCBtDELMAkGA1UEBhMCRlIxHTAbBgNVBAgMFFJob25lLUFs
+cGVzIEF1dmVyZ25lMREwDwYDVQQHDAhHcmVub2JsZTEiMCAGA1UECgwZQmVsbGVk
+b25uZSBDb21tdW5pY2F0aW9uczEcMBoGA1UEAwwTc2lwOnNpcC5leGFtcGxlLm9y
+ZzExMC8GCSqGSIb3DQEJARYiaW5mb0BiZWxsZWRvbm5lLWNvbW11bmljYXRpb25z
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4xtjAHDt6L3UFm
+7FKENyy/mLyP044ND5fesErGJsPFKU1O7WwM/gZhSRZnI5DJWwBJ8OBeQoEqc8fH
+EZ5BUyhGc9ESiru/5/WEagbmXALelR2g/KX3v+jIyZWfB8OWlglNEfRIo4lJMMBr
+5q2kD7da8iB4LDXa/kyDcJNlCbG7F0ZyHSLBB7NNk83Pim0Sf1SzSN/WAm/ynKBs
+XglrJmOUCc8MQub6mQjBnxhLVPssCszAsqYdR9kd8lPiJ/hxQfZF5lDdR0txoruU
+dA7hxP32w0HFTB75i5zHfoBZ+Vvnq3b9Wp3YvW/5WHjkcoJEhTJ9wif2Umlp6OZw
+AKpkRW8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNT
+TCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMtXv4mv2dvM4Ph5ca1/
+A2MgCkljMB8GA1UdIwQYMBaAFAZfXccWr2L4LW5xA4ig1h0rBH+6MA0GCSqGSIb3
+DQEBCwUAA4GBAD5s1YfbBCsbc5Oe6v4QSjibPmOP8o2K0LyySmPgPDFxAM+BSq5M
+UfxdUbcKhkhbH6bMytLDldpLNNyM3Rsn+9Ko5F5azAHwY1h0chtfyVGHSd3/E3dM
+L1k4fwpIlBdnuX5qH8gpZ+DUecmMWyUJHUbyOuQphXMyxZRyWTFXnGXV
+-----END CERTIFICATE-----
diff --git a/tester/certificates/client/key.pem b/tester/certificates/client/key.pem
new file mode 100644
index 000000000..40b5542dd
--- /dev/null
+++ b/tester/certificates/client/key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAnjG2MAcO3ovdQWbsUoQ3LL+YvI/Tjg0Pl96wSsYmw8UpTU7t
+bAz+BmFJFmcjkMlbAEnw4F5CgSpzx8cRnkFTKEZz0RKKu7/n9YRqBuZcAt6VHaD8
+pfe/6MjJlZ8Hw5aWCU0R9EijiUkwwGvmraQPt1ryIHgsNdr+TINwk2UJsbsXRnId
+IsEHs02Tzc+KbRJ/VLNI39YCb/KcoGxeCWsmY5QJzwxC5vqZCMGfGEtU+ywKzMCy
+ph1H2R3yU+In+HFB9kXmUN1HS3Giu5R0DuHE/fbDQcVMHvmLnMd+gFn5W+erdv1a
+ndi9b/lYeORygkSFMn3CJ/ZSaWno5nAAqmRFbwIDAQABAoIBAB52XCrrcQWR0U1i
+0GcjZqyLSJIm8AoOoc4Q58m+VoCkWsu0QyvnZJM98KELw2GCJK/tjSDnhc7xqdHy
+l4Xt9mFvD6ZW97gnwDcbBH/HpDg5PGW0NnKPPrlI0Oiq8wfK26F24do0kqlBGs4y
++Py+9vfL34w5F+pW/Vkmhmsbrb43h0YU44M7BkqG/5ah2f6bsEV8NeqyMWhkn5m7
+GONv8Zot0aKeLz/krgQ4+ataQ6CBrSgwIiZ3FO/BTLIMC0g1qHamajpwZbA3/SBx
+8viziHVcZl3KJqPnwFVBySuDmxw9DCULPIBBnKXW0ieZ4uL8rBd0NvGu5lD9b+CN
+TglCzkECgYEAyvrNIdXvqYClqizdQRfIIUJsPk1fezqF6q36TT8WC1PaRYYL1VkG
+8oTNMJdAU9uxqeZTG4SRkBhWcktN5VBArvWrPAzdSqkhU3YbztXLyTbxGTmdYsIO
+1Lgm0yJ3pQAtm3js9T+A2gtU2aZFYAEY1J9+4q6Xj6fjvsyl2XgpqMkCgYEAx4Qd
+hl+XUj0Y0Wpj880aB7ao1BFIwzNa2B3h5+zM7hD0WrY4nu1gBCJIDLjzVPdy9f/h
+VMk9RDtWiutvO6x4nSOEfutCcFQkD3xXY7A7NCb+nEZMqOUvb6F7Igy6MU78Bbnr
+Ci0hBMDUXmX5Adpaht16E9pL2ttpv1wjmWQIUHcCgYBy6VWkaCdMAKbJFqkTptEH
+80CwbME3VERoPaJMhQCH3Sre3Spp2ALU3VYEwjwKvX9xPhGirIRz3TNjdTpeLfbQ
+lggg8O9+yw0w4NaRW/wIp/AKZdGyDUa0KqTgNs0hPl6Te/w6Q39A8dVReo4f8b8K
+8Fi3IDxxeYy3gcgKu7pp8QKBgQCIBHq4bBzWlQ6BXj2sLUysq4tnoCzx3uX05lJn
+cdm4B1j/KrFpL71AtDpYahKB/3yhVwPAcL1S8f0rEhywGwHTZy5h9HND7yjyYbuW
+G8QQ5vC3i3mhvzVarkUqznB1QzqvkLM7Kc8T1X4yqORcrgb/YKhkNnN2ThVGv0MJ
+xNeiOwKBgQCGIgZ7y22u5OJhbh6lRh4yosiGAZ2G+cviH8KO5Wco4tG/DKabR1SE
+ZYlo1MjIY/CEq2JPHa7ZXucRUKg78Mcy544FmMKDb/IpnGkjc+vhrYhjvMum/vTO
+t6PwzTGGIJfVaLFYyTpr+ykDEOmsLWGDiTpXujbINQulHgczNR99EQ==
+-----END RSA PRIVATE KEY-----
diff --git a/tester/certificates/cn/cafile.pem b/tester/certificates/cn/cafile.pem
index 43437333b..60b6983e8 100644
--- a/tester/certificates/cn/cafile.pem
+++ b/tester/certificates/cn/cafile.pem
@@ -19,28 +19,26 @@ FUWGJhPnkrnklmBdVB0l7qXYjR5uf766HDkoDxuLhNifow3IYvsS+L2Y6puRQb9w
 HLMDE29mBDl0WyoX3h0yR0EiAO15V9A7I10=
 -----END CERTIFICATE-----
 
-UTN USERFirst Hardware Root CA, used for *.linphone.org
-==============================
+AddTrust External Root used for *.linphone.org
+======================
 -----BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
-BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
-OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
-eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
-ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
-wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
-tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
-i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
-Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
-gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
-lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
-UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
-BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
-XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
-lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
-iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
-nfhmqA==
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
 -----END CERTIFICATE-----
diff --git a/tester/common/bc_completion b/tester/common/bc_completion
deleted file mode 100644
index c5bd543d2..000000000
--- a/tester/common/bc_completion
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright (C) 2012  Belledonne Comunications, Grenoble, France
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Created by Gautier Pelloux-Prayer on 2014/10/24.
-# This script adds auto-completion for liblinphone_tester binary for Bash and
-# Zsh. To use it, just type: `source liblinphone_completion`, then for each
-# supported exectuable (see end of file), you will get auto-completions.
-# To use it permanently, source this file in your .rc file (.bashrc or .zshrc).
-
-_liblinphone_complete() {
-	local completions command_requiring_argument prev_arg latest_arg available_tasks has_not_set_suite suite_name
-
-	if [ -n "$BASH_VERSION" ]; then
-		set -- "${COMP_WORDS[@]}" #convert them to arguments (eg $1,$#,$@,etc.)
-	elif [ -n "$ZSH_VERSION" ]; then
-		local args
-		read -cA args #read list of arguments user entered
-		set -- "${args[@]}" #convert them to arguments (eg $1,$#,$@,etc.)
-	fi
-	#skip program name
-	program=$1
-	shift
-
-	# if user required help, do not complete anything
-	if ! grep -q -- "--help" <<< "$@"; then
-		# retrieve the last argument
-		latest_arg=""
-		prev_arg=""
-		latest_is_empty=0
-		for arg in "$@"; do
-			if [ ! -z "$arg" ]; then
-				prev_arg="$latest_arg"
-				latest_arg="$arg"
-			else
-				latest_is_empty=1
-			fi
-		done
-
-		# get the tasks available, from --help
-		available_tasks="$($program 2>&1 --help | sed -nE "s/.*--([^ ]*).*/--\\1/p")"
-
-		# these commands expect an argument
-		command_requiring_argument="$($program 2>&1 --help | sed -nE "s/.*--(.*) <.*/--\\1/p")"
-
-		# remove all already provided tasks (it's useless to provide them twice)
-		if [[ ! -z "$@" ]]; then
-			current_tasks=$(echo $@ | grep -Eo -- "--([^ ])*" | tr '\n' '|' | sed 's/|/$|/g')--$
-			if [ ! -z "$current_tasks" ]; then
-				available_tasks=$(echo "$available_tasks" | grep -vE -- "(${current_tasks})")
-			fi
-		fi
-		# remove --test option if --suite is not provided yet!
-		has_not_set_suite=$(grep -q -- "--suite" <<< "$@"; echo $?)
-		if [ $has_not_set_suite = 1 ]; then
-			available_tasks=$(echo "$available_tasks" | grep -v -- --test)
-		fi
-
-		# if latest arg does not start with '--', it is a custom value
-		if [ $latest_is_empty = 0 ] && ! grep -q -- '^--' <<< "$latest_arg"; then
-			if [ "$prev_arg" = "--test" ] && [ $has_not_set_suite = 0 ]; then
-				suite_name=$(echo $@ | sed -nE 's/.*--suite ([^(--)]*) (--.*)$/\1/p' |sed "s@\\\\@@g")
-				completions="$($program --list-tests $suite_name)"
-			elif [ "$prev_arg" = "--suite" ] || [ "$prev_arg" = "--list-tests" ]; then
-				completions="$($program --list-suites)"
-			fi
-		elif [ "$latest_arg" = "--test" ]; then
-			# list available tests if --suite was provided
-			if [ $has_not_set_suite = 0 ]; then
-				suite_name=$(echo $@ | sed -nE 's/.*--suite ([^(--)]*) (--.*)/\1/p' |sed "s@\\\\@@g")
-				completions="$($program --list-tests $suite_name)"
-			fi
-		elif [ "$latest_arg" = "--suite" ] || [ "$latest_arg" = "--list-tests" ]; then
-			completions="$($program --list-suites)"
-		# we are waiting for a custom value, so do not hint anything
-		elif [[ ! -z "$latest_arg" ]] && grep -q -- "^$latest_arg$" <<< "$command_requiring_argument"; then
-			completions=""
-		else
-			completions="$available_tasks"
-		fi
-	fi
-
-	if [ ! -z "$completions"  ]; then
-		if [ -n "$BASH_VERSION" ]; then
-			IFS=$'\n'  #if that even necessary?
-			COMPREPLY=($(compgen -W "${completions}" -- ${COMP_WORDS[COMP_CWORD]}))
-		elif [ -n "$ZSH_VERSION" ]; then
-			reply=( "${(ps:\n:)completions}" )
-		fi
-	fi
-}
-
-for tester in liblinphone_tester mediastreamer2_tester belle_sip_tester pcap_playback \
-				bench mediastream msaudiocmp mtudiscover videodisplay linphone lpc2xml_test \
-				lp-gen-wrappers xml2lpc_test; do
-	if [ -n "$BASH_VERSION" ]; then
-		complete -F _liblinphone_complete $tester
-	elif [ -n "$ZSH_VERSION" ]; then
-		compctl -K _liblinphone_complete $tester
-	else
-		echo "Your shell might be not supported! Only bash and zsh tested."
-	fi
-done
diff --git a/tester/common/bc_tester_utils.c b/tester/common/bc_tester_utils.c
deleted file mode 100644
index ba5e6b811..000000000
--- a/tester/common/bc_tester_utils.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
-tester - liblinphone test suite
-Copyright (C) 2013  Belledonne Communications SARL
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/* this must be provided at compile time*/
-#include BC_CONFIG_FILE
-
-#include "bc_tester_utils.h"
-
-#include <stdlib.h>
-#include <time.h>
-
-#include "CUnit/Basic.h"
-#include "CUnit/Automated.h"
-#ifdef _WIN32
-#if defined(__MINGW32__) || !defined(WINAPI_FAMILY_PARTITION) || !defined(WINAPI_PARTITION_DESKTOP)
-#define BC_TESTER_WINDOWS_DESKTOP 1
-#elif defined(WINAPI_FAMILY_PARTITION)
-#if defined(WINAPI_PARTITION_DESKTOP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#define BC_TESTER_WINDOWS_DESKTOP 1
-#endif
-#if defined(WINAPI_PARTITION_PHONE_APP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
-#define BC_TESTER_WINDOWS_PHONE 1
-#endif
-#if defined(WINAPI_PARTITION_APP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-#define BC_TESTER_WINDOWS_UNIVERSAL 1
-#endif
-#endif
-#endif
-
-
-static char *bc_tester_resource_dir_prefix = NULL;
-static char *bc_tester_writable_dir_prefix = NULL;
-
-int bc_printf_verbosity_info;
-int bc_printf_verbosity_error;
-
-static test_suite_t **test_suite = NULL;
-static int nb_test_suites = 0;
-
-#ifdef HAVE_CU_CURSES
-#include "CUnit/CUCurses.h"
-static unsigned char curses = 0;
-#endif
-
-char* xml_file = "CUnitAutomated-Results.xml";
-int   xml_enabled = 0;
-char * suite_name;
-char * test_name;
-void (*tester_printf_va)(int level, const char *fmt, va_list args);
-
-void bc_tester_printf(int level, const char *fmt, ...) {
-	va_list args;
-	va_start (args, fmt);
-	tester_printf_va(level, fmt, args);
-	va_end (args);
-}
-
-int bc_tester_run_suite(test_suite_t *suite) {
-	int i;
-
-	CU_pSuite pSuite = CU_add_suite(suite->name, suite->init_func, suite->cleanup_func);
-
-	for (i = 0; i < suite->nb_tests; i++) {
-		if (NULL == CU_add_test(pSuite, suite->tests[i].name, suite->tests[i].func)) {
-			return CU_get_error();
-		}
-	}
-
-	return 0;
-}
-
-const char * bc_tester_suite_name(int suite_index) {
-	if (suite_index >= nb_test_suites) return NULL;
-	return test_suite[suite_index]->name;
-}
-
-int bc_tester_suite_index(const char *suite_name) {
-	int i;
-
-	for (i = 0; i < nb_test_suites; i++) {
-		if ((strcmp(suite_name, test_suite[i]->name) == 0) && (strlen(suite_name) == strlen(test_suite[i]->name))) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-int bc_tester_nb_suites(void) {
-	return nb_test_suites;
-}
-
-const char * bc_tester_test_name(const char *suite_name, int test_index) {
-	int suite_index = bc_tester_suite_index(suite_name);
-	if ((suite_index < 0) || (suite_index >= nb_test_suites)) return NULL;
-	if (test_index >= test_suite[suite_index]->nb_tests) return NULL;
-	return test_suite[suite_index]->tests[test_index].name;
-}
-
-int bc_tester_nb_tests(const char *suite_name) {
-	int i = bc_tester_suite_index(suite_name);
-	if (i < 0) return 0;
-	return test_suite[i]->nb_tests;
-}
-
-void bc_tester_list_suites(void) {
-	int j;
-	for(j=0;j<nb_test_suites;j++) {
-		bc_tester_printf(bc_printf_verbosity_info, "%s", bc_tester_suite_name(j));
-	}
-}
-
-void bc_tester_list_tests(const char *suite_name) {
-	int j;
-	for( j = 0; j < bc_tester_nb_tests(suite_name); j++) {
-		const char *test_name = bc_tester_test_name(suite_name, j);
-		bc_tester_printf(bc_printf_verbosity_info, "%s", test_name);
-	}
-}
-
-static void all_complete_message_handler(const CU_pFailureRecord pFailure) {
-#ifdef HAVE_CU_GET_SUITE
-	char * results = CU_get_run_results_string();
-	bc_tester_printf(bc_printf_verbosity_info,"\n%s",results);
-	free(results);
-#endif
-}
-
-static void suite_init_failure_message_handler(const CU_pSuite pSuite) {
-	bc_tester_printf(bc_printf_verbosity_error,"Suite initialization failed for [%s]", pSuite->pName);
-}
-
-static void suite_cleanup_failure_message_handler(const CU_pSuite pSuite) {
-	bc_tester_printf(bc_printf_verbosity_error,"Suite cleanup failed for [%s]", pSuite->pName);
-}
-
-#ifdef HAVE_CU_GET_SUITE
-static time_t suite_start_time = 0;
-static void suite_start_message_handler(const CU_pSuite pSuite) {
-	bc_tester_printf(bc_printf_verbosity_info,"Suite [%s] started\n", pSuite->pName);
-	suite_start_time = time(NULL);
-}
-static void suite_complete_message_handler(const CU_pSuite pSuite, const CU_pFailureRecord pFailure) {
-	bc_tester_printf(bc_printf_verbosity_info,"Suite [%s] ended in %lu sec\n", pSuite->pName, time(NULL) - suite_start_time);
-}
-
-static time_t test_start_time = 0;
-static void test_start_message_handler(const CU_pTest pTest, const CU_pSuite pSuite) {
-	bc_tester_printf(bc_printf_verbosity_info,"Suite [%s] Test [%s] started", pSuite->pName,pTest->pName);
-	test_start_time = time(NULL);
-}
-
-/*derivated from cunit*/
-static void test_complete_message_handler(const CU_pTest pTest,
-	const CU_pSuite pSuite,
-	const CU_pFailureRecord pFailureList) {
-	int i;
-	char result[2048];
-	char buffer[2048];
-	CU_pFailureRecord pFailure = pFailureList;
-	snprintf(result, sizeof(result), "Suite [%s] Test [%s] %s in %lu secs"
-			, pSuite->pName, pTest->pName, pFailure?"failed":"passed",(unsigned long)(time(NULL) - test_start_time));
-	if (pFailure) {
-		for (i = 1 ; (NULL != pFailure) ; pFailure = pFailure->pNext, i++) {
-			snprintf(buffer, sizeof(buffer), "\n    %d. %s:%u  - %s", i,
-				(NULL != pFailure->strFileName) ? pFailure->strFileName : "",
-				pFailure->uiLineNumber,
-				(NULL != pFailure->strCondition) ? pFailure->strCondition : "");
-			strncat(result, buffer, strlen(buffer));
-		}
-	}
-	bc_tester_printf(bc_printf_verbosity_info,"%s\n", result);
-}
-#endif
-
-int bc_tester_run_tests(const char *suite_name, const char *test_name) {
-	int i;
-
-	/* initialize the CUnit test registry */
-	if (CUE_SUCCESS != CU_initialize_registry())
-		return CU_get_error();
-
-	for (i = 0; i < nb_test_suites; i++) {
-		bc_tester_run_suite(test_suite[i]);
-	}
-#ifdef HAVE_CU_GET_SUITE
-	CU_set_suite_start_handler(suite_start_message_handler);
-	CU_set_suite_complete_handler(suite_complete_message_handler);
-	CU_set_test_start_handler(test_start_message_handler);
-	CU_set_test_complete_handler(test_complete_message_handler);
-#endif
-	CU_set_all_test_complete_handler(all_complete_message_handler);
-	CU_set_suite_init_failure_handler(suite_init_failure_message_handler);
-	CU_set_suite_cleanup_failure_handler(suite_cleanup_failure_message_handler);
-
-	if( xml_enabled != 0 ){
-		CU_automated_run_tests();
-	} else {
-
-#ifndef HAVE_CU_GET_SUITE
-		if( suite_name ){
-			bc_tester_printf(bc_printf_verbosity_info, "Tester compiled without CU_get_suite() function, running all tests instead of suite '%s'", suite_name);
-		}
-#else
-		if (suite_name){
-			CU_pSuite suite;
-			suite=CU_get_suite(suite_name);
-			if (!suite) {
-				bc_tester_printf(bc_printf_verbosity_error, "Could not find suite '%s'. Available suites are:", suite_name);
-				bc_tester_list_suites();
-				return -1;
-			} else if (test_name) {
-				CU_pTest test=CU_get_test_by_name(test_name, suite);
-				if (!test) {
-					bc_tester_printf(bc_printf_verbosity_error, "Could not find test '%s' in suite '%s'. Available tests are:", test_name, suite_name);
-					// do not use suite_name here, since this method is case sensitive
-					bc_tester_list_tests(suite->pName);
-					return -2;
-				} else {
-					CU_ErrorCode err= CU_run_test(suite, test);
-					if (err != CUE_SUCCESS) bc_tester_printf(bc_printf_verbosity_error, "CU_basic_run_test error %d", err);
-				}
-			} else {
-				CU_run_suite(suite);
-			}
-		}
-		else
-#endif
-		{
-#ifdef HAVE_CU_CURSES
-			if (curses) {
-			/* Run tests using the CUnit curses interface */
-				CU_curses_run_tests();
-			}
-			else
-#endif
-			{
-				/* Run all tests using the CUnit Basic interface */
-				CU_run_all_tests();
-			}
-		}
-	}
-	return CU_get_number_of_tests_failed()!=0;
-
-}
-
-
-void bc_tester_helper(const char *name, const char* additionnal_helper) {
-	bc_tester_printf(bc_printf_verbosity_info,"%s --help\n"
-		"\t\t\t--list-suites\n"
-		"\t\t\t--list-tests <suite>\n"
-		"\t\t\t--suite <suite name>\n"
-		"\t\t\t--test <test name>\n"
-#ifdef HAVE_CU_CURSES
-		"\t\t\t--curses\n"
-#endif
-		"\t\t\t--xml\n"
-		"\t\t\t--xml-file <xml file name>\n"
-		"And additionally:\n"
-		"%s"
-		, name
-		, additionnal_helper);
-}
-
-void bc_tester_init(void (*ftester_printf)(int level, const char *fmt, va_list args), int iverbosity_info, int iverbosity_error) {
-#if defined(BC_TESTER_WINDOWS_PHONE) || defined(BC_TESTER_WINDOWS_UNIVERSAL)
-	bc_tester_set_resource_dir_prefix("Assets");
-#elif defined(__QNX__)
-	bc_tester_set_resource_dir_prefix("./app/native/assets/");
-#else
-	bc_tester_set_resource_dir_prefix(".");
-#endif
-
-#ifdef ANDROID
-	bc_tester_set_writable_dir_prefix("/data/data/org.linphone.tester/cache");
-#elif defined(__QNX__)
-	bc_tester_set_writable_dir_prefix("./tmp");
-#else
-	bc_tester_set_writable_dir_prefix(".");
-#endif
-
-	tester_printf_va = ftester_printf;
-	bc_printf_verbosity_error = iverbosity_error;
-	bc_printf_verbosity_info = iverbosity_info;
-}
-
-int bc_tester_parse_args(int argc, char **argv, int argid)
-{
-	int i = argid;
-	if (strcmp(argv[i],"--help")==0){
-		return -1;
-	} else if (strcmp(argv[i],"--test")==0){
-		CHECK_ARG("--test", ++i, argc);
-		test_name=argv[i];
-	}else if (strcmp(argv[i],"--suite")==0){
-		CHECK_ARG("--suite", ++i, argc);
-		suite_name=argv[i];
-	} else if (strcmp(argv[i],"--list-suites")==0){
-		bc_tester_list_suites();
-		return 0;
-	} else if (strcmp(argv[i],"--list-tests")==0){
-		CHECK_ARG("--list-tests", ++i, argc);
-		suite_name = argv[i];
-		bc_tester_list_tests(suite_name);
-		return 0;
-	} else if (strcmp(argv[i], "--xml-file") == 0){
-		CHECK_ARG("--xml-file", ++i, argc);
-		xml_file = argv[i];
-		xml_enabled = 1;
-	} else if (strcmp(argv[i], "--xml") == 0){
-		xml_enabled = 1;
-	}else {
-		bc_tester_printf(bc_printf_verbosity_error, "Unknown option \"%s\"\n", argv[i]);
-		return -1;
-	}
-
-	if( xml_enabled && (suite_name || test_name) ){
-		bc_tester_printf(bc_printf_verbosity_error, "Cannot use both XML and specific test suite\n");
-		return -1;
-	}
-
-	/* returns number of arguments read + 1 */
-	return i - argid + 1;
-}
-
-int bc_tester_start(void) {
-	int ret;
-	if( xml_enabled ){
-		size_t size = strlen(xml_file) + strlen(".tmp") + 1;
-		char * xml_tmp_file = malloc(sizeof(char) * size);
-		snprintf(xml_tmp_file, size, "%s.tmp", xml_file);
-		CU_set_output_filename(xml_tmp_file);
-		free(xml_tmp_file);
-	}
-
-	ret = bc_tester_run_tests(suite_name, test_name);
-
-	return ret;
-}
-void bc_tester_add_suite(test_suite_t *suite) {
-	if (test_suite == NULL) {
-		test_suite = (test_suite_t **)malloc(10 * sizeof(test_suite_t *));
-	}
-	test_suite[nb_test_suites] = suite;
-	nb_test_suites++;
-	if ((nb_test_suites % 10) == 0) {
-		test_suite = (test_suite_t **)realloc(test_suite, (nb_test_suites + 10) * sizeof(test_suite_t *));
-	}
-}
-
-void bc_tester_uninit(void) {
-	/* Redisplay list of failed tests on end */
-	if (CU_get_number_of_failure_records()){
-		CU_basic_show_failures(CU_get_failure_list());
-	}
-	CU_cleanup_registry();
-	/*add missing final newline*/
-	bc_tester_printf(bc_printf_verbosity_info,"");
-
-	if( xml_enabled ){
-		/*create real xml file only if tester did not crash*/
-		size_t size = strlen(xml_file) + strlen(".tmp-Results.xml") + 1;
-		char * xml_tmp_file = malloc(sizeof(char) * size);
-		snprintf(xml_tmp_file, size, "%s.tmp-Results.xml", xml_file);
-		rename(xml_tmp_file, xml_file);
-		free(xml_tmp_file);
-	}
-
-	if (test_suite != NULL) {
-		free(test_suite);
-		test_suite = NULL;
-		nb_test_suites = 0;
-	}
-
-	if (bc_tester_resource_dir_prefix != NULL) {
-		free(bc_tester_resource_dir_prefix);
-		bc_tester_resource_dir_prefix = NULL;
-	}
-	if (bc_tester_writable_dir_prefix != NULL) {
-		free(bc_tester_writable_dir_prefix);
-		bc_tester_writable_dir_prefix = NULL;
-	}
-}
-
-static void bc_tester_set_dir_prefix(char **prefix, const char *name) {
-	size_t len = strlen(name);
-	if (*prefix != NULL) free(*prefix);
-	*prefix = malloc(len + 1);
-	strncpy(*prefix, name, len);
-	(*prefix)[len] = '\0';
-}
-
-const char * bc_tester_get_resource_dir_prefix(void) {
-	return bc_tester_resource_dir_prefix;
-}
-
-void bc_tester_set_resource_dir_prefix(const char *name) {
-	bc_tester_set_dir_prefix(&bc_tester_resource_dir_prefix, name);
-}
-
-const char * bc_tester_get_writable_dir_prefix(void) {
-	return bc_tester_writable_dir_prefix;
-}
-
-void bc_tester_set_writable_dir_prefix(const char *name) {
-	bc_tester_set_dir_prefix(&bc_tester_writable_dir_prefix, name);
-}
-
-static char * bc_tester_path(const char *prefix, const char *name) {
-	char* file = NULL;
-	if (name) {
-		size_t len = strlen(prefix) + 1 + strlen(name) + 1;
-		file = malloc(len);
-		snprintf(file, len, "%s/%s", prefix, name);
-		file[strlen(file)] = '\0';
-	}
-	return file;
-}
-
-char * bc_tester_res(const char *name) {
-	return bc_tester_path(bc_tester_resource_dir_prefix, name);
-}
-
-char * bc_tester_file(const char *name) {
-	return bc_tester_path(bc_tester_writable_dir_prefix, name);
-}
diff --git a/tester/common/bc_tester_utils.h b/tester/common/bc_tester_utils.h
deleted file mode 100644
index b3c1deaae..000000000
--- a/tester/common/bc_tester_utils.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-	tester - liblinphone test suite
-	Copyright (C) 2013  Belledonne Communications SARL
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef TESTER_UTILS_H
-#define TESTER_UTILS_H
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-
-#ifdef _WIN32
-#ifndef snprintf
-#define snprintf _snprintf
-#endif
-#endif
-
-extern int bc_printf_verbosity_info;
-extern int bc_printf_verbosity_error;
-
-typedef void (*test_function_t)(void);
-typedef int (*init_function_t)(void);
-typedef int (*cleanup_function_t)(void);
-typedef int (*test_suite_function_t)(const char *name);
-
-typedef struct {
-	const char *name;
-	test_function_t func;
-} test_t;
-
-typedef struct {
-	const char *name;
-	init_function_t init_func;
-	cleanup_function_t cleanup_func;
-	int nb_tests;
-	test_t *tests;
-} test_suite_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define CHECK_ARG(argument, index, argc)                      \
-if(index >= argc) {                                           \
-fprintf(stderr, "Missing argument for \"%s\"\n", argument);   \
-return -1;                                                    \
-}                                                             \
-
-void bc_tester_init(void (*ftester_printf)(int level, const char *fmt, va_list args)
-					, int verbosity_info, int verbosity_error);
-void bc_tester_helper(const char *name, const char* additionnal_helper);
-int bc_tester_parse_args(int argc, char** argv, int argid);
-int bc_tester_start(void);
-void bc_tester_add_suite(test_suite_t *suite);
-void bc_tester_uninit(void);
-void bc_tester_printf(int level, const char *fmt, ...);
-const char * bc_tester_get_resource_dir_prefix(void);
-void bc_tester_set_resource_dir_prefix(const char *name);
-const char * bc_tester_get_writable_dir_prefix(void);
-void bc_tester_set_writable_dir_prefix(const char *name);
-
-int bc_tester_nb_suites(void);
-int bc_tester_nb_tests(const char* name);
-void bc_tester_list_suites(void);
-void bc_tester_list_tests(const char *suite_name);
-const char * bc_tester_suite_name(int suite_index);
-const char * bc_tester_test_name(const char *suite_name, int test_index);
-int bc_tester_run_suite(test_suite_t *suite);
-int bc_tester_run_tests(const char *suite_name, const char *test_name);
-int bc_tester_suite_index(const char *suite_name);
-
-
-/**
- * Get full path to the given resource
- *
- * @param name relative resource path
- * @return path to the resource. Must be freed by caller.
-*/
-char * bc_tester_res(const char *name);
-
-/**
-* Get full path to the given writable_file
-*
-* @param name relative writable file path
-* @return path to the writable file. Must be freed by caller.
-*/
-char * bc_tester_file(const char *name);
-
-
-/*Redefine the CU_... macros WITHOUT final ';' semicolon, to allow IF conditions and with smarter error message */
-extern int CU_assertImplementation(int bValue,
-                                      unsigned int uiLine,
-                                      const char *strCondition,
-                                      const char *strFile,
-                                      const char *strFunction,
-                                      int bFatal);
-
-#define _BC_ASSERT(pred, format, fatal) CU_assertImplementation(pred, __LINE__, format, __FILE__, "", fatal)
-#define _BC_ASSERT_PRED(name, pred, actual, expected, type, fatal, ...) \
-	do { \
-		char format[4096] = {0}; \
-		type cactual = (actual); \
-		type cexpected = (expected); \
-		snprintf(format, 4096, name "(" #actual ", " #expected ") - " __VA_ARGS__); \
-		_BC_ASSERT(pred, format, fatal); \
-	} while (0)
-#define BC_PASS(msg) _BC_ASSERT(TRUE, "BC_PASS(" #msg ").", FALSE)
-#define BC_FAIL(msg) _BC_ASSERT(FALSE, "BC_FAIL(" #msg ").", FALSE)
-#define BC_ASSERT(value) _BC_ASSERT((value), #value, FALSE)
-#define BC_ASSERT_FATAL(value) _BC_ASSERT((value), #value, TRUE)
-#define BC_TEST(value) _BC_ASSERT((value), #value, FALSE)
-#define BC_TEST_FATAL(value) _BC_ASSERT((value), #value, TRUE)
-#define BC_ASSERT_TRUE(value) _BC_ASSERT((value), ("BC_ASSERT_TRUE(" #value ")"), FALSE)
-#define BC_ASSERT_TRUE_FATAL(value) _BC_ASSERT((value), ("BC_ASSERT_TRUE_FATAL(" #value ")"), TRUE)
-#define BC_ASSERT_FALSE(value) _BC_ASSERT(!(value), ("BC_ASSERT_FALSE(" #value ")"), FALSE)
-#define BC_ASSERT_FALSE_FATAL(value) _BC_ASSERT(!(value), ("BC_ASSERT_FALSE_FATAL(" #value ")"), TRUE)
-#define BC_ASSERT_EQUAL(actual, expected, type, type_format) _BC_ASSERT_PRED("BC_ASSERT_EQUAL", ((cactual) == (cexpected)), actual, expected, type, FALSE, "Expected " type_format " but was " type_format ".", cexpected, cactual)
-#define BC_ASSERT_EQUAL_FATAL(actual, expected, type, type_format) _BC_ASSERT_PRED("BC_ASSERT_EQUAL_FATAL", ((cactual) == (cexpected)), actual, expected, type, TRUE, "Expected " type_format " but was " type_format ".", cexpected, cactual)
-#define BC_ASSERT_NOT_EQUAL(actual, expected, type, type_format) _BC_ASSERT_PRED("BC_ASSERT_NOT_EQUAL", ((cactual) != (cexpected)), actual, expected, type, FALSE, "Expected NOT " type_format " but it was.", cexpected)
-#define BC_ASSERT_NOT_EQUAL_FATAL(actual, expected, type, type_format) _BC_ASSERT_PRED("BC_ASSERT_NOT_EQUAL_FATAL", ((cactual) != (cexpected)), actual, expected, type, TRUE, "Expected NOT " type_format " but it was.", cexpected)
-#define BC_ASSERT_PTR_EQUAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_PTR_EQUAL", ((cactual) == (cexpected)), (const void*)(actual), (const void*)(expected), const void*, FALSE, "Expected %p but was %p.", cexpected, cactual)
-#define BC_ASSERT_PTR_EQUAL_FATAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_PTR_EQUAL_FATAL", ((cactual) == (cexpected)), (const void*)(actual), (const void*)(expected), const void*, TRUE, "Expected %p but was %p.", cexpected, cactual)
-#define BC_ASSERT_PTR_NOT_EQUAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_PTR_NOT_EQUAL", ((cactual) != (cexpected)), (const void*)(actual), (const void*)(expected), const void*, FALSE, "Expected NOT %p but it was.", cexpected)
-#define BC_ASSERT_PTR_NOT_EQUAL_FATAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_PTR_NOT_EQUAL_FATAL", ((cactual) != (cexpected)), (const void*)(actual), (const void*)(expected), const void*, TRUE, "Expected NOT %p but it was.", cexpected)
-#define BC_ASSERT_PTR_NULL(value) _BC_ASSERT_PRED("BC_ASSERT_PTR_NULL", ((cactual) == (cexpected)), (const void*)(value), (const void*)NULL, const void*, FALSE, "Expected NULL but was %p.", cactual)
-#define BC_ASSERT_PTR_NULL_FATAL(value) _BC_ASSERT_PRED("BC_ASSERT_PTR_NULL_FATAL", ((cactual) == (cexpected)), (const void*)(value), (const void*)NULL, const void*, TRUE, "Expected NULL but was %p.", cactual)
-#define BC_ASSERT_PTR_NOT_NULL(value) _BC_ASSERT_PRED("BC_ASSERT_PTR_NOT_NULL", ((cactual) != (cexpected)), (const void*)(value), (const void*)NULL, const void*, FALSE, "Expected NOT NULL but it was.")
-#define BC_ASSERT_PTR_NOT_NULL_FATAL(value) _BC_ASSERT_PRED("BC_ASSERT_PTR_NOT_NULL_FATAL", ((cactual) != (cexpected)), (const void*)(value), (const void*)NULL, const void*, TRUE, "Expected NOT NULL but it was.")
-#define BC_ASSERT_STRING_EQUAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_STRING_EQUAL", !(strcmp((const char*)(cactual), (const char*)(cexpected))), actual, expected, const char*, FALSE, "Expected %s but was %s.", cexpected, cactual)
-#define BC_ASSERT_STRING_EQUAL_FATAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_STRING_EQUAL_FATAL", !(strcmp((const char*)(cactual), (const char*)(cexpected))), actual, expected, const char*, TRUE, "Expected %s but was %s.", cexpected, cactual)
-#define BC_ASSERT_STRING_NOT_EQUAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_STRING_NOT_EQUAL", (strcmp((const char*)(cactual), (const char*)(cexpected))), actual, expected, const char*, FALSE, "Expected NOT %s but it was.", cexpected)
-#define BC_ASSERT_STRING_NOT_EQUAL_FATAL(actual, expected) _BC_ASSERT_PRED("BC_ASSERT_STRING_NOT_EQUAL_FATAL", (strcmp((const char*)(cactual), (const char*)(cexpected))), actual, expected, const char*, TRUE, "Expected NOT %s but it was.", cexpected)
-#define BC_ASSERT_NSTRING_EQUAL(actual, expected, count) _BC_ASSERT_PRED("BC_ASSERT_NSTRING_EQUAL", !(strncmp((const char*)(cactual), (const char*)(cexpected), (size_t)(count))), actual, expected, const char*, FALSE, "Expected %*s but was %*s.", (int)(count), cexpected, (int)(count), cactual)
-#define BC_ASSERT_NSTRING_EQUAL_FATAL(actual, expected, count) _BC_ASSERT_PRED("BC_ASSERT_NSTRING_EQUAL_FATAL", !(strncmp((const char*)(cactual), (const char*)(cexpected), (size_t)(count))), actual, expected, const char*, TRUE, "Expected %*s but was %*s.", (int)count, cexpected, (int)count, cactual)
-#define BC_ASSERT_NSTRING_NOT_EQUAL(actual, expected, count) _BC_ASSERT_PRED("BC_ASSERT_NSTRING_NOT_EQUAL", (strncmp((const char*)(cactual), (const char*)(cexpected), (size_t)(count))), actual, expected, const char*, FALSE, "Expected %*s but it was.", (int)count, cexpected)
-#define BC_ASSERT_NSTRING_NOT_EQUAL_FATAL(actual, expected, count) _BC_ASSERT_PRED("BC_ASSERT_NSTRING_NOT_EQUAL_FATAL", (strncmp((const char*)(cactual), (const char*)(cexpected), (size_t)(count))), actual, expected, const char*, TRUE, "Expected %*s but it was.", (int)count, cexpected)
-#define BC_ASSERT_DOUBLE_EQUAL(actual, expected, granularity) _BC_ASSERT_PRED("BC_ASSERT_DOUBLE_EQUAL", ((fabs((double)(cactual) - (cexpected)) <= fabs((double)(granularity)))), actual, expected, double, FALSE, "Expected %f but was %f.", cexpected, cactual)
-#define BC_ASSERT_DOUBLE_EQUAL_FATAL(actual, expected, granularity) _BC_ASSERT_PRED("BC_ASSERT_DOUBLE_EQUAL_FATAL", ((fabs((double)(cactual) - (cexpected)) <= fabs((double)(granularity)))), actual, expected, double, TRUE, "Expected %f but was %f.", cexpected, cactual)
-#define BC_ASSERT_DOUBLE_NOT_EQUAL(actual, expected, granularity) _BC_ASSERT_PRED("BC_ASSERT_DOUBLE_NOT_EQUAL", ((fabs((double)(cactual) - (cexpected)) > fabs((double)(granularity)))), actual, expected, double, FALSE, "Expected %f but was %f.", cexpected, cactual)
-#define BC_ASSERT_DOUBLE_NOT_EQUAL_FATAL(actual, expected, granularity) _BC_ASSERT_PRED("BC_ASSERT_DOUBLE_NOT_EQUAL_FATAL", ((fabs((double)(cactual) - (cexpected)) > fabs((double)(granularity)))), actual, expected, double, TRUE, "Expected %f but was %f.", cexpected, cactual)
-
-/*Custom defines*/
-#define BC_ASSERT_GREATER(actual, lower, type, type_format) _BC_ASSERT_PRED("BC_ASSERT_GREATER", ((cactual) >= (cexpected)), actual, lower, type, FALSE, "Expected at least " type_format " but was " type_format ".", cexpected, cactual)
-#define BC_ASSERT_LOWER(actual, lower, type, type_format) _BC_ASSERT_PRED("BC_ASSERT_LOWER", ((cactual) <= (cexpected)), actual, lower, type, FALSE, "Expected at most " type_format " but was " type_format ".", cexpected, cactual)
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/tester/complex_sip_case_tester.c b/tester/complex_sip_case_tester.c
new file mode 100644
index 000000000..6e9aa8dc4
--- /dev/null
+++ b/tester/complex_sip_case_tester.c
@@ -0,0 +1,370 @@
+/*
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2015  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "linphonecore.h"
+#include "liblinphone_tester.h"
+#include "lpconfig.h"
+#include "private.h"
+
+
+#if HAVE_SIPP
+void check_rtcp(LinphoneCall *call) {
+	MSTimeSpec ts;
+
+	linphone_call_ref(call);
+	liblinphone_tester_clock_start(&ts);
+
+	do {
+		if (linphone_call_get_audio_stats(call)->round_trip_delay > 0.0 && (!linphone_call_log_video_enabled(linphone_call_get_call_log(call)) || linphone_call_get_video_stats(call)->round_trip_delay > 0.0)) {
+			break;
+		}
+		wait_for_until(call->core, NULL, NULL, 0, 20); /*just to sleep while iterating*/
+	} while (!liblinphone_tester_clock_elapsed(&ts, 15000));
+
+	BC_ASSERT_GREATER(linphone_call_get_audio_stats(call)->round_trip_delay, 0.0, float, "%f");
+	if (linphone_call_log_video_enabled(linphone_call_get_call_log(call))) {
+		BC_ASSERT_GREATER(linphone_call_get_video_stats(call)->round_trip_delay, 0.0, float, "%f");
+	}
+
+	linphone_call_unref(call);
+}
+
+FILE *sip_start(const char *senario, const char* dest_username, const char *passwd, LinphoneAddress* dest_addres) {
+	char *dest;
+	char *command;
+	FILE *file;
+
+	if (linphone_address_get_port(dest_addres)>0)
+		dest = ms_strdup_printf("%s:%i",linphone_address_get_domain(dest_addres),linphone_address_get_port(dest_addres));
+	else
+		dest = ms_strdup_printf("%s",linphone_address_get_domain(dest_addres));
+	//until errors logs are handled correctly and stop breaks output, they will be DISABLED
+	command = ms_strdup_printf(SIPP_COMMAND" -sf %s -s %s %s -trace_err -trace_msg -rtp_echo -m 1 -d 1000 -ap %s 2>/dev/null",senario
+								,dest_username
+								,dest
+								,(passwd?passwd:"none"));
+
+	ms_message("Starting sipp command [%s]",command);
+	file = popen(command, "r");
+	ms_free(command);
+	ms_free(dest);
+	return file;
+}
+
+
+static FILE *sip_start_recv(const char *senario) {
+	char *command;
+	FILE *file;
+
+	//until errors logs are handled correctly and stop breaks output, they will be DISABLED
+	command = ms_strdup_printf(SIPP_COMMAND" -sf %s -trace_err -trace_msg -rtp_echo -m 1 -d 1000 2>/dev/null",senario);
+
+	ms_message("Starting sipp command [%s]",command);
+	file = popen(command, "r");
+	ms_free(command);
+	return file;
+}
+
+static void dest_server_server_resolved(void *data, const char *name, struct addrinfo *ai_list) {
+	*(struct addrinfo **)data =ai_list;
+}
+
+LinphoneAddress * linphone_core_manager_resolve(LinphoneCoreManager *mgr, const LinphoneAddress *source) {
+	struct addrinfo *addrinfo = NULL;
+	char ipstring [INET6_ADDRSTRLEN];
+	int err;
+	int port = linphone_address_get_port(source);
+	LinphoneAddress * dest;
+	
+	sal_resolve_a(	mgr->lc->sal
+	 ,linphone_address_get_domain(source)
+	 ,linphone_address_get_port(source)
+	 ,AF_INET
+	 ,(SalResolverCallback)dest_server_server_resolved
+	 ,&addrinfo);
+	
+	 dest=linphone_address_new(NULL);
+	 
+	 wait_for(mgr->lc, mgr->lc, (int*)&addrinfo, 1);
+	 err=getnameinfo((struct sockaddr*)addrinfo->ai_addr,addrinfo->ai_addrlen,ipstring,INET6_ADDRSTRLEN,NULL,0,NI_NUMERICHOST);
+	 if (err !=0 ){
+		 ms_error("linphone_core_manager_resolve(): getnameinfo error %s", gai_strerror(err));
+	 }
+	 linphone_address_set_domain(dest, ipstring);
+	 if (port > 0)
+		linphone_address_set_port(dest, port);
+	
+	return dest;
+}
+
+
+static void sip_update_within_icoming_reinvite_with_no_sdp(void) {
+	LinphoneCoreManager *mgr;
+	char *identity_char;
+	char *scen;
+	FILE * sipp_out;
+
+	/*currently we use direct connection because sipp do not properly set ACK request uri*/
+	mgr= linphone_core_manager_new2( "empty_rc", FALSE);
+	mgr->identity= linphone_core_get_primary_contact_parsed(mgr->lc);
+	linphone_address_set_username(mgr->identity,"marie");
+	identity_char=linphone_address_as_string(mgr->identity);
+	linphone_core_set_primary_contact(mgr->lc,identity_char);
+	linphone_core_iterate(mgr->lc);
+	scen = bc_tester_res("sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml");
+	sipp_out = sip_start(scen, linphone_address_get_username(mgr->identity),NULL, mgr->identity);
+
+	if (sipp_out) {
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallIncomingReceived, 1));
+		linphone_core_accept_call(mgr->lc, linphone_core_get_current_call(mgr->lc));
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallStreamsRunning, 2));
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallEnd, 1));
+		pclose(sipp_out);
+	}
+	linphone_core_manager_destroy(mgr);
+}
+
+static void call_with_audio_mline_before_video_in_sdp(void) {
+	LinphoneCoreManager *mgr;
+	char *identity_char;
+	char *scen;
+	FILE * sipp_out;
+	LinphoneCall *call = NULL;
+
+	/*currently we use direct connection because sipp do not properly set ACK request uri*/
+	mgr= linphone_core_manager_new2( "empty_rc", FALSE);
+	mgr->identity = linphone_core_get_primary_contact_parsed(mgr->lc);
+	linphone_address_set_username(mgr->identity,"marie");
+	identity_char = linphone_address_as_string(mgr->identity);
+	linphone_core_set_primary_contact(mgr->lc,identity_char);
+
+	linphone_core_iterate(mgr->lc);
+
+	scen = bc_tester_res("sipp/call_with_audio_mline_before_video_in_sdp.xml");
+
+	sipp_out = sip_start(scen, linphone_address_get_username(mgr->identity), NULL,  mgr->identity);
+
+	if (sipp_out) {
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallIncomingReceived, 1));
+		call = linphone_core_get_current_call(mgr->lc);
+		BC_ASSERT_PTR_NOT_NULL(call);
+		if (call) {
+			linphone_core_accept_call(mgr->lc, call);
+			BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallStreamsRunning, 1));
+			BC_ASSERT_EQUAL(call->main_audio_stream_index, 0, int, "%d");
+			BC_ASSERT_EQUAL(call->main_video_stream_index, 1, int, "%d");
+			BC_ASSERT_TRUE(call->main_text_stream_index > 1);
+			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(call)));
+
+			check_rtcp(call);
+		}
+
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallEnd, 1));
+		pclose(sipp_out);
+	}
+	linphone_core_manager_destroy(mgr);
+}
+
+static void call_with_video_mline_before_audio_in_sdp(void) {
+	LinphoneCoreManager *mgr;
+	char *identity_char;
+	char *scen;
+	FILE * sipp_out;
+	LinphoneCall *call = NULL;
+
+	/*currently we use direct connection because sipp do not properly set ACK request uri*/
+	mgr= linphone_core_manager_new2( "empty_rc", FALSE);
+	mgr->identity = linphone_core_get_primary_contact_parsed(mgr->lc);
+	linphone_address_set_username(mgr->identity,"marie");
+	identity_char = linphone_address_as_string(mgr->identity);
+	linphone_core_set_primary_contact(mgr->lc,identity_char);
+
+	linphone_core_iterate(mgr->lc);
+
+	scen = bc_tester_res("sipp/call_with_video_mline_before_audio_in_sdp.xml");
+
+	sipp_out = sip_start(scen, linphone_address_get_username(mgr->identity), NULL, mgr->identity);
+
+	if (sipp_out) {
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallIncomingReceived, 1));
+		call = linphone_core_get_current_call(mgr->lc);
+		BC_ASSERT_PTR_NOT_NULL(call);
+		if (call) {
+			linphone_core_accept_call(mgr->lc, call);
+			BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallStreamsRunning, 1));
+			BC_ASSERT_EQUAL(call->main_audio_stream_index, 1, int, "%d");
+			BC_ASSERT_EQUAL(call->main_video_stream_index, 0, int, "%d");
+			BC_ASSERT_TRUE(call->main_text_stream_index > 1);
+			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(call)));
+
+			check_rtcp(call);
+		}
+
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallEnd, 1));
+		pclose(sipp_out);
+	}
+	linphone_core_manager_destroy(mgr);
+}
+
+static void call_with_multiple_audio_mline_in_sdp(void) {
+	LinphoneCoreManager *mgr;
+	char *identity_char;
+	char *scen;
+	FILE * sipp_out;
+	LinphoneCall *call = NULL;
+
+	/*currently we use direct connection because sipp do not properly set ACK request uri*/
+	mgr= linphone_core_manager_new2( "empty_rc", FALSE);
+	mgr->identity = linphone_core_get_primary_contact_parsed(mgr->lc);
+	linphone_address_set_username(mgr->identity,"marie");
+	identity_char = linphone_address_as_string(mgr->identity);
+	linphone_core_set_primary_contact(mgr->lc,identity_char);
+
+	linphone_core_iterate(mgr->lc);
+
+	scen = bc_tester_res("sipp/call_with_multiple_audio_mline_in_sdp.xml");
+
+	sipp_out = sip_start(scen, linphone_address_get_username(mgr->identity), NULL, mgr->identity);
+
+	if (sipp_out) {
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallIncomingReceived, 1));
+		call = linphone_core_get_current_call(mgr->lc);
+		BC_ASSERT_PTR_NOT_NULL(call);
+		if (call) {
+			linphone_core_accept_call(mgr->lc, call);
+			BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallStreamsRunning, 1));
+			BC_ASSERT_EQUAL(call->main_audio_stream_index, 0, int, "%d");
+			BC_ASSERT_EQUAL(call->main_video_stream_index, 2, int, "%d");
+			BC_ASSERT_TRUE(call->main_text_stream_index > 2);
+			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(call)));
+
+			check_rtcp(call);
+		}
+
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallEnd, 1));
+		pclose(sipp_out);
+	}
+	linphone_core_manager_destroy(mgr);
+}
+
+static void call_with_multiple_video_mline_in_sdp(void) {
+	LinphoneCoreManager *mgr;
+	char *identity_char;
+	char *scen;
+	FILE * sipp_out;
+	LinphoneCall *call = NULL;
+
+	/*currently we use direct connection because sipp do not properly set ACK request uri*/
+	mgr= linphone_core_manager_new2( "empty_rc", FALSE);
+	mgr->identity = linphone_core_get_primary_contact_parsed(mgr->lc);
+	linphone_address_set_username(mgr->identity,"marie");
+	identity_char = linphone_address_as_string(mgr->identity);
+	linphone_core_set_primary_contact(mgr->lc,identity_char);
+
+	linphone_core_iterate(mgr->lc);
+
+	scen = bc_tester_res("sipp/call_with_multiple_video_mline_in_sdp.xml");
+
+	sipp_out = sip_start(scen, linphone_address_get_username(mgr->identity), NULL, mgr->identity);
+
+	if (sipp_out) {
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallIncomingReceived, 1));
+		call = linphone_core_get_current_call(mgr->lc);
+		BC_ASSERT_PTR_NOT_NULL(call);
+		if (call) {
+			linphone_core_accept_call(mgr->lc, call);
+			BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallStreamsRunning, 1));
+			BC_ASSERT_EQUAL(call->main_audio_stream_index, 0, int, "%d");
+			BC_ASSERT_EQUAL(call->main_video_stream_index, 1, int, "%d");
+			BC_ASSERT_TRUE(call->main_text_stream_index > 3);
+			BC_ASSERT_TRUE(linphone_call_log_video_enabled(linphone_call_get_call_log(call)));
+
+			check_rtcp(call);
+		}
+
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallEnd, 1));
+		pclose(sipp_out);
+	}
+	linphone_core_manager_destroy(mgr);
+}
+
+
+static void call_invite_200ok_without_contact_header(void) {
+	LinphoneCoreManager *mgr;
+	char *identity_char;
+	char *scen;
+	FILE * sipp_out;
+	LinphoneCall *call = NULL;
+
+	/*currently we use direct connection because sipp do not properly set ACK request uri*/
+	mgr= linphone_core_manager_new2("empty_rc", FALSE);
+	mgr->identity = linphone_core_get_primary_contact_parsed(mgr->lc);
+	linphone_address_set_username(mgr->identity,"marie");
+	identity_char = linphone_address_as_string(mgr->identity);
+	linphone_core_set_primary_contact(mgr->lc,identity_char);
+
+	linphone_core_iterate(mgr->lc);
+
+	scen = bc_tester_res("sipp/call_invite_200ok_without_contact_header.xml");
+
+	sipp_out = sip_start_recv(scen);
+
+	if (sipp_out) {
+		call = linphone_core_invite(mgr->lc, "sipp@127.0.0.1");
+		BC_ASSERT_PTR_NOT_NULL(call);
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallOutgoingInit, 1));
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallOutgoingProgress, 1));
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallOutgoingRinging, 1));
+		/*assert that the call never gets connected nor terminated*/
+		BC_ASSERT_FALSE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallConnected, 1));
+		BC_ASSERT_EQUAL(mgr->stat.number_of_LinphoneCallEnd, 0, int, "%d");
+		BC_ASSERT_EQUAL(mgr->stat.number_of_LinphoneCallError, 0, int, "%d");
+		linphone_core_terminate_call(mgr->lc, call);
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallEnd, 1));
+		BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallReleased, 1));
+		pclose(sipp_out);
+	}
+	linphone_core_manager_destroy(mgr);
+}
+
+
+static test_t tests[] = {
+	TEST_NO_TAG("SIP UPDATE within incoming reinvite without sdp", sip_update_within_icoming_reinvite_with_no_sdp),
+	TEST_NO_TAG("Call with audio mline before video in sdp", call_with_audio_mline_before_video_in_sdp),
+	TEST_NO_TAG("Call with video mline before audio in sdp", call_with_video_mline_before_audio_in_sdp),
+	TEST_NO_TAG("Call with multiple audio mline in sdp", call_with_multiple_audio_mline_in_sdp),
+	TEST_NO_TAG("Call with multiple video mline in sdp", call_with_multiple_video_mline_in_sdp),
+	TEST_NO_TAG("Call invite 200ok without contact header", call_invite_200ok_without_contact_header)
+};
+#endif
+
+test_suite_t complex_sip_call_test_suite = {
+	"Complex SIP Case",
+	NULL,
+	NULL,
+	liblinphone_tester_before_each,
+	liblinphone_tester_after_each,
+#if HAVE_SIPP
+	sizeof(tests) / sizeof(tests[0]),
+	tests
+#else
+	0,
+	NULL
+#endif
+};
diff --git a/tester/dtmf_tester.c b/tester/dtmf_tester.c
index 38d6c3579..abfeef7cb 100644
--- a/tester/dtmf_tester.c
+++ b/tester/dtmf_tester.c
@@ -36,7 +36,9 @@ void send_dtmf_base(LinphoneCoreManager **pmarie, LinphoneCoreManager **ppauline
 	LinphoneCall *marie_call = NULL;
 
 	if (use_opus) {
-		if (!ms_filter_codec_supported("opus")) {
+		//if (!ms_filter_codec_supported("opus")) {
+		if(!ms_factory_codec_supported(marie->lc->factory, "opus") && !ms_factory_codec_supported(pauline->lc->factory, "opus")){
+
 			ms_warning("Opus not supported, skipping test.");
 			return;
 		}
@@ -72,7 +74,7 @@ void send_dtmf_base(LinphoneCoreManager **pmarie, LinphoneCoreManager **ppauline
 		linphone_call_send_dtmfs(marie_call, dtmf_seq);
 
 		/*wait for the DTMF sequence to be received from pauline*/
-		BC_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &pauline->stat.dtmf_count, dtmf_count_prev + strlen(dtmf_seq), 10000 + dtmf_delay_ms * strlen(dtmf_seq)));
+		BC_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &pauline->stat.dtmf_count, (int)(dtmf_count_prev + strlen(dtmf_seq)), (int)(10000 + dtmf_delay_ms * strlen(dtmf_seq))));
 		expected = (dtmf!='\0')?ms_strdup_printf("%c%s",dtmf,dtmf_seq):ms_strdup(dtmf_seq);
 	}
 
@@ -102,38 +104,38 @@ void send_dtmf_cleanup(LinphoneCoreManager *marie, LinphoneCoreManager *pauline)
 	linphone_core_manager_destroy(pauline);
 }
 
-static void send_dtmf_rfc2833() {
+static void send_dtmf_rfc2833(void) {
 	LinphoneCoreManager *marie, *pauline;
 	send_dtmf_base(&marie, &pauline, TRUE,FALSE,'1',NULL,FALSE);
 	send_dtmf_cleanup(marie, pauline);
 }
 
-static void send_dtmf_sip_info() {
+static void send_dtmf_sip_info(void) {
 	LinphoneCoreManager *marie, *pauline;
 	send_dtmf_base(&marie, &pauline, FALSE,TRUE,'#',NULL,FALSE);
 	send_dtmf_cleanup(marie, pauline);
 }
 
-static void send_dtmfs_sequence_rfc2833() {
+static void send_dtmfs_sequence_rfc2833(void) {
 	LinphoneCoreManager *marie, *pauline;
 	send_dtmf_base(&marie, &pauline, TRUE,FALSE,'\0',"1230#",FALSE);
 	send_dtmf_cleanup(marie, pauline);
 }
 
-static void send_dtmfs_sequence_sip_info() {
+static void send_dtmfs_sequence_sip_info(void) {
 	LinphoneCoreManager *marie, *pauline;
 	send_dtmf_base(&marie, &pauline, FALSE,TRUE,'\0',"1230#",FALSE);
 	send_dtmf_cleanup(marie, pauline);
 }
 
-static void send_dtmfs_sequence_not_ready() {
+static void send_dtmfs_sequence_not_ready(void) {
 	LinphoneCoreManager *marie;
 	marie = linphone_core_manager_new( "marie_rc");
 	BC_ASSERT_EQUAL(linphone_call_send_dtmfs(linphone_core_get_current_call(marie->lc), "123"), -1, int, "%d");
 	linphone_core_manager_destroy(marie);
 }
 
-static void send_dtmfs_sequence_call_state_changed() {
+static void send_dtmfs_sequence_call_state_changed(void) {
 	LinphoneCoreManager *marie, *pauline;
 	LinphoneCall *marie_call = NULL;
 	send_dtmf_base(&marie, &pauline, FALSE,TRUE,'\0',NULL,FALSE);
@@ -152,29 +154,25 @@ static void send_dtmfs_sequence_call_state_changed() {
 
 		BC_ASSERT_PTR_NULL(pauline->stat.dtmf_list_received);
 	}
+	end_call(marie, pauline);
 	send_dtmf_cleanup(marie, pauline);
 }
 
-static void send_dtmf_rfc2833_opus() {
+static void send_dtmf_rfc2833_opus(void) {
 	LinphoneCoreManager *marie, *pauline;
 	send_dtmf_base(&marie, &pauline, TRUE,FALSE,'1',NULL,TRUE);
 	send_dtmf_cleanup(marie, pauline);
 }
 
 test_t dtmf_tests[] = {
-	{ "Send DTMF using RFC2833",send_dtmf_rfc2833},
-	{ "Send DTMF using SIP INFO",send_dtmf_sip_info},
-	{ "Send DTMF sequence using RFC2833",send_dtmfs_sequence_rfc2833},
-	{ "Send DTMF sequence using SIP INFO",send_dtmfs_sequence_sip_info},
-	{ "DTMF sequence not sent if invalid call",send_dtmfs_sequence_not_ready},
-	{ "DTMF sequence canceled if call state changed",send_dtmfs_sequence_call_state_changed},
-	{ "Send DTMF using RFC2833 using Opus",send_dtmf_rfc2833_opus},
+	TEST_NO_TAG("Send DTMF using RFC2833",send_dtmf_rfc2833),
+	TEST_NO_TAG("Send DTMF using SIP INFO",send_dtmf_sip_info),
+	TEST_NO_TAG("Send DTMF sequence using RFC2833",send_dtmfs_sequence_rfc2833),
+	TEST_NO_TAG("Send DTMF sequence using SIP INFO",send_dtmfs_sequence_sip_info),
+	TEST_NO_TAG("DTMF sequence not sent if invalid call",send_dtmfs_sequence_not_ready),
+	TEST_NO_TAG("DTMF sequence canceled if call state changed",send_dtmfs_sequence_call_state_changed),
+	TEST_NO_TAG("Send DTMF using RFC2833 using Opus",send_dtmf_rfc2833_opus)
 };
 
-test_suite_t dtmf_test_suite = {
-	"DTMF",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(dtmf_tests) / sizeof(dtmf_tests[0]),
-	dtmf_tests
-};
+test_suite_t dtmf_test_suite = {"DTMF", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								sizeof(dtmf_tests) / sizeof(dtmf_tests[0]), dtmf_tests};
diff --git a/tester/eventapi_tester.c b/tester/eventapi_tester.c
index b196652db..76533857b 100644
--- a/tester/eventapi_tester.c
+++ b/tester/eventapi_tester.c
@@ -24,7 +24,6 @@
 #include <event.h>
 #include "liblinphone_tester.h"
 
-
 static const char *subscribe_content="<somexml>blabla</somexml>";
 static const char *notify_content="<somexml2>blabla</somexml2>";
 
@@ -38,8 +37,12 @@ const char *liblinphone_tester_get_notify_content(void){
 
 void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *eventname, const LinphoneContent *content){
 	LinphoneCoreManager *mgr;
-	BC_ASSERT_PTR_NOT_NULL_FATAL(content);
-	BC_ASSERT_STRING_EQUAL(notify_content,(const char*)linphone_content_get_buffer(content));
+	const char * ua = linphone_event_get_custom_header(lev, "User-Agent");
+	if (!BC_ASSERT_PTR_NOT_NULL(content)) return;
+	if (!linphone_content_is_multipart(content) && (!ua ||  !strstr(ua, "flexisip"))) { /*disable check for full presence server support*/
+		/*hack to disable content checking for list notify */
+		BC_ASSERT_STRING_EQUAL(notify_content,(const char*)linphone_content_get_buffer(content));
+	}
 	mgr=get_manager(lc);
 	mgr->stat.number_of_NotifyReceived++;
 }
@@ -69,8 +72,8 @@ void linphone_subscription_state_change(LinphoneCore *lc, LinphoneEvent *lev, Li
 			else
 				linphone_event_deny_subscription(lev, LinphoneReasonDeclined);
 		break;
-		case LinphoneSubscriptionOutgoingInit:
-			counters->number_of_LinphoneSubscriptionOutgoingInit++;
+		case LinphoneSubscriptionOutgoingProgress:
+			counters->number_of_LinphoneSubscriptionOutgoingProgress++;
 		break;
 		case LinphoneSubscriptionPending:
 			counters->number_of_LinphoneSubscriptionPending++;
@@ -126,8 +129,8 @@ static void subscribe_test_declined(void) {
 	LinphoneContent* content;
 	LinphoneEvent *lev;
 	const LinphoneErrorInfo *ei;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
 
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
@@ -139,7 +142,7 @@ static void subscribe_test_declined(void) {
 	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",600,content);
 	linphone_event_ref(lev);
 
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionError,1,21000));/*yes flexisip may wait 20 secs in case of forking*/
 	ei=linphone_event_get_error_info(lev);
@@ -150,6 +153,7 @@ static void subscribe_test_declined(void) {
 	}
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
 
+	bctbx_list_free(lcs);
 	linphone_content_unref(content);
 	linphone_event_unref(lev);
 	linphone_core_manager_destroy(marie);
@@ -168,9 +172,9 @@ static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTes
 	LinphoneContent* content;
 	LinphoneEvent *lev;
 	int expires= refresh_type!=NoRefresh ? 4 : 600;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 
-	lcs=ms_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
 
 	if (refresh_type==ManualRefresh){
 		lp_config_set_int(marie->lc->config,"sip","refresh_generic_subscribe",0);
@@ -183,7 +187,7 @@ static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTes
 
 	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,content);
 
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,1,3000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionActive,1,1000));
@@ -203,13 +207,14 @@ static void subscribe_test_with_args(bool_t terminated_by_subscriber, RefreshTes
 	if (terminated_by_subscriber){
 		linphone_event_terminate(lev);
 	}else{
-		BC_ASSERT_PTR_NOT_NULL_FATAL(pauline->lev);
+		BC_ASSERT_PTR_NOT_NULL(pauline->lev);
 		linphone_event_terminate(pauline->lev);
 	}
 
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,1000));
 
+	bctbx_list_free(lcs);
 	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
@@ -221,9 +226,9 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 	LinphoneContent* content;
 	LinphoneEvent *lev;
 	int expires= refresh_type!=NoRefresh ? 4 : 600;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 
-	lcs=ms_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
 
 	if (refresh_type==ManualRefresh){
 		lp_config_set_int(marie->lc->config,"sip","refresh_generic_subscribe",0);
@@ -239,7 +244,7 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 	linphone_event_add_custom_header(lev,"My-Header2","pimpon");
 	linphone_event_send_subscribe(lev,content);
 
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
 
 	if (pauline->stat.number_of_LinphoneSubscriptionIncomingReceived == 1) {
@@ -265,7 +270,7 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 	if (terminated_by_subscriber){
 		linphone_event_terminate(lev);
 	}else{
-		BC_ASSERT_PTR_NOT_NULL_FATAL(pauline->lev);
+		BC_ASSERT_PTR_NOT_NULL(pauline->lev);
 		linphone_event_terminate(pauline->lev);
 	}
 
@@ -275,6 +280,7 @@ static void subscribe_test_with_args2(bool_t terminated_by_subscriber, RefreshTe
 	linphone_content_unref(content);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
+	bctbx_list_free(lcs);
 }
 
 static void subscribe_test_terminated_by_subscriber(void){
@@ -300,13 +306,126 @@ static void subscribe_test_manually_refreshed(void){
 	subscribe_test_with_args(TRUE,ManualRefresh);
 }
 
+static void subscribe_loosing_dialog(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneContent* content;
+	LinphoneEvent *lev;
+	int expires= 4;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+
+	lcs=bctbx_list_append(lcs,pauline->lc);
+
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_buffer(content,subscribe_content,strlen(subscribe_content));
+
+	lev=linphone_core_create_subscribe(marie->lc,pauline->identity,"dodo",expires);
+	linphone_event_add_custom_header(lev,"My-Header","pouet");
+	linphone_event_add_custom_header(lev,"My-Header2","pimpon");
+	linphone_event_send_subscribe(lev,content);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,1,1000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
+
+	
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,1,5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionActive,1,5000));
+
+	/*make sure marie receives first notification before terminating*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,5000));
+
+	/* now pauline looses internet connection and reboots */
+	linphone_core_set_network_reachable(pauline->lc, FALSE);
+	/*let expire the incoming subscribe received by pauline */
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
+	lcs = bctbx_list_remove(lcs, pauline->lc);
+	linphone_core_manager_destroy(pauline);
+	pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	lcs = bctbx_list_append(lcs, pauline->lc);
+	
+	/*marie will retry the subscription*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,2,8000));
+	/*and get it accepted again*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,2,5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionActive,1,5000));
+	BC_ASSERT_EQUAL(linphone_event_get_subscription_state(pauline->lev), LinphoneSubscriptionActive, int, "%d");
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,2,5000));
+	linphone_event_terminate(lev);
+	
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
+
+	linphone_content_unref(content);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	bctbx_list_free(lcs);
+}
+
+static void subscribe_with_io_error(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneContent* content;
+	LinphoneEvent *lev;
+	int expires= 4;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+
+	lcs=bctbx_list_append(lcs,pauline->lc);
+
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_buffer(content,subscribe_content,strlen(subscribe_content));
+
+	lev=linphone_core_create_subscribe(marie->lc,pauline->identity,"dodo",expires);
+	linphone_event_add_custom_header(lev,"My-Header","pouet");
+	linphone_event_add_custom_header(lev,"My-Header2","pimpon");
+	linphone_event_send_subscribe(lev,content);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,1,1000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
+
+	
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,1,5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionActive,1,5000));
+
+	/*make sure marie receives first notification before terminating*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,5000));
+
+	/* now marie gets network errors when refreshing*/
+	sal_set_send_error(marie->lc->sal, -1);
+	
+	/*marie will retry the subscription*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,2,8000));
+	sal_set_send_error(marie->lc->sal, 0);
+	
+	/*and get it accepted again*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,2,10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionActive,2,5000));
+	BC_ASSERT_EQUAL(linphone_event_get_subscription_state(pauline->lev), LinphoneSubscriptionActive, int, "%d");
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,2,5000));
+	linphone_event_terminate(lev);
+	
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
+
+	linphone_content_unref(content);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	bctbx_list_free(lcs);
+}
+
+
 static void publish_test_with_args(bool_t refresh, int expires){
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneContent* content;
 	LinphoneEvent *lev;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
 
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
@@ -317,8 +436,9 @@ static void publish_test_with_args(bool_t refresh, int expires){
 
 	lev=linphone_core_create_publish(marie->lc,pauline->identity,"dodo",expires);
 	linphone_event_add_custom_header(lev,"CustomHeader","someValue");
-	linphone_event_send_publish(lev,content);
 	linphone_event_ref(lev);
+	linphone_event_send_publish(lev,content);
+	
 
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishProgress,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePublishOk,1,3000));
@@ -343,35 +463,61 @@ static void publish_test_with_args(bool_t refresh, int expires){
 	linphone_core_manager_destroy(pauline);
 }
 
-static void publish_test(){
+static void publish_test(void){
 	publish_test_with_args(TRUE,5);
 }
 
-static void publish_no_auto_test(){
+static void publish_no_auto_test(void){
 	publish_test_with_args(FALSE,5);
 }
 
-static void publish_without_expires(){
+static void publish_without_expires(void){
 	publish_test_with_args(TRUE,-1);
 }
 
+static void out_of_dialog_notify(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneContent* content;
+	LinphoneEvent *lev;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+
+	content = linphone_core_create_content(marie->lc);
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"somexml");
+	linphone_content_set_buffer(content,notify_content,strlen(notify_content));
+
+	lev = linphone_core_create_notify(marie->lc,pauline->identity,"dodo");
+	linphone_event_ref(lev);
+	linphone_event_add_custom_header(lev,"CustomHeader","someValue");
+	linphone_event_notify(lev,content);
+	
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,1,3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,3000));
+
+	linphone_event_unref(lev);
+
+	linphone_content_unref(content);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
 test_t event_tests[] = {
-	{ "Subscribe declined"	,	subscribe_test_declined 	},
-	{ "Subscribe terminated by subscriber", subscribe_test_terminated_by_subscriber },
-	{ "Subscribe with custom headers", subscribe_test_with_custom_header },
-	{ "Subscribe refreshed", subscribe_test_refreshed },
-	{ "Subscribe manually refreshed", subscribe_test_manually_refreshed },
-	{ "Subscribe terminated by notifier", subscribe_test_terminated_by_notifier },
-	{ "Publish", publish_test },
-	{ "Publish without expires", publish_without_expires },
-	{ "Publish without automatic refresh",publish_no_auto_test }
-};
-
-test_suite_t event_test_suite = {
-	"Event",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(event_tests) / sizeof(event_tests[0]),
-	event_tests
+	TEST_ONE_TAG("Subscribe declined", subscribe_test_declined, "presence"),
+	TEST_ONE_TAG("Subscribe terminated by subscriber", subscribe_test_terminated_by_subscriber, "presence"),
+	TEST_ONE_TAG("Subscribe with custom headers", subscribe_test_with_custom_header, "presence"),
+	TEST_ONE_TAG("Subscribe refreshed", subscribe_test_refreshed, "presence"),
+	TEST_ONE_TAG("Subscribe loosing dialog", subscribe_loosing_dialog, "presence"),
+	TEST_ONE_TAG("Subscribe with io error", subscribe_with_io_error, "presence"),
+	TEST_ONE_TAG("Subscribe manually refreshed", subscribe_test_manually_refreshed, "presence"),
+	TEST_ONE_TAG("Subscribe terminated by notifier", subscribe_test_terminated_by_notifier, "presence"),
+	TEST_ONE_TAG("Publish", publish_test, "presence"),
+	TEST_ONE_TAG("Publish without expires", publish_without_expires, "presence"),
+	TEST_ONE_TAG("Publish without automatic refresh",publish_no_auto_test, "presence"),
+	TEST_ONE_TAG("Out of dialog notify", out_of_dialog_notify, "presence")
 };
 
+test_suite_t event_test_suite = {"Event", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								 sizeof(event_tests) / sizeof(event_tests[0]), event_tests};
diff --git a/tester/flexisip/flexisip.conf b/tester/flexisip/flexisip.conf
index 7fe250368..5ad6cb028 100644
--- a/tester/flexisip/flexisip.conf
+++ b/tester/flexisip/flexisip.conf
@@ -18,7 +18,7 @@ auto-respawn=true
 # List of white space separated host names pointing to this machine.
 # This is to prevent loops while routing SIP messages.
 #  Default value: localhost
-aliases=localhost sip2.linphone.org sipopen.example.org sip.example.org auth.example.org auth1.example.org auth2.example.org client.example.org
+aliases=localhost sip2.linphone.org sipopen.example.org sip.example.org auth.example.org auth1.example.org auth2.example.org client.example.org sipv4.example.org sipv4-nat64.example.org
 
 # List of white space separated SIP uris where the proxy must listen.Wildcard
 # (*) can be used to mean 'all local ip addresses'. If 'transport'
@@ -38,7 +38,7 @@ aliases=localhost sip2.linphone.org sipopen.example.org sip.example.org auth.exa
 #  Default value: sip:*
 #transports=sip:192.168.56.101:5060  sips:192.168.56.101:5061
 
-#note: the ip addresses are explicitely specified here because the machine has several interfaces. In a simple case, using '*' instead of the explicit ip address is sufficient,
+#note: the ip addresses are explicitely specified here because the machine has several interfaces. In a simple case, using '*' instead of the explicit ip address is sufficient, 
 #and there is no need to specify the ipv6 transport addresses.
 transports=sip:94.23.19.176:5060  sips:94.23.19.176:5061;tls-certificates-dir=/etc/flexisip/tls/certificates/cn sips:94.23.19.176:5062;tls-certificates-dir=/etc/flexisip/tls/certificates/altname sips:94.23.19.176:5063;require-peer-certificate=1 sip:94.23.19.176:5064 sip:[2001:41d0:2:14b0::1]:5060  sips:[2001:41d0:2:14b0::1]:5061;tls-certificates-dir=/etc/flexisip/tls/certificates/cn sips:[2001:41d0:2:14b0::1]:5062;tls-certificates-dir=/etc/flexisip/tls/certificates/altname sips:[2001:41d0:2:14b0::1]:5063;require-peer-certificate=1 sip:[2001:41d0:2:14b0::1]:5064
 
@@ -107,20 +107,19 @@ no-403=user-agent contains 'tester-no-403'
 # to true. Ex: from.uri.domain contains 'sip.linphone.org', from.uri.domain
 # in 'a.org b.org c.org', (to.uri.domain in 'a.org b.org c.org')
 # && (user-agent == 'Linphone v2')
-#  Default value:
-filter= from.uri.domain contains 'sip.example.org' || from.uri.domain contains 'auth.example.org' || from.uri.domain contains 'auth1.example.org' || from.uri.domain contains 'auth2.example.org' || from.uri.domain contains 'anonymous.invalid'
+#  Default value: 
+filter= from.uri.domain contains 'sip.example.org' || from.uri.domain contains 'auth.example.org' || from.uri.domain contains 'auth1.example.org' || from.uri.domain contains 'auth2.example.org' || from.uri.domain contains 'anonymous.invalid' 
 
 # List of whitespace separated domain names to challenge. Others
 # are denied.
-#  Default value:
+#  Default value: 
 auth-domains= sip.example.org auth.example.org auth1.example.org auth2.example.org
 
-client-certificates-domains=client.example.org
 
 
 # List of whitespace separated IP which will not be challenged.
-#  Default value:
-trusted-hosts=
+#  Default value: 
+trusted-hosts=127.0.0.1 94.23.19.176
 
 # Database backend implementation [odbc, file].
 #  Default value: odbc
@@ -615,3 +614,12 @@ packet-rate-limit=5
 #  Default value: 2
 ban-time=1
 
+[module::Presence]
+enabled=true
+presence-server = <sip:127.0.0.1:5065;transport=tcp>
+only-list-subscription = !(user-agent contains 'full-presence-support')
+
+[presence-server]
+expires = 600
+transports = sip:127.0.0.1:5065;transport=tcp
+
diff --git a/tester/flexisip/userdb.conf b/tester/flexisip/userdb.conf
index 3ee1b7e0a..6ac364764 100644
--- a/tester/flexisip/userdb.conf
+++ b/tester/flexisip/userdb.conf
@@ -1,4 +1,4 @@
-liblinphone_tester@sip.example.org secret
+liblinphone_tester@sip.example.org secret liblinphone_tester +33123456789
 liblinphone_tester@auth.example.org secret
 liblinphone_tester@auth1.example.org secret
 tester@sip.example.org secret
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index c2bb8b780..82fefe92a 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -1,19 +1,19 @@
 /*
-    liblinphone_tester - liblinphone test suite
-    Copyright (C) 2013  Belledonne Communications SARL
+	liblinphone_tester - liblinphone test suite
+	Copyright (C) 2013  Belledonne Communications SARL
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 2 of the License, or
-    (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
@@ -29,10 +29,10 @@ static void subscribe_forking(void) {
 	LinphoneContent* content;
 	LinphoneEvent *lev;
 	int expires=  600;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,pauline2->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,pauline2->lc);
 
 	content = linphone_core_create_content(marie->lc);
 	linphone_content_set_type(content,"application");
@@ -41,7 +41,7 @@ static void subscribe_forking(void) {
 
 	lev=linphone_core_subscribe(marie->lc,pauline->identity,"dodo",expires,content);
 
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingInit,1,1000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneSubscriptionIncomingReceived,1,3000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline2->stat.number_of_LinphoneSubscriptionIncomingReceived,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,1,1000));
@@ -55,29 +55,36 @@ static void subscribe_forking(void) {
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(pauline2);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void message_forking(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,marie->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
 	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
 
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
 
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room, message);
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneMessageReceived,1,3000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie2->stat.number_of_LinphoneMessageReceived,1,1000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneMessageDelivered,1,1000));
+
+	/*wait a bit that 200Ok for MESSAGE are sent to server before shuting down the cores, because otherwise Flexisip will consider the messages
+	 * as not delivered and will expedite them in the next test, after receiving the REGISTER from marie's instances*/
+	wait_for_list(lcs, NULL, 0, 2000);
+
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(pauline);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void message_forking_with_unreachable_recipients(void) {
@@ -85,19 +92,28 @@ static void message_forking_with_unreachable_recipients(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,marie->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
 	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
 
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,marie3->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie3->lc);
+
+	/*the following lines are to workaround a problem with messages sent by a previous test (Message forking) that arrive together with REGISTER responses,
+	 * because the ForkMessageContext is not terminated at flexisip side if Message forking test is passing fast*/
+	wait_for_list(lcs,NULL,0,1000);
+	marie->stat.number_of_LinphoneMessageReceived = 0;
+	marie2->stat.number_of_LinphoneMessageReceived = 0;
+	marie3->stat.number_of_LinphoneMessageReceived = 0;
 
 	/*marie2 and marie3 go offline*/
 	linphone_core_set_network_reachable(marie2->lc,FALSE);
 	linphone_core_set_network_reachable(marie3->lc,FALSE);
 
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room, message);
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneMessageReceived,1,3000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneMessageDelivered,1,1000));
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
@@ -118,7 +134,7 @@ static void message_forking_with_unreachable_recipients(void) {
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie3);
 	linphone_core_manager_destroy(pauline);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void message_forking_with_all_recipients_unreachable(void) {
@@ -126,20 +142,30 @@ static void message_forking_with_all_recipients_unreachable(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,marie->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
 	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
+
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie3->lc);
+
+	/*the following lines are to workaround a problem with messages sent by a previous test (Message forking) that arrive together with REGISTER responses,
+	 * because the ForkMessageContext is not terminated at flexisip side if Message forking test is passing fast*/
+	wait_for_list(lcs,NULL,0,1000);
+	marie->stat.number_of_LinphoneMessageReceived = 0;
+	marie2->stat.number_of_LinphoneMessageReceived = 0;
+	marie3->stat.number_of_LinphoneMessageReceived = 0;
 
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,marie3->lc);
 
 	/*All marie's device go offline*/
 	linphone_core_set_network_reachable(marie->lc,FALSE);
 	linphone_core_set_network_reachable(marie2->lc,FALSE);
 	linphone_core_set_network_reachable(marie3->lc,FALSE);
 
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room, message);
 
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneMessageInProgress,1,5000));
 	/*flexisip will accept the message with 202 after 16 seconds*/
@@ -167,7 +193,7 @@ static void message_forking_with_all_recipients_unreachable(void) {
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie3);
 	linphone_core_manager_destroy(pauline);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void call_forking(void){
@@ -175,11 +201,11 @@ static void call_forking(void){
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,pauline->lc);
 
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,marie3->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie3->lc);
 
 	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
@@ -213,7 +239,7 @@ static void call_forking(void){
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie3);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void call_forking_with_urgent_reply(void){
@@ -221,44 +247,44 @@ static void call_forking_with_urgent_reply(void){
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie3->lc);
 
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,marie3->lc);
+	if (linphone_core_media_encryption_supported(pauline->lc,LinphoneMediaEncryptionSRTP)) {
+		linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
+		linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
+		linphone_core_set_user_agent(marie3->lc,"Natted Linphone",NULL);
+		linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
 
-	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
-	linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
-	linphone_core_set_user_agent(marie3->lc,"Natted Linphone",NULL);
-	linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
 
-	BC_ASSERT_TRUE(linphone_core_media_encryption_supported(pauline->lc,LinphoneMediaEncryptionSRTP));
-	linphone_core_set_media_encryption(pauline->lc,LinphoneMediaEncryptionSRTP);
-	linphone_core_set_network_reachable(marie2->lc,FALSE);
-	linphone_core_set_network_reachable(marie3->lc,FALSE);
+		linphone_core_set_media_encryption(pauline->lc,LinphoneMediaEncryptionSRTP);
+		linphone_core_set_network_reachable(marie2->lc,FALSE);
+		linphone_core_set_network_reachable(marie3->lc,FALSE);
 
-	linphone_core_invite_address(pauline->lc,marie->identity);
-	/*pauline should hear ringback, after 5 seconds, when it will retry without SRTP*/
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,9000));
-	/*Marie should be ringing*/
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallIncomingReceived,1,1000));
+		linphone_core_invite_address(pauline->lc,marie->identity);
+		/*pauline should hear ringback, after 5 seconds, when it will retry without SRTP*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,9000));
+		/*Marie should be ringing*/
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallIncomingReceived,1,1000));
 
-	/*marie accepts the call on its first device*/
-	linphone_core_accept_call(marie->lc,linphone_core_get_current_call(marie->lc));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,1000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,1000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,1000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,1000));
-
-	linphone_core_terminate_call(pauline->lc,linphone_core_get_current_call(pauline->lc));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+		/*marie accepts the call on its first device*/
+		linphone_core_accept_call(marie->lc,linphone_core_get_current_call(marie->lc));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,1000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,1000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,1000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,1000));
 
+		linphone_core_terminate_call(pauline->lc,linphone_core_get_current_call(pauline->lc));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,1000));
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
+	}
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie3);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void call_forking_cancelled(void){
@@ -266,11 +292,11 @@ static void call_forking_cancelled(void){
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,pauline->lc);
 
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,marie3->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie3->lc);
 
 	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
@@ -298,7 +324,7 @@ static void call_forking_cancelled(void){
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie3);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void call_forking_declined(bool_t declined_globaly){
@@ -306,11 +332,11 @@ static void call_forking_declined(bool_t declined_globaly){
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,pauline->lc);
 
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,marie3->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie3->lc);
 
 	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
@@ -353,7 +379,7 @@ static void call_forking_declined(bool_t declined_globaly){
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie3);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void call_forking_declined_globaly(void){
@@ -365,7 +391,7 @@ static void call_forking_declined_localy(void){
 }
 
 static void call_forking_with_push_notification_single(void){
-	MSList* lcs;
+	bctbx_list_t* lcs;
 	LinphoneCoreManager* marie = linphone_core_manager_new2( "marie_rc", FALSE);
 	LinphoneCoreManager* pauline = linphone_core_manager_new2( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc",FALSE);
 	int dummy=0;
@@ -376,8 +402,8 @@ static void call_forking_with_push_notification_single(void){
 		linphone_core_get_default_proxy_config(marie->lc),
 		"app-id=org.linphonetester;pn-tok=aaabbb;pn-type=apple;pn-msg-str=33;pn-call-str=34;");
 
-	lcs=ms_list_append(NULL,pauline->lc);
-	lcs=ms_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(NULL,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
 
 	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneRegistrationOk,1,5000));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneRegistrationOk,1,5000));
@@ -411,7 +437,7 @@ static void call_forking_with_push_notification_single(void){
 
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(marie);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void call_forking_with_push_notification_multiple(void){
@@ -419,10 +445,10 @@ static void call_forking_with_push_notification_multiple(void){
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 
-	MSList* lcs=ms_list_append(NULL,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,pauline->lc);
 
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
 
 	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
@@ -471,11 +497,11 @@ static void call_forking_not_responded(void){
 	LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc");
-	MSList* lcs=ms_list_append(NULL,pauline->lc);
+	bctbx_list_t* lcs=bctbx_list_append(NULL,pauline->lc);
 
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,marie3->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,marie3->lc);
 
 	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
@@ -501,19 +527,16 @@ static void call_forking_not_responded(void){
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie3);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 }
 
 static void early_media_call_forking(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_early_rc");
 	LinphoneCoreManager* marie2 = linphone_core_manager_new("marie_early_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
-	MSList *lcs=NULL;
-	LinphoneCallParams *params=linphone_core_create_default_call_parameters(pauline->lc);
+	bctbx_list_t *lcs=NULL;
+	LinphoneCallParams *params=linphone_core_create_call_params(pauline->lc, NULL);
 	LinphoneVideoPolicy pol;
-	LinphoneCall *marie1_call;
-	LinphoneCall *marie2_call;
-	LinphoneCall *pauline_call;
 	int dummy=0;
 
 	pol.automatically_accept=1;
@@ -523,19 +546,23 @@ static void early_media_call_forking(void) {
 	linphone_core_set_user_agent(marie2->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
 
-	linphone_core_enable_video(pauline->lc,TRUE,TRUE);
+	linphone_core_enable_video_capture(pauline->lc,TRUE);
+	linphone_core_enable_video_display(pauline->lc,TRUE);
 
-	linphone_core_enable_video(marie->lc,TRUE,TRUE);
+	linphone_core_enable_video_capture(marie->lc,TRUE);
+	linphone_core_enable_video_display(marie->lc,TRUE);
 	linphone_core_set_video_policy(marie->lc,&pol);
 
-	linphone_core_enable_video(marie2->lc,TRUE,TRUE);
+	linphone_core_enable_video_capture(marie2->lc,TRUE);
+	linphone_core_enable_video_display(marie2->lc,TRUE);
+
 	linphone_core_set_video_policy(marie2->lc,&pol);
 	linphone_core_set_audio_port_range(marie2->lc,40200,40300);
 	linphone_core_set_video_port_range(marie2->lc,40400,40500);
 
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	lcs=bctbx_list_append(lcs,pauline->lc);
 
 	linphone_call_params_enable_early_media_sending(params,TRUE);
 	linphone_call_params_enable_video(params,TRUE);
@@ -548,18 +575,14 @@ static void early_media_call_forking(void) {
 	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1,3000));
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1, int, "%d");
 
-	pauline_call=linphone_core_get_current_call(pauline->lc);
-	marie1_call=linphone_core_get_current_call(marie->lc);
-	marie2_call=linphone_core_get_current_call(marie2->lc);
-
 	/*wait a bit that streams are established*/
-	wait_for_list(lcs,&dummy,1,6000);
-	BC_ASSERT_GREATER(linphone_call_get_audio_stats(pauline_call)->download_bandwidth, 60, int, "%d");
-	BC_ASSERT_LOWER(linphone_call_get_audio_stats(pauline_call)->download_bandwidth, 99, int, "%d");
-	BC_ASSERT_GREATER(linphone_call_get_audio_stats(marie1_call)->download_bandwidth, 60, int, "%d");
-	BC_ASSERT_LOWER(linphone_call_get_audio_stats(marie1_call)->download_bandwidth, 99, int, "%d");
-	BC_ASSERT_GREATER(linphone_call_get_audio_stats(marie2_call)->download_bandwidth, 60, int, "%d");
-	BC_ASSERT_LOWER(linphone_call_get_audio_stats(marie2_call)->download_bandwidth, 99, int, "%d");
+	wait_for_list(lcs,&dummy,1,5000);
+	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(pauline), 60, int, "%d");
+	BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(pauline), 99, int, "%d");
+	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(marie), 60, int, "%d");
+	BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(marie), 99, int, "%d");
+	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(marie2), 60, int, "%d");
+	BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(marie2), 99, int, "%d");
 
 	linphone_core_accept_call(marie->lc,linphone_core_get_current_call(marie->lc));
 	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,3000));
@@ -570,16 +593,14 @@ static void early_media_call_forking(void) {
 
 	/*wait a bit that streams are established*/
 	wait_for_list(lcs,&dummy,1,3000);
-	BC_ASSERT_GREATER(linphone_call_get_audio_stats(pauline_call)->download_bandwidth, 60, int, "%d");
-	BC_ASSERT_LOWER(linphone_call_get_audio_stats(pauline_call)->download_bandwidth, 99, int, "%d");
-	BC_ASSERT_GREATER(linphone_call_get_audio_stats(marie1_call)->download_bandwidth, 60, int, "%d");
-	BC_ASSERT_LOWER(linphone_call_get_audio_stats(marie1_call)->download_bandwidth, 99, int, "%d");
+	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(pauline), 60, int, "%d");
+	BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(pauline), 99, int, "%d");
+	BC_ASSERT_GREATER(linphone_core_manager_get_mean_audio_down_bw(marie), 60, int, "%d");
+	BC_ASSERT_LOWER(linphone_core_manager_get_mean_audio_down_bw(marie), 99, int, "%d");
 
-	linphone_core_terminate_all_calls(pauline->lc);
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,5000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,5000));
+	end_call(pauline, marie);
 
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(marie);
@@ -590,10 +611,10 @@ static void call_with_sips(void){
 		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_sips_rc");
 		LinphoneCoreManager* pauline1 = linphone_core_manager_new( "pauline_sips_rc");
 		LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc");
-		MSList* lcs=ms_list_append(NULL,marie->lc);
+		bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 
-		lcs=ms_list_append(lcs,pauline1->lc);
-		lcs=ms_list_append(lcs,pauline2->lc);
+		lcs=bctbx_list_append(lcs,pauline1->lc);
+		lcs=bctbx_list_append(lcs,pauline2->lc);
 
 		linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 		linphone_core_set_user_agent(pauline1->lc,"Natted Linphone",NULL);
@@ -623,7 +644,7 @@ static void call_with_sips(void){
 		linphone_core_manager_destroy(marie);
 		linphone_core_manager_destroy(pauline1);
 		linphone_core_manager_destroy(pauline2);
-		ms_list_free(lcs);
+		bctbx_list_free(lcs);
 	}
 }
 
@@ -632,13 +653,13 @@ static void call_with_sips_not_achievable(void){
 		LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc");
 		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_sips_rc");
 		LinphoneCoreManager* pauline1 = linphone_core_manager_new( "pauline_rc");
-		MSList* lcs=ms_list_append(NULL,marie->lc);
+		bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
 		LinphoneAddress *dest;
 		LinphoneCall *call;
 		const LinphoneErrorInfo *ei;
 
-		lcs=ms_list_append(lcs,pauline1->lc);
-		lcs=ms_list_append(lcs,pauline2->lc);
+		lcs=bctbx_list_append(lcs,pauline1->lc);
+		lcs=bctbx_list_append(lcs,pauline2->lc);
 
 
 		dest=linphone_address_clone(pauline1->identity);
@@ -654,20 +675,43 @@ static void call_with_sips_not_achievable(void){
 		if (ei){
 			BC_ASSERT_EQUAL(linphone_error_info_get_reason(ei), LinphoneReasonTemporarilyUnavailable, int, "%d");
 		}
+		linphone_call_unref(call);
 
 		linphone_core_manager_destroy(marie);
 		linphone_core_manager_destroy(pauline1);
 		linphone_core_manager_destroy(pauline2);
-		ms_list_free(lcs);
+		bctbx_list_free(lcs);
 	}
 }
 
-static void call_with_ipv6(void) {
-	int begin;
-	int leaked_objects;
+
+
+static bool_t is_sending_ipv6(RtpSession *session, bool_t rtcp){
+	const struct sockaddr *dest = rtcp ? (struct sockaddr*)&session->rtcp.gs.rem_addr : (struct sockaddr*)&session->rtp.gs.rem_addr;
+	struct sockaddr_in6 *in6=(struct sockaddr_in6*)dest;
+	return dest->sa_family == AF_INET6 && !IN6_IS_ADDR_V4MAPPED(&in6->sin6_addr);
+}
+static bool_t is_remote_contact_ipv6(LinphoneCall *call){
+	const char *contact=linphone_call_get_remote_contact(call);
+	LinphoneAddress *ct_addr;
+	bool_t ret = FALSE;
+
+	BC_ASSERT_PTR_NOT_NULL(contact);
+	if (contact){
+		ct_addr=linphone_address_new(contact);
+		BC_ASSERT_PTR_NOT_NULL(ct_addr);
+		if (ct_addr){
+			ret = strchr(linphone_address_get_domain(ct_addr),':') != NULL;
+		}
+		linphone_address_destroy(ct_addr);
+	}
+	return ret;
+}
+
+static void _call_with_ipv6(bool_t caller_with_ipv6, bool_t callee_with_ipv6) {
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
-	LinphoneCall *pauline_call;
+	LinphoneCall *pauline_call, *marie_call;
 
 	/*calling ortp_init() here is done to have WSAStartup() done, otherwise liblinphone_tester_ipv6_available() will not work.*/
 	ortp_init();
@@ -677,52 +721,56 @@ static void call_with_ipv6(void) {
 		return;
 	}
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
-	liblinphone_tester_enable_ipv6(TRUE);
-	marie = linphone_core_manager_new( "marie_rc");
-	pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	marie = linphone_core_manager_new2( "marie_rc", FALSE);
+	linphone_core_enable_ipv6(marie->lc, caller_with_ipv6);
+	linphone_core_manager_start(marie, TRUE);
+	
+	pauline = linphone_core_manager_new2( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc", FALSE);
+	linphone_core_enable_ipv6(pauline->lc, callee_with_ipv6);
+	linphone_core_manager_start(pauline, TRUE);
 
 	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
 	BC_ASSERT_TRUE(call(marie,pauline));
-	pauline_call=linphone_core_get_current_call(pauline->lc);
+	pauline_call = linphone_core_get_current_call(pauline->lc);
+	marie_call = linphone_core_get_current_call(marie->lc);
 	BC_ASSERT_PTR_NOT_NULL(pauline_call);
-	if (pauline_call){
+	BC_ASSERT_PTR_NOT_NULL(marie_call);
+	if (pauline_call && marie_call){
 		/*check that the remote contact is IPv6*/
-		const char *contact=linphone_call_get_remote_contact(pauline_call);
-		LinphoneAddress *ct_addr;
-
-		BC_ASSERT_PTR_NOT_NULL(contact);
-		if (contact){
-			ct_addr=linphone_address_new(contact);
-			BC_ASSERT_PTR_NOT_NULL(ct_addr);
-			if (ct_addr){
-				BC_ASSERT_PTR_NOT_NULL(strchr(linphone_address_get_domain(ct_addr),':'));
-			}
-			linphone_address_destroy(ct_addr);
-		}
-
+		BC_ASSERT_EQUAL(is_remote_contact_ipv6(pauline_call), caller_with_ipv6, int, "%i");
+		BC_ASSERT_EQUAL(is_remote_contact_ipv6(marie_call), callee_with_ipv6, int, "%i");
+		
+		/*check that the RTP destinations are IPv6 (flexisip should propose an IPv6 relay for parties with IPv6)*/
+		BC_ASSERT_EQUAL(is_sending_ipv6(marie_call->sessions[0].rtp_session, FALSE), caller_with_ipv6, int, "%i");
+		BC_ASSERT_EQUAL(is_sending_ipv6(marie_call->sessions[0].rtp_session, TRUE), caller_with_ipv6, int, "%i");
+		BC_ASSERT_EQUAL(is_sending_ipv6(pauline_call->sessions[0].rtp_session, FALSE), callee_with_ipv6, int, "%i");
+		BC_ASSERT_EQUAL(is_sending_ipv6(pauline_call->sessions[0].rtp_session, TRUE), callee_with_ipv6, int, "%i");
+		
 	}
 
 	liblinphone_tester_check_rtcp(marie,pauline);
 	end_call(marie,pauline);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-	liblinphone_tester_enable_ipv6(FALSE);
 
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 	ortp_exit();
 }
 
+static void call_with_ipv6(void){
+	_call_with_ipv6(TRUE, TRUE);
+}
+
+static void call_ipv4_to_ipv6(void){
+	_call_with_ipv6(FALSE, TRUE);
+}
+
+static void call_ipv6_to_ipv4(void){
+	_call_with_ipv6(TRUE, FALSE);
+}
+
 static void file_transfer_message_rcs_to_external_body_client(void) {
 	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc");
 		LinphoneChatRoom* chat_room;
 		LinphoneChatMessage* message;
 		LinphoneChatMessageCbs *cbs;
@@ -731,13 +779,20 @@ static void file_transfer_message_rcs_to_external_body_client(void) {
 		size_t file_size;
 		char *send_filepath = bc_tester_res("images/nowebcamCIF.jpg");
 		char *receive_filepath = bc_tester_file("receive_file.dump");
-		LinphoneCoreManager* pauline = linphone_core_manager_init( "pauline_rc");
+		LinphoneCoreManager* marie = linphone_core_manager_new2( "marie_rc", FALSE);
+		LinphoneCoreManager* pauline = linphone_core_manager_new2( "pauline_rc", FALSE);
+		// This is done to prevent register to be sent before the custom header is set
+		linphone_core_set_network_reachable(marie->lc, FALSE);
+		linphone_core_set_network_reachable(pauline->lc, FALSE);
 
 		linphone_proxy_config_set_custom_header(marie->lc->default_proxy, "Accept", "application/sdp");
-		linphone_core_manager_start(marie, "marie_rc", TRUE);
+		linphone_core_set_network_reachable(marie->lc, TRUE);
+		linphone_core_manager_start(marie, TRUE);
+
 
 		linphone_proxy_config_set_custom_header(pauline->lc->default_proxy, "Accept", "application/sdp, text/plain, application/vnd.gsma.rcs-ft-http+xml");
-		linphone_core_manager_start(pauline, "pauline_rc", TRUE);
+		linphone_core_set_network_reachable(pauline->lc, TRUE);
+		linphone_core_manager_start(pauline, TRUE);
 
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
@@ -772,7 +827,7 @@ static void file_transfer_message_rcs_to_external_body_client(void) {
 		linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_file_transfer_send);
 		linphone_chat_room_send_chat_message(chat_room,message);
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageExtBodyReceived,1));
-		fclose(file_to_send);
+
 		if (marie->stat.last_received_chat_message ) {
 			cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
 			linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
@@ -781,16 +836,16 @@ static void file_transfer_message_rcs_to_external_body_client(void) {
 		}
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageFileTransferDone,1));
 
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
+		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,2, int, "%d");
 		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
 		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived,1, int, "%d");
-		BC_ASSERT_TRUE(compare_files(send_filepath, receive_filepath));
+		compare_files(send_filepath, receive_filepath);
 
 		linphone_content_unref(content);
 		linphone_core_manager_destroy(marie);
 		linphone_core_manager_destroy(pauline);
 		ms_free(send_filepath);
-		ms_free(receive_filepath);
+		bc_free(receive_filepath);
 	}
 }
 
@@ -818,18 +873,21 @@ void send_file_transfer_message_using_external_body_url(LinphoneCoreManager *mar
 
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress, 1, int, "%d");
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived, 1, int, "%d");
+
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneMessageDelivered, 1));
+
 }
 
 static void file_transfer_message_external_body_to_external_body_client(void) {
 	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc");
-		LinphoneCoreManager* pauline = linphone_core_manager_init( "pauline_rc");
+		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 
 		linphone_proxy_config_set_custom_header(marie->lc->default_proxy, "Accept", "application/sdp");
-		linphone_core_manager_start(marie, "marie_rc", TRUE);
+		linphone_core_manager_start(marie, TRUE);
 
 		linphone_proxy_config_set_custom_header(pauline->lc->default_proxy, "Accept", "application/sdp");
-		linphone_core_manager_start(pauline, "pauline_rc", TRUE);
+		linphone_core_manager_start(pauline, TRUE);
 
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
@@ -846,14 +904,14 @@ static void file_transfer_message_external_body_to_external_body_client(void) {
 
 static void file_transfer_message_external_body_to_rcs_client(void) {
 	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc");
-		LinphoneCoreManager* pauline = linphone_core_manager_init( "pauline_rc");
+		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 
 		linphone_proxy_config_set_custom_header(marie->lc->default_proxy, "Accept", "application/sdp");
-		linphone_core_manager_start(marie, "marie_rc", TRUE);
+		linphone_core_manager_start(marie, TRUE);
 
 		linphone_proxy_config_set_custom_header(pauline->lc->default_proxy, "Accept", "application/sdp, text/plain, application/vnd.gsma.rcs-ft-http+xml");
-		linphone_core_manager_start(pauline, "pauline_rc", TRUE);
+		linphone_core_manager_start(pauline, TRUE);
 
 		reset_counters(&marie->stat);
 		reset_counters(&pauline->stat);
@@ -868,8 +926,10 @@ static void file_transfer_message_external_body_to_rcs_client(void) {
 static void dos_module_trigger(void) {
 	LinphoneChatRoom *chat_room;
 	int i = 0;
+	int dummy = 0;
 	const char* passmsg = "This one should pass through";
 	int number_of_messge_to_send = 100;
+	LinphoneChatMessage * chat_msg = NULL;
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 
@@ -881,19 +941,20 @@ static void dos_module_trigger(void) {
 	do {
 		char msg[128];
 		sprintf(msg, "Flood message number %i", i);
-		linphone_chat_room_send_message(chat_room, msg);
-		ms_usleep(10000);
+		chat_msg = linphone_chat_room_create_message(chat_room, msg);
+		linphone_chat_room_send_chat_message(chat_room, chat_msg);
+		wait_for_until(marie->lc, pauline->lc, &dummy, 1, 10);
 		i++;
 	} while (i < number_of_messge_to_send);
 	// At this point we should be banned for a minute
 
-	ms_usleep(65000000); // Wait several seconds to ensure we are not banned anymore
+	wait_for_until(marie->lc, pauline->lc, &dummy, 1, 65000);; // Wait several seconds to ensure we are not banned anymore
 	BC_ASSERT_LOWER(marie->stat.number_of_LinphoneMessageReceived, number_of_messge_to_send, int, "%d");
 
 	reset_counters(&marie->stat);
 	reset_counters(&pauline->stat);
-
-	linphone_chat_room_send_message(chat_room, passmsg);
+	chat_msg = linphone_chat_room_create_message(chat_room, passmsg);
+	linphone_chat_room_send_chat_message(chat_room, chat_msg);
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived, 1));
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceived, 1, int, "%d");
 	if (marie->stat.last_received_chat_message) {
@@ -903,36 +964,266 @@ static void dos_module_trigger(void) {
 	linphone_core_manager_destroy(pauline);
 }
 
+#if HAVE_SIPP
+static void test_subscribe_notify_with_sipp_publisher(void) {
+	char *scen;
+	FILE * sipp_out;
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	/*just to get an identity*/
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneAddress *sip_example_org;
+	const LinphoneAuthInfo	*marie_auth = linphone_core_find_auth_info(marie->lc, NULL, linphone_address_get_username(marie->identity), NULL);
+	LpConfig *pauline_lp = linphone_core_get_config(pauline->lc);
+	char* lf_identity=linphone_address_as_string_uri_only(marie->identity);
+	LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
+
+	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+
+	ms_free(lf_identity);
+
+	lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);
+
+	linphone_core_add_friend(pauline->lc,lf);
+
+	/*wait for subscribe acknowledgment*/
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,pauline->lc,&pauline->stat.number_of_NotifyPresenceReceived,1,2000));
+	BC_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf), int, "%d");
+
+	scen = bc_tester_res("sipp/simple_publish.xml");
+
+	sip_example_org = linphone_core_manager_resolve(marie, marie->identity);
+	sipp_out = sip_start(scen, linphone_address_get_username(marie->identity), linphone_auth_info_get_passwd(marie_auth), sip_example_org);
+	linphone_address_destroy(sip_example_org);
+
+	if (sipp_out) {
+		/*wait for marie status*/
+		BC_ASSERT_TRUE(wait_for_until(pauline->lc,pauline->lc,&pauline->stat.number_of_NotifyPresenceReceived,2,3000));
+		BC_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf), int, "%d");
+		BC_ASSERT_EQUAL(0,pclose(sipp_out),int,"%d");
+	}
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+//does not work because sipp seams not able to manage 2 call  id in case file
+#if 0
+static void test_subscribe_notify_with_sipp_publisher_double_publish(void) {
+	char *scen;
+	FILE * sipp_out;
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+	/*just to get an identity*/
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneAddress *sip_example_org;
+
+	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+
+	LpConfig *pauline_lp = linphone_core_get_config(pauline->lc);
+	char* lf_identity=linphone_address_as_string_uri_only(marie->identity);
+	LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
+	ms_free(lf_identity);
+	lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);
+
+	linphone_core_add_friend(pauline->lc,lf);
+
+	/*wait for subscribe acknowledgment*/
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,pauline->lc,&pauline->stat.number_of_NotifyPresenceReceived,1,2000));
+	BC_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf), int, "%d");
+
+	scen = bc_tester_res("sipp/double_publish_with_error.xml");
+
+	sip_example_org = linphone_core_manager_resolve(marie, marie->identity);
+	sipp_out = sip_start(scen, linphone_address_get_username(marie->identity), sip_example_org);
+
+	if (sipp_out) {
+		/*wait for marie status*/
+		BC_ASSERT_TRUE(wait_for_until(pauline->lc,pauline->lc,&pauline->stat.number_of_NotifyPresenceReceived,2,3000));
+		BC_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf), int, "%d");
+		pclose(sipp_out);
+		BC_ASSERT_EQUAL(pauline->stat.number_of_NotifyPresenceReceived,2,int, "%d");
+	}
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+#endif
+#endif
+
+static void test_publish_unpublish(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneProxyConfig* proxy;
+
+	proxy = linphone_core_get_default_proxy_config(marie->lc);
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,TRUE);
+	linphone_proxy_config_done(proxy);
+	wait_for(marie->lc, NULL, NULL, 0);
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,FALSE);
+	linphone_proxy_config_done(proxy);
+	wait_for(marie->lc, NULL, NULL, 0);
+	linphone_core_manager_destroy(marie);
+}
+
+static void test_list_subscribe (void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp");
+
+	char *list =	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+					"<resource-lists xmlns=\"urn:ietf:params:xml:ns:resource-lists\"\n"
+					"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n"
+					"<list>\n"
+						"\t<entry uri=\"%s\" />\n"
+						"\t<entry uri=\"%s\" />\n"
+						"\t<entry uri=\"sip:+33952@toto.com;user=phone\" />\n"
+					"</list>\n"
+					"</resource-lists>\n";
+
+
+	LinphoneEvent *lev;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,marie->lc);
+	char * pauline_uri=linphone_address_as_string_uri_only(pauline->identity);
+	char * laure_uri=linphone_address_as_string_uri_only(laure->identity);
+	char * subscribe_content = ms_strdup_printf(list,pauline_uri,laure_uri);
+	LinphoneContent* content = linphone_core_create_content(marie->lc);
+	LinphoneAddress *list_name = linphone_address_new("sip:mescops@sip.example.org");
+	LinphoneProxyConfig* proxy_config;
+	int dummy=0;
+
+	ms_free(pauline_uri);
+	ms_free(laure_uri);
+
+	lcs=bctbx_list_append(lcs,pauline->lc);
+	lcs=bctbx_list_append(lcs,laure->lc);
+
+	linphone_content_set_type(content,"application");
+	linphone_content_set_subtype(content,"resource-lists+xml");
+	linphone_content_set_buffer(content,subscribe_content,strlen(subscribe_content));
+
+	lev=linphone_core_create_subscribe(marie->lc,list_name,"presence",60);
+
+	linphone_event_add_custom_header(lev,"Supported","eventlist");
+	linphone_event_add_custom_header(lev,"Accept","application/pidf+xml, application/rlmi+xml");
+	linphone_event_add_custom_header(lev,"Content-Disposition", "recipient-list");
+	linphone_event_add_custom_header(lev,"Require", "recipient-list-subscribe");
+
+	linphone_event_send_subscribe(lev,content);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionOutgoingProgress,1,1000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionActive,1,5000));
+
+	/*make sure marie receives first notification before terminating*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,5000));
+	/*dummy wait to avoid derred notify*/
+	wait_for_list(lcs,&dummy,1,2000);
+	proxy_config = linphone_core_get_default_proxy_config(pauline->lc);
+	linphone_proxy_config_edit(proxy_config);
+	linphone_proxy_config_enable_publish(proxy_config,TRUE);
+	linphone_proxy_config_done(proxy_config);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,2,5000));
+
+	proxy_config = linphone_core_get_default_proxy_config(laure->lc);
+	linphone_proxy_config_edit(proxy_config);
+	linphone_proxy_config_enable_publish(proxy_config,TRUE);
+	linphone_proxy_config_done(proxy_config);
+	/*make sure notify is not sent "imadiatly but defered*/
+	BC_ASSERT_FALSE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,3,1000));
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,3,5000));
+
+	linphone_event_terminate(lev);
+
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneSubscriptionTerminated,1,5000));
+
+	ms_free(subscribe_content);
+	linphone_address_destroy(list_name);
+	linphone_content_unref(content);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(laure);
+}
+
+#if HAVE_SIPP
+static void test_subscribe_on_wrong_dialog(void) {
+	char *scen;
+	FILE * sipp_out;
+	/*just to get an identity*/
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	const LinphoneAuthInfo	*marie_auth = linphone_core_find_auth_info(marie->lc, NULL, linphone_address_get_username(marie->identity), NULL);
+	LinphoneAddress *sip_example_org;
+
+	scen = bc_tester_res("sipp/subscribe_on_wrong_dialog.xml");
+	sip_example_org = linphone_core_manager_resolve(marie, marie->identity);
+	sipp_out = sip_start(scen, linphone_address_get_username(marie->identity),linphone_auth_info_get_passwd(marie_auth), sip_example_org);
+	linphone_address_destroy(sip_example_org);
+
+	if (sipp_out) {
+		/*wait for marie status*/
+		BC_ASSERT_EQUAL(0, pclose(sipp_out),int,"%d");
+	}
+
+	linphone_core_manager_destroy(marie);
+}
+#endif
+
+static void publish_subscribe(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneCoreManager* marie2 = NULL;
+	LinphoneAddress *marie_identity = linphone_address_ref(marie->identity);
+	
+	linphone_core_set_network_reachable(marie->lc, FALSE);
+	linphone_core_manager_destroy(marie);
+	
+	linphone_core_invite_address(pauline->lc, marie_identity);
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneCallOutgoingProgress, 1, 3000));
+	
+	marie2 = linphone_core_manager_new("marie2_rc");
+	BC_ASSERT_TRUE(wait_for_until(marie2->lc, NULL, &marie2->stat.number_of_LinphoneCallIncomingReceived, 1, 3000));
+	
+	linphone_address_unref(marie_identity);
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(marie2);
+}
+
 test_t flexisip_tests[] = {
-	{ "Subscribe forking", subscribe_forking },
-	{ "Message forking", message_forking },
-	{ "Message forking with unreachable recipients", message_forking_with_unreachable_recipients },
-	{ "Message forking with all recipients unreachable", message_forking_with_all_recipients_unreachable},
-	{ "Call forking", call_forking },
-	{ "Call forking cancelled", call_forking_cancelled },
-	{ "Call forking declined globaly", call_forking_declined_globaly },
-	{ "Call forking declined localy", call_forking_declined_localy },
-	{ "Call forking with urgent reply", call_forking_with_urgent_reply },
-	{ "Call forking with push notification (single)", call_forking_with_push_notification_single },
-	{ "Call forking with push notification (multiple)", call_forking_with_push_notification_multiple },
-	{ "Call forking not responded", call_forking_not_responded },
-	{ "Early-media call forking", early_media_call_forking },
-	{ "Call with sips", call_with_sips },
-	{ "Call with sips not achievable", call_with_sips_not_achievable },
-	{ "Call with ipv6", call_with_ipv6 },
-	{ "File transfer message rcs to external body client", file_transfer_message_rcs_to_external_body_client },
-	{ "File transfer message external body to rcs client", file_transfer_message_external_body_to_rcs_client },
-	{ "File transfer message external body to external body client", file_transfer_message_external_body_to_external_body_client },
-	{ "DoS module trigger by sending a lot of chat messages", dos_module_trigger }
+	TEST_ONE_TAG("Subscribe forking", subscribe_forking, "LeaksMemory"),
+	TEST_NO_TAG("Message forking", message_forking),
+	TEST_NO_TAG("Message forking with unreachable recipients", message_forking_with_unreachable_recipients),
+	TEST_NO_TAG("Message forking with all recipients unreachable", message_forking_with_all_recipients_unreachable),
+	TEST_NO_TAG("Call forking", call_forking),
+	TEST_NO_TAG("Call forking cancelled", call_forking_cancelled),
+	TEST_NO_TAG("Call forking declined globaly", call_forking_declined_globaly),
+	TEST_NO_TAG("Call forking declined localy", call_forking_declined_localy),
+	TEST_NO_TAG("Call forking with urgent reply", call_forking_with_urgent_reply),
+	TEST_NO_TAG("Call forking with push notification (single)", call_forking_with_push_notification_single),
+	TEST_NO_TAG("Call forking with push notification (multiple)", call_forking_with_push_notification_multiple),
+	TEST_NO_TAG("Call forking not responded", call_forking_not_responded),
+	TEST_NO_TAG("Early-media call forking", early_media_call_forking),
+	TEST_NO_TAG("Call with sips", call_with_sips),
+	TEST_NO_TAG("Call with sips not achievable", call_with_sips_not_achievable),
+	TEST_NO_TAG("Call ipv6 to ipv6", call_with_ipv6),
+	TEST_NO_TAG("Call ipv6 to ipv4", call_ipv6_to_ipv4),
+	TEST_NO_TAG("Call ipv4 to ipv6", call_ipv4_to_ipv6),
+#if HAVE_SIPP
+	TEST_ONE_TAG("Subscribe Notify with sipp publisher", test_subscribe_notify_with_sipp_publisher, "LeaksMemory"),
+	/*TEST_ONE_TAG("Subscribe Notify with sipp double publish", test_subscribe_notify_with_sipp_publisher_double_publish, "LeaksMemory"),*/
+#endif
+	TEST_NO_TAG("Publish/unpublish", test_publish_unpublish),
+	TEST_NO_TAG("List subscribe", test_list_subscribe),
+	TEST_NO_TAG("File transfer message rcs to external body client", file_transfer_message_rcs_to_external_body_client),
+	TEST_ONE_TAG("File transfer message external body to rcs client", file_transfer_message_external_body_to_rcs_client, "LeaksMemory"),
+	TEST_ONE_TAG("File transfer message external body to external body client", file_transfer_message_external_body_to_external_body_client, "LeaksMemory"),
+	TEST_NO_TAG("DoS module trigger by sending a lot of chat messages", dos_module_trigger),
+#if HAVE_SIPP
+	TEST_NO_TAG("Subscribe on wrong dialog", test_subscribe_on_wrong_dialog),
+#endif
+	TEST_NO_TAG("Publish/subscribe", publish_subscribe)
 };
 
-
-test_suite_t flexisip_test_suite = {
-	"Flexisip",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(flexisip_tests) / sizeof(flexisip_tests[0]),
-	flexisip_tests
-};
-
-
+test_suite_t flexisip_test_suite = {"Flexisip", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+									sizeof(flexisip_tests) / sizeof(flexisip_tests[0]), flexisip_tests};
diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index d49c890de..1e33d6c78 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -20,20 +20,32 @@
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
-#if HAVE_CU_CURSES
-#include "CUnit/CUCurses.h"
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
 #endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#endif
+
 #ifdef HAVE_GTK
 #include <gtk/gtk.h>
 #endif
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
+
 static FILE * log_file = NULL;
 
 #ifdef ANDROID
 
 #include <android/log.h>
 #include <jni.h>
-#include <CUnit/Util.h>
 #define CALLBACK_BUFFER_SIZE  1024
 
 static JNIEnv *current_env = NULL;
@@ -62,7 +74,7 @@ void liblinphone_android_log_handler(int prio, const char *fmt, va_list args) {
 	}
 }
 
-static void liblinphone_android_ortp_log_handler(OrtpLogLevel lev, const char *fmt, va_list args) {
+static void liblinphone_android_ortp_log_handler(const char *domain, OrtpLogLevel lev, const char *fmt, va_list args) {
 	int prio;
 	switch(lev){
 		case ORTP_DEBUG:	prio = ANDROID_LOG_DEBUG;	break;
@@ -75,15 +87,31 @@ static void liblinphone_android_ortp_log_handler(OrtpLogLevel lev, const char *f
 	liblinphone_android_log_handler(prio, fmt, args);
 }
 
-void cunit_android_trace_handler(int level, const char *fmt, va_list args) {
+static void liblinphone_android_bctbx_log_handler(const char *domain, BctbxLogLevel lev, const char *fmt, va_list args) {
+	int prio;
+	switch(lev){
+		case BCTBX_LOG_DEBUG:	prio = ANDROID_LOG_DEBUG;	break;
+		case BCTBX_LOG_MESSAGE:	prio = ANDROID_LOG_INFO;	break;
+		case BCTBX_LOG_WARNING:	prio = ANDROID_LOG_WARN;	break;
+		case BCTBX_LOG_ERROR:	prio = ANDROID_LOG_ERROR;	break;
+		case BCTBX_LOG_FATAL:	prio = ANDROID_LOG_FATAL;	break;
+		default:			prio = ANDROID_LOG_DEFAULT;	break;
+	}
+	liblinphone_android_log_handler(prio, fmt, args);
+}
+
+void bcunit_android_trace_handler(int level, const char *fmt, va_list args) {
 	char buffer[CALLBACK_BUFFER_SIZE];
+	jstring javaString;
+	jclass cls;
+	jmethodID method;
+	jint javaLevel = level;
 	JNIEnv *env = current_env;
 	if(env == NULL) return;
 	vsnprintf(buffer, CALLBACK_BUFFER_SIZE, fmt, args);
-	jstring javaString = (*env)->NewStringUTF(env, buffer);
-	jint javaLevel = level;
-	jclass cls = (*env)->GetObjectClass(env, current_obj);
-	jmethodID method = (*env)->GetMethodID(env, cls, "printLog", "(ILjava/lang/String;)V");
+	javaString = (*env)->NewStringUTF(env, buffer);
+	cls = (*env)->GetObjectClass(env, current_obj);
+	method = (*env)->GetMethodID(env, cls, "printLog", "(ILjava/lang/String;)V");
 	(*env)->CallVoidMethod(env, current_obj, method, javaLevel, javaString);
 	(*env)->DeleteLocalRef(env,javaString);
 	(*env)->DeleteLocalRef(env,cls);
@@ -102,10 +130,10 @@ JNIEXPORT jint JNICALL Java_org_linphone_tester_Tester_run(JNIEnv *env, jobject
 	}
 	current_env = env;
 	current_obj = obj;
-	CU_set_trace_handler(cunit_android_trace_handler);
+	bc_set_trace_handler(bcunit_android_trace_handler);
 	ret = main(argc, argv);
 	current_env = NULL;
-	CU_set_trace_handler(NULL);
+	bc_set_trace_handler(NULL);
 	for (i=0; i<argc; i++) {
 		free(argv[i]);
 	}
@@ -122,12 +150,6 @@ JNIEXPORT void JNICALL Java_org_linphone_tester_Tester_clearAccounts(JNIEnv *env
 }
 #endif /* ANDROID */
 
-#ifdef __QNX__
-static void liblinphone_tester_qnx_log_handler(OrtpLogLevel lev, const char *fmt, va_list args) {
-	ortp_qnx_log_handler("liblinphone_tester", lev, fmt, args);
-}
-#endif /* __QNX__ */
-
 static void log_handler(int lev, const char *fmt, va_list args) {
 #ifdef _WIN32
 	vfprintf(lev == ORTP_ERROR ? stderr : stdout, fmt, args);
@@ -137,7 +159,7 @@ static void log_handler(int lev, const char *fmt, va_list args) {
 	va_copy(cap,args);
 #ifdef ANDROID
 	/* IMPORTANT: needed by liblinphone tester to retrieve suite list...*/
-	cunit_android_trace_handler(lev == ORTP_ERROR, fmt, cap);
+	bcunit_android_trace_handler(lev == ORTP_ERROR, fmt, cap);
 #else
 	/* Otherwise, we must use stdio to avoid log formatting (for autocompletion etc.) */
 	vfprintf(lev == ORTP_ERROR ? stderr : stdout, fmt, cap);
@@ -146,7 +168,7 @@ static void log_handler(int lev, const char *fmt, va_list args) {
 	va_end(cap);
 #endif
 	if (log_file){
-		ortp_logv_out(lev, fmt, args);
+		ortp_logv_out(ORTP_LOG_DOMAIN, lev, fmt, args);
 	}
 }
 
@@ -154,32 +176,46 @@ void liblinphone_tester_init(void(*ftester_printf)(int level, const char *fmt, v
 	if (! log_file) {
 #if defined(ANDROID)
 		linphone_core_set_log_handler(liblinphone_android_ortp_log_handler);
-#elif defined(__QNX__)
-		linphone_core_set_log_handler(liblinphone_tester_qnx_log_handler);
+		bctbx_set_log_handler(liblinphone_android_bctbx_log_handler);
 #endif
 	}
 
 	if (ftester_printf == NULL) ftester_printf = log_handler;
-	bc_tester_init(ftester_printf, ORTP_MESSAGE, ORTP_ERROR);
+	bc_tester_init(ftester_printf, ORTP_MESSAGE, ORTP_ERROR, "rcfiles");
 	liblinphone_tester_add_suites();
 }
 
-void liblinphone_tester_uninit(void) {
-	bc_tester_uninit();
+int liblinphone_tester_set_log_file(const char *filename) {
+	if (log_file) {
+		fclose(log_file);
+	}
+	log_file = fopen(filename, "w");
+	if (!log_file) {
+		ms_error("Cannot open file [%s] for writing logs because [%s]", filename, strerror(errno));
+		return -1;
+	}
+	ms_message("Redirecting traces to file [%s]", filename);
+	bctbx_set_log_file(log_file);
+	ortp_set_log_file(log_file);
+	return 0;
 }
 
 
-#if !__ios && !(defined(LINPHONE_WINDOWS_PHONE) || defined(LINPHONE_WINDOWS_UNIVERSAL))
+#if !TARGET_OS_IPHONE && !(defined(LINPHONE_WINDOWS_PHONE) || defined(LINPHONE_WINDOWS_UNIVERSAL))
 
 static const char* liblinphone_helper =
 		"\t\t\t--verbose\n"
 		"\t\t\t--silent\n"
 		"\t\t\t--log-file <output log file path>\n"
-		"\t\t\t--config <config path>\n"
 		"\t\t\t--domain <test sip domain>\n"
 		"\t\t\t--auth-domain <test auth domain>\n"
 		"\t\t\t--dns-hosts </etc/hosts -like file to used to override DNS names (default: tester_hosts)>\n"
-		"\t\t\t--keep-recorded-files\n";
+		"\t\t\t--keep-recorded-files\n"
+		"\t\t\t--disable-leak-detector\n"
+		"\t\t\t--disable-tls-support\n"
+		"\t\t\t--no-ipv6 (turn off IPv6 in LinphoneCore, tests requiring IPv6 will be skipped)\n"
+		"\t\t\t--show-account-manager-logs (show temporary test account creation logs)\n"
+		;
 
 int main (int argc, char *argv[])
 {
@@ -195,44 +231,35 @@ int main (int argc, char *argv[])
 #endif
 
 	liblinphone_tester_init(NULL);
-
-	if (strstr(argv[0], ".libs")) {
-		char res_dir[128] = {0};
-		// this allows to launch liblinphone_tester from outside of tester directory
-		strncpy(res_dir, argv[0], strstr(argv[0], ".libs")-argv[0]);
-		bc_tester_set_resource_dir_prefix(res_dir);
-		bc_tester_set_writable_dir_prefix(res_dir);
-	}
+	linphone_core_set_log_level(ORTP_ERROR);
 
 	for(i = 1; i < argc; ++i) {
 		if (strcmp(argv[i], "--verbose") == 0) {
-			linphone_core_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
+			linphone_core_set_log_level(ORTP_MESSAGE);
 		} else if (strcmp(argv[i], "--silent") == 0) {
-			linphone_core_set_log_level_mask(ORTP_FATAL);
+			linphone_core_set_log_level(ORTP_FATAL);
 		} else if (strcmp(argv[i],"--log-file")==0){
 			CHECK_ARG("--log-file", ++i, argc);
-			log_file=fopen(argv[i],"w");
-			if (!log_file) {
-				ms_error("Cannot open file [%s] for writing logs because [%s]",argv[i],strerror(errno));
-				return -2;
-			} else {
-				ms_message("Redirecting traces to file [%s]",argv[i]);
-				ortp_set_log_file(log_file);
-			}
+			if (liblinphone_tester_set_log_file(argv[i]) < 0) return -2;
 		} else if (strcmp(argv[i],"--domain")==0){
 			CHECK_ARG("--domain", ++i, argc);
 			test_domain=argv[i];
 		} else if (strcmp(argv[i],"--auth-domain")==0){
 			CHECK_ARG("--auth-domain", ++i, argc);
 			auth_domain=argv[i];
-		} else if (strcmp(argv[i],"--config")==0){
-			CHECK_ARG("--config", ++i, argc);
-			bc_tester_set_resource_dir_prefix(argv[i]);
 		}else if (strcmp(argv[i],"--dns-hosts")==0){
 			CHECK_ARG("--dns-hosts", ++i, argc);
 			userhostsfile=argv[i];
 		} else if (strcmp(argv[i],"--keep-recorded-files")==0){
 			liblinphone_tester_keep_recorded_files(TRUE);
+		} else if (strcmp(argv[i],"--disable-leak-detector")==0){
+			liblinphone_tester_disable_leak_detector(TRUE);
+		} else if (strcmp(argv[i],"--disable-tls-support")==0){
+			liblinphone_tester_tls_support_disabled = TRUE;
+		} else if (strcmp(argv[i],"--no-ipv6")==0){
+			liblinphonetester_ipv6 = FALSE;
+		} else if (strcmp(argv[i],"--show-account-manager-logs")==0){
+			liblinphonetester_show_account_manager_logs=TRUE;
 		} else {
 			int bret = bc_tester_parse_args(argc, argv, i);
 			if (bret>0) {
@@ -245,8 +272,10 @@ int main (int argc, char *argv[])
 		}
 	}
 
-	ret = bc_tester_start();
+	ret = bc_tester_start(argv[0]);
 	liblinphone_tester_uninit();
 	return ret;
 }
+
+
 #endif
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index c3db2bf5e..77ffd4041 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -22,12 +22,19 @@
 
 
 
-#include "bc_tester_utils.h"
+#include <bctoolbox/tester.h>
 #include "linphonecore.h"
+#include <mediastreamer2/msutils.h>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+
+#ifdef _MSC_VER
+#define popen _popen
+#define pclose _pclose
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -35,8 +42,10 @@ extern "C" {
 extern test_suite_t setup_test_suite;
 extern test_suite_t register_test_suite;
 extern test_suite_t call_test_suite;
+extern test_suite_t call_video_test_suite;
 extern test_suite_t message_test_suite;
 extern test_suite_t presence_test_suite;
+extern test_suite_t presence_server_test_suite;
 extern test_suite_t upnp_test_suite;
 extern test_suite_t event_test_suite;
 extern test_suite_t flexisip_test_suite;
@@ -52,9 +61,17 @@ extern test_suite_t video_test_suite;
 extern test_suite_t multicast_call_test_suite;
 extern test_suite_t multi_call_test_suite;
 extern test_suite_t proxy_config_test_suite;
+#ifdef VCARD_ENABLED
+extern test_suite_t vcard_test_suite;
+#endif
+extern test_suite_t audio_bypass_suite;
+#if HAVE_SIPP
+extern test_suite_t complex_sip_call_test_suite;
+#endif
 extern int manager_count;
 
 extern int liblinphone_tester_ipv6_available(void);
+extern int liblinphone_tester_ipv4_available(void);
 
 /**
  * @brief Tells the tester whether or not to clean the accounts it has created between runs.
@@ -75,6 +92,12 @@ extern void liblinphone_tester_keep_accounts( int keep );
 **/
 void liblinphone_tester_keep_recorded_files(int keep);
 
+/**
+ * @brief Disable the automatic object leak detection. This is useful because the object leak detector prevents valgrind from seeing the leaks.
+ * @details By default object leak detector is enabled.
+**/
+void liblinphone_tester_disable_leak_detector(int disabled);
+
 /**
  * @brief Clears the created accounts during the testing session.
  */
@@ -87,7 +110,11 @@ extern const char* test_username;
 extern const char* test_password;
 extern const char* test_route;
 extern const char* userhostsfile;
-
+extern bool_t liblinphone_tester_tls_support_disabled;
+extern const MSAudioDiffParams audio_cmp_params;
+extern const char *liblinphone_tester_mire_id;
+extern bool_t liblinphonetester_ipv6;
+extern bool_t liblinphonetester_show_account_manager_logs;
 
 typedef struct _stats {
 	int number_of_LinphoneRegistrationNone;
@@ -143,6 +170,8 @@ typedef struct _stats {
 
 	int number_of_NewSubscriptionRequest;
 	int number_of_NotifyReceived;
+	int number_of_NotifyPresenceReceived;
+	int number_of_NotifyPresenceReceivedForUriOrTel;
 	int number_of_LinphonePresenceActivityOffline;
 	int number_of_LinphonePresenceActivityOnline;
 	int number_of_LinphonePresenceActivityAppointment;
@@ -174,11 +203,14 @@ typedef struct _stats {
 	int number_of_LinphonePresenceActivityWorship;
 	const LinphonePresenceModel *last_received_presence;
 
+	int number_of_LinphonePresenceBasicStatusOpen;
+	int number_of_LinphonePresenceBasicStatusClosed;
+
 	int number_of_inforeceived;
 	LinphoneInfoMessage* last_received_info_message;
 
 	int number_of_LinphoneSubscriptionIncomingReceived;
-	int number_of_LinphoneSubscriptionOutgoingInit;
+	int number_of_LinphoneSubscriptionOutgoingProgress;
 	int number_of_LinphoneSubscriptionPending;
 	int number_of_LinphoneSubscriptionActive;
 	int number_of_LinphoneSubscriptionTerminated;
@@ -207,7 +239,8 @@ typedef struct _stats {
 
 	int number_of_LinphoneCallStatsUpdated;
 	int number_of_rtcp_sent;
-	int number_of_rtcp_received;
+	int number_of_rtcp_received; /*total number of rtcp packet received */
+	int number_of_rtcp_received_via_mux;/*number of rtcp packet received in rtcp-mux mode*/
 
 	int number_of_video_windows_created;
 
@@ -216,13 +249,11 @@ typedef struct _stats {
 	int number_of_LinphoneCoreLogCollectionUploadStateNotDelivered;
 	int number_of_LinphoneCoreLogCollectionUploadStateInProgress;
 	int audio_download_bandwidth[3];
-	int *current_audio_download_bandwidth;
 	int audio_upload_bandwidth[3];
-	int *current_audio_upload_bandwidth;
 
 	int video_download_bandwidth[3];
 	int video_upload_bandwidth[3];
-	int current_bandwidth_index;
+	int current_bandwidth_index[2] /*audio and video only*/;
 
 	int number_of_rtcp_generic_nack;
 }stats;
@@ -235,9 +266,17 @@ typedef struct _LinphoneCoreManager {
 	LinphoneAddress* identity;
 	LinphoneEvent *lev;
 	bool_t decline_subscribe;
-	int number_of_cunit_error_at_creation;
+	int number_of_bcunit_error_at_creation;
+	char* phone_alias;
 } LinphoneCoreManager;
 
+typedef struct _LinphoneConferenceServer {
+	LinphoneCoreManager base;
+	LinphoneCall *first_call;
+	LinphoneCoreVTable *vtable;
+	LinphoneRegistrationState reg_state;
+} LinphoneConferenceServer;
+
 typedef struct _LinphoneCallTestParams {
 	LinphoneCallParams *base;
 	bool_t sdp_removal;
@@ -245,13 +284,16 @@ typedef struct _LinphoneCallTestParams {
 } LinphoneCallTestParams;
 
 
-void liblinphone_tester_add_suites();
+void liblinphone_tester_add_suites(void);
 
-LinphoneCoreManager* linphone_core_manager_init(const char* rc_file);
-void linphone_core_manager_start(LinphoneCoreManager *mgr, const char* rc_file, int check_for_proxies);
+void linphone_core_manager_init(LinphoneCoreManager *mgr, const char* rc_file, const char* phone_alias);
+void linphone_core_manager_start(LinphoneCoreManager *mgr, int check_for_proxies);
+LinphoneCoreManager* linphone_core_manager_new3(const char* rc_file, int check_for_proxies, const char* phone_alias);
 LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_for_proxies);
 LinphoneCoreManager* linphone_core_manager_new(const char* rc_file);
 void linphone_core_manager_stop(LinphoneCoreManager *mgr);
+void linphone_core_manager_uninit(LinphoneCoreManager *mgr);
+void linphone_core_manager_wait_for_stun_resolution(LinphoneCoreManager *mgr);
 void linphone_core_manager_destroy(LinphoneCoreManager* mgr);
 
 void reset_counters( stats* counters);
@@ -260,6 +302,7 @@ void registration_state_changed(struct _LinphoneCore *lc, LinphoneProxyConfig *c
 void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg);
 void linphone_transfer_state_changed(LinphoneCore *lc, LinphoneCall *transfered, LinphoneCallState new_call_state);
 void notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf);
+void notify_presence_received_for_uri_or_tel(LinphoneCore *lc, LinphoneFriend *lf, const char *uri_or_tel, const LinphonePresenceModel *presence);
 void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from_address, const char *message);
 void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* message);
 void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer);
@@ -290,12 +333,18 @@ bool_t call_with_test_params(LinphoneCoreManager* caller_mgr
 				,LinphoneCoreManager* callee_mgr
 				,const LinphoneCallTestParams *caller_test_params
 				,const LinphoneCallTestParams *callee_test_params);
+bool_t call_with_params2(LinphoneCoreManager* caller_mgr
+						,LinphoneCoreManager* callee_mgr
+						, const LinphoneCallTestParams *caller_test_params
+						, const LinphoneCallTestParams *callee_test_params
+						, bool_t build_callee_params);
 
 bool_t call(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr);
-bool_t add_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t change_video_policy);
+bool_t request_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee, bool_t use_accept_call_update);
 void end_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2);
 void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate);
 void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mime);
+void disable_all_codecs(const MSList* elem, LinphoneCoreManager* call);
 stats * get_stats(LinphoneCore *lc);
 bool_t transport_supported(LinphoneTransportType transport);
 LinphoneCoreManager *get_manager(LinphoneCore *lc);
@@ -309,18 +358,19 @@ bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms);
 void linphone_core_manager_check_accounts(LinphoneCoreManager *m);
 void account_manager_destroy(void);
 LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, const char* file, void* user_data);
-void liblinphone_tester_enable_ipv6(bool_t enabled);
+
 void linphone_call_iframe_decoded_cb(LinphoneCall *call,void * user_data);
-void call_paused_resumed_base(bool_t multicast);
+void call_paused_resumed_base(bool_t multicast,bool_t with_losses);
 void simple_call_base(bool_t enable_multicast_recv_side);
 void call_base_with_configfile(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel, const char *marie_rc, const char *pauline_rc);
 void call_base(LinphoneMediaEncryption mode, bool_t enable_video,bool_t enable_relay,LinphoneFirewallPolicy policy,bool_t enable_tunnel);
 bool_t call_with_caller_params(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr, const LinphoneCallParams *params);
 bool_t pause_call_1(LinphoneCoreManager* mgr_1,LinphoneCall* call_1,LinphoneCoreManager* mgr_2,LinphoneCall* call_2);
-bool_t compare_files(const char *path1, const char *path2);
+void compare_files(const char *path1, const char *path2);
 void check_media_direction(LinphoneCoreManager* mgr, LinphoneCall *call, MSList* lcs,LinphoneMediaDirection audio_dir, LinphoneMediaDirection video_dir);
-
-static const int audio_cmp_max_shift=10;
+void _call_with_ice_base(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t caller_with_ice, bool_t callee_with_ice, bool_t random_ports, bool_t forced_relay);
+int check_nb_media_starts(LinphoneCoreManager *caller, LinphoneCoreManager *callee, unsigned int caller_nb_media_starts, unsigned int callee_nb_media_starts);
+void record_call(const char *filename, bool_t enableVideo, const char *video_codec);
 
 /*
  * this function return max value in the last 3 seconds*/
@@ -331,11 +381,21 @@ int linphone_core_manager_get_mean_audio_up_bw(const LinphoneCoreManager *mgr);
 
 void video_call_base_2(LinphoneCoreManager* pauline,LinphoneCoreManager* marie, bool_t using_policy,LinphoneMediaEncryption mode, bool_t callee_video_enabled, bool_t caller_video_enabled);
 
-int liblinphone_tester_setup();
+void liblinphone_tester_before_each(void);
+void liblinphone_tester_after_each(void);
 void liblinphone_tester_init(void(*ftester_printf)(int level, const char *fmt, va_list args));
 void liblinphone_tester_uninit(void);
+int liblinphone_tester_set_log_file(const char *filename);
+bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee, LinphoneIceState state);
 
-extern const char *liblinphone_tester_mire_id;
+
+LinphoneConferenceServer* linphone_conference_server_new(const char *rc_file, bool_t do_registration);
+void linphone_conference_server_destroy(LinphoneConferenceServer *conf_srv);
+
+LinphoneAddress * linphone_core_manager_resolve(LinphoneCoreManager *mgr, const LinphoneAddress *source);
+FILE *sip_start(const char *senario, const char* dest_username, const char *passwd, LinphoneAddress* dest_addres);
+
+void early_media_without_sdp_in_200_base( bool_t use_video, bool_t use_ice );
 
 
 #ifdef __cplusplus
diff --git a/tester/liblinphone_tester_ios.m b/tester/liblinphone_tester_ios.m
new file mode 100644
index 000000000..424da58d5
--- /dev/null
+++ b/tester/liblinphone_tester_ios.m
@@ -0,0 +1,67 @@
+/*
+ linphone library - modular sound and video processing and streaming
+ Copyright (C) 2006-2014 Belledonne Communications, Grenoble
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#if TARGET_OS_IPHONE
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#include <AudioToolbox/AudioToolbox.h>
+#include <CoreFoundation/CFRunLoop.h>
+#include "liblinphone_tester.h"
+
+int g_argc;
+char** g_argv;
+void stop_handler(int sig) {
+    return;
+}
+
+static void* _apple_main(void* data) {
+    NSString *bundlePath = [[[NSBundle mainBundle] bundlePath] retain];
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentPath = [[paths objectAtIndex:0] retain];
+
+    NSLog(@"Bundle path: %@", bundlePath);
+	NSLog(@"Document path: %@", documentPath);
+
+    bc_tester_set_resource_dir_prefix(bundlePath.UTF8String);
+    bc_tester_set_writable_dir_prefix(documentPath.UTF8String);
+
+	liblinphone_tester_init(NULL);
+	bc_tester_start(NULL);
+	liblinphone_tester_uninit();
+
+    [bundlePath release];
+    [documentPath release];
+    return NULL;
+}
+int main(int argc, char * argv[]) {
+    pthread_t main_thread;
+    g_argc=argc;
+    g_argv=argv;
+    pthread_create(&main_thread,NULL,_apple_main,NULL);
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    int value = UIApplicationMain(0, nil, nil, nil);
+    [pool release];
+    return value;
+    pthread_join(main_thread,NULL);
+    return 0;
+}
+
+
+#endif // target IPHONE
diff --git a/tester/liblinphone_tester_windows.cpp b/tester/liblinphone_tester_windows.cpp
index 30b480a8c..1748e712b 100644
--- a/tester/liblinphone_tester_windows.cpp
+++ b/tester/liblinphone_tester_windows.cpp
@@ -2,7 +2,7 @@
 
 #include "liblinphone_tester_windows.h"
 
-using namespace liblinphone_tester_runtime_component;
+using namespace BelledonneCommunications::Linphone::Tester;
 using namespace Platform;
 using namespace Windows::Foundation;
 using namespace Windows::Storage;
@@ -14,7 +14,7 @@ using namespace Windows::System::Threading;
 
 static OutputTraceListener^ sTraceListener;
 
-LibLinphoneTester^ LibLinphoneTester::_instance = ref new LibLinphoneTester();
+NativeTester^ NativeTester::_instance = ref new NativeTester();
 
 static void nativeOutputTraceHandler(int lev, const char *fmt, va_list args)
 {
@@ -45,47 +45,53 @@ static void nativeOutputTraceHandler(int lev, const char *fmt, va_list args)
 	}
 }
 
-static void libLinphoneNativeOutputTraceHandler(OrtpLogLevel lev, const char *fmt, va_list args)
+static void libLinphoneNativeOutputTraceHandler(const char *domain, OrtpLogLevel lev, const char *fmt, va_list args)
 {
 	nativeOutputTraceHandler((int)lev, fmt, args);
 }
 
 
-LibLinphoneTester::LibLinphoneTester()
+NativeTester::NativeTester()
 {
-	liblinphone_tester_init(nativeOutputTraceHandler);
-	bc_tester_set_resource_dir_prefix("Assets");
 }
 
-LibLinphoneTester::~LibLinphoneTester()
+NativeTester::~NativeTester()
 {
 	liblinphone_tester_uninit();
 }
 
-void LibLinphoneTester::setWritableDirectory(StorageFolder^ folder)
-{
-	char writable_dir[MAX_WRITABLE_DIR_SIZE] = { 0 };
-	const wchar_t *wwritable_dir = folder->Path->Data();
-	wcstombs(writable_dir, wwritable_dir, sizeof(writable_dir));
-	bc_tester_set_writable_dir_prefix(writable_dir);
-}
-
-void LibLinphoneTester::setOutputTraceListener(OutputTraceListener^ traceListener)
+void NativeTester::setOutputTraceListener(OutputTraceListener^ traceListener)
 {
 	sTraceListener = traceListener;
 }
 
-void LibLinphoneTester::init(bool verbose)
+void NativeTester::initialize(StorageFolder^ writableDirectory, Platform::Boolean ui)
 {
-	if (verbose) {
+	if (ui) {
+		liblinphone_tester_init(nativeOutputTraceHandler);
+	} else {
+		liblinphone_tester_init(NULL);
 		linphone_core_set_log_level_mask((OrtpLogLevel)(ORTP_MESSAGE | ORTP_WARNING | ORTP_ERROR | ORTP_FATAL));
 	}
-	else {
-		linphone_core_set_log_level_mask(ORTP_FATAL);
+
+	char writable_dir[MAX_WRITABLE_DIR_SIZE] = { 0 };
+	const wchar_t *wwritable_dir = writableDirectory->Path->Data();
+	wcstombs(writable_dir, wwritable_dir, sizeof(writable_dir));
+	bc_tester_set_writable_dir_prefix(writable_dir);
+	bc_tester_set_resource_dir_prefix("Assets");
+
+	if (!ui) {
+		char *xmlFile = bc_tester_file("LibLinphoneWindows10.xml");
+		char *args[] = { "--xml-file", xmlFile };
+		bc_tester_parse_args(2, args, 0);
+
+		char *logFile = bc_tester_file("LibLinphoneWindows10.log");
+		liblinphone_tester_set_log_file(logFile);
+		free(logFile);
 	}
 }
 
-bool LibLinphoneTester::run(Platform::String^ suiteName, Platform::String^ caseName, Platform::Boolean verbose)
+bool NativeTester::run(Platform::String^ suiteName, Platform::String^ caseName, Platform::Boolean verbose)
 {
 	std::wstring all(L"ALL");
 	std::wstring wssuitename = suiteName->Data();
@@ -95,36 +101,31 @@ bool LibLinphoneTester::run(Platform::String^ suiteName, Platform::String^ caseN
 	wcstombs(csuitename, wssuitename.c_str(), sizeof(csuitename));
 	wcstombs(ccasename, wscasename.c_str(), sizeof(ccasename));
 
-	init(verbose);
+	if (verbose) {
+		linphone_core_set_log_level_mask((OrtpLogLevel)(ORTP_MESSAGE | ORTP_WARNING | ORTP_ERROR | ORTP_FATAL));
+	}
+	else {
+		linphone_core_set_log_level_mask(ORTP_FATAL);
+	}
 	linphone_core_set_log_handler(libLinphoneNativeOutputTraceHandler);
-	return bc_tester_run_tests(wssuitename == all ? 0 : csuitename, wscasename == all ? 0 : ccasename) != 0;
+	return bc_tester_run_tests(wssuitename == all ? 0 : csuitename, wscasename == all ? 0 : ccasename, NULL) != 0;
 }
 
-void LibLinphoneTester::runAllToXml()
+void NativeTester::runAllToXml()
 {
 	auto workItem = ref new WorkItemHandler([this](IAsyncAction ^workItem) {
-		char *xmlFile = bc_tester_file("LibLinphoneWindows10.xml");
-		char *logFile = bc_tester_file("LibLinphoneWindows10.log");
-		char *args[] = { "--xml-file", xmlFile };
-		bc_tester_parse_args(2, args, 0);
-		init(true);
-		FILE *f = fopen(logFile, "w");
-		ortp_set_log_file(f);
-		bc_tester_start();
+		bc_tester_start(NULL);
 		bc_tester_uninit();
-		fclose(f);
-		free(xmlFile);
-		free(logFile);
 	});
 	_asyncAction = ThreadPool::RunAsync(workItem);
 }
 
-unsigned int LibLinphoneTester::nbTestSuites()
+unsigned int NativeTester::nbTestSuites()
 {
 	return bc_tester_nb_suites();
 }
 
-unsigned int LibLinphoneTester::nbTests(Platform::String^ suiteName)
+unsigned int NativeTester::nbTests(Platform::String^ suiteName)
 {
 	std::wstring suitename = suiteName->Data();
 	char cname[MAX_SUITE_NAME_SIZE] = { 0 };
@@ -132,7 +133,7 @@ unsigned int LibLinphoneTester::nbTests(Platform::String^ suiteName)
 	return bc_tester_nb_tests(cname);
 }
 
-Platform::String^ LibLinphoneTester::testSuiteName(int index)
+Platform::String^ NativeTester::testSuiteName(int index)
 {
 	const char *cname = bc_tester_suite_name(index);
 	wchar_t wcname[MAX_SUITE_NAME_SIZE];
@@ -140,7 +141,7 @@ Platform::String^ LibLinphoneTester::testSuiteName(int index)
 	return ref new String(wcname);
 }
 
-Platform::String^ LibLinphoneTester::testName(Platform::String^ suiteName, int testIndex)
+Platform::String^ NativeTester::testName(Platform::String^ suiteName, int testIndex)
 {
 	std::wstring suitename = suiteName->Data();
 	char csuitename[MAX_SUITE_NAME_SIZE] = { 0 };
diff --git a/tester/liblinphone_tester_windows.h b/tester/liblinphone_tester_windows.h
index 08d60ddfd..dec64cb48 100644
--- a/tester/liblinphone_tester_windows.h
+++ b/tester/liblinphone_tester_windows.h
@@ -3,40 +3,45 @@
 #include "linphonecore.h"
 #include "liblinphone_tester.h"
 
-namespace liblinphone_tester_runtime_component
+namespace BelledonneCommunications
 {
-	public interface class OutputTraceListener
+	namespace Linphone
 	{
-	public:
-		void outputTrace(Platform::String^ lev, Platform::String^ msg);
-	};
-
-    public ref class LibLinphoneTester sealed
-    {
-    public:
-		void setWritableDirectory(Windows::Storage::StorageFolder^ folder);
-		void setOutputTraceListener(OutputTraceListener^ traceListener);
-		unsigned int nbTestSuites();
-		unsigned int nbTests(Platform::String^ suiteName);
-		Platform::String^ testSuiteName(int index);
-		Platform::String^ testName(Platform::String^ suiteName, int testIndex);
-		bool run(Platform::String^ suiteName, Platform::String^ caseName, Platform::Boolean verbose);
-		void runAllToXml();
-
-		static property LibLinphoneTester^ Instance
+		namespace Tester
 		{
-			LibLinphoneTester^ get() { return _instance; }
-		}
-		property Windows::Foundation::IAsyncAction^ AsyncAction
-		{
-			Windows::Foundation::IAsyncAction^ get() { return _asyncAction; }
-		}
-	private:
-		LibLinphoneTester();
-		~LibLinphoneTester();
-		void init(bool verbose);
+			public interface class OutputTraceListener
+			{
+			public:
+				void outputTrace(Platform::String^ lev, Platform::String^ msg);
+			};
 
-		static LibLinphoneTester^ _instance;
-		Windows::Foundation::IAsyncAction^ _asyncAction;
-	};
+			public ref class NativeTester sealed
+			{
+			public:
+				void setOutputTraceListener(OutputTraceListener^ traceListener);
+				unsigned int nbTestSuites();
+				unsigned int nbTests(Platform::String^ suiteName);
+				Platform::String^ testSuiteName(int index);
+				Platform::String^ testName(Platform::String^ suiteName, int testIndex);
+				void initialize(Windows::Storage::StorageFolder^ writableDirectory, Platform::Boolean ui);
+				bool run(Platform::String^ suiteName, Platform::String^ caseName, Platform::Boolean verbose);
+				void runAllToXml();
+
+				static property NativeTester^ Instance
+				{
+					NativeTester^ get() { return _instance; }
+				}
+				property Windows::Foundation::IAsyncAction^ AsyncAction
+				{
+					Windows::Foundation::IAsyncAction^ get() { return _asyncAction; }
+				}
+			private:
+				NativeTester();
+				~NativeTester();
+
+				static NativeTester^ _instance;
+				Windows::Foundation::IAsyncAction^ _asyncAction;
+			};
+		}
+	}
 }
\ No newline at end of file
diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c
index 4beabef73..0c2f30c3a 100644
--- a/tester/log_collection_tester.c
+++ b/tester/log_collection_tester.c
@@ -30,9 +30,9 @@
 
 
 /*getline is POSIX 2008, not available on many systems.*/
-#if defined(ANDROID) || defined(_WIN32)
+#if defined(ANDROID) || defined(_WIN32) || defined(__QNX__)
 /* This code is public domain -- Will Hartung 4/9/09 */
-static size_t getline(char **lineptr, size_t *n, FILE *stream) {
+static ssize_t getline(char **lineptr, size_t *n, FILE *stream) {
 	char *bufptr = NULL;
 	char *p = bufptr;
 	size_t size;
@@ -89,7 +89,7 @@ static size_t getline(char **lineptr, size_t *n, FILE *stream) {
 #endif
 
 static LinphoneLogCollectionState old_collection_state;
-static void collect_init()  {
+static void collect_init(void)  {
 	old_collection_state = linphone_core_log_collection_enabled();
 	linphone_core_set_log_collection_path(bc_tester_get_writable_dir_prefix());
 }
@@ -101,14 +101,14 @@ static void collect_cleanup(LinphoneCoreManager *marie)  {
 	linphone_core_reset_log_collection();
 }
 
-static LinphoneCoreManager* setup(bool_t enable_logs)  {
+static LinphoneCoreManager* setup(LinphoneLogCollectionState log_collection_state)  {
 	LinphoneCoreManager *marie;
 	int timeout = 300;
 
 	collect_init();
-	linphone_core_enable_log_collection(enable_logs);
+	linphone_core_enable_log_collection(log_collection_state);
 
-	marie = linphone_core_manager_new2( "marie_rc", 0);
+	marie = linphone_core_manager_new2("marie_rc", 0);
 	// wait a few seconds to generate some traffic
 	while (--timeout){
 		// Generate some logs - error logs because we must ensure that
@@ -140,7 +140,7 @@ static FILE* gzuncompress(const char* filepath) {
 }
 #endif
 
-static time_t get_current_time() {
+static time_t get_current_time(void) {
 	struct timeval tp;
 	struct tm *lt;
 #ifndef _WIN32
@@ -161,7 +161,7 @@ static time_t get_current_time() {
 static time_t check_file(LinphoneCoreManager* mgr)  {
 
 	time_t cur_time = get_current_time();
-	char*    filepath = linphone_core_compress_log_collection(mgr->lc);
+	char*    filepath = linphone_core_compress_log_collection();
 	time_t  log_time = -1;
 	uint32_t timediff = 0;
 	FILE *file = NULL;
@@ -215,7 +215,6 @@ static time_t check_file(LinphoneCoreManager* mgr)  {
 
 
 		timediff = labs((long int)log_time - (long int)cur_time);
-		(void)timediff;
 #ifndef _WIN32
 		BC_ASSERT_LOWER(timediff, 1, unsigned, "%u");
 		if( !(timediff <= 1) ){
@@ -230,6 +229,7 @@ static time_t check_file(LinphoneCoreManager* mgr)  {
 			);
 		}
 #else
+		(void)timediff;
 		ms_warning("strptime() not available for this platform, test is incomplete.");
 #endif
 	}
@@ -237,27 +237,27 @@ static time_t check_file(LinphoneCoreManager* mgr)  {
 	return log_time;
 }
 
-static void collect_files_disabled()  {
-	LinphoneCoreManager* marie = setup(FALSE);
-	BC_ASSERT_PTR_NULL(linphone_core_compress_log_collection(marie->lc));
+static void collect_files_disabled(void)  {
+	LinphoneCoreManager* marie = setup(LinphoneLogCollectionDisabled);
+	BC_ASSERT_PTR_NULL(linphone_core_compress_log_collection());
 	collect_cleanup(marie);
 }
 
-static void collect_files_filled() {
-	LinphoneCoreManager* marie = setup(TRUE);
+static void collect_files_filled(void) {
+	LinphoneCoreManager* marie = setup(LinphoneLogCollectionEnabled);
 	check_file(marie);
 	collect_cleanup(marie);
 }
 
-static void collect_files_small_size()  {
-	LinphoneCoreManager* marie = setup(TRUE);
+static void collect_files_small_size(void)  {
+	LinphoneCoreManager* marie = setup(LinphoneLogCollectionEnabled);
 	linphone_core_set_log_collection_max_file_size(5000);
 	check_file(marie);
 	collect_cleanup(marie);
 }
 
-static void collect_files_changing_size()  {
-	LinphoneCoreManager* marie = setup(TRUE);
+static void collect_files_changing_size(void)  {
+	LinphoneCoreManager* marie = setup(LinphoneLogCollectionEnabled);
 	int waiting = 100;
 
 	check_file(marie);
@@ -282,16 +282,16 @@ static void logCollectionUploadStateChangedCb(LinphoneCore *lc, LinphoneCoreLogC
 			break;
 		case LinphoneCoreLogCollectionUploadStateDelivered:
 			counters->number_of_LinphoneCoreLogCollectionUploadStateDelivered++;
-			BC_ASSERT_GREATER(strlen(info), 0, int, "%d");
+			BC_ASSERT_GREATER((int)strlen(info), 0, int, "%d");
 			break;
 		case LinphoneCoreLogCollectionUploadStateNotDelivered:
 			counters->number_of_LinphoneCoreLogCollectionUploadStateNotDelivered++;
 			break;
 	}
 }
-static void upload_collected_traces()  {
+static void upload_collected_traces(void)  {
 	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = setup(TRUE);
+		LinphoneCoreManager* marie = setup(LinphoneLogCollectionEnabled);
 		int waiting = 100;
 		LinphoneCoreVTable *v_table = linphone_core_v_table_new();
 		v_table->log_collection_upload_state_changed = logCollectionUploadStateChangedCb;
@@ -301,34 +301,29 @@ static void upload_collected_traces()  {
 		linphone_core_set_log_collection_upload_server_url(marie->lc,"https://www.linphone.org:444/lft.php");
 		// Generate some logs
 		while (--waiting) ms_error("(test error)Waiting %d...", waiting);
-		linphone_core_compress_log_collection(marie->lc);
+		ms_free(linphone_core_compress_log_collection());
 		linphone_core_upload_log_collection(marie->lc);
-		BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphoneCoreLogCollectionUploadStateDelivered,1));
+		BC_ASSERT_TRUE(wait_for_until(marie->lc,marie->lc,&marie->stat.number_of_LinphoneCoreLogCollectionUploadStateDelivered,1, 10000));
 
 		/*try 2 times*/
 		waiting=100;
-		linphone_core_reset_log_collection(marie->lc);
+		linphone_core_reset_log_collection();
 		while (--waiting) ms_error("(test error)Waiting %d...", waiting);
-		linphone_core_compress_log_collection(marie->lc);
+		ms_free(linphone_core_compress_log_collection());
 		linphone_core_upload_log_collection(marie->lc);
-		BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphoneCoreLogCollectionUploadStateDelivered,2));
+		BC_ASSERT_TRUE(wait_for_until(marie->lc,marie->lc,&marie->stat.number_of_LinphoneCoreLogCollectionUploadStateDelivered,2, 10000));
 		collect_cleanup(marie);
 	}
 }
 
 test_t log_collection_tests[] = {
-	{ "No file when disabled", collect_files_disabled},
-	{ "Collect files filled when enabled", collect_files_filled},
-	{ "Logs collected into small file", collect_files_small_size},
-	{ "Logs collected when decreasing max size", collect_files_changing_size},
-	{ "Upload collected traces", upload_collected_traces}
-};
-
-test_suite_t log_collection_test_suite = {
-	"LogCollection",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(log_collection_tests) / sizeof(log_collection_tests[0]),
-	log_collection_tests
+	TEST_NO_TAG("No file when disabled", collect_files_disabled),
+	TEST_NO_TAG("Collect files filled when enabled", collect_files_filled),
+	TEST_NO_TAG("Logs collected into small file", collect_files_small_size),
+	TEST_NO_TAG("Logs collected when decreasing max size", collect_files_changing_size),
+	TEST_NO_TAG("Upload collected traces", upload_collected_traces)
 };
 
+test_suite_t log_collection_test_suite = {"LogCollection", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+										  sizeof(log_collection_tests) / sizeof(log_collection_tests[0]),
+										  log_collection_tests};
diff --git a/tester/marie_xml b/tester/marie_xml
deleted file mode 100644
index 5818930ba..000000000
--- a/tester/marie_xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://www.linphone.org/xsds/lpconfig.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd">
-  <section name="sip">
-    <entry name="sip_port">-1</entry>
-    <entry name="sip_tcp_port">-1</entry>
-    <entry name="sip_tls_port">-1</entry>
-    <entry name="default_proxy">0</entry>
-    <entry name="ping_with_options">0</entry>
-    <entry name="register_only_when_network_is_up">0</entry>
-    <entry name="composing_idle_timeout">1</entry>
-  </section>
-  <section name="auth_info_0">
-    <entry name="username">marie</entry>
-    <entry name="userid">marie</entry>
-    <entry name="passwd">secret</entry>
-    <entry name="realm">sip.example.org</entry>
-  </section>
-  <section name="proxy_0">
-    <entry name="reg_proxy">sip.example.org;transport=tcp</entry>
-    <entry name="reg_route">sip.example.org;transport=tcp;lr</entry>
-    <entry name="reg_identity">sip:marie@sip.example.org</entry>
-    <entry name="reg_expires">3600</entry>
-    <entry name="reg_sendregister">1</entry>
-    <entry name="publish">0</entry>
-    <entry name="dial_escape_plus">0</entry>
-  </section>
-  <section name="friend_0">
-    <entry name="url">"Paupoche" &lt;sip:pauline@sip.example.org&gt;</entry>
-    <entry name="pol">accept</entry>
-    <entry name="subscribe">0</entry>
-  </section>
-  <section name="rtp">
-    <entry name="audio_rtp_port">8070</entry>
-    <entry name="video_rtp_port">9072</entry>
-  </section>
-  <section name="video">
-    <entry name="display">0</entry>
-    <entry name="capture">0</entry>
-    <entry name="show_local">0</entry>
-    <entry name="size">vga</entry>
-    <entry name="enabled">0</entry>
-    <entry name="self_view">0</entry>
-    <entry name="automatically_initiate">0</entry>
-    <entry name="automatically_accept">0</entry>
-    <entry name="device">StaticImage: Static picture</entry>
-  </section>
-  <section name="sound">
-    <entry name="echocancellation">0 #to not overload cpu in case of VG</entry>
-  </section>
-</config>
diff --git a/tester/message_tester.c b/tester/message_tester.c
index c82388235..3c49bd180 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -23,23 +23,33 @@
 #include "liblinphone_tester.h"
 #include "lime.h"
 
-#ifdef MSG_STORAGE_ENABLED
+#ifdef SQLITE_STORAGE_ENABLED
 #include <sqlite3.h>
 #endif
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 
 static char* message_external_body_url=NULL;
 
-void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from_address, const char *message) {
+void text_message_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from_address, const char *msg) {
 	stats* counters = get_stats(lc);
 	counters->number_of_LinphoneMessageReceivedLegacy++;
 }
 
-void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* message) {
-	char* from=linphone_address_as_string(linphone_chat_message_get_from(message));
+void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage* msg) {
+	char* from=linphone_address_as_string(linphone_chat_message_get_from(msg));
 	stats* counters;
-	const char *text=linphone_chat_message_get_text(message);
-	const char *external_body_url=linphone_chat_message_get_external_body_url(message);
+	const char *text=linphone_chat_message_get_text(msg);
+	const char *external_body_url=linphone_chat_message_get_external_body_url(msg);
 	ms_message("Message from [%s]  is [%s] , external URL [%s]",from?from:""
 																,text?text:""
 																,external_body_url?external_body_url:"");
@@ -47,13 +57,13 @@ void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMess
 	counters = get_stats(lc);
 	counters->number_of_LinphoneMessageReceived++;
 	if (counters->last_received_chat_message) linphone_chat_message_unref(counters->last_received_chat_message);
-	counters->last_received_chat_message=linphone_chat_message_ref(message);
-	if (linphone_chat_message_get_file_transfer_information(message)) {
+	counters->last_received_chat_message=linphone_chat_message_ref(msg);
+	if (linphone_chat_message_get_file_transfer_information(msg)) {
 		counters->number_of_LinphoneMessageReceivedWithFile++;
-	} else if (linphone_chat_message_get_external_body_url(message)) {
+	} else if (linphone_chat_message_get_external_body_url(msg)) {
 		counters->number_of_LinphoneMessageExtBodyReceived++;
 		if (message_external_body_url) {
-			BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_external_body_url(message),message_external_body_url);
+			BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_external_body_url(msg),message_external_body_url);
 			message_external_body_url=NULL;
 		}
 	}
@@ -62,77 +72,76 @@ void message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMess
 /**
  * function invoked when a file transfer is received.
  * */
-void file_transfer_received(LinphoneChatMessage *message, const LinphoneContent* content, const LinphoneBuffer *buffer){
+void file_transfer_received(LinphoneChatMessage *msg, const LinphoneContent* content, const LinphoneBuffer *buffer){
 	FILE* file=NULL;
 	char *receive_file = bc_tester_file("receive_file.dump");
-	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(message);
+	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(msg);
 	LinphoneCore *lc = linphone_chat_room_get_core(cr);
-	if (!linphone_chat_message_get_user_data(message)) {
+	if (!linphone_chat_message_get_user_data(msg)) {
 		/*first chunk, creating file*/
 		file = fopen(receive_file,"wb");
-		linphone_chat_message_set_user_data(message,(void*)file); /*store fd for next chunks*/
+		linphone_chat_message_set_user_data(msg,(void*)file); /*store fd for next chunks*/
 	}
-	ms_free(receive_file);
-	file = (FILE*)linphone_chat_message_get_user_data(message);
-
+	bc_free(receive_file);
+	file = (FILE*)linphone_chat_message_get_user_data(msg);
+	BC_ASSERT_PTR_NOT_NULL(file);
 	if (linphone_buffer_is_empty(buffer)) { /* tranfer complete */
 		stats* counters = get_stats(lc);
 		counters->number_of_LinphoneFileTransferDownloadSuccessful++;
+		linphone_chat_message_set_user_data(msg, NULL);
 		fclose(file);
 	} else { /* store content on a file*/
-		if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==-1){
+		if (fwrite(linphone_buffer_get_content(buffer),linphone_buffer_get_size(buffer),1,file)==0){
 			ms_error("file_transfer_received(): write() failed: %s",strerror(errno));
 		}
 	}
 }
 
-char big_file[128000]; /* a buffer to simulate a big file for the file transfer message test */
-
 /*
  * function called when the file transfer is initiated. file content should be feed into object LinphoneContent
  * */
-LinphoneBuffer * tester_file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size){
+LinphoneBuffer * tester_file_transfer_send(LinphoneChatMessage *msg, const LinphoneContent* content, size_t offset, size_t size){
 	LinphoneBuffer *lb;
 	size_t file_size;
 	size_t size_to_send;
-	FILE *file_to_send;
 	uint8_t *buf;
+	FILE *file_to_send = linphone_chat_message_get_user_data(msg);
 
-	file_to_send = linphone_chat_message_get_user_data(message);
+	BC_ASSERT_PTR_NOT_NULL(file_to_send);
+	if (file_to_send == NULL){
+		return NULL;
+	}
 	fseek(file_to_send, 0, SEEK_END);
 	file_size = ftell(file_to_send);
-	fseek(file_to_send, offset, SEEK_SET);
+	fseek(file_to_send, (long)offset, SEEK_SET);
 	size_to_send = MIN(size, file_size - offset);
 	buf = ms_malloc(size_to_send);
 	if (fread(buf, size_to_send, 1, file_to_send)!=size_to_send){
-		// reaching end of file
+		// reaching end of file, close it
+		fclose(file_to_send);
+		linphone_chat_message_set_user_data(msg, NULL);
 	}
 	lb = linphone_buffer_new_from_data(buf, size_to_send);
 	ms_free(buf);
 	return lb;
 }
 
-LinphoneBuffer * tester_memory_file_transfer_send(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t size){
-	size_t size_to_send = MIN(size, sizeof(big_file) - offset);
-	return linphone_buffer_new_from_data((uint8_t *)big_file + offset, size_to_send);
-}
-
 /**
  * function invoked to report file transfer progress.
  * */
-void file_transfer_progress_indication(LinphoneChatMessage *message, const LinphoneContent* content, size_t offset, size_t total) {
-	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(message);
+void file_transfer_progress_indication(LinphoneChatMessage *msg, const LinphoneContent* content, size_t offset, size_t total) {
+	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(msg);
 	LinphoneCore *lc = linphone_chat_room_get_core(cr);
-	const LinphoneAddress* from_address = linphone_chat_message_get_from(message);
-	const LinphoneAddress* to_address = linphone_chat_message_get_to(message);
-	char *address = linphone_chat_message_is_outgoing(message)?linphone_address_as_string(to_address):linphone_address_as_string(from_address);
+	const LinphoneAddress* from_address = linphone_chat_message_get_from(msg);
+	const LinphoneAddress* to_address = linphone_chat_message_get_to(msg);
+	char *address = linphone_chat_message_is_outgoing(msg)?linphone_address_as_string(to_address):linphone_address_as_string(from_address);
 	stats* counters = get_stats(lc);
 	int progress = (int)((offset * 100)/total);
 	ms_message(" File transfer  [%d%%] %s of type [%s/%s] %s [%s] \n", progress
-																	,(linphone_chat_message_is_outgoing(message)?"sent":"received")
+																	,(linphone_chat_message_is_outgoing(msg)?"sent":"received")
 																	, linphone_content_get_type(content)
 																	, linphone_content_get_subtype(content)
-																	,(linphone_chat_message_is_outgoing(message)?"to":"from")
+																	,(linphone_chat_message_is_outgoing(msg)?"to":"from")
 																	, address);
 	counters->progress_of_LinphoneFileTransfer = progress;
 	free(address);
@@ -155,9 +164,6 @@ void liblinphone_tester_chat_message_msg_state_changed(LinphoneChatMessage *msg,
 	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(msg);
 	LinphoneCore *lc = linphone_chat_room_get_core(cr);
 	stats* counters = get_stats(lc);
-	const char *text = linphone_chat_message_get_text(msg);
-	if (!text) text = "<no text>";
-	ms_message("Message [%s] [%s]",text, linphone_chat_message_state_to_string(state));
 	switch (state) {
 		case LinphoneChatMessageStateIdle:
 			return;
@@ -177,237 +183,10 @@ void liblinphone_tester_chat_message_msg_state_changed(LinphoneChatMessage *msg,
 			counters->number_of_LinphoneMessageFileTransferDone++;
 			return;
 	}
-	ms_error("Unexpected state [%s] for message [%p]",linphone_chat_message_state_to_string(state), msg);
+	ms_error("Unexpected state [%s] for msg [%p]",linphone_chat_message_state_to_string(state), msg);
 }
 
-static void text_message(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneChatRoom* chat_room;
-
-	chat_room = linphone_core_get_chat_room(pauline->lc,marie->identity);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
-	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceivedLegacy,1, int, "%d");
-
-	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void text_message_within_dialog(void) {
-	LinphoneChatRoom* chat_room;
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-	lp_config_set_int(pauline->lc->config,"sip","chat_use_call_dialogs",1);
-
-	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	BC_ASSERT_TRUE(call(marie,pauline));
-
-	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
-
-	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static LinphoneAuthInfo* text_message_with_credential_from_auth_cb_auth_info;
-static void text_message_with_credential_from_auth_cb_auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain) {
-	ms_message("text_message_with_credential_from_auth_cb:Auth info requested  for user id [%s] at realm [%s]\n"
-						,username
-						,realm);
-	linphone_core_add_auth_info(lc,text_message_with_credential_from_auth_cb_auth_info); /*add stored authentication info to LinphoneCore*/
-}
-
-
-static void text_message_with_credential_from_auth_cb(void) {
-	LinphoneChatRoom* chat_room;
-	LinphoneCoreVTable* vtable = linphone_core_v_table_new();
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	text_message_with_credential_from_auth_cb_auth_info=linphone_auth_info_clone((LinphoneAuthInfo*)(linphone_core_get_auth_info_list(pauline->lc)->data));
-
-	/*to force cb to be called*/
-	linphone_core_clear_all_auth_info(pauline->lc);
-	vtable->auth_info_requested=text_message_with_credential_from_auth_cb_auth_info_requested;
-	linphone_core_add_listener(pauline->lc, vtable);
-
-	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
-	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceivedLegacy,1, int, "%d");
-
-	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void text_message_with_privacy(void) {
-	LinphoneChatRoom* chat_room;
-
-	LinphoneProxyConfig* pauline_proxy;
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-
-	/*test proxy config privacy*/
-	linphone_core_get_default_proxy(pauline->lc,&pauline_proxy);
-	linphone_proxy_config_set_privacy(pauline_proxy,LinphonePrivacyId);
-
-	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
-	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceivedLegacy,1, int, "%d");
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void text_message_compatibility_mode(void) {
-	char route[256];
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneProxyConfig* proxy;
-	LinphoneAddress* proxy_address;
-	char*tmp;
-	LCSipTransports transport;
-	LinphoneChatRoom* chat_room;
-
-	linphone_core_get_default_proxy(marie->lc,&proxy);
-	BC_ASSERT_PTR_NOT_NULL (proxy);
-	proxy_address=linphone_address_new(linphone_proxy_config_get_addr(proxy));
-	linphone_address_clean(proxy_address);
-	tmp=linphone_address_as_string_uri_only(proxy_address);
-	linphone_proxy_config_set_server_addr(proxy,tmp);
-	sprintf(route,"sip:%s",test_route);
-	linphone_proxy_config_set_route(proxy,route);
-	ms_free(tmp);
-	linphone_address_destroy(proxy_address);
-	linphone_core_get_sip_transports(marie->lc,&transport);
-	transport.udp_port=0;
-	transport.tls_port=0;
-	transport.dtls_port=0;
-	/*only keep tcp*/
-	linphone_core_set_sip_transports(marie->lc,&transport);
-	marie->stat.number_of_LinphoneRegistrationOk=0;
-
-	BC_ASSERT_TRUE (wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphoneRegistrationOk,1));
-
-	chat_room = linphone_core_get_chat_room(marie->lc, pauline->identity);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageReceived,1));
-	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageReceivedLegacy,1, int, "%d");
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-static void text_message_with_ack(void) {
-	int leaked_objects;
-	int begin;
-	LinphoneCoreManager* marie;
-	LinphoneCoreManager* pauline;
-
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
-	marie = linphone_core_manager_new( "marie_rc");
-	pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-	{
-		LinphoneChatRoom* chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-		LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
-		LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_room_send_chat_message(chat_room,message);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageDelivered,1));
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
-		linphone_core_manager_destroy(marie);
-		linphone_core_manager_destroy(pauline);
-	}
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
-}
-
-static void text_message_with_external_body(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
-	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
-
-	linphone_chat_message_set_external_body_url(message,message_external_body_url="http://www.linphone.org");
-
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
-	linphone_chat_room_send_chat_message(chat_room,message);
-
-	/* check transient message list: the message should be in it, and should be the only one */
-	BC_ASSERT_EQUAL(ms_list_size(chat_room->transient_messages), 1, int, "%d");
-	BC_ASSERT_PTR_EQUAL(ms_list_nth_data(chat_room->transient_messages,0), message);
-
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageDelivered,1));
-
-	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
-	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived,1, int, "%d");
-
-	BC_ASSERT_EQUAL(ms_list_size(chat_room->transient_messages), 0, int, "%d");
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
-bool_t compare_files(const char *path1, const char *path2) {
-	bool_t res;
+void compare_files(const char *path1, const char *path2) {
 	size_t size1;
 	size_t size2;
 	uint8_t *buf1;
@@ -415,522 +194,241 @@ bool_t compare_files(const char *path1, const char *path2) {
 
 	buf1 = (uint8_t*)ms_load_path_content(path1, &size1);
 	buf2 = (uint8_t*)ms_load_path_content(path2, &size2);
-	res = buf1 && buf2 && (size1 == size2) && (memcmp(buf1, buf2, size1) == 0);
+	BC_ASSERT_PTR_NOT_NULL(buf1);
+	BC_ASSERT_PTR_NOT_NULL(buf2);
+	BC_ASSERT_EQUAL((uint8_t)size1, (uint8_t)size2, uint8_t, "%u");
+	BC_ASSERT_EQUAL(memcmp(buf1, buf2, size1), 0, int, "%d");
 	ms_free(buf1);
 	ms_free(buf2);
-	return res;
 }
 
-static void file_transfer_message(void) {
-	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-		LinphoneChatRoom* chat_room;
-		LinphoneChatMessage* message;
-		LinphoneChatMessageCbs *cbs;
-		LinphoneContent* content;
-		FILE *file_to_send = NULL;
-		size_t file_size;
-		char *send_filepath = bc_tester_res("images/nowebcamCIF.jpg");
-		char *receive_filepath = bc_tester_file("receive_file.dump");
-		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		file_to_send = fopen(send_filepath, "rb");
-		fseek(file_to_send, 0, SEEK_END);
-		file_size = ftell(file_to_send);
-		fseek(file_to_send, 0, SEEK_SET);
-
-		/* Globally configure an http file transfer server. */
-		linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
-
-		/* create a chatroom on pauline's side */
-		chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-		/* create a file transfer message */
-		content = linphone_core_create_content(pauline->lc);
-		linphone_content_set_type(content,"image");
-		linphone_content_set_subtype(content,"jpeg");
-		linphone_content_set_size(content,file_size); /*total size to be transfered*/
-		linphone_content_set_name(content,"nowebcamCIF.jpg");
-		message = linphone_chat_room_create_file_transfer_message(chat_room, content);
-		linphone_chat_message_set_user_data(message, file_to_send);
-		cbs = linphone_chat_message_get_callbacks(message);
-		{
-			int dummy=0;
-			wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-			reset_counters(&marie->stat);
-			reset_counters(&pauline->stat);
-		}
-		linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_file_transfer_send);
-		linphone_chat_room_send_chat_message(chat_room,message);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
-		fclose(file_to_send);
-		if (marie->stat.last_received_chat_message ) {
-			cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
-			linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-			linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
-			linphone_chat_message_download_file(marie->stat.last_received_chat_message);
-		}
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1));
-
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
-		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1, int, "%d");
-		BC_ASSERT_TRUE(compare_files(send_filepath, receive_filepath));
-
-		linphone_content_unref(content);
-		linphone_core_manager_destroy(pauline);
-		ms_free(send_filepath);
-		ms_free(receive_filepath);
-		linphone_core_manager_destroy(marie);
-	}
-}
-
-/* same than previous but with a 160 characters file */
-#define SMALL_FILE_SIZE 160
-static void small_file_transfer_message(void) {
-	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-		int i;
-		LinphoneChatRoom* chat_room;
-		LinphoneChatMessage* message;
-		LinphoneChatMessageCbs *cbs;
-		LinphoneContent* content;
-		const char* big_file_content="big file"; /* setting dummy file content to something */
-		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		for (i=0;i<SMALL_FILE_SIZE;i+=strlen(big_file_content))
-			memcpy(big_file+i, big_file_content, strlen(big_file_content));
-
-		big_file[0]=*"S";
-		big_file[SMALL_FILE_SIZE - 1]=*"E";
-
-		/* Globally configure an http file transfer server. */
-		linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
-
-		/* create a chatroom on pauline's side */
-		chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-		/* create a file transfer message */
-		content = linphone_core_create_content(pauline->lc);
-		linphone_content_set_type(content,"text");
-		linphone_content_set_subtype(content,"plain");
-		linphone_content_set_size(content,SMALL_FILE_SIZE); /*total size to be transfered*/
-		linphone_content_set_name(content,"bigfile.txt");
-		message = linphone_chat_room_create_file_transfer_message(chat_room, content);
-		{
-			int dummy=0;
-			wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-			reset_counters(&marie->stat);
-			reset_counters(&pauline->stat);
-		}
-		cbs = linphone_chat_message_get_callbacks(message);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_memory_file_transfer_send);
-		linphone_chat_room_send_chat_message(chat_room,message);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
-		if (marie->stat.last_received_chat_message ) {
-			cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
-			linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-			linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
-			linphone_chat_message_download_file(marie->stat.last_received_chat_message);
-		}
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1));
-
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
-		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1, int, "%d");
-
-		linphone_content_unref(content);
-		linphone_core_manager_destroy(pauline);
-		linphone_core_manager_destroy(marie);
-	}
-}
-
-#ifdef HAVE_LIME
-
-static FILE* fopen_from_write_dir(const char * name, const char * mode) {
-	char *filepath = bc_tester_file(name);
-	FILE * file = fopen(filepath,mode);
-	ms_free(filepath);
-	return file;
-}
-
-static void lime_file_transfer_message_base(bool_t encrypt_file) {
-	int i;
-	FILE *ZIDCacheMarieFD, *ZIDCachePaulineFD;
-	LinphoneCoreManager *marie, *pauline;
-	LinphoneChatRoom *chat_room;
-	LinphoneContent *content;
-	LinphoneChatMessage *message;
+LinphoneChatMessage* create_message_from_nowebcam(LinphoneChatRoom *chat_room) {
+	FILE *file_to_send = NULL;
 	LinphoneChatMessageCbs *cbs;
-	char *pauline_id, *marie_id;
-	char *filepath;
+	LinphoneContent* content;
+	LinphoneChatMessage* msg;
+	size_t file_size;
+	char *send_filepath = bc_tester_res("images/nowebcamCIF.jpg");
+	file_to_send = fopen(send_filepath, "rb");
+	fseek(file_to_send, 0, SEEK_END);
+	file_size = ftell(file_to_send);
+	fseek(file_to_send, 0, SEEK_SET);
 
-	/* setting dummy file content to something */
-	const char* big_file_content="big file";
-	for (i=0;i<sizeof(big_file);i+=strlen(big_file_content))
-		memcpy(big_file+i, big_file_content, strlen(big_file_content));
+	content = linphone_core_create_content(chat_room->lc);
+	belle_sip_object_set_name(&content->base, "nowebcam content");
+	linphone_content_set_type(content,"image");
+	linphone_content_set_subtype(content,"jpeg");
+	linphone_content_set_size(content,file_size); /*total size to be transfered*/
+	linphone_content_set_name(content,"nowebcamCIF.jpg");
 
-	big_file[0]=*"S";
-	big_file[sizeof(big_file)-1]=*"E";
 
-	marie = linphone_core_manager_new( "marie_rc");
-	pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
+	msg = linphone_chat_room_create_file_transfer_message(chat_room, content);
+	cbs = linphone_chat_message_get_callbacks(msg);
+	linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_file_transfer_send);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
+	linphone_chat_message_set_user_data(msg, file_to_send);
 
-	/* make sure lime is enabled */
-	linphone_core_enable_lime(marie->lc, 1);
-	linphone_core_enable_lime(pauline->lc, 1);
-	if (!encrypt_file) {
-		LpConfig *pauline_lp = linphone_core_get_config(pauline->lc);
-		lp_config_set_int(pauline_lp,"sip","lime_for_file_sharing",0);
-	}
+	linphone_content_unref(content);
+	ms_free(send_filepath);
+	return msg;
+}
 
-	/* set the zid caches files : create two ZID cache from this valid one inserting the auto-generated sip URI for the peer account as keys in ZID cache are indexed by peer sip uri */
-	ZIDCacheMarieFD = fopen_from_write_dir("tmpZIDCacheMarie.xml", "wb");
-	ZIDCachePaulineFD = fopen_from_write_dir("tmpZIDCachePauline.xml", "wb");
-	pauline_id = linphone_address_as_string_uri_only(pauline->identity);
-	marie_id = linphone_address_as_string_uri_only(marie->identity);
-	fprintf(ZIDCacheMarieFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</sndKey><rcvKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000078</sndIndex><rcvIndex>000001cf</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778csal_set_uuid(lc->sal, account->instance_id);bdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>72d80ab1cad243cf45634980c1d02cfb2df81ce0dd5dfcf1ebeacfc5345a9176</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000000f</sndIndex><rcvIndex>00000000</rcvIndex></peer></cache>", pauline_id, pauline_id);
-	fprintf(ZIDCachePaulineFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>005dbe0399643d953a2202dd</selfZID><peer><ZID>ef7692d0792a67491ae2d44e</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><rcvKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</rcvKey><sndKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</sndKey><rcvSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvIndex>00000078</rcvIndex><sndIndex>000001cf</sndIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>81e6e6362c34dc974263d1f77cbb9a8d6d6a718330994379099a8fa19fb12faa</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000002e</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>", marie_id, marie_id);
-	fclose(ZIDCacheMarieFD);
-	fclose(ZIDCachePaulineFD);
-	ms_free(marie_id);
-	ms_free(pauline_id);
+void text_message_base(LinphoneCoreManager* marie, LinphoneCoreManager* pauline) {
+	LinphoneChatMessage* msg = linphone_chat_room_create_message(linphone_core_get_chat_room(pauline->lc,marie->identity),"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(msg);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(msg->chat_room,msg);
 
-	filepath = bc_tester_file("tmpZIDCacheMarie.xml");
-	linphone_core_set_zrtp_secrets_file(marie->lc, filepath);
-	ms_free(filepath);
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageDelivered,1));
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
 
-	filepath = bc_tester_file("tmpZIDCachePauline.xml");
-	linphone_core_set_zrtp_secrets_file(pauline->lc, filepath);
-	ms_free(filepath);
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
+}
+
+/****************************** Tests starting below ******************************/
+
+static void text_message(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+
+	linphone_chat_room_send_message(linphone_core_get_chat_room(pauline->lc,marie->identity), "hello");
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedLegacy,1));
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void text_message_within_call_dialog(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	lp_config_set_int(pauline->lc->config,"sip","chat_use_call_dialogs",1);
+
+	BC_ASSERT_TRUE(call(marie,pauline));
+	linphone_chat_room_send_message(linphone_core_get_chat_room(pauline->lc, marie->identity),"Bla bla bla bla");
+
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
+	// when using call dialogs, we will never receive delivered status
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,0,int,"%d");
+
+	end_call(marie, pauline);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static LinphoneAuthInfo* text_message_with_credential_from_auth_cb_auth_info;
+static void text_message_with_credential_from_auth_cb_auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain) {
+	ms_message("text_message_with_credential_from_auth_callback:Auth info requested  for user id [%s] at realm [%s]\n"
+						,username
+						,realm);
+	linphone_core_add_auth_info(lc,text_message_with_credential_from_auth_cb_auth_info); /*add stored authentication info to LinphoneCore*/
+}
+static void text_message_with_credential_from_auth_callback(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCoreVTable* vtable = linphone_core_v_table_new();
+
+	/*to force cb to be called*/
+	text_message_with_credential_from_auth_cb_auth_info=linphone_auth_info_clone((LinphoneAuthInfo*)(linphone_core_get_auth_info_list(pauline->lc)->data));
+	linphone_core_clear_all_auth_info(pauline->lc);
+	vtable->auth_info_requested=text_message_with_credential_from_auth_cb_auth_info_requested;
+	linphone_core_add_listener(pauline->lc, vtable);
+
+	text_message_base(marie, pauline);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void text_message_with_privacy(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	linphone_proxy_config_set_privacy(linphone_core_get_default_proxy_config(pauline->lc),LinphonePrivacyId);
+
+	text_message_base(marie, pauline);
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceivedLegacy,1, int, "%d");
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void text_message_compatibility_mode(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneProxyConfig* proxy = linphone_core_get_default_proxy_config(marie->lc);
+	LinphoneAddress* proxy_address=linphone_address_new(linphone_proxy_config_get_server_addr(proxy));
+	char route[256];
+	char*tmp;
+	/*only keep tcp*/
+	LCSipTransports transport = {0,-1,0,0};
+	linphone_address_clean(proxy_address);
+	tmp=linphone_address_as_string_uri_only(proxy_address);
+	linphone_proxy_config_set_server_addr(proxy,tmp);
+	sprintf(route,"sip:%s",test_route);
+	linphone_proxy_config_set_route(proxy,route);
+	ms_free(tmp);
+	linphone_address_destroy(proxy_address);
+	linphone_core_set_sip_transports(marie->lc,&transport);
+	marie->stat.number_of_LinphoneRegistrationOk=0;
+	BC_ASSERT_TRUE (wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphoneRegistrationOk,1));
+
+	text_message_base(marie, pauline);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void text_message_with_ack(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+
+	text_message_base(marie, pauline);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void text_message_with_send_error(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+
+	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(marie->lc, pauline->identity);
+	LinphoneChatMessage* msg = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(msg);
+
+	/*simulate a network error*/
+	sal_set_send_error(marie->lc->sal, -1);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room,msg);
+
+	/* check transient msg list: the msg should be in it, and should be the only one */
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(chat_room->transient_messages), 1, unsigned int, "%u");
+	BC_ASSERT_PTR_EQUAL(bctbx_list_nth_data(chat_room->transient_messages,0), msg);
+
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageNotDelivered,1));
+	/*BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageInProgress,1, int, "%d");*/
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageReceived,0, int, "%d");
+
+	/* the msg should have been discarded from transient list after an error */
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(chat_room->transient_messages), 0, unsigned int, "%u");
+
+	sal_set_send_error(marie->lc->sal, 0);
+
+	/*give a chance to register again to allow linphone_core_manager_destroy to properly unregister*/
+	linphone_core_refresh_registers(marie->lc);
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneRegistrationOk,marie->stat.number_of_LinphoneRegistrationOk + 1));
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void text_message_with_external_body(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
+	LinphoneChatMessage* msg = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(msg);
+
+	message_external_body_url="http://www.linphone.org";
+	linphone_chat_message_set_external_body_url(msg,message_external_body_url);
+
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_chat_room_send_chat_message(chat_room,msg);
+
+	/* check transient msg list: the msg should be in it, and should be the only one */
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(chat_room->transient_messages), 1, unsigned int, "%u");
+	BC_ASSERT_PTR_EQUAL(bctbx_list_nth_data(chat_room->transient_messages,0), msg);
+
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageDelivered,1));
+
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageExtBodyReceived,1, int, "%d");
+
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(chat_room->transient_messages), 0, unsigned int, "%u");
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+void transfer_message_base2(LinphoneCoreManager* marie, LinphoneCoreManager* pauline, bool_t upload_error, bool_t download_error) {
+	char *send_filepath = bc_tester_res("images/nowebcamCIF.jpg");
+	char *receive_filepath = bc_tester_file("receive_file.dump");
+	LinphoneChatRoom* chat_room;
+	LinphoneChatMessage* msg;
+	LinphoneChatMessageCbs *cbs;
 
 	/* Globally configure an http file transfer server. */
 	linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
 
 	/* create a chatroom on pauline's side */
 	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
+	/* create a file transfer msg */
+	msg = create_message_from_nowebcam(chat_room);
+	linphone_chat_room_send_chat_message(chat_room,msg);
 
-	/* create a file transfer message */
-	content = linphone_core_create_content(pauline->lc);
-	linphone_content_set_type(content,"text");
-	linphone_content_set_subtype(content,"plain");
-	linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
-	linphone_content_set_name(content,"big_file.txt");
-
-	message = linphone_chat_room_create_file_transfer_message(chat_room, content);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-
-	cbs = linphone_chat_message_get_callbacks(message);
-	linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-	linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_memory_file_transfer_send);
-	linphone_chat_room_send_chat_message(chat_room,message);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
-	if (marie->stat.last_received_chat_message ) {
-		cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
-		linphone_chat_message_download_file(marie->stat.last_received_chat_message);
-	}
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1));
-
-	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
-	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
-	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1, int, "%d");
-
-	linphone_content_unref(content);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-
-}
-static  void lime_file_transfer_message() {
-	lime_file_transfer_message_base(TRUE);
-}
-
-static  void lime_file_transfer_message_without_encryption() {
-	lime_file_transfer_message_base(FALSE);
-}
-
-static void printHex(char *title, uint8_t *data, uint32_t length) {
-	int i;
-	char debug_string_buffer[2048];
-	char *debug_string = debug_string_buffer;
-	sprintf (debug_string, "%s : ", title);
-	debug_string += strlen(title)+3;
-	for (i=0; i<length; i++) {
-		sprintf (debug_string, "0x%02x, ", data[i]);
-		debug_string+=6;
-	}
-	*debug_string = '\0';
-	ms_message("%s", debug_string_buffer);
-}
-
-#define PLAIN_TEXT_TEST_MESSAGE "Ceci est un fabuleux message de test à encrypter"
-static void lime_unit(void) {
-	int retval;
-	size_t size;
-	uint8_t *cacheBufferString;
-	xmlDocPtr cacheBufferAlice;
-	xmlDocPtr cacheBufferBob;
-	uint8_t *multipartMessage = NULL;
-	uint8_t *decryptedMessage = NULL;
-	xmlChar *xmlStringOutput;
-	int xmlStringLength;
-	limeURIKeys_t associatedKeys;
-	int i;
-	limeKey_t associatedKey;
-	uint8_t targetZID[12] = {0x00, 0x5d, 0xbe, 0x03, 0x99, 0x64, 0x3d, 0x95, 0x3a, 0x22, 0x02, 0xdd};
-	uint8_t senderZID[12] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x70, 0x80, 0x90, 0xa0, 0xb0, 0xc0, 0xd0};
-	uint8_t encryptedMessage[1024];
-	uint8_t plainMessage[1024];
-	uint8_t receiverZID[12];
-	xmlDocPtr cacheBuffer;
-	FILE *CACHE;
-
-	/**** Low level tests using on cache file to extract keys, encrypt/decrypt ****/
-	/**** use functions that are not directly used by external entities ****/
-
-	/* create and load cache file */
-	CACHE = fopen_from_write_dir("ZIDCache.xml", "wb");
-	fprintf (CACHE, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>pipo1@pipo.com</uri><sndKey>963c57bb28e62068d2df23e8f9b771932d3c57bb28e62068d2df23e8f9b77193</sndKey><rcvKey>05d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>02ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000069</sndIndex><rcvIndex>000001e8</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>pipo1@pipo.com</uri><sndKey>123456789012345678901234567890123456765431262068d2df23e8f9b77193</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000001</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>");
-	fclose(CACHE);
-	CACHE = fopen_from_write_dir("ZIDCache.xml", "rb+");
-	cacheBufferString = (uint8_t*) ms_load_file_content(CACHE, &size);
-	*(cacheBufferString+size) = '\0';
-	fclose(CACHE);
-	/* parse it to an xmlDoc */
-	cacheBuffer = xmlParseDoc(cacheBufferString);
-	ms_free(cacheBufferString);
-
-	/* get data from cache : sender */
-	associatedKeys.peerURI = (uint8_t *)malloc(15);
-	memcpy(associatedKeys.peerURI, "pipo1@pipo.com", 15);
-	associatedKeys.associatedZIDNumber  = 0;
-	retval = lime_getCachedSndKeysByURI(cacheBuffer, &associatedKeys);
-	BC_ASSERT_EQUAL_FATAL(retval, 0, int, "%d");
-	BC_ASSERT_EQUAL_FATAL(associatedKeys.associatedZIDNumber, 2, int, "%d"); /* there are 2 keys associated to pipo1@pipo.com address in the cache above*/
-	ms_message("Get cached key by URI, for sender, return %d keys", associatedKeys.associatedZIDNumber);
-
-	for (i=0; i<associatedKeys.associatedZIDNumber; i++) {
-		printHex("ZID", associatedKeys.peerKeys[i]->peerZID, 12);
-		printHex("key", associatedKeys.peerKeys[i]->key, 32);
-		printHex("sessionID", associatedKeys.peerKeys[i]->sessionId, 32);
-		ms_message("session index %d\n", associatedKeys.peerKeys[i]->sessionIndex);
-	}
-
-	/* get data from cache : receiver */
-	memcpy(associatedKey.peerZID, targetZID, 12);
-	retval = lime_getCachedRcvKeyByZid(cacheBuffer, &associatedKey);
-	BC_ASSERT_EQUAL_FATAL(retval, 0, int, "%d");
-	printHex("Got receiver key for ZID", targetZID, 12);
-	printHex("Key", associatedKey.key, 32);
-	printHex("sessionID", associatedKey.sessionId, 32);
-	ms_message("session index %d\n", associatedKey.sessionIndex);
-
-	/* encrypt/decrypt a message */
-	lime_encryptMessage(associatedKeys.peerKeys[0], (uint8_t *)PLAIN_TEXT_TEST_MESSAGE, strlen(PLAIN_TEXT_TEST_MESSAGE), senderZID, encryptedMessage);
-	printHex("Ciphered", encryptedMessage, strlen((char *)encryptedMessage));
-	/* invert sender and receiverZID to decrypt/authenticate */
-	memcpy(receiverZID, associatedKeys.peerKeys[0]->peerZID, 12);
-	memcpy(associatedKeys.peerKeys[0]->peerZID, senderZID, 12);
-	retval = lime_decryptMessage(associatedKeys.peerKeys[0], encryptedMessage, strlen(PLAIN_TEXT_TEST_MESSAGE)+16, receiverZID, plainMessage);
-	BC_ASSERT_EQUAL_FATAL(retval, 0, int, "%d");
-	BC_ASSERT_STRING_EQUAL((char *)plainMessage, (char *)PLAIN_TEXT_TEST_MESSAGE);
-	ms_message("Decrypt and auth returned %d\nPlain text is %s\n", retval, plainMessage);
-
-	/* update receiver data */
-	associatedKey.sessionIndex++;
-	associatedKey.key[0]++;
-	associatedKey.sessionId[0]++;
-	retval = lime_setCachedKey(cacheBuffer, &associatedKey, LIME_RECEIVER);
-	BC_ASSERT_EQUAL_FATAL(retval, 0, int, "%d");
-
-	/* update sender data */
-	associatedKeys.peerKeys[0]->sessionIndex++;
-	associatedKeys.peerKeys[0]->key[0]++;
-	associatedKeys.peerKeys[0]->sessionId[0]++;
-	retval = lime_setCachedKey(cacheBuffer, associatedKeys.peerKeys[0], LIME_SENDER);
-	BC_ASSERT_EQUAL_FATAL(retval, 0, int, "%d");
-
-	/* free memory */
-	lime_freeKeys(associatedKeys);
-
-	/* write the file */
-	/* dump the xml document into a string */
-	xmlDocDumpFormatMemoryEnc(cacheBuffer, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
-	/* write it to the file */
-	CACHE = fopen_from_write_dir("ZIDCache.xml", "w+");
-	fwrite(xmlStringOutput, 1, xmlStringLength, CACHE);
-	xmlFree(xmlStringOutput);
-	fclose(CACHE);
-	xmlFreeDoc(cacheBuffer);
-
-	/**** Higher level tests using 2 caches to encrypt/decrypt a message ****/
-	/* Create Alice cache file and then load it */
-	CACHE = fopen_from_write_dir("ZIDCacheAlice.xml", "wb");
-	fprintf(CACHE, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:pauline@sip.example.org</uri><sndKey>9111ebeb52e50edcc6fcb3eea1a2d3ae3c2c75d3668923e83c59d0f472455150</sndKey><rcvKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000080</sndIndex><rcvIndex>000001cf</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:pauline@sip.example.org</uri><sndKey>72d80ab1cad243cf45634980c1d02cfb2df81ce0dd5dfcf1ebeacfc5345a9176</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000000f</sndIndex><rcvIndex>00000000</rcvIndex></peer></cache>");
-	fclose(CACHE);
-	CACHE = fopen_from_write_dir("ZIDCacheAlice.xml", "rb+");
-	cacheBufferString = (uint8_t *)ms_load_file_content(CACHE, &size);
-	*(cacheBufferString+size) = '\0';
-	fclose(CACHE);
-	/* parse it to an xmlDoc */
-	cacheBufferAlice = xmlParseDoc(cacheBufferString);
-	ms_free(cacheBufferString);
-
-	/* Create Bob cache file and then load it */
-	CACHE = fopen_from_write_dir("ZIDCacheBob.xml", "wb");
-	fprintf(CACHE, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>005dbe0399643d953a2202dd</selfZID><peer><ZID>ef7692d0792a67491ae2d44e</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:marie@sip.example.org</uri><rcvKey>9111ebeb52e50edcc6fcb3eea1a2d3ae3c2c75d3668923e83c59d0f472455150</rcvKey><sndKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</sndKey><rcvSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvIndex>00000080</rcvIndex><sndIndex>000001cf</sndIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:marie@sip.example.org</uri><sndKey>81e6e6362c34dc974263d1f77cbb9a8d6d6a718330994379099a8fa19fb12faa</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000002e</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>");
-	fclose(CACHE);
-	CACHE = fopen_from_write_dir("ZIDCacheBob.xml", "rb+");
-	cacheBufferString = (uint8_t *)ms_load_file_content(CACHE, &size);
-	*(cacheBufferString+size) = '\0';
-	fclose(CACHE);
-	/* parse it to an xmlDoc */
-	cacheBufferBob = xmlParseDoc(cacheBufferString);
-	ms_free(cacheBufferString);
-
-
-
-	/* encrypt a message */
-	retval = lime_createMultipartMessage(cacheBufferAlice, (uint8_t *)PLAIN_TEXT_TEST_MESSAGE, (uint8_t *)"sip:pauline@sip.example.org", &multipartMessage);
-
-	BC_ASSERT_EQUAL_FATAL(retval, 0, int, "%d");
-	if (retval == 0) {
-		ms_message("Encrypted message created is %s", multipartMessage);
-	}
-
-	/* decrypt the multipart message */
-	retval = lime_decryptMultipartMessage(cacheBufferBob, multipartMessage, &decryptedMessage);
-
-	BC_ASSERT_EQUAL_FATAL(retval, 0, int, "%d");
-	if (retval == 0) {
-		BC_ASSERT_STRING_EQUAL((char *)decryptedMessage, (char *)PLAIN_TEXT_TEST_MESSAGE);
-		ms_message("Succesfully decrypted message is %s", decryptedMessage);
-	}
-	free(multipartMessage);
-	free(decryptedMessage);
-
-	/* update ZID files */
-	/* dump the xml document into a string */
-	xmlDocDumpFormatMemoryEnc(cacheBufferAlice, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
-	/* write it to the file */
-	CACHE = fopen_from_write_dir("ZIDCacheAlice.xml", "wb+");
-	fwrite(xmlStringOutput, 1, xmlStringLength, CACHE);
-	xmlFree(xmlStringOutput);
-	fclose(CACHE);
-
-	xmlDocDumpFormatMemoryEnc(cacheBufferBob, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
-	/* write it to the file */
-	CACHE = fopen_from_write_dir("ZIDCacheBob.xml", "wb+");
-	fwrite(xmlStringOutput, 1, xmlStringLength, CACHE);
-	xmlFree(xmlStringOutput);
-	fclose(CACHE);
-
-
-	xmlFreeDoc(cacheBufferAlice);
-	xmlFreeDoc(cacheBufferBob);
-}
-
-static void lime_text_message(void) {
-	FILE *ZIDCacheMarieFD, *ZIDCachePaulineFD;
-	LinphoneChatRoom* chat_room;
-	char* filepath;
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-	/* make sure lime is enabled */
-	linphone_core_enable_lime(marie->lc, 1);
-	linphone_core_enable_lime(pauline->lc, 1);
-
-	/* set the zid caches files : create two ZID cache from this valid one inserting the auto-generated sip URI for the peer account as keys in ZID cache are indexed by peer sip uri */
-	ZIDCacheMarieFD = fopen_from_write_dir("tmpZIDCacheMarie.xml", "w");
-	ZIDCachePaulineFD = fopen_from_write_dir("tmpZIDCachePauline.xml", "w");
-	fprintf(ZIDCacheMarieFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</sndKey><rcvKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000078</sndIndex><rcvIndex>000001cf</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>72d80ab1cad243cf45634980c1d02cfb2df81ce0dd5dfcf1ebeacfc5345a9176</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000000f</sndIndex><rcvIndex>00000000</rcvIndex></peer></cache>", linphone_address_as_string_uri_only(pauline->identity), linphone_address_as_string_uri_only(pauline->identity));
-	fprintf(ZIDCachePaulineFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>005dbe0399643d953a2202dd</selfZID><peer><ZID>ef7692d0792a67491ae2d44e</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><rcvKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</rcvKey><sndKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</sndKey><rcvSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvIndex>00000078</rcvIndex><sndIndex>000001cf</sndIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>81e6e6362c34dc974263d1f77cbb9a8d6d6a718330994379099a8fa19fb12faa</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000002e</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>", linphone_address_as_string_uri_only(marie->identity), linphone_address_as_string_uri_only(marie->identity));
-	fclose(ZIDCacheMarieFD);
-	fclose(ZIDCachePaulineFD);
-
-	filepath = bc_tester_file("tmpZIDCacheMarie.xml");
-	linphone_core_set_zrtp_secrets_file(marie->lc, filepath);
-	ms_free(filepath);
-
-	filepath = bc_tester_file("tmpZIDCachePauline.xml");
-	linphone_core_set_zrtp_secrets_file(pauline->lc, filepath);
-	ms_free(filepath);
-
-	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-
-	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedLegacy,1));
-
-	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
-	/* TODO : check the message arrived correctly deciphered */
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-#endif /* HAVE_LIME */
-
-static void file_transfer_message_io_error_upload(void) {
-	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-		int i;
-		LinphoneChatRoom* chat_room;
-		LinphoneChatMessage* message;
-		LinphoneChatMessageCbs *cbs;
-		LinphoneContent* content;
-		const char* big_file_content="big file"; /* setting dummy file content to something */
-		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		/* setting dummy file content to something */
-		for (i=0;i<sizeof(big_file);i+=strlen(big_file_content))
-			memcpy(big_file+i, big_file_content, strlen(big_file_content));
-
-		big_file[0]=*"S";
-		big_file[sizeof(big_file)-1]=*"E";
-
-		/* Globally configure an http file transfer server. */
-		linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
-
-		/* create a chatroom on pauline's side */
-		chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-
-		/* create a file transfer message */
-		content = linphone_core_create_content(pauline->lc);
-		linphone_content_set_type(content,"text");
-		linphone_content_set_subtype(content,"plain");
-		linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
-		linphone_content_set_name(content,"bigfile.txt");
-		message = linphone_chat_room_create_file_transfer_message(chat_room, content);
-		{
-			int dummy=0;
-			wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-			reset_counters(&marie->stat);
-			reset_counters(&pauline->stat);
-		}
-		cbs = linphone_chat_message_get_callbacks(message);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_memory_file_transfer_send);
-		linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
-		linphone_chat_room_send_chat_message(chat_room,message);
-
-		/*wait for file to be 25% uploaded and simultate a network error*/
+	if (upload_error) {
+		/*wait for file to be 25% uploaded and simulate a network error*/
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.progress_of_LinphoneFileTransfer,25));
 		sal_set_send_error(pauline->lc->sal, -1);
 
@@ -943,189 +441,108 @@ static void file_transfer_message_io_error_upload(void) {
 
 		linphone_core_refresh_registers(pauline->lc); /*to make sure registration is back in registered and so it can be later unregistered*/
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneRegistrationOk,pauline->stat.number_of_LinphoneRegistrationOk+1));
-
-		linphone_content_unref(content);
-		linphone_core_manager_destroy(pauline);
-		linphone_core_manager_destroy(marie);
-	}
-}
-
-
-#ifdef TEST_IS_BUGGED_NO_CALL_TO_IO_ERROR_CALLBACK
-static void file_transfer_message_io_error_download(void) {
-	if (transport_supported(LinphoneTransportTls)) {
-		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-		int i;
-		LinphoneChatRoom* chat_room;
-		LinphoneChatMessage* message;
-		LinphoneContent content;
-		const char* big_file_content="big file"; /* setting dummy file content to something */
-		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		/* setting dummy file content to something */
-		for (i=0;i<sizeof(big_file);i+=strlen(big_file_content))
-			memcpy(big_file+i, big_file_content, strlen(big_file_content));
-
-		big_file[0]=*"S";
-		big_file[sizeof(big_file)-1]=*"E";
-
-		/* Globally configure an http file transfer server. */
-		linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
-
-		/* create a chatroom on pauline's side */
-		chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-
-		/* create a file transfer message */
-		memset(&content,0,sizeof(content));
-		content.type="text";
-		content.subtype="plain";
-		content.size=sizeof(big_file); /*total size to be transfered*/
-		content.name = "bigfile.txt";
-		message = linphone_chat_room_create_file_transfer_message(chat_room, &content);
-		{
-			int dummy=0;
-			wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-			reset_counters(&marie->stat);
-			reset_counters(&pauline->stat);
-		}
-		linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
-
-		/* wait for marie to receive pauline's message */
+	} else {
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
+		if (marie->stat.last_received_chat_message ) {
+			cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
+			linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+			linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
+			linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
+			linphone_chat_message_download_file(marie->stat.last_received_chat_message);
 
-
-		if (marie->stat.last_received_chat_message ) { /* get last message and use it to download file */
-			linphone_chat_message_start_file_download(marie->stat.last_received_chat_message, liblinphone_tester_chat_message_state_change, marie->lc);
-			/* wait for file to be 50% downloaded */
-			BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.progress_of_LinphoneFileTransfer, 50));
-			/* and simulate network error */
-			sal_set_recv_error(marie->lc->sal, -1);
+			if (download_error) {
+				/* wait for file to be 50% downloaded */
+				BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.progress_of_LinphoneFileTransfer, 50));
+				/* and simulate network error */
+				belle_http_provider_set_recv_error(marie->lc->http_provider, -1);
+				BC_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneMessageNotDelivered,1, 10000));
+				belle_http_provider_set_recv_error(marie->lc->http_provider, 0);
+			} else {
+				/* wait for a long time in case the DNS SRV resolution takes times - it should be immediate though */
+				if (BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1,55000))) {
+					compare_files(send_filepath, receive_filepath);
+				}
+			}
 		}
-
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
+		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,2, int, "%d"); //sent twice because of file transfer
 		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
-		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageNotDelivered,1, int, "%d");
-		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,0, int, "%d");
+	}
+	ms_free(send_filepath);
+	bc_free(receive_filepath);
+}
 
-		sal_set_recv_error(marie->lc->sal, 0);
+void transfer_message_base(bool_t upload_error, bool_t download_error) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+		transfer_message_base2(marie,pauline,upload_error,download_error);
 		linphone_core_manager_destroy(pauline);
 		linphone_core_manager_destroy(marie);
 	}
 }
-#endif
+static void transfer_message(void) {
+	transfer_message_base(FALSE, FALSE);
+}
 
-static void file_transfer_message_upload_cancelled(void) {
+static void transfer_message_with_upload_io_error(void) {
+	transfer_message_base(TRUE, FALSE);
+}
+
+static void transfer_message_with_download_io_error(void) {
+	transfer_message_base(FALSE, TRUE);
+}
+
+static void transfer_message_upload_cancelled(void) {
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-		int i;
 		LinphoneChatRoom* chat_room;
-		LinphoneChatMessage* message;
-		LinphoneChatMessageCbs *cbs;
-		LinphoneContent* content;
-		const char* big_file_content="big file"; /* setting dummy file content to something */
+		LinphoneChatMessage* msg;
 		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		/* setting dummy file content to something */
-		for (i=0;i<sizeof(big_file);i+=strlen(big_file_content))
-			memcpy(big_file+i, big_file_content, strlen(big_file_content));
-
-		big_file[0]=*"S";
-		big_file[sizeof(big_file)-1]=*"E";
-
 		/* Globally configure an http file transfer server. */
 		linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
 
 		/* create a chatroom on pauline's side */
 		chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
 
-		/* create a file transfer message */
-		content = linphone_core_create_content(pauline->lc);
-		linphone_content_set_type(content,"text");
-		linphone_content_set_subtype(content,"plain");
-		linphone_content_set_size(content,sizeof(big_file)); /*total size to be transfered*/
-		linphone_content_set_name(content,"bigfile.txt");
-		message = linphone_chat_room_create_file_transfer_message(chat_room, content);
-		{
-			int dummy=0;
-			wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-			reset_counters(&marie->stat);
-			reset_counters(&pauline->stat);
-		}
-		cbs = linphone_chat_message_get_callbacks(message);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_memory_file_transfer_send);
-		linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
-		linphone_chat_room_send_chat_message(chat_room,message);
+		msg = create_message_from_nowebcam(chat_room);
+		linphone_chat_room_send_chat_message(chat_room,msg);
 
 		/*wait for file to be 50% uploaded and cancel the transfer */
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.progress_of_LinphoneFileTransfer, 50));
-		linphone_chat_message_cancel_file_transfer(message);
+		linphone_chat_message_cancel_file_transfer(msg);
 
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneMessageNotDelivered,1));
 
 		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageNotDelivered,1, int, "%d");
 		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,0, int, "%d");
 
-		linphone_content_unref(content);
 		linphone_core_manager_destroy(pauline);
 		linphone_core_manager_destroy(marie);
 	}
 }
 
-static void file_transfer_message_download_cancelled(void) {
-#if 0
-	int i;
-	char* to;
+static void transfer_message_download_cancelled(void) {
 	LinphoneChatRoom* chat_room;
-	LinphoneChatMessage* message;
-	LinphoneContent content;
-	const char* big_file_content="big file"; /* setting dummy file content to something */
+	LinphoneChatMessage* msg;
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
-
-	/* setting dummy file content to something */
-	for (i=0;i<sizeof(big_file);i+=strlen(big_file_content))
-		memcpy(big_file+i, big_file_content, strlen(big_file_content));
-
-	big_file[0]=*"S";
-	big_file[sizeof(big_file)-1]=*"E";
-
 	/* Globally configure an http file transfer server. */
 	linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
 
 	/* create a chatroom on pauline's side */
-	to = linphone_address_as_string(marie->identity);
-	chat_room = linphone_core_create_chat_room(pauline->lc,to);
+	chat_room = linphone_core_get_chat_room(pauline->lc,marie->identity);
+	msg = create_message_from_nowebcam(chat_room);
+	linphone_chat_room_send_chat_message(chat_room,msg);
 
-	/* create a file transfer message */
-	memset(&content,0,sizeof(content));
-	content.type="text";
-	content.subtype="plain";
-	content.size=sizeof(big_file); /*total size to be transfered*/
-	content.name = "bigfile.txt";
-	message = linphone_chat_room_create_file_transfer_message(chat_room, &content);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	linphone_chat_room_send_message2(chat_room,message,liblinphone_tester_chat_message_state_change,pauline->lc);
-
-	/* wait for marie to receive pauline's message */
+	/* wait for marie to receive pauline's msg */
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
 
 
-	if (marie->stat.last_received_chat_message ) { /* get last message and use it to download file */
+	if (marie->stat.last_received_chat_message ) { /* get last msg and use it to download file */
+		LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(marie->stat.last_received_chat_message);
+		linphone_chat_message_cbs_set_file_transfer_progress_indication(cbs, file_transfer_progress_indication);
 		linphone_chat_message_start_file_download(marie->stat.last_received_chat_message, liblinphone_tester_chat_message_state_change, marie->lc);
 		/* wait for file to be 50% downloaded */
 		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.progress_of_LinphoneFileTransfer, 50));
@@ -1133,15 +550,13 @@ static void file_transfer_message_download_cancelled(void) {
 		linphone_chat_message_cancel_file_transfer(marie->stat.last_received_chat_message);
 	}
 
-	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,1, int, "%d");
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,2, int, "%d");
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,0, int, "%d");
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageNotDelivered,1, int, "%d");
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-#endif
-	ms_error("Test skipped");
 }
 
 static void file_transfer_using_external_body_url(void) {
@@ -1149,10 +564,8 @@ static void file_transfer_using_external_body_url(void) {
 		LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
 		LinphoneChatMessageCbs *cbs;
 		LinphoneChatRoom *chat_room;
-		LinphoneChatMessage *message;
+		LinphoneChatMessage *msg;
 		LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
 
 		/* make sure lime is disabled */
 		linphone_core_enable_lime(marie->lc, FALSE);
@@ -1161,13 +574,13 @@ static void file_transfer_using_external_body_url(void) {
 		/* create a chatroom on pauline's side */
 		chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
 
-		message = linphone_chat_room_create_message(chat_room, NULL);
+		msg = linphone_chat_room_create_message(chat_room, NULL);
 
-		cbs = linphone_chat_message_get_callbacks(message);
+		cbs = linphone_chat_message_get_callbacks(msg);
 		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
 
-		linphone_chat_message_set_external_body_url(message, "https://www.linphone.org:444//tmp/54ec58280ace9_c30709218df8eaba61d1.jpg");
-		linphone_chat_room_send_chat_message(chat_room, message);
+		linphone_chat_message_set_external_body_url(msg, "https://www.linphone.org:444//tmp/54ec58280ace9_c30709218df8eaba61d1.jpg");
+		linphone_chat_room_send_chat_message(chat_room, msg);
 
 		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
 		if (marie->stat.last_received_chat_message) {
@@ -1180,166 +593,85 @@ static void file_transfer_using_external_body_url(void) {
 	}
 }
 
-static void file_transfer_2_messages_simultaneously() {
+static void file_transfer_2_messages_simultaneously(void) {
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 		LinphoneChatRoom* pauline_room;
-		LinphoneChatMessage* message;
-		LinphoneChatMessage* message2;
+		LinphoneChatMessage* msg;
+		LinphoneChatMessage* msg2;
 		LinphoneChatMessageCbs *cbs;
-		LinphoneContent* content;
-		FILE *file_to_send = NULL;
-		size_t file_size;
 		char *send_filepath = bc_tester_res("images/nowebcamCIF.jpg");
 		char *receive_filepath = bc_tester_file("receive_file.dump");
 		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		file_to_send = fopen(send_filepath, "rb");
-		fseek(file_to_send, 0, SEEK_END);
-		file_size = ftell(file_to_send);
-		fseek(file_to_send, 0, SEEK_SET);
-
 		/* Globally configure an http file transfer server. */
 		linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
 
 		/* create a chatroom on pauline's side */
 		pauline_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-		/* create a file transfer message */
-		content = linphone_core_create_content(pauline->lc);
-		linphone_content_set_type(content,"image");
-		linphone_content_set_subtype(content,"jpeg");
-		linphone_content_set_size(content,file_size); /*total size to be transfered*/
-		linphone_content_set_name(content,"nowebcamCIF.jpg");
-		message = linphone_chat_room_create_file_transfer_message(pauline_room, content);
-		linphone_chat_message_set_user_data(message, file_to_send);
-		message2 = linphone_chat_room_create_file_transfer_message(pauline_room, content);
-		linphone_chat_message_set_user_data(message2, file_to_send);
-		linphone_content_unref(content);
+		msg = create_message_from_nowebcam(pauline_room);
+		msg2 = create_message_from_nowebcam(pauline_room);
 
-
-
-		{
-			/*just to have time to purge message stored in the server*/
-			int dummy=0;
-			wait_for_until(marie->lc,pauline->lc,&dummy,1,100);
-			reset_counters(&marie->stat);
-			reset_counters(&pauline->stat);
-		}
-
-		cbs = linphone_chat_message_get_callbacks(message);
+		cbs = linphone_chat_message_get_callbacks(msg2);
 		linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_file_transfer_send);
-		cbs = linphone_chat_message_get_callbacks(message2);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_send(cbs, tester_file_transfer_send);
 
-		BC_ASSERT_EQUAL(ms_list_size(linphone_core_get_chat_rooms(marie->lc)), 0, int, "%d");
-		linphone_chat_room_send_chat_message(pauline_room,message);
-		linphone_chat_room_send_chat_message(pauline_room,message2);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
-		message = linphone_chat_message_clone(marie->stat.last_received_chat_message);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,2));
-		message2 = marie->stat.last_received_chat_message;
-		fclose(file_to_send);
-		BC_ASSERT_EQUAL(ms_list_size(linphone_core_get_chat_rooms(marie->lc)), 1, int, "%d");
-		if (ms_list_size(linphone_core_get_chat_rooms(marie->lc)) != 1) {
-			char * buf = ms_strdup_printf("Found %d rooms instead of 1: ", ms_list_size(linphone_core_get_chat_rooms(marie->lc)));
-			const MSList *it = linphone_core_get_chat_rooms(marie->lc);
-			while (it) {
-				const LinphoneAddress * peer = linphone_chat_room_get_peer_address(it->data);
-				buf = ms_strcat_printf("%s, ", linphone_address_get_username(peer));
-				it = it->next;
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(linphone_core_get_chat_rooms(marie->lc)), 0, unsigned int, "%u");
+		if (bctbx_list_size(linphone_core_get_chat_rooms(marie->lc)) == 0) {
+			linphone_chat_room_send_chat_message(pauline_room,msg);
+			linphone_chat_room_send_chat_message(pauline_room,msg2);
+			if (BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1))) {
+				msg = linphone_chat_message_clone(marie->stat.last_received_chat_message);
+				BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,2));
+				msg2 = marie->stat.last_received_chat_message;
+				BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(linphone_core_get_chat_rooms(marie->lc)), 1, unsigned int, "%u");
+				if (bctbx_list_size(linphone_core_get_chat_rooms(marie->lc)) != 1) {
+					char * buf = ms_strdup_printf("Found %d rooms instead of 1: ", bctbx_list_size(linphone_core_get_chat_rooms(marie->lc)));
+					const bctbx_list_t *it = linphone_core_get_chat_rooms(marie->lc);
+					while (it) {
+						const LinphoneAddress * peer = linphone_chat_room_get_peer_address(it->data);
+						buf = ms_strcat_printf("%s, ", linphone_address_get_username(peer));
+						it = it->next;
+					}
+					ms_error("%s", buf);
+				}
+
+				cbs = linphone_chat_message_get_callbacks(msg);
+				linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+				linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
+				linphone_chat_message_download_file(msg);
+
+				cbs = linphone_chat_message_get_callbacks(msg2);
+				linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+				linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
+				linphone_chat_message_download_file(msg2);
+
+				BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,2));
+
+				BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,4, int, "%d");
+				BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,2, int, "%d");
+				compare_files(send_filepath, receive_filepath);
+
+				linphone_chat_message_unref(msg);
 			}
-			ms_error("%s", buf);
 		}
-
-		cbs = linphone_chat_message_get_callbacks(message);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
-		linphone_chat_message_download_file(message);
-
-		cbs = linphone_chat_message_get_callbacks(message2);
-		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
-		linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
-		linphone_chat_message_download_file(message2);
-
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,2));
-
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,2, int, "%d");
-		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,2, int, "%d");
-		BC_ASSERT_TRUE(compare_files(send_filepath, receive_filepath));
-
-		linphone_chat_message_unref(message);
 		linphone_core_manager_destroy(pauline);
 		ms_free(send_filepath);
-		ms_free(receive_filepath);
+		bc_free(receive_filepath);
 		linphone_core_manager_destroy(marie);
 	}
 }
 
-static void text_message_with_send_error(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-
-	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(marie->lc, pauline->identity);
-	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
-	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
-
-	/*simultate a network error*/
-	sal_set_send_error(marie->lc->sal, -1);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
-	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
-	linphone_chat_room_send_chat_message(chat_room,message);
-
-	/* check transient message list: the message should be in it, and should be the only one */
-	BC_ASSERT_EQUAL(ms_list_size(chat_room->transient_messages), 1, int, "%d");
-	BC_ASSERT_PTR_EQUAL(ms_list_nth_data(chat_room->transient_messages,0), message);
-
-
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageNotDelivered,1));
-	/*BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageInProgress,1, int, "%d");*/
-	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageReceived,0, int, "%d");
-
-	/* the message should have been discarded from transient list after an error */
-	BC_ASSERT_EQUAL(ms_list_size(chat_room->transient_messages), 0, int, "%d");
-
-	sal_set_send_error(marie->lc->sal, 0);
-
-	/*give a chance to register again to allow linphone_core_manager_destroy to properly unregister*/
-	linphone_core_refresh_registers(marie->lc);
-	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneRegistrationOk,marie->stat.number_of_LinphoneRegistrationOk + 1));
-	
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-
 static void text_message_denied(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneChatRoom* chat_room = linphone_core_get_chat_room(marie->lc, pauline->identity);
-	LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
-	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(message);
+	LinphoneChatMessage* msg = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(msg);
 
 	/*pauline doesn't want to be disturbed*/
 	linphone_core_disable_chat(pauline->lc,LinphoneReasonDoNotDisturb);
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
 	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
-	linphone_chat_room_send_chat_message(chat_room,message);
+	linphone_chat_room_send_chat_message(chat_room,msg);
 
 	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageNotDelivered,1));
 	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageReceived,0, int, "%d");
@@ -1359,9 +691,7 @@ void info_message_received(LinphoneCore *lc, LinphoneCall* call, const LinphoneI
 	counters->number_of_inforeceived++;
 }
 
-
-
-static void info_message_with_args(bool_t with_content) {
+void info_message_base(bool_t with_content) {
 	LinphoneInfoMessage *info;
 	const LinphoneContent *content;
 	const char *hvalue;
@@ -1381,12 +711,6 @@ static void info_message_with_args(bool_t with_content) {
 		linphone_info_message_set_content(info,ct);
 		linphone_content_unref(ct);
 	}
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
 	linphone_call_send_info_message(linphone_core_get_current_call(marie->lc),info);
 	linphone_info_message_destroy(info);
 
@@ -1409,19 +733,20 @@ static void info_message_with_args(bool_t with_content) {
 			if (linphone_content_get_type(content)) BC_ASSERT_STRING_EQUAL(linphone_content_get_type(content),"application");
 			if (linphone_content_get_subtype(content)) BC_ASSERT_STRING_EQUAL(linphone_content_get_subtype(content),"somexml");
 			if (linphone_content_get_buffer(content))BC_ASSERT_STRING_EQUAL((const char*)linphone_content_get_buffer(content),info_content);
-			BC_ASSERT_EQUAL(linphone_content_get_size(content),strlen(info_content), int, "%d");
+			BC_ASSERT_EQUAL((int)linphone_content_get_size(content),(int)strlen(info_content), int, "%d");
 		}
 	}
+	end_call(marie, pauline);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-static void info_message(){
-	info_message_with_args(FALSE);
+static void info_message(void){
+	info_message_base(FALSE);
 }
 
-static void info_message_with_body(){
-	info_message_with_args(TRUE);
+static void info_message_with_body(void){
+	info_message_base(TRUE);
 }
 
 static void is_composing_notification(void) {
@@ -1431,31 +756,393 @@ static void is_composing_notification(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
-
-	{
-		int dummy=0;
-		wait_for_until(marie->lc,pauline->lc,&dummy,1,100); /*just to have time to purge message stored in the server*/
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-	}
+	linphone_core_get_chat_room(marie->lc, pauline->identity); /*make marie create the chatroom with pauline, which is necessary for receiving the is-composing*/
 	linphone_chat_room_compose(chat_room);
 	wait_for_until(pauline->lc, marie->lc, &dummy, 1, 1500); /*just to sleep while iterating*/
-	linphone_chat_room_send_message(chat_room, "Composing a message");
+	linphone_chat_room_send_message(chat_room, "Composing a msg");
 	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, 1));
 	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingIdleReceived, 2));
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-#ifdef MSG_STORAGE_ENABLED
+static FILE* fopen_from_write_dir(const char * name, const char * mode) {
+	char *filepath = bc_tester_file(name);
+	FILE * file = fopen(filepath,mode);
+	bc_free(filepath);
+	return file;
+}
+
+static void lime_text_message(void) {
+	FILE *ZIDCacheMarieFD, *ZIDCachePaulineFD;
+	LinphoneChatRoom* chat_room;
+	char* filepath;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+
+	if (!linphone_core_lime_available(marie->lc)) {
+		ms_warning("Lime not available, skiping");
+		goto end;
+	}
+	/* make sure lime is enabled */
+	linphone_core_enable_lime(marie->lc, 1);
+	linphone_core_enable_lime(pauline->lc, 1);
+
+	/* set the zid caches files : create two ZID cache from this valid one inserting the auto-generated sip URI for the peer account as keys in ZID cache are indexed by peer sip uri */
+	ZIDCacheMarieFD = fopen_from_write_dir("tmpZIDCacheMarie.xml", "w");
+	ZIDCachePaulineFD = fopen_from_write_dir("tmpZIDCachePauline.xml", "w");
+	fprintf(ZIDCacheMarieFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</sndKey><rcvKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000078</sndIndex><rcvIndex>000001cf</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>72d80ab1cad243cf45634980c1d02cfb2df81ce0dd5dfcf1ebeacfc5345a9176</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000000f</sndIndex><rcvIndex>00000000</rcvIndex></peer></cache>", linphone_address_as_string_uri_only(pauline->identity), linphone_address_as_string_uri_only(pauline->identity));
+	fprintf(ZIDCachePaulineFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>005dbe0399643d953a2202dd</selfZID><peer><ZID>ef7692d0792a67491ae2d44e</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><rcvKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</rcvKey><sndKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</sndKey><rcvSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvIndex>00000078</rcvIndex><sndIndex>000001cf</sndIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>81e6e6362c34dc974263d1f77cbb9a8d6d6a718330994379099a8fa19fb12faa</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000002e</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>", linphone_address_as_string_uri_only(marie->identity), linphone_address_as_string_uri_only(marie->identity));
+	fclose(ZIDCacheMarieFD);
+	fclose(ZIDCachePaulineFD);
+
+	filepath = bc_tester_file("tmpZIDCacheMarie.xml");
+	linphone_core_set_zrtp_secrets_file(marie->lc, filepath);
+	bc_free(filepath);
+
+	filepath = bc_tester_file("tmpZIDCachePauline.xml");
+	linphone_core_set_zrtp_secrets_file(pauline->lc, filepath);
+	bc_free(filepath);
+
+	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
+
+	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedLegacy,1));
+
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
+	/* TODO : check the msg arrived correctly deciphered */
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void lime_text_message_to_non_lime(void) {
+	FILE *ZIDCachePaulineFD;
+	LinphoneChatRoom* chat_room;
+	char* filepath;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+
+	if (!linphone_core_lime_available(marie->lc)) {
+		ms_warning("Lime not available, skiping");
+		goto end;
+	}
+	/* make sure lime is enabled */
+	linphone_core_enable_lime(marie->lc, 0);
+	linphone_core_enable_lime(pauline->lc, 1);
+
+	/* set the zid caches files : create two ZID cache from this valid one inserting the auto-generated sip URI for the peer account as keys in ZID cache are indexed by peer sip uri */
+	ZIDCachePaulineFD = fopen_from_write_dir("tmpZIDCachePauline.xml", "w");
+	fprintf(ZIDCachePaulineFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>005dbe0399643d953a2202dd</selfZID><peer><ZID>ef7692d0792a67491ae2d44e</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><rcvKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</rcvKey><sndKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</sndKey><rcvSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvIndex>00000078</rcvIndex><sndIndex>000001cf</sndIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>81e6e6362c34dc974263d1f77cbb9a8d6d6a718330994379099a8fa19fb12faa</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000002e</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>", linphone_address_as_string_uri_only(marie->identity), linphone_address_as_string_uri_only(marie->identity));
+	fclose(ZIDCachePaulineFD);
+
+	filepath = bc_tester_file("tmpZIDCachePauline.xml");
+	linphone_core_set_zrtp_secrets_file(pauline->lc, filepath);
+	bc_free(filepath);
+
+	chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
+
+	linphone_chat_room_send_message(chat_room,"Bla bla bla bla");
+	//since we cannot decrypt message, we should not receive any message
+	BC_ASSERT_FALSE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,1));
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneMessageReceivedLegacy,0, int, "%d");
+
+	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+void lime_transfer_message_base(bool_t encrypt_file,bool_t download_file_from_stored_msg) {
+	FILE *ZIDCacheMarieFD, *ZIDCachePaulineFD;
+	LinphoneCoreManager *marie, *pauline;
+	LinphoneChatMessage *msg;
+	LinphoneChatMessageCbs *cbs;
+	char *pauline_id, *marie_id;
+	char *filepath;
+
+	marie = linphone_core_manager_new( "marie_rc");
+	pauline = linphone_core_manager_new( "pauline_tcp_rc");
+
+	if (!linphone_core_lime_available(marie->lc)) {
+		ms_warning("Lime not available, skiping");
+		goto end;
+	}
+	/* make sure lime is enabled */
+	linphone_core_enable_lime(marie->lc, 1);
+	linphone_core_enable_lime(pauline->lc, 1);
+	if (!encrypt_file) {
+		LpConfig *pauline_lp = linphone_core_get_config(pauline->lc);
+		lp_config_set_int(pauline_lp,"sip","lime_for_file_sharing",0);
+	}
+
+	/* set the zid caches files : create two ZID cache from this valid one inserting the auto-generated sip URI for the peer account as keys in ZID cache are indexed by peer sip uri */
+	ZIDCacheMarieFD = fopen_from_write_dir("tmpZIDCacheMarie.xml", "wb");
+	ZIDCachePaulineFD = fopen_from_write_dir("tmpZIDCachePauline.xml", "wb");
+	pauline_id = linphone_address_as_string_uri_only(pauline->identity);
+	marie_id = linphone_address_as_string_uri_only(marie->identity);
+	fprintf(ZIDCacheMarieFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</sndKey><rcvKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000078</sndIndex><rcvIndex>000001cf</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778csal_set_uuid(lc->sal, account->instance_id);bdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>72d80ab1cad243cf45634980c1d02cfb2df81ce0dd5dfcf1ebeacfc5345a9176</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000000f</sndIndex><rcvIndex>00000000</rcvIndex></peer></cache>", pauline_id, pauline_id);
+	fprintf(ZIDCachePaulineFD, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>005dbe0399643d953a2202dd</selfZID><peer><ZID>ef7692d0792a67491ae2d44e</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><rcvKey>08df5907d30959b8cb70f6fff2d8febd88fb41b0c8afc39e4b972f86dd5cfe2d</rcvKey><sndKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</sndKey><rcvSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvIndex>00000078</rcvIndex><sndIndex>000001cf</sndIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>%s</uri><sndKey>81e6e6362c34dc974263d1f77cbb9a8d6d6a718330994379099a8fa19fb12faa</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000002e</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>", marie_id, marie_id);
+	fclose(ZIDCacheMarieFD);
+	fclose(ZIDCachePaulineFD);
+	ms_free(marie_id);
+	ms_free(pauline_id);
+
+	filepath = bc_tester_file("tmpZIDCacheMarie.xml");
+	linphone_core_set_zrtp_secrets_file(marie->lc, filepath);
+	bc_free(filepath);
+
+	filepath = bc_tester_file("tmpZIDCachePauline.xml");
+	linphone_core_set_zrtp_secrets_file(pauline->lc, filepath);
+	bc_free(filepath);
+
+	/* Globally configure an http file transfer server. */
+	linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
+
+	/* create a file transfer msg */
+	msg = create_message_from_nowebcam(linphone_core_get_chat_room(pauline->lc, marie->identity));
+
+	linphone_chat_room_send_chat_message(msg->chat_room, msg);
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedWithFile,1));
+	if (marie->stat.last_received_chat_message ) {
+		LinphoneChatMessage *recv_msg;
+		const LinphoneContent* content;
+		if (download_file_from_stored_msg) {
+			LinphoneChatRoom *marie_room = linphone_core_get_chat_room(marie->lc, pauline->identity);
+			MSList * msgs = linphone_chat_room_get_history(marie_room,1);
+			BC_ASSERT_PTR_NOT_NULL(msgs);
+			if (!msgs)  goto end;
+			recv_msg = (LinphoneChatMessage *)msgs->data;
+			ms_list_free(msgs);
+		} else {
+			recv_msg = marie->stat.last_received_chat_message;
+		}
+		cbs = linphone_chat_message_get_callbacks(recv_msg);
+		linphone_chat_message_cbs_set_msg_state_changed(cbs, liblinphone_tester_chat_message_msg_state_changed);
+		linphone_chat_message_cbs_set_file_transfer_recv(cbs, file_transfer_received);
+		content = linphone_chat_message_get_file_transfer_information(recv_msg);
+		if (!content) goto end;
+		if (encrypt_file)
+			BC_ASSERT_PTR_NOT_NULL(linphone_content_get_key(content));
+		else
+			BC_ASSERT_PTR_NULL(linphone_content_get_key(content));
+		linphone_chat_message_download_file(recv_msg);
+		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1));
+	}
+
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageInProgress,2, int, "%d"); // file transfer
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphoneMessageDelivered,1, int, "%d");
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneFileTransferDownloadSuccessful,1, int, "%d");
+end:
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static  void lime_transfer_message(void) {
+	lime_transfer_message_base(TRUE,FALSE);
+}
+
+static  void lime_transfer_message_from_history(void) {
+	lime_transfer_message_base(TRUE,TRUE);
+}
+
+static  void lime_transfer_message_without_encryption(void) {
+	lime_transfer_message_base(FALSE,FALSE);
+}
+
+static void printHex(char *title, uint8_t *data, size_t length) {
+	size_t i;
+	char debug_string_buffer[2048];
+	char *debug_string = debug_string_buffer;
+	sprintf (debug_string, "%s : ", title);
+	debug_string += strlen(title)+3;
+	for (i=0; i<length; i++) {
+		sprintf (debug_string, "0x%02x, ", data[i]);
+		debug_string+=6;
+	}
+	*debug_string = '\0';
+	ms_message("%s", debug_string_buffer);
+}
+
+static void lime_unit(void) {
+	if (lime_is_available()) {
+		const char* PLAIN_TEXT_TEST_MESSAGE = "Ceci est un fabuleux msg de test à encrypter";
+		int retval;
+		size_t size;
+		uint8_t *cacheBufferString;
+		xmlDocPtr cacheBufferAlice;
+		xmlDocPtr cacheBufferBob;
+		uint8_t *multipartMessage = NULL;
+		uint8_t *decryptedMessage = NULL;
+		xmlChar *xmlStringOutput;
+		int xmlStringLength;
+		limeURIKeys_t associatedKeys;
+		int i;
+		limeKey_t associatedKey;
+		uint8_t targetZID[12] = {0x00, 0x5d, 0xbe, 0x03, 0x99, 0x64, 0x3d, 0x95, 0x3a, 0x22, 0x02, 0xdd};
+		uint8_t senderZID[12] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x70, 0x80, 0x90, 0xa0, 0xb0, 0xc0, 0xd0};
+		uint8_t encryptedMessage[1024];
+		uint8_t plainMessage[1024];
+		uint8_t receiverZID[12];
+		xmlDocPtr cacheBuffer;
+		FILE *CACHE;
+
+		/**** Low level tests using on cache file to extract keys, encrypt/decrypt ****/
+		/**** use functions that are not directly used by external entities ****/
+
+		/* create and load cache file */
+		CACHE = fopen_from_write_dir("ZIDCache.xml", "wb");
+		fprintf (CACHE, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>pipo1@pipo.com</uri><sndKey>963c57bb28e62068d2df23e8f9b771932d3c57bb28e62068d2df23e8f9b77193</sndKey><rcvKey>05d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>02ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000069</sndIndex><rcvIndex>000001e8</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>pipo1@pipo.com</uri><sndKey>123456789012345678901234567890123456765431262068d2df23e8f9b77193</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000001</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>");
+		fclose(CACHE);
+		CACHE = fopen_from_write_dir("ZIDCache.xml", "rb+");
+		cacheBufferString = (uint8_t*) ms_load_file_content(CACHE, &size);
+		*(cacheBufferString+size) = '\0';
+		fclose(CACHE);
+		/* parse it to an xmlDoc */
+		cacheBuffer = xmlParseDoc(cacheBufferString);
+		ms_free(cacheBufferString);
+
+		/* get data from cache : sender */
+		associatedKeys.peerURI = (uint8_t *)malloc(15);
+		memcpy(associatedKeys.peerURI, "pipo1@pipo.com", 15);
+		associatedKeys.associatedZIDNumber  = 0;
+		retval = lime_getCachedSndKeysByURI(cacheBuffer, &associatedKeys);
+		BC_ASSERT_EQUAL(retval, 0, int, "%d");
+		BC_ASSERT_EQUAL(associatedKeys.associatedZIDNumber, 2, int, "%d"); /* there are 2 keys associated to pipo1@pipo.com address in the cache above*/
+		ms_message("Get cached key by URI, for sender, return %d keys", associatedKeys.associatedZIDNumber);
+
+		for (i=0; i<associatedKeys.associatedZIDNumber; i++) {
+			printHex("ZID", associatedKeys.peerKeys[i]->peerZID, 12);
+			printHex("key", associatedKeys.peerKeys[i]->key, 32);
+			printHex("sessionID", associatedKeys.peerKeys[i]->sessionId, 32);
+			ms_message("session index %d\n", associatedKeys.peerKeys[i]->sessionIndex);
+		}
+
+		/* get data from cache : receiver */
+		memcpy(associatedKey.peerZID, targetZID, 12);
+		retval = lime_getCachedRcvKeyByZid(cacheBuffer, &associatedKey);
+		BC_ASSERT_EQUAL(retval, 0, int, "%d");
+		printHex("Got receiver key for ZID", targetZID, 12);
+		printHex("Key", associatedKey.key, 32);
+		printHex("sessionID", associatedKey.sessionId, 32);
+		ms_message("session index %d\n", associatedKey.sessionIndex);
+
+		/* encrypt/decrypt a msg */
+		lime_encryptMessage(associatedKeys.peerKeys[0], (uint8_t *)PLAIN_TEXT_TEST_MESSAGE, (uint32_t)strlen(PLAIN_TEXT_TEST_MESSAGE), senderZID, encryptedMessage);
+		printHex("Ciphered", encryptedMessage, strlen((char *)encryptedMessage));
+		/* invert sender and receiverZID to decrypt/authenticate */
+		memcpy(receiverZID, associatedKeys.peerKeys[0]->peerZID, 12);
+		memcpy(associatedKeys.peerKeys[0]->peerZID, senderZID, 12);
+		retval = lime_decryptMessage(associatedKeys.peerKeys[0], encryptedMessage, (uint32_t)strlen(PLAIN_TEXT_TEST_MESSAGE)+16, receiverZID, plainMessage);
+		BC_ASSERT_EQUAL(retval, 0, int, "%d");
+		BC_ASSERT_STRING_EQUAL((char *)plainMessage, (char *)PLAIN_TEXT_TEST_MESSAGE);
+		ms_message("Decrypt and auth returned %d\nPlain text is %s\n", retval, plainMessage);
+
+		/* update receiver data */
+		associatedKey.sessionIndex++;
+		associatedKey.key[0]++;
+		associatedKey.sessionId[0]++;
+		retval = lime_setCachedKey(cacheBuffer, &associatedKey, LIME_RECEIVER);
+		BC_ASSERT_EQUAL(retval, 0, int, "%d");
+
+		/* update sender data */
+		associatedKeys.peerKeys[0]->sessionIndex++;
+		associatedKeys.peerKeys[0]->key[0]++;
+		associatedKeys.peerKeys[0]->sessionId[0]++;
+		retval = lime_setCachedKey(cacheBuffer, associatedKeys.peerKeys[0], LIME_SENDER);
+		BC_ASSERT_EQUAL(retval, 0, int, "%d");
+
+		/* free memory */
+		lime_freeKeys(&associatedKeys);
+
+		/* write the file */
+		/* dump the xml document into a string */
+		xmlDocDumpFormatMemoryEnc(cacheBuffer, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
+		/* write it to the file */
+		CACHE = fopen_from_write_dir("ZIDCache.xml", "w+");
+		fwrite(xmlStringOutput, 1, xmlStringLength, CACHE);
+		xmlFree(xmlStringOutput);
+		fclose(CACHE);
+		xmlFreeDoc(cacheBuffer);
+
+		/**** Higher level tests using 2 caches to encrypt/decrypt a msg ****/
+		/* Create Alice cache file and then load it */
+		CACHE = fopen_from_write_dir("ZIDCacheAlice.xml", "wb");
+		fprintf(CACHE, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>ef7692d0792a67491ae2d44e</selfZID><peer><ZID>005dbe0399643d953a2202dd</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:pauline@sip.example.org</uri><sndKey>9111ebeb52e50edcc6fcb3eea1a2d3ae3c2c75d3668923e83c59d0f472455150</sndKey><rcvKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</rcvKey><sndSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>00000080</sndIndex><rcvIndex>000001cf</rcvIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:pauline@sip.example.org</uri><sndKey>72d80ab1cad243cf45634980c1d02cfb2df81ce0dd5dfcf1ebeacfc5345a9176</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000000f</sndIndex><rcvIndex>00000000</rcvIndex></peer></cache>");
+		fclose(CACHE);
+		CACHE = fopen_from_write_dir("ZIDCacheAlice.xml", "rb+");
+		cacheBufferString = (uint8_t *)ms_load_file_content(CACHE, &size);
+		*(cacheBufferString+size) = '\0';
+		fclose(CACHE);
+		/* parse it to an xmlDoc */
+		cacheBufferAlice = xmlParseDoc(cacheBufferString);
+		ms_free(cacheBufferString);
+
+		/* Create Bob cache file and then load it */
+		CACHE = fopen_from_write_dir("ZIDCacheBob.xml", "wb");
+		fprintf(CACHE, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cache><selfZID>005dbe0399643d953a2202dd</selfZID><peer><ZID>ef7692d0792a67491ae2d44e</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:marie@sip.example.org</uri><rcvKey>9111ebeb52e50edcc6fcb3eea1a2d3ae3c2c75d3668923e83c59d0f472455150</rcvKey><sndKey>60f020a3fe11dc2cc0e1e8ed9341b4cd14944db806ca4fc95456bbe45d95c43a</sndKey><rcvSId>5f9aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndSId>bcffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvIndex>00000080</rcvIndex><sndIndex>000001cf</sndIndex><pvs>01</pvs></peer><peer><ZID>1234567889643d953a2202ee</ZID><rs1>9b5c8f06f3b6c2c695f2dfc3c26f31f5fef8661f8c5fe7c95aeb5c5b0435b045</rs1><aux>f8324dd18ea905171ec2be89f879d01d5994132048d92ea020778cbdf31c605e</aux><rs2>2fdcef69380937c2cf221f7d11526f286c39f49641452ba9012521c705094899</rs2><uri>sip:marie@sip.example.org</uri><sndKey>81e6e6362c34dc974263d1f77cbb9a8d6d6a718330994379099a8fa19fb12faa</sndKey><rcvKey>25d9ac653a83c4559cb0ae7394e7cd3b2d3c57bb28e62068d2df23e8f9b77193</rcvKey><sndSId>f69aa1e5e4c7ec88fa389a9f6b8879b42d3c57bb28e62068d2df23e8f9b77193</sndSId><rcvSId>22ffd51e7316a6c6f53a50fcf01b01bf2d3c57bb28e62068d2df23e8f9b77193</rcvSId><sndIndex>0000002e</sndIndex><rcvIndex>00000000</rcvIndex><pvs>01</pvs></peer></cache>");
+		fclose(CACHE);
+		CACHE = fopen_from_write_dir("ZIDCacheBob.xml", "rb+");
+		cacheBufferString = (uint8_t *)ms_load_file_content(CACHE, &size);
+		*(cacheBufferString+size) = '\0';
+		fclose(CACHE);
+		/* parse it to an xmlDoc */
+		cacheBufferBob = xmlParseDoc(cacheBufferString);
+		ms_free(cacheBufferString);
+
+
+
+		/* encrypt a msg */
+		retval = lime_createMultipartMessage(cacheBufferAlice, (uint8_t *)PLAIN_TEXT_TEST_MESSAGE, (uint8_t *)"sip:pauline@sip.example.org", &multipartMessage);
+
+		BC_ASSERT_EQUAL(retval, 0, int, "%d");
+		if (retval == 0) {
+			ms_message("Encrypted msg created is %s", multipartMessage);
+		}
+
+		/* decrypt the multipart msg */
+		retval = lime_decryptMultipartMessage(cacheBufferBob, multipartMessage, &decryptedMessage);
+
+		BC_ASSERT_EQUAL(retval, 0, int, "%d");
+		if (retval == 0) {
+			BC_ASSERT_STRING_EQUAL((char *)decryptedMessage, (char *)PLAIN_TEXT_TEST_MESSAGE);
+			ms_message("Succesfully decrypted msg is %s", decryptedMessage);
+		}
+		free(multipartMessage);
+		free(decryptedMessage);
+
+		/* update ZID files */
+		/* dump the xml document into a string */
+		xmlDocDumpFormatMemoryEnc(cacheBufferAlice, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
+		/* write it to the file */
+		CACHE = fopen_from_write_dir("ZIDCacheAlice.xml", "wb+");
+		fwrite(xmlStringOutput, 1, xmlStringLength, CACHE);
+		xmlFree(xmlStringOutput);
+		fclose(CACHE);
+
+		xmlDocDumpFormatMemoryEnc(cacheBufferBob, &xmlStringOutput, &xmlStringLength, "UTF-8", 0);
+		/* write it to the file */
+		CACHE = fopen_from_write_dir("ZIDCacheBob.xml", "wb+");
+		fwrite(xmlStringOutput, 1, xmlStringLength, CACHE);
+		xmlFree(xmlStringOutput);
+		fclose(CACHE);
+
+
+		xmlFreeDoc(cacheBufferAlice);
+		xmlFreeDoc(cacheBufferBob);
+	} else {
+		ms_warning("Lime not available, skiping");
+	}
+}
+
+#ifdef SQLITE_STORAGE_ENABLED
 
 /*
  * Copy file "from" to file "to".
  * Destination file is truncated if existing.
  * Return 0 on success, positive value on error.
  */
-static int
-message_tester_copy_file(const char *from, const char *to)
+int message_tester_copy_file(const char *from, const char *to)
 {
 	FILE *in, *out;
 	char buf[256];
@@ -1496,20 +1183,26 @@ message_tester_copy_file(const char *from, const char *to)
 	return 0;
 }
 
-static int check_no_strange_time(void* data,int argc, char** argv,char** cNames) {
+int check_no_strange_time(void* data,int argc, char** argv,char** cNames) {
 	BC_ASSERT_EQUAL(argc, 1, int, "%d");
 	BC_ASSERT_STRING_EQUAL(cNames[0], "COUNT(*)"); // count of non updated messages should be 0
 	BC_ASSERT_STRING_EQUAL(argv[0], "0"); // count of non updated messages should be 0
 	return 0;
 }
 
-static void message_storage_migration() {
+void history_message_count_helper(LinphoneChatRoom* chatroom, int x, int y, unsigned int expected ){
+	bctbx_list_t* messages = linphone_chat_room_get_history_range(chatroom, x, y);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), expected, unsigned int, "%u");
+	bctbx_list_free_with_data(messages, (void (*)(void *))linphone_chat_message_unref);
+}
+
+static void database_migration(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	char *src_db = bc_tester_res("messages.db");
 	char *tmp_db  = bc_tester_file("tmp.db");
-	const MSList* chatrooms;
+	const bctbx_list_t* chatrooms;
 
-	BC_ASSERT_EQUAL_FATAL(message_tester_copy_file(src_db, tmp_db), 0, int, "%d");
+	BC_ASSERT_EQUAL(message_tester_copy_file(src_db, tmp_db), 0, int, "%d");
 
 	// enable to test the performances of the migration step
 	//linphone_core_message_storage_set_debug(marie->lc, TRUE);
@@ -1517,41 +1210,34 @@ static void message_storage_migration() {
 	// the messages.db has 10000 dummy messages with the very first DB scheme.
 	// This will test the migration procedure
 	linphone_core_set_chat_database_path(marie->lc, tmp_db);
+	BC_ASSERT_PTR_NOT_NULL(marie->lc->db);
+	if (!marie->lc->db) goto end;
 
 	chatrooms = linphone_core_get_chat_rooms(marie->lc);
-	BC_ASSERT(ms_list_size(chatrooms) > 0);
+	BC_ASSERT(bctbx_list_size(chatrooms) > 0);
 
 	// check that all messages have been migrated to the UTC time storage
 	BC_ASSERT(sqlite3_exec(marie->lc->db, "SELECT COUNT(*) FROM history WHERE time != '-1';", check_no_strange_time, NULL, NULL) == SQLITE_OK );
 
+end:
 	linphone_core_manager_destroy(marie);
 	remove(tmp_db);
 	ms_free(src_db);
-	ms_free(tmp_db);
+	bc_free(tmp_db);
 }
 
-static void history_message_count_helper(LinphoneChatRoom* chatroom, int x, int y, int expected ){
-	MSList* messages = linphone_chat_room_get_history_range(chatroom, x, y);
-	int size = ms_list_size(messages);
-	if( expected != size ){
-		ms_warning("History retrieved from %d to %d returned %d records, but expected %d", x, y, size, expected);
-	}
-	BC_ASSERT_EQUAL(size, expected, int, "%d");
-
-	ms_list_free_with_data(messages, (void (*)(void *))linphone_chat_message_unref);
-
-}
-
-static void history_range_full_test(){
+static void history_range(void){
 	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
 	LinphoneAddress *jehan_addr = linphone_address_new("<sip:Jehan@sip.linphone.org>");
 	LinphoneChatRoom *chatroom;
 	char *src_db = bc_tester_res("messages.db");
 	char *tmp_db  = bc_tester_file("tmp.db");
 
-	BC_ASSERT_EQUAL_FATAL(message_tester_copy_file(src_db, tmp_db), 0, int, "%d");
+	BC_ASSERT_EQUAL(message_tester_copy_file(src_db, tmp_db), 0, int, "%d");
 
 	linphone_core_set_chat_database_path(marie->lc, tmp_db);
+	BC_ASSERT_PTR_NOT_NULL(marie->lc->db);
+	if (!marie->lc->db) goto end;
 
 	chatroom = linphone_core_get_chat_room(marie->lc, jehan_addr);
 	BC_ASSERT_PTR_NOT_NULL(chatroom);
@@ -1575,114 +1261,629 @@ static void history_range_full_test(){
 		history_message_count_helper(chatroom, -2, 2, 3);
 		history_message_count_helper(chatroom, -3, 1, 2);
 	}
+
+end:
 	linphone_core_manager_destroy(marie);
 	linphone_address_destroy(jehan_addr);
 	remove(tmp_db);
 	ms_free(src_db);
-	ms_free(tmp_db);
+	bc_free(tmp_db);
 }
 
-
-static void history_messages_count() {
+static void history_count(void) {
 	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
 	LinphoneAddress *jehan_addr = linphone_address_new("<sip:Jehan@sip.linphone.org>");
 	LinphoneChatRoom *chatroom;
-	MSList *messages;
+	bctbx_list_t *messages;
 	char *src_db = bc_tester_res("messages.db");
 	char *tmp_db  = bc_tester_file("tmp.db");
 
-	BC_ASSERT_EQUAL_FATAL(message_tester_copy_file(src_db, tmp_db), 0, int, "%d");
+	BC_ASSERT_EQUAL(message_tester_copy_file(src_db, tmp_db), 0, int, "%d");
 
 	linphone_core_set_chat_database_path(marie->lc, tmp_db);
+	BC_ASSERT_PTR_NOT_NULL(marie->lc->db);
+	if (!marie->lc->db) goto end;
 
 	chatroom = linphone_core_get_chat_room(marie->lc, jehan_addr);
 	BC_ASSERT_PTR_NOT_NULL(chatroom);
 	if (chatroom){
 		messages=linphone_chat_room_get_history(chatroom,10);
-		BC_ASSERT_EQUAL(ms_list_size(messages), 10, int, "%d");
-		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), 10, unsigned int, "%u");
+		bctbx_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
 
 		messages=linphone_chat_room_get_history(chatroom,1);
-		BC_ASSERT_EQUAL(ms_list_size(messages), 1, int, "%d");
-		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), 1, unsigned int, "%u");
+		bctbx_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
 
 		messages=linphone_chat_room_get_history(chatroom,0);
 		BC_ASSERT_EQUAL(linphone_chat_room_get_history_size(chatroom), 1270, int, "%d");
-		BC_ASSERT_EQUAL(ms_list_size(messages), 1270, int, "%d");
-		/*check the second most recent message*/
-		BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text((LinphoneChatMessage *)messages->next->data), "Fore and aft follow each other.");
-		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), 1270, unsigned int, "%u");
 
-		/*test offset+limit: retrieve the 42th latest message only and check its content*/
+		/*check the second most recent msg*/
+		BC_ASSERT_PTR_NOT_NULL(messages);
+		if (messages){
+			BC_ASSERT_PTR_NOT_NULL(messages->next->data);
+			if (messages->next->data){
+				BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text((LinphoneChatMessage *)messages->next->data), "Fore and aft follow each other.");
+			}
+		}
+
+		bctbx_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+
+		/*test offset+limit: retrieve the 42th latest msg only and check its content*/
 		messages=linphone_chat_room_get_history_range(chatroom, 42, 42);
-		BC_ASSERT_EQUAL(ms_list_size(messages), 1, int, "%d");
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), 1, unsigned int, "%u");
 		BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text((LinphoneChatMessage *)messages->data), "If you open yourself to the Tao is intangible and evasive, yet prefers to keep us at the mercy of the kingdom, then all of the streams of hundreds of valleys because of its limitless possibilities.");
-		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+		bctbx_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
 
 		/*test offset without limit*/
 		messages = linphone_chat_room_get_history_range(chatroom, 1265, -1);
-		BC_ASSERT_EQUAL(ms_list_size(messages), 1270-1265, int, "%d");
-		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), 1270-1265, unsigned int, "%u");
+		bctbx_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
 
 		/*test limit without offset*/
 		messages = linphone_chat_room_get_history_range(chatroom, 0, 5);
-		BC_ASSERT_EQUAL(ms_list_size(messages), 6, int, "%d");
-		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), 6, unsigned int, "%u");
+		bctbx_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
 
 		/*test invalid start*/
 		messages = linphone_chat_room_get_history_range(chatroom, 1265, 1260);
-		BC_ASSERT_EQUAL(ms_list_size(messages), 1270-1265, int, "%d");
-		ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
+		BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(messages), 1270-1265, unsigned int, "%u");
+		bctbx_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref);
 	}
+
+end:
 	linphone_core_manager_destroy(marie);
 	linphone_address_destroy(jehan_addr);
 	remove(tmp_db);
 	ms_free(src_db);
-	ms_free(tmp_db);
+	bc_free(tmp_db);
+}
+#endif
+
+static void text_status_after_destroying_chat_room(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneChatRoom *chatroom = linphone_core_get_chat_room_from_uri(marie->lc, "<sip:Jehan@sip.linphone.org>");
+	LinphoneChatMessage *msg = linphone_chat_room_create_message(chatroom, "hello");
+	linphone_chat_room_send_chat_message(chatroom, msg);
+	linphone_core_delete_chat_room(marie->lc, chatroom);
+	//since message is orphan, we do not expect to be notified of state change
+	BC_ASSERT_FALSE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneMessageNotDelivered, 1, 1000));
+	linphone_core_manager_destroy(marie);
 }
 
 
-#endif
+static void file_transfer_not_sent_if_invalid_url(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneChatRoom *chatroom = linphone_core_get_chat_room_from_uri(marie->lc, "<sip:Jehan@sip.linphone.org>");
+	LinphoneChatMessage *msg = create_message_from_nowebcam(chatroom);
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(msg);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_core_set_file_transfer_server(marie->lc, "INVALID URL");
+	linphone_chat_room_send_chat_message(chatroom, msg);
+	BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneMessageNotDelivered, 1, 1000));
+	linphone_core_manager_destroy(marie);
+}
+
+void file_transfer_io_error_base(char *server_url, bool_t destroy_room) {
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneChatRoom *chatroom = linphone_core_get_chat_room_from_uri(marie->lc, "<sip:Jehan@sip.linphone.org>");
+	LinphoneChatMessage *msg = create_message_from_nowebcam(chatroom);
+	LinphoneChatMessageCbs *cbs = linphone_chat_message_get_callbacks(msg);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs,liblinphone_tester_chat_message_msg_state_changed);
+	linphone_core_set_file_transfer_server(marie->lc, server_url);
+	linphone_chat_room_send_chat_message(chatroom, msg);
+	BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneMessageInProgress, 1, 1000));
+	if (destroy_room) {
+		//since message is orphan, we do not expect to be notified of state change
+		linphone_core_delete_chat_room(marie->lc, chatroom);
+		BC_ASSERT_FALSE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneMessageNotDelivered, 1, 1000));
+	} else {
+		BC_ASSERT_TRUE(wait_for_until(marie->lc, NULL, &marie->stat.number_of_LinphoneMessageNotDelivered, 1, 3000));
+	}
+	linphone_core_manager_destroy(marie);
+}
+
+static void file_transfer_not_sent_if_host_not_found(void) {
+	file_transfer_io_error_base("https://not-existing-url.com", FALSE);
+}
+
+static void file_transfer_not_sent_if_url_moved_permanently(void) {
+	file_transfer_io_error_base("http://linphone.org/toto.php", FALSE);
+}
+
+static void file_transfer_io_error_after_destroying_chatroom(void) {
+	file_transfer_io_error_base("https://www.linphone.org:444/lft.php", TRUE);
+}
+
+static void real_time_text(bool_t audio_stream_enabled, bool_t srtp_enabled, bool_t mess_with_marie_payload_number, bool_t mess_with_pauline_payload_number,
+						   bool_t ice_enabled, bool_t sql_storage, bool_t do_not_store_rtt_messages_in_sql_storage) {
+	LinphoneChatRoom *pauline_chat_room;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCallParams *marie_params = NULL;
+	LinphoneCall *pauline_call, *marie_call;
+	char *marie_db  = bc_tester_file("marie.db");
+	char *pauline_db  = bc_tester_file("pauline.db");
+
+	if (sql_storage) {
+		linphone_core_set_chat_database_path(marie->lc, marie_db);
+		BC_ASSERT_PTR_NOT_NULL(marie->lc->db);
+		linphone_core_set_chat_database_path(pauline->lc, pauline_db);
+		BC_ASSERT_PTR_NOT_NULL(pauline->lc->db);
+		if (do_not_store_rtt_messages_in_sql_storage) {
+			lp_config_set_int(marie->lc->config, "misc", "store_rtt_messages", 0);
+			lp_config_set_int(pauline->lc->config, "misc", "store_rtt_messages", 0);
+		}
+	}
+
+	if (mess_with_marie_payload_number) {
+		bctbx_list_t *elem;
+		for (elem = marie->lc->codecs_conf.text_codecs; elem != NULL; elem = elem->next) {
+			PayloadType *pt = (PayloadType*)elem->data;
+			if (strcasecmp(pt->mime_type, payload_type_t140.mime_type) == 0) {
+				payload_type_set_number(pt, 99);
+				break;
+			}
+		}
+	} else if (mess_with_pauline_payload_number) {
+		bctbx_list_t *elem;
+		for (elem = pauline->lc->codecs_conf.text_codecs; elem != NULL; elem = elem->next) {
+			PayloadType *pt = (PayloadType*)elem->data;
+			if (strcasecmp(pt->mime_type, payload_type_t140.mime_type) == 0) {
+				payload_type_set_number(pt, 99);
+				break;
+			}
+		}
+	}
+
+	if (ice_enabled) {
+		linphone_core_set_firewall_policy(marie->lc, LinphonePolicyUseIce);
+		linphone_core_set_firewall_policy(pauline->lc, LinphonePolicyUseIce);
+	}
+
+	if (srtp_enabled) {
+		BC_ASSERT_TRUE(linphone_core_media_encryption_supported(marie->lc, LinphoneMediaEncryptionSRTP));
+		linphone_core_set_media_encryption(marie->lc, LinphoneMediaEncryptionSRTP);
+		linphone_core_set_media_encryption(pauline->lc, LinphoneMediaEncryptionSRTP);
+		linphone_core_set_media_encryption_mandatory(marie->lc, TRUE);
+		linphone_core_set_media_encryption_mandatory(pauline->lc, TRUE);
+	}
+
+	marie_params = linphone_core_create_call_params(marie->lc, NULL);
+	linphone_call_params_enable_realtime_text(marie_params,TRUE);
+	if (!audio_stream_enabled) {
+		linphone_call_params_enable_audio(marie_params,FALSE);
+		linphone_core_set_nortp_timeout(marie->lc, 5);
+		linphone_core_set_nortp_timeout(pauline->lc, 5);
+	}
+
+	BC_ASSERT_TRUE(call_with_caller_params(marie, pauline, marie_params));
+	pauline_call = linphone_core_get_current_call(pauline->lc);
+	marie_call = linphone_core_get_current_call(marie->lc);
+	if (pauline_call) {
+		BC_ASSERT_TRUE(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(pauline_call)));
+		if (!audio_stream_enabled) {
+			BC_ASSERT_TRUE(linphone_call_params_audio_enabled(linphone_call_get_current_params(pauline_call)));
+		}
+
+		pauline_chat_room = linphone_call_get_chat_room(pauline_call);
+		BC_ASSERT_PTR_NOT_NULL(pauline_chat_room);
+		if (pauline_chat_room) {
+			const char* message = "Be l3l";
+			size_t i;
+			LinphoneChatMessage* rtt_message = linphone_chat_room_create_message(pauline_chat_room,NULL);
+			LinphoneChatRoom *marie_chat_room = linphone_call_get_chat_room(marie_call);
+
+			for (i = 0; i < strlen(message); i++) {
+				BC_ASSERT_FALSE(linphone_chat_message_put_char(rtt_message, message[i]));
+				BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, (int)i+1, 1000));
+				BC_ASSERT_EQUAL(linphone_chat_room_get_char(marie_chat_room), message[i], char, "%c");
+			}
+			linphone_chat_room_send_chat_message(pauline_chat_room, rtt_message);
+			BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
+
+			if (sql_storage) {
+				bctbx_list_t *marie_messages = linphone_chat_room_get_history(marie_chat_room, 0);
+				bctbx_list_t *pauline_messages = linphone_chat_room_get_history(pauline_chat_room, 0);
+				LinphoneChatMessage *marie_msg = NULL;
+				LinphoneChatMessage *pauline_msg = NULL;
+				if (do_not_store_rtt_messages_in_sql_storage) {
+					BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(marie_messages), 0, unsigned int , "%u");
+					BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(pauline_messages), 0, unsigned int , "%u");
+				} else {
+					BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(marie_messages), 1, unsigned int , "%u");
+					BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(pauline_messages), 1, unsigned int , "%u");
+					if (!marie_messages || !pauline_messages) {
+						goto end;
+					}
+					marie_msg = (LinphoneChatMessage *)marie_messages->data;
+					pauline_msg = (LinphoneChatMessage *)pauline_messages->data;
+					BC_ASSERT_STRING_EQUAL(marie_msg->message, message);
+					BC_ASSERT_STRING_EQUAL(pauline_msg->message, message);
+					bctbx_list_free_with_data(marie_messages, (void (*)(void *))linphone_chat_message_unref);
+					bctbx_list_free_with_data(pauline_messages, (void (*)(void *))linphone_chat_message_unref);
+				}
+			}
+		}
+
+		if (!audio_stream_enabled) {
+			int dummy = 0;
+			wait_for_until(pauline->lc, marie->lc, &dummy, 1, 7000); /* Wait to see if call is dropped after the nortp_timeout */
+			BC_ASSERT_FALSE(marie->stat.number_of_LinphoneCallEnd > 0);
+			BC_ASSERT_FALSE(pauline->stat.number_of_LinphoneCallEnd > 0);
+		}
+
+		if (ice_enabled) {
+			BC_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
+		}
+
+end:
+		end_call(marie, pauline);
+	}
+	linphone_call_params_destroy(marie_params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+	remove(marie_db);
+	bc_free(marie_db);
+	remove(pauline_db);
+	bc_free(pauline_db);
+}
+
+static void real_time_text_message(void) {
+	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE);
+}
+
+static void real_time_text_sql_storage(void) {
+	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE);
+}
+
+static void real_time_text_sql_storage_rtt_disabled(void) {
+	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE);
+}
+
+static void real_time_text_conversation(void) {
+	LinphoneChatRoom *pauline_chat_room, *marie_chat_room;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCallParams *marie_params = linphone_core_create_call_params(marie->lc, NULL);
+	LinphoneCall *pauline_call, *marie_call;
+	linphone_call_params_enable_realtime_text(marie_params,TRUE);
+
+	BC_ASSERT_TRUE(call_with_caller_params(marie, pauline, marie_params));
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+	marie_call=linphone_core_get_current_call(marie->lc);
+	BC_ASSERT_TRUE(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(pauline_call)));
+
+	pauline_chat_room = linphone_call_get_chat_room(pauline_call);
+	BC_ASSERT_PTR_NOT_NULL(pauline_chat_room);
+	marie_chat_room = linphone_call_get_chat_room(marie_call);
+	BC_ASSERT_PTR_NOT_NULL(pauline_chat_room);
+	if (pauline_chat_room && marie_chat_room) {
+		const char* message1_1 = "Lorem";
+		const char* message1_2 = "Ipsum";
+		const char* message2_1 = "Be lle Com";
+		const char* message2_2 = "eB ell moC";
+		size_t i;
+		LinphoneChatMessage* pauline_rtt_message = linphone_chat_room_create_message(pauline_chat_room,NULL);
+		LinphoneChatMessage* marie_rtt_message = linphone_chat_room_create_message(marie_chat_room,NULL);
+
+		for (i = 0; i < strlen(message1_1); i++) {
+			linphone_chat_message_put_char(pauline_rtt_message, message1_1[i]);
+			BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, (int)i+1, 1000));
+			BC_ASSERT_EQUAL(linphone_chat_room_get_char(marie_chat_room), message1_1[i], char, "%c");
+
+			linphone_chat_message_put_char(marie_rtt_message, message1_2[i]);
+			BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneIsComposingActiveReceived, (int)i+1, 1000));
+			BC_ASSERT_EQUAL(linphone_chat_room_get_char(pauline_chat_room), message1_2[i], char, "%c");
+		}
+
+		/*Commit the message, triggers a NEW LINE in T.140 */
+		linphone_chat_room_send_chat_message(pauline_chat_room, pauline_rtt_message);
+		linphone_chat_room_send_chat_message(marie_chat_room, marie_rtt_message);
+
+		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
+		{
+			LinphoneChatMessage * msg = marie->stat.last_received_chat_message;
+			BC_ASSERT_PTR_NOT_NULL(msg);
+			if (msg) {
+				BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(msg), message1_1);
+			}
+		}
+		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneMessageReceived, 1));
+		{
+			LinphoneChatMessage * msg = pauline->stat.last_received_chat_message;
+			BC_ASSERT_PTR_NOT_NULL(msg);
+			if (msg) {
+				BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(msg), message1_2);
+			}
+		}
+
+		reset_counters(&pauline->stat);
+		reset_counters(&marie->stat);
+		pauline_rtt_message = linphone_chat_room_create_message(pauline_chat_room,NULL);
+		marie_rtt_message = linphone_chat_room_create_message(marie_chat_room,NULL);
+
+		for (i = 0; i < strlen(message2_1); i++) {
+			linphone_chat_message_put_char(pauline_rtt_message, message2_1[i]);
+			BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, (int)i+1, 1000));
+			BC_ASSERT_EQUAL(linphone_chat_room_get_char(marie_chat_room), message2_1[i], char, "%c");
+
+			linphone_chat_message_put_char(marie_rtt_message, message2_2[i]);
+			BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneIsComposingActiveReceived, (int)i+1, 1000));
+			BC_ASSERT_EQUAL(linphone_chat_room_get_char(pauline_chat_room), message2_2[i], char, "%c");
+		}
+
+		/*Commit the message, triggers a NEW LINE in T.140 */
+		linphone_chat_room_send_chat_message(pauline_chat_room, pauline_rtt_message);
+		linphone_chat_room_send_chat_message(marie_chat_room, marie_rtt_message);
+
+		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
+		{
+			LinphoneChatMessage * msg = marie->stat.last_received_chat_message;
+			BC_ASSERT_PTR_NOT_NULL(msg);
+			if (msg) {
+				BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(msg), message2_1);
+			}
+		}
+		BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneMessageReceived, 1));
+		{
+			LinphoneChatMessage * msg = pauline->stat.last_received_chat_message;
+			BC_ASSERT_PTR_NOT_NULL(msg);
+			if (msg) {
+				BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(msg), message2_2);
+			}
+		}
+	}
+	end_call(marie, pauline);
+	linphone_call_params_destroy(marie_params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void real_time_text_without_audio(void) {
+	real_time_text(FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE);
+}
+
+static void real_time_text_srtp(void) {
+	real_time_text(TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE);
+}
+
+static void real_time_text_ice(void) {
+	real_time_text(TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
+}
+
+static void real_time_text_message_compat(bool_t end_with_crlf, bool_t end_with_lf) {
+	LinphoneChatRoom *pauline_chat_room;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCallParams *marie_params = NULL;
+	LinphoneCall *pauline_call, *marie_call;
+
+	marie_params = linphone_core_create_call_params(marie->lc, NULL);
+	linphone_call_params_enable_realtime_text(marie_params,TRUE);
+
+	BC_ASSERT_TRUE(call_with_caller_params(marie, pauline, marie_params));
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+	marie_call=linphone_core_get_current_call(marie->lc);
+	if (pauline_call) {
+		BC_ASSERT_TRUE(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(pauline_call)));
+
+		pauline_chat_room = linphone_call_get_chat_room(pauline_call);
+		BC_ASSERT_PTR_NOT_NULL(pauline_chat_room);
+		if (pauline_chat_room) {
+			const char* message = "Be l3l";
+			size_t i;
+			LinphoneChatMessage* rtt_message = linphone_chat_room_create_message(pauline_chat_room,NULL);
+			LinphoneChatRoom *marie_chat_room = linphone_call_get_chat_room(marie_call);
+			uint32_t crlf = 0x0D0A;
+			uint32_t lf = 0x0A;
+
+			for (i = 0; i < strlen(message); i++) {
+				linphone_chat_message_put_char(rtt_message, message[i]);
+				BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, (int)i+1, 1000));
+				BC_ASSERT_EQUAL(linphone_chat_room_get_char(marie_chat_room), message[i], char, "%c");
+			}
+
+			if (end_with_crlf) {
+				linphone_chat_message_put_char(rtt_message, crlf);
+			} else if (end_with_lf) {
+				linphone_chat_message_put_char(rtt_message, lf);
+			}
+			BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, (int)strlen(message), 1000));
+			BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
+			linphone_chat_message_unref(rtt_message);
+		}
+		end_call(marie, pauline);
+	}
+	linphone_call_params_destroy(marie_params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void real_time_text_message_compat_crlf(void) {
+	real_time_text_message_compat(TRUE, FALSE);
+}
+
+static void real_time_text_message_compat_lf(void) {
+	real_time_text_message_compat(FALSE, TRUE);
+}
+
+static void real_time_text_message_accented_chars(void) {
+	LinphoneChatRoom *pauline_chat_room;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCallParams *marie_params = NULL;
+	LinphoneCall *pauline_call, *marie_call;
+
+	marie_params = linphone_core_create_call_params(marie->lc, NULL);
+	linphone_call_params_enable_realtime_text(marie_params,TRUE);
+
+	BC_ASSERT_TRUE(call_with_caller_params(marie, pauline, marie_params));
+	pauline_call=linphone_core_get_current_call(pauline->lc);
+	marie_call=linphone_core_get_current_call(marie->lc);
+	if (pauline_call) {
+		BC_ASSERT_TRUE(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(pauline_call)));
+
+		pauline_chat_room = linphone_call_get_chat_room(pauline_call);
+		BC_ASSERT_PTR_NOT_NULL(pauline_chat_room);
+		if (pauline_chat_room) {
+			LinphoneChatMessage* rtt_message = linphone_chat_room_create_message(pauline_chat_room,NULL);
+			LinphoneChatRoom *marie_chat_room = linphone_call_get_chat_room(marie_call);
+			int i;
+			uint32_t message[8];
+			int message_len = 8;
+
+			message[0] = 0xE3; // ã
+			message[1] = 0xE6; // æ
+			message[2] = 0xE7; // ç
+			message[3] = 0xE9; // é
+			message[4] = 0xEE; // î
+			message[5] = 0xF8; // ø
+			message[6] = 0xF9; // ù
+			message[7] = 0xFF; // ÿ
+			for (i = 0; i < message_len; i++) {
+				linphone_chat_message_put_char(rtt_message, message[i]);
+				BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, i+1, 1000));
+				BC_ASSERT_EQUAL(linphone_chat_room_get_char(marie_chat_room), message[i], unsigned long, "%lu");
+			}
+
+			linphone_chat_room_send_chat_message(pauline_chat_room, rtt_message);
+			BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
+			BC_ASSERT_EQUAL(strcmp(marie->stat.last_received_chat_message->message, "ãæçéîøùÿ"), 0, int, "%i");
+		}
+		end_call(marie, pauline);
+	}
+	linphone_call_params_destroy(marie_params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void real_time_text_message_different_text_codecs_payload_numbers_sender_side(void) {
+	real_time_text(FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE);
+}
+
+static void real_time_text_message_different_text_codecs_payload_numbers_receiver_side(void) {
+	real_time_text(FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE);
+}
+
+static void real_time_text_copy_paste(void) {
+	LinphoneChatRoom *pauline_chat_room;
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCallParams *marie_params = NULL;
+	LinphoneCall *pauline_call, *marie_call;
+
+	marie_params = linphone_core_create_call_params(marie->lc, NULL);
+	linphone_call_params_enable_realtime_text(marie_params,TRUE);
+
+	BC_ASSERT_TRUE(call_with_caller_params(marie, pauline, marie_params));
+	pauline_call = linphone_core_get_current_call(pauline->lc);
+	marie_call = linphone_core_get_current_call(marie->lc);
+	if (pauline_call) {
+		BC_ASSERT_TRUE(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(pauline_call)));
+
+		pauline_chat_room = linphone_call_get_chat_room(pauline_call);
+		BC_ASSERT_PTR_NOT_NULL(pauline_chat_room);
+		if (pauline_chat_room) {
+			const char* message = "Be l3l";
+			size_t i;
+			LinphoneChatMessage* rtt_message = linphone_chat_room_create_message(pauline_chat_room,NULL);
+			LinphoneChatRoom *marie_chat_room = linphone_call_get_chat_room(marie_call);
+
+			for (i = 1; i <= strlen(message); i++) {
+				linphone_chat_message_put_char(rtt_message, message[i-1]);
+				if (i % 4 == 0) {
+					int j;
+					BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, (int)i, 1000));
+					for (j = 4; j > 0; j--) {
+						BC_ASSERT_EQUAL(linphone_chat_room_get_char(marie_chat_room), message[i-j], char, "%c");
+					}
+				}
+			}
+			linphone_chat_room_send_chat_message(pauline_chat_room, rtt_message);
+			BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneMessageReceived, 1));
+		}
+
+		end_call(marie, pauline);
+	}
+	linphone_call_params_destroy(marie_params);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+void file_transfer_with_http_proxy(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+		linphone_core_set_http_proxy_host(marie->lc, "sip.linphone.org");
+		transfer_message_base2(marie,pauline,FALSE,FALSE);
+		linphone_core_manager_destroy(pauline);
+		linphone_core_manager_destroy(marie);
+	}
+}
 
 test_t message_tests[] = {
-	{ "Text message", text_message },
-	{ "Text message within call's dialog", text_message_within_dialog},
-	{ "Text message with credentials from auth info cb", text_message_with_credential_from_auth_cb},
-	{ "Text message with privacy", text_message_with_privacy },
-	{ "Text message compatibility mode", text_message_compatibility_mode },
-	{ "Text message with ack", text_message_with_ack },
-	{ "Text message with send error", text_message_with_send_error },
-	{ "Text message with external body", text_message_with_external_body },
-	{ "File transfer message", file_transfer_message },
-	{ "Small File transfer message", small_file_transfer_message},
-	{ "File transfer message with io error at upload", file_transfer_message_io_error_upload },
-/*	{ "File transfer message with io error at download", file_transfer_message_io_error_download },*/
-	{ "File transfer message upload cancelled", file_transfer_message_upload_cancelled },
-	{ "File transfer message download cancelled", file_transfer_message_download_cancelled },
-	{ "File transfer message using external body url", file_transfer_using_external_body_url },
-	{ "File transfer 2 messages simultaneously", file_transfer_2_messages_simultaneously },
-	{ "Text message denied", text_message_denied },
-	{ "Info message", info_message },
-	{ "Info message with body", info_message_with_body },
-	{ "IsComposing notification", is_composing_notification }
-#ifdef HAVE_LIME
-	,{ "Lime Text Message", lime_text_message }
-	,{ "Lime File transfer message", lime_file_transfer_message }
-	,{ "Lime File transfer message encryption only", lime_file_transfer_message_without_encryption}
-	,{ "Lime Unitary", lime_unit }
-#endif /* HAVE_LIME */
-#ifdef MSG_STORAGE_ENABLED
-	,{ "Database migration", message_storage_migration }
-	,{ "History count", history_messages_count }
-	,{ "History range", history_range_full_test }
+	TEST_NO_TAG("Text message", text_message),
+	TEST_NO_TAG("Text message within call dialog", text_message_within_call_dialog),
+	TEST_NO_TAG("Text message with credentials from auth callback", text_message_with_credential_from_auth_callback),
+	TEST_NO_TAG("Text message with privacy", text_message_with_privacy),
+	TEST_NO_TAG("Text message compatibility mode", text_message_compatibility_mode),
+	TEST_NO_TAG("Text message with ack", text_message_with_ack),
+	TEST_NO_TAG("Text message with send error", text_message_with_send_error),
+	TEST_NO_TAG("Text message with external body", text_message_with_external_body),
+	TEST_NO_TAG("Transfer message", transfer_message),
+	TEST_NO_TAG("Transfer message with http proxy", file_transfer_with_http_proxy),
+	TEST_NO_TAG("Transfer message with upload io error", transfer_message_with_upload_io_error),
+	TEST_NO_TAG("Transfer message with download io error", transfer_message_with_download_io_error),
+	TEST_NO_TAG("Transfer message upload cancelled", transfer_message_upload_cancelled),
+	TEST_NO_TAG("Transfer message download cancelled", transfer_message_download_cancelled),
+	TEST_ONE_TAG("Transfer message using external body url", file_transfer_using_external_body_url, "LeaksMemory"),
+	TEST_NO_TAG("Transfer 2 messages simultaneously", file_transfer_2_messages_simultaneously),
+	TEST_NO_TAG("Text message denied", text_message_denied),
+	TEST_NO_TAG("Info message", info_message),
+	TEST_NO_TAG("Info message with body", info_message_with_body),
+	TEST_NO_TAG("IsComposing notification", is_composing_notification),
+	TEST_NO_TAG("Lime text message", lime_text_message),
+	TEST_NO_TAG("Lime text message to non lime", lime_text_message_to_non_lime),
+	TEST_NO_TAG("Lime transfer message", lime_transfer_message),
+	TEST_NO_TAG("Lime transfer message from history", lime_transfer_message_from_history),
+	TEST_NO_TAG("Lime transfer message without encryption", lime_transfer_message_without_encryption),
+	TEST_NO_TAG("Lime unitary", lime_unit),
+#ifdef SQLITE_STORAGE_ENABLED
+	TEST_NO_TAG("Database migration", database_migration),
+	TEST_NO_TAG("History range", history_range),
+	TEST_NO_TAG("History count", history_count),
 #endif
+	TEST_NO_TAG("Text status after destroying chat room", text_status_after_destroying_chat_room),
+	TEST_NO_TAG("Transfer not sent if invalid url", file_transfer_not_sent_if_invalid_url),
+	TEST_NO_TAG("Transfer not sent if host not found", file_transfer_not_sent_if_host_not_found),
+	TEST_NO_TAG("Transfer not sent if url moved permanently", file_transfer_not_sent_if_url_moved_permanently),
+	TEST_ONE_TAG("Transfer io error after destroying chatroom", file_transfer_io_error_after_destroying_chatroom, "LeaksMemory"),
+	TEST_ONE_TAG("Real Time Text message", real_time_text_message, "RTT"),
+	TEST_ONE_TAG("Real Time Text SQL storage", real_time_text_sql_storage, "RTT"),
+	TEST_ONE_TAG("Real Time Text SQL storage with RTT messages not stored", real_time_text_sql_storage_rtt_disabled, "RTT"),
+	TEST_ONE_TAG("Real Time Text conversation", real_time_text_conversation, "RTT"),
+	TEST_ONE_TAG("Real Time Text without audio", real_time_text_without_audio, "RTT"),
+	TEST_ONE_TAG("Real Time Text with srtp", real_time_text_srtp, "RTT"),
+	TEST_ONE_TAG("Real Time Text with ice", real_time_text_ice, "RTT"),
+	TEST_ONE_TAG("Real Time Text message compatibility crlf", real_time_text_message_compat_crlf, "RTT"),
+	TEST_ONE_TAG("Real Time Text message compatibility lf", real_time_text_message_compat_lf, "RTT"),
+	TEST_ONE_TAG("Real Time Text message with accented characters", real_time_text_message_accented_chars, "RTT"),
+	TEST_ONE_TAG("Real Time Text offer answer with different payload numbers (sender side)", real_time_text_message_different_text_codecs_payload_numbers_sender_side, "RTT"),
+	TEST_ONE_TAG("Real Time Text offer answer with different payload numbers (receiver side)", real_time_text_message_different_text_codecs_payload_numbers_receiver_side, "RTT"),
+	TEST_ONE_TAG("Real Time Text copy paste", real_time_text_copy_paste, "RTT"),
 };
 
 test_suite_t message_test_suite = {
 	"Message",
-	liblinphone_tester_setup,
 	NULL,
-	sizeof(message_tests) / sizeof(message_tests[0]),
-	message_tests
+	NULL,
+	liblinphone_tester_before_each,
+	liblinphone_tester_after_each,
+	sizeof(message_tests) / sizeof(message_tests[0]), message_tests
 };
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
diff --git a/tester/multi_call_tester.c b/tester/multi_call_tester.c
deleted file mode 100644
index 45f7bfcbc..000000000
--- a/tester/multi_call_tester.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
-	liblinphone_tester - liblinphone test suite
-	Copyright (C) 2013  Belledonne Communications SARL
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "linphonecore.h"
-#include "lpconfig.h"
-#include "private.h"
-#include "liblinphone_tester.h"
-#include "mediastreamer2/msutils.h"
-#include "belle-sip/sipstack.h"
-
-#ifdef _WIN32
-#define unlink _unlink
-#endif
-
-
-static void call_waiting_indication_with_param(bool_t enable_caller_privacy) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	MSList *iterator;
-	MSList* lcs;
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall* pauline_called_by_laure=NULL;
-	LinphoneCallParams *laure_params=linphone_core_create_default_call_parameters(laure->lc);
-	LinphoneCallParams *marie_params=linphone_core_create_default_call_parameters(marie->lc);
-
-	if (enable_caller_privacy)
-		linphone_call_params_set_privacy(marie_params,LinphonePrivacyId);
-
-	lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-	BC_ASSERT_TRUE(call_with_caller_params(marie,pauline,marie_params));
-	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-
-	if (enable_caller_privacy)
-		linphone_call_params_set_privacy(laure_params,LinphonePrivacyId);
-
-	BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(laure->lc,pauline->identity,laure_params));
-
-	BC_ASSERT_TRUE(wait_for(laure->lc
-							,pauline->lc
-							,&pauline->stat.number_of_LinphoneCallIncomingReceived
-							,2));
-
-	BC_ASSERT_EQUAL(laure->stat.number_of_LinphoneCallOutgoingProgress,1, int, "%d");
-
-
-	BC_ASSERT_TRUE(wait_for(laure->lc
-							,pauline->lc
-							,&laure->stat.number_of_LinphoneCallOutgoingRinging
-							,1));
-
-	for (iterator=(MSList *)linphone_core_get_calls(pauline->lc);iterator!=NULL;iterator=iterator->next) {
-		LinphoneCall *call=(LinphoneCall *)iterator->data;
-		if (call != pauline_called_by_marie) {
-			/*fine, this is the call waiting*/
-			pauline_called_by_laure=call;
-			linphone_core_accept_call(pauline->lc,pauline_called_by_laure);
-		}
-	}
-
-	BC_ASSERT_TRUE(wait_for(laure->lc
-							,pauline->lc
-							,&laure->stat.number_of_LinphoneCallConnected
-							,1));
-
-	BC_ASSERT_TRUE(wait_for(pauline->lc
-								,marie->lc
-								,&marie->stat.number_of_LinphoneCallPausedByRemote
-								,1));
-
-	if (pauline_called_by_laure && enable_caller_privacy )
-		BC_ASSERT_EQUAL(linphone_call_params_get_privacy(linphone_call_get_current_params(pauline_called_by_laure)),LinphonePrivacyId, int, "%d");
-	/*wait a bit for ACK to be sent*/
-	wait_for_list(lcs,NULL,0,1000);
-	linphone_core_terminate_all_calls(pauline->lc);
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
-
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-static void call_waiting_indication(void) {
-	call_waiting_indication_with_param(FALSE);
-}
-
-static void call_waiting_indication_with_privacy(void) {
-	call_waiting_indication_with_param(TRUE);
-}
-
-static void incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallState state) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	MSList* lcs;
-	LinphoneCallParams *laure_params=linphone_core_create_default_call_parameters(laure->lc);
-	LinphoneCallParams *marie_params=linphone_core_create_default_call_parameters(marie->lc);
-
-	lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-
-	if (state==LinphoneCallOutgoingRinging || state==LinphoneCallOutgoingEarlyMedia) {
-		BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address_with_params(marie->lc,pauline->identity,marie_params));
-
-		BC_ASSERT_TRUE(wait_for(marie->lc
-								,pauline->lc
-								,&pauline->stat.number_of_LinphoneCallIncomingReceived
-								,1));
-
-		if (state==LinphoneCallOutgoingEarlyMedia)
-			linphone_core_accept_early_media(pauline->lc,linphone_core_get_current_call(pauline->lc));
-
-		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallOutgoingProgress,1, int, "%d");
-		BC_ASSERT_TRUE(wait_for(marie->lc
-									,pauline->lc
-									,state==LinphoneCallOutgoingEarlyMedia?&marie->stat.number_of_LinphoneCallOutgoingEarlyMedia:&marie->stat.number_of_LinphoneCallOutgoingRinging
-									,1));
-	} else if (state==LinphoneCallOutgoingProgress) {
-		BC_ASSERT_PTR_NOT_NULL(linphone_core_invite_address(marie->lc,pauline->identity));
-	} else {
-		ms_error("Unsupported state");
-		return;
-	}
-
-	BC_ASSERT_TRUE(call_with_caller_params(laure,marie,laure_params));
-
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
-
-
-	linphone_core_terminate_all_calls(marie->lc);
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
-
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-static void incoming_call_accepted_when_outgoing_call_in_progress(void) {
-	incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallOutgoingProgress);
-}
-static void incoming_call_accepted_when_outgoing_call_in_outgoing_ringing(void) {
-	incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallOutgoingRinging);
-}
-static void incoming_call_accepted_when_outgoing_call_in_outgoing_ringing_early_media(void) {
-	incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallOutgoingEarlyMedia);
-}
-
-static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManager* pauline, LinphoneCoreManager* laure) {
-
-	stats initial_marie_stat;
-	stats initial_pauline_stat;
-	stats initial_laure_stat;
-
-	LinphoneCall* marie_call_pauline;
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall* marie_call_laure;
-	const MSList* calls;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-	BC_ASSERT_TRUE(call(marie,pauline));
-	marie_call_pauline=linphone_core_get_current_call(marie->lc);
-	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-	BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
-
-	BC_ASSERT_TRUE(call(marie,laure));
-	initial_marie_stat=marie->stat;
-	initial_pauline_stat=pauline->stat;
-	initial_laure_stat=laure->stat;
-
-	marie_call_laure=linphone_core_get_current_call(marie->lc);
-
-	BC_ASSERT_PTR_NOT_NULL_FATAL(marie_call_laure);
-	linphone_core_add_to_conference(marie->lc,marie_call_laure);
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallUpdating,initial_marie_stat.number_of_LinphoneCallUpdating+1,5000));
-
-	linphone_core_add_to_conference(marie->lc,marie_call_pauline);
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallResuming,initial_marie_stat.number_of_LinphoneCallResuming+1,2000));
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,initial_pauline_stat.number_of_LinphoneCallStreamsRunning+1,5000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,initial_laure_stat.number_of_LinphoneCallStreamsRunning+1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,initial_marie_stat.number_of_LinphoneCallStreamsRunning+2,3000));
-
-	BC_ASSERT_TRUE(linphone_core_is_in_conference(marie->lc));
-	BC_ASSERT_EQUAL(linphone_core_get_conference_size(marie->lc),3, int, "%d");
-
-	/*
-	 * FIXME: check_ice cannot work as it is today because there is no current call for the party that hosts the conference
-	if (linphone_core_get_firewall_policy(marie->lc) == LinphonePolicyUseIce) {
-		if (linphone_core_get_firewall_policy(pauline->lc) == LinphonePolicyUseIce) {
-			check_ice(marie,pauline,LinphoneIceStateHostConnection);
-		}
-		if (linphone_core_get_firewall_policy(laure->lc) == LinphonePolicyUseIce) {
-			check_ice(marie,laure,LinphoneIceStateHostConnection);
-		}
-	}
-	*/
-	for (calls=linphone_core_get_calls(marie->lc);calls!=NULL;calls=calls->next) {
-		LinphoneCall *call=(LinphoneCall *)calls->data;
-		BC_ASSERT_EQUAL(linphone_core_get_media_encryption(marie->lc),linphone_call_params_get_media_encryption(linphone_call_get_current_params(call)),int,"%d");
-	}
-
-	linphone_core_terminate_conference(marie->lc);
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,10000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,10000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,10000));
-
-
-
-	ms_list_free(lcs);
-}
-static void simple_conference(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	simple_conference_base(marie,pauline,laure);
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-}
-
-
-
-static void simple_encrypted_conference_with_ice(LinphoneMediaEncryption mode) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-
-	if (linphone_core_media_encryption_supported(marie->lc,mode)) {
-		linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
-		linphone_core_set_stun_server(marie->lc,"stun.linphone.org");
-		linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
-		linphone_core_set_stun_server(pauline->lc,"stun.linphone.org");
-		linphone_core_set_firewall_policy(laure->lc,LinphonePolicyUseIce);
-		linphone_core_set_stun_server(laure->lc,"stun.linphone.org");
-
-		/*work around a to avoid stun resolution to be initiate in  call_received callback leading a mainloop reentrency*/
-		/*
-			belle_sip_main_loop_iterate() at belle_sip_loop.c:369
-			belle_sip_main_loop_run [inlined]() at belle_sip_loop.c:478
-			belle_sip_main_loop_sleep() at belle_sip_loop.c:490
-			sal_iterate() at sal_impl.c:745
-			linphone_core_get_stun_server_addrinfo() at misc.c:585
-			linphone_core_gather_ice_candidates() at misc.c:610
-			linphone_call_prepare_ice() at linphonecall.c:1 906
-			linphone_call_new_incoming() at linphonecall.c:1 101
-			call_received() at callbacks.c:347
-			...
-			linphone_core_iterate() at linphonecore.c:2 620
-			...
-
-			linphone_core_set_stun_server() initiates an asynchronous resolution, but it needs a few iteration before it is completed.
-			By calling private function linphone_core_get_stun_server_addrinfo() we make sure to wait that the resolution is done before the
-			test calls actually start.
-		*/
-		linphone_core_get_stun_server_addrinfo(marie->lc);
-		linphone_core_get_stun_server_addrinfo(pauline->lc);
-		linphone_core_get_stun_server_addrinfo(laure->lc);
-		/**/
-
-		linphone_core_set_media_encryption(marie->lc,mode);
-		linphone_core_set_media_encryption(pauline->lc,mode);
-		linphone_core_set_media_encryption(laure->lc,mode);
-
-		simple_conference_base(marie,pauline,laure);
-	} else {
-		ms_warning("No [%s] support available",linphone_media_encryption_to_string(mode));
-		BC_PASS("Passed");
-	}
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-}
-
-static void simple_conference_with_ice(void) {
-	simple_encrypted_conference_with_ice(LinphoneMediaEncryptionNone);
-}
-static void simple_zrtp_conference_with_ice(void) {
-	simple_encrypted_conference_with_ice(LinphoneMediaEncryptionZRTP);
-}
-
-
-static void simple_call_transfer(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall *marie_calling_pauline;
-	LinphoneCall *marie_calling_laure;
-
-	char* laure_identity=linphone_address_as_string(laure->identity);
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-
-	BC_ASSERT_TRUE(call(marie,pauline));
-	marie_calling_pauline=linphone_core_get_current_call(marie->lc);
-	pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
-	reset_counters(&laure->stat);
-
-
-	linphone_core_transfer_call(pauline->lc,pauline_called_by_marie,laure_identity);
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallRefered,1,2000));
-	/*marie pausing pauline*/
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallPausing,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausedByRemote,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallPaused,1,2000));
-	/*marie calling laure*/
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-
-	BC_ASSERT_PTR_NOT_NULL(linphone_call_get_transfer_target_call(marie_calling_pauline));
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
-	linphone_core_accept_call(laure->lc,linphone_core_get_current_call(laure->lc));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-
-	marie_calling_laure=linphone_core_get_current_call(marie->lc);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(marie_calling_laure);
-	BC_ASSERT_PTR_EQUAL(linphone_call_get_transferer_call(marie_calling_laure),marie_calling_pauline);
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallConnected,1,2000));
-
-	/*terminate marie to pauline call*/
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,2000));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-
-static void unattended_call_transfer(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	LinphoneCall* pauline_called_by_marie;
-
-	char* laure_identity=linphone_address_as_string(laure->identity);
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-
-	BC_ASSERT_TRUE(call(marie,pauline));
-	pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
-
-	reset_counters(&marie->stat);
-	reset_counters(&pauline->stat);
-	reset_counters(&laure->stat);
-
-	linphone_core_transfer_call(marie->lc,pauline_called_by_marie,laure_identity);
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-
-	/*marie ends the call  */
-	linphone_core_terminate_call(marie->lc,pauline_called_by_marie);
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-
-	/*Pauline starts the transfer*/
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
-	linphone_core_accept_call(laure->lc,linphone_core_get_current_call(laure->lc));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
-
-	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-
-static void unattended_call_transfer_with_error(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCall* pauline_called_by_marie;
-	bool_t call_ok=TRUE;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-
-	lcs=ms_list_append(lcs,pauline->lc);
-
-	BC_ASSERT_TRUE((call_ok=call(marie,pauline)));
-	if (call_ok){
-		pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
-
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-
-		linphone_core_transfer_call(marie->lc,pauline_called_by_marie,"unknown_user");
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-
-		/*Pauline starts the transfer*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
-		/* and immediately get an error*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallError,1,2000));
-
-		/*the error must be reported back to marie*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallError,1,2000));
-
-		/*and pauline should resume the call automatically*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallResuming,1,2000));
-
-		/*and call should be resumed*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	}
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	ms_list_free(lcs);
-}
-
-
-static void call_transfer_existing_call_outgoing_call(void) {
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-	LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
-	LinphoneCall* marie_call_pauline;
-	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall* marie_call_laure;
-	LinphoneCall* laure_called_by_marie;
-	LinphoneCall* lcall;
-	bool_t call_ok=TRUE;
-	const MSList* calls;
-	MSList* lcs=ms_list_append(NULL,marie->lc);
-
-	lcs=ms_list_append(lcs,pauline->lc);
-	lcs=ms_list_append(lcs,laure->lc);
-
-	/*marie call pauline*/
-	BC_ASSERT_TRUE((call_ok=call(marie,pauline)));
-	if (call_ok){
-		marie_call_pauline=linphone_core_get_current_call(marie->lc);
-		pauline_called_by_marie=linphone_core_get_current_call(pauline->lc);
-		/*marie pause pauline*/
-		BC_ASSERT_TRUE(pause_call_1(marie,marie_call_pauline,pauline,pauline_called_by_marie));
-
-		/*marie call laure*/
-		BC_ASSERT_TRUE(call(marie,laure));
-		marie_call_laure=linphone_core_get_current_call(marie->lc);
-		laure_called_by_marie=linphone_core_get_current_call(laure->lc);
-		/*marie pause laure*/
-		BC_ASSERT_TRUE(pause_call_1(marie,marie_call_laure,laure,laure_called_by_marie));
-
-		reset_counters(&marie->stat);
-		reset_counters(&pauline->stat);
-		reset_counters(&laure->stat);
-
-
-		linphone_core_transfer_call_to_another(marie->lc,marie_call_pauline,marie_call_laure);
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-
-		/*pauline pausing marie*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPausing,1,4000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallPaused,1,4000));
-		/*pauline calling laure*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallOutgoingProgress,1,2000));
-
-		/*laure accept call*/
-		for(calls=linphone_core_get_calls(laure->lc);calls!=NULL;calls=calls->next) {
-			lcall = (LinphoneCall*)calls->data;
-			if (linphone_call_get_state(lcall) == LinphoneCallIncomingReceived) {
-				BC_ASSERT_PTR_EQUAL(linphone_call_get_replaced_call(lcall),laure_called_by_marie);
-				linphone_core_accept_call(laure->lc,lcall);
-				break;
-			}
-		}
-		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallConnected,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallConnected,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallConnected,1,2000));
-
-		/*terminate marie to pauline/laure call*/
-		BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,2,2000));
-		BC_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallEnd,1,2000));
-	}
-
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-	linphone_core_manager_destroy(laure);
-	ms_list_free(lcs);
-}
-
-test_t multi_call_tests[] = {
-	{ "Call waiting indication", call_waiting_indication },
-	{ "Call waiting indication with privacy", call_waiting_indication_with_privacy },
-	{ "Simple conference", simple_conference },
-	{ "Simple conference with ICE",simple_conference_with_ice},
-	{ "Simple ZRTP conference with ICE",simple_zrtp_conference_with_ice},
-	{ "Simple call transfer", simple_call_transfer },
-	{ "Unattended call transfer", unattended_call_transfer },
-	{ "Unattended call transfer with error", unattended_call_transfer_with_error },
-	{ "Call transfer existing call outgoing call", call_transfer_existing_call_outgoing_call },
-	{ "Incoming call accepted when outgoing call in progress",incoming_call_accepted_when_outgoing_call_in_progress},
-	{ "Incoming call accepted when outgoing call in outgoing ringing",incoming_call_accepted_when_outgoing_call_in_outgoing_ringing},
-	{ "Incoming call accepted when outgoing call in outgoing ringing early media",incoming_call_accepted_when_outgoing_call_in_outgoing_ringing_early_media},
-};
-
-test_suite_t multi_call_test_suite = {
-	"Multi call",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(multi_call_tests) / sizeof(multi_call_tests[0]),
-	multi_call_tests
-};
diff --git a/tester/offeranswer_tester.c b/tester/offeranswer_tester.c
index b433bda5c..901c65120 100644
--- a/tester/offeranswer_tester.c
+++ b/tester/offeranswer_tester.c
@@ -70,15 +70,10 @@ static void check_payload_type_numbers(LinphoneCall *call1, LinphoneCall *call2,
 }
 
 static void simple_call_with_different_codec_mappings(void) {
-	int begin;
-	int leaked_objects;
 	LinphoneCoreManager* marie;
 	LinphoneCoreManager* pauline;
 	LinphoneCall *pauline_call;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
-
 	marie = linphone_core_manager_new( "marie_rc");
 	pauline = linphone_core_manager_new( "pauline_tcp_rc");
 
@@ -111,62 +106,50 @@ static void simple_call_with_different_codec_mappings(void) {
 	end_call(marie,pauline);
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
-
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
 }
 
 static void call_failed_because_of_codecs(void) {
-	int begin,leaked_objects;
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
+	LinphoneCall* out_call;
 
-	belle_sip_object_enable_leak_detector(TRUE);
-	begin=belle_sip_object_get_object_count();
+	disable_all_audio_codecs_except_one(marie->lc,"pcmu",-1);
+	disable_all_audio_codecs_except_one(pauline->lc,"pcma",-1);
+	out_call = linphone_core_invite_address(pauline->lc,marie->identity);
+	linphone_call_ref(out_call);
+	BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallOutgoingInit,1));
 
-	{
-		LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-		LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
-		LinphoneCall* out_call;
+	/*flexisip will retain the 488 until the "urgent reply" timeout (I.E 5s) arrives.*/
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1,7000));
+	BC_ASSERT_EQUAL(linphone_call_get_reason(out_call),LinphoneReasonNotAcceptable, int, "%d");
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallIncomingReceived,0, int, "%d");
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallReleased,0, int, "%d");
 
-		disable_all_audio_codecs_except_one(marie->lc,"pcmu",-1);
-		disable_all_audio_codecs_except_one(pauline->lc,"pcma",-1);
-		out_call = linphone_core_invite_address(pauline->lc,marie->identity);
-		linphone_call_ref(out_call);
-		BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallOutgoingInit,1));
-
-		/*flexisip will retain the 488 until the "urgent reply" timeout (I.E 5s) arrives.*/
-		BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1,7000));
-		BC_ASSERT_EQUAL(linphone_call_get_reason(out_call),LinphoneReasonNotAcceptable, int, "%d");
-		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallIncomingReceived,0, int, "%d");
-		BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallReleased,0, int, "%d");
-
-		linphone_call_unref(out_call);
-		linphone_core_manager_destroy(marie);
-		linphone_core_manager_destroy(pauline);
-	}
-	leaked_objects=belle_sip_object_get_object_count()-begin;
-	BC_ASSERT_EQUAL(leaked_objects, 0, int, "%d");
-	if (leaked_objects>0){
-		belle_sip_object_dump_active_objects();
-	}
+	linphone_call_unref(out_call);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
 }
 
 
-static void profile_call_base(bool_t avpf1, LinphoneMediaEncryption srtp1,bool_t avpf2, LinphoneMediaEncryption srtp2, bool_t encryption_mandatory, const char *expected_profile) {
+static void profile_call_base(bool_t avpf1
+							  , LinphoneMediaEncryption srtp1
+							  , bool_t avpf2
+							  , LinphoneMediaEncryption srtp2
+							  , bool_t encryption_mandatory
+							  , const char *expected_profile
+							  , bool_t enable_video) {
 	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
 	LinphoneProxyConfig *lpc;
 	const LinphoneCallParams *params;
 
 	if (avpf1) {
-		linphone_core_get_default_proxy(marie->lc, &lpc);
+		lpc = linphone_core_get_default_proxy_config(marie->lc);
 		linphone_proxy_config_enable_avpf(lpc, TRUE);
 		linphone_proxy_config_set_avpf_rr_interval(lpc, 3);
 	}
 	if (avpf2) {
-		linphone_core_get_default_proxy(pauline->lc, &lpc);
+		lpc = linphone_core_get_default_proxy_config(pauline->lc);
 		linphone_proxy_config_enable_avpf(lpc, TRUE);
 		linphone_proxy_config_set_avpf_rr_interval(lpc, 3);
 	}
@@ -176,6 +159,18 @@ static void profile_call_base(bool_t avpf1, LinphoneMediaEncryption srtp1,bool_t
 		linphone_core_set_media_encryption_mandatory(pauline->lc,TRUE);
 	}
 
+	if (enable_video && linphone_core_video_supported(marie->lc)) {
+		LinphoneVideoPolicy policy;
+		policy.automatically_accept = TRUE;
+		policy.automatically_initiate = TRUE;
+		linphone_core_enable_video_capture(marie->lc, TRUE);
+		linphone_core_enable_video_display(marie->lc, TRUE);
+		linphone_core_set_video_policy(marie->lc,&policy);
+		linphone_core_enable_video_capture(pauline->lc, TRUE);
+		linphone_core_enable_video_display(pauline->lc, TRUE);
+		linphone_core_set_video_policy(pauline->lc,&policy);
+	}
+
 	if (linphone_core_media_encryption_supported(marie->lc, srtp1)) {
 		linphone_core_set_media_encryption(marie->lc, srtp1);
 	} else {
@@ -213,90 +208,197 @@ end:
 	linphone_core_manager_destroy(marie);
 }
 
-static void profile_call(bool_t avpf1, LinphoneMediaEncryption srtp1, bool_t avpf2, LinphoneMediaEncryption srtp2, const char *expected_profile) {
-	return profile_call_base(avpf1, srtp1, avpf2,srtp2,FALSE,expected_profile);
+static void profile_call(bool_t avpf1, LinphoneMediaEncryption srtp1, bool_t avpf2, LinphoneMediaEncryption srtp2, const char *expected_profile, bool_t enable_video) {
+	profile_call_base(avpf1, srtp1, avpf2,srtp2,FALSE,expected_profile,enable_video);
 }
+
 static void avp_to_avp_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionNone, "RTP/AVP");
+	profile_call(FALSE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionNone, "RTP/AVP", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avp_to_avp_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionNone, "RTP/AVP", TRUE);
+}
+#endif
 
 static void avp_to_avpf_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionNone, "RTP/AVP");
+	profile_call(FALSE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionNone, "RTP/AVP",FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avp_to_avpf_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionNone, "RTP/AVP",TRUE);
+}
+#endif
 
 static void avp_to_savp_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionSRTP, "RTP/AVP");
+	profile_call(FALSE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionSRTP, "RTP/AVP", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avp_to_savp_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionSRTP, "RTP/AVP", TRUE);
+}
+#endif
 
 static void avp_to_savpf_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionSRTP, "RTP/AVP");
+	profile_call(FALSE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionSRTP, "RTP/AVP", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avp_to_savpf_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionSRTP, "RTP/AVP", TRUE);
+}
+#endif
 
 static void avpf_to_avp_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionNone, "RTP/AVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionNone, "RTP/AVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avpf_to_avp_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionNone, "RTP/AVPF", TRUE);
+}
+#endif
 
 static void avpf_to_avpf_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionNone, "RTP/AVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionNone, "RTP/AVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avpf_to_avpf_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionNone, "RTP/AVPF", TRUE);
+}
+#endif
 
 static void avpf_to_savp_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionSRTP, "RTP/AVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionSRTP, "RTP/AVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avpf_to_savp_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionNone, FALSE, LinphoneMediaEncryptionSRTP, "RTP/AVPF", TRUE);
+}
+#endif
 
 static void avpf_to_savpf_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionSRTP, "RTP/AVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionSRTP, "RTP/AVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void avpf_to_savpf_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionNone, TRUE, LinphoneMediaEncryptionSRTP, "RTP/AVPF", TRUE);
+}
+#endif
 
 static void savp_to_avp_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionNone, "RTP/SAVP");
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionNone, "RTP/SAVP", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savp_to_avp_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionNone, "RTP/SAVP", TRUE);
+}
+#endif
 
 static void savp_to_avpf_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionNone, "RTP/SAVP");
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionNone, "RTP/SAVP", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savp_to_avpf_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionNone, "RTP/SAVP", TRUE);
+}
+#endif
 
 static void savp_to_savp_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionSRTP, "RTP/SAVP");
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionSRTP, "RTP/SAVP", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savp_to_savp_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionSRTP, "RTP/SAVP", TRUE);
+}
+#endif
 
 static void savp_to_savpf_call(void) {
-	profile_call(FALSE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionSRTP, "RTP/SAVP");
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionSRTP, "RTP/SAVP", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savp_to_savpf_video_call(void) {
+	profile_call(FALSE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionSRTP, "RTP/SAVP", TRUE);
+}
+#endif
 
 static void savpf_to_avp_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionNone, "RTP/SAVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionNone, "RTP/SAVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savpf_to_avp_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionNone, "RTP/SAVPF", TRUE);
+}
+#endif
 
 static void savpf_to_avpf_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionNone, "RTP/SAVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionNone, "RTP/SAVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savpf_to_avpf_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionNone, "RTP/SAVPF", TRUE);
+}
+#endif
 
 static void savpf_to_savp_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionSRTP, "RTP/SAVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionSRTP, "RTP/SAVPF", FALSE);
 }
-
+#ifdef VIDEO_ENABLED
+static void savpf_to_savp_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, FALSE, LinphoneMediaEncryptionSRTP, "RTP/SAVPF", TRUE);
+}
+#endif
 static void savpf_to_savpf_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionSRTP, "RTP/SAVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionSRTP, "RTP/SAVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savpf_to_savpf_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionSRTP, TRUE, LinphoneMediaEncryptionSRTP, "RTP/SAVPF", TRUE);
+}
+#endif
 
 static void savpf_dtls_to_savpf_dtls_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionDTLS, "UDP/TLS/RTP/SAVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionDTLS, "UDP/TLS/RTP/SAVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savpf_dtls_to_savpf_dtls_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionDTLS, "UDP/TLS/RTP/SAVPF", TRUE);
+}
+#endif
+
 static void savpf_dtls_to_savpf_dtls_encryption_mandatory_call(void) {
-	profile_call_base(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionDTLS, TRUE, "UDP/TLS/RTP/SAVPF");
+	profile_call_base(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionDTLS, TRUE, "UDP/TLS/RTP/SAVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savpf_dtls_to_savpf_dtls_encryption_mandatory_video_call(void) {
+	profile_call_base(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionDTLS, TRUE, "UDP/TLS/RTP/SAVPF", TRUE);
+}
+#endif
+
 static void savpf_dtls_to_savpf_encryption_mandatory_call(void) {
-	/*profile_call_base(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionSRTP, TRUE, "UDP/TLS/RTP/SAVPF"); not sure of result*/
+	/*profile_call_base(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionSRTP, TRUE, "UDP/TLS/RTP/SAVPF",FALSE); not sure of result*/
 }
+#ifdef VIDEO_ENABLED
+static void savpf_dtls_to_savpf_encryption_mandatory_video_call(void) {
+	/*profile_call_base(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionSRTP, TRUE, "UDP/TLS/RTP/SAVPF",TRUE); not sure of result*/
+}
+#endif
 
 static void savpf_dtls_to_savpf_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionSRTP, "UDP/TLS/RTP/SAVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionSRTP, "UDP/TLS/RTP/SAVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savpf_dtls_to_savpf_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionSRTP, "UDP/TLS/RTP/SAVPF", TRUE);
+}
+#endif
 
 static void savpf_dtls_to_avpf_call(void) {
-	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionNone, "UDP/TLS/RTP/SAVPF");
+	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionNone, "UDP/TLS/RTP/SAVPF", FALSE);
 }
+#ifdef VIDEO_ENABLED
+static void savpf_dtls_to_avpf_video_call(void) {
+	profile_call(TRUE, LinphoneMediaEncryptionDTLS, TRUE, LinphoneMediaEncryptionNone, "UDP/TLS/RTP/SAVPF", TRUE);
+}
+#endif
 
 #ifdef VIDEO_ENABLED
 static LinphonePayloadType * configure_core_for_avpf_and_video(LinphoneCore *lc) {
@@ -306,7 +408,7 @@ static LinphonePayloadType * configure_core_for_avpf_and_video(LinphoneCore *lc)
 
 	policy.automatically_initiate = TRUE;
 	policy.automatically_accept = TRUE;
-	linphone_core_get_default_proxy(lc, &lpc);
+	lpc = linphone_core_get_default_proxy_config(lc);
 	linphone_proxy_config_enable_avpf(lpc, TRUE);
 	linphone_proxy_config_set_avpf_rr_interval(lpc, 3);
 	linphone_core_set_video_device(lc, "StaticImage: Static picture");
@@ -350,7 +452,7 @@ static void compatible_avpf_features(void) {
 
 	BC_ASSERT_TRUE((call_ok=call(marie, pauline)));
 	if (!call_ok) goto end;
-	
+
 	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
 	BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
 	check_avpf_features(marie->lc, lpt->avpf.features);
@@ -387,40 +489,57 @@ end:
 #endif
 
 static test_t offeranswer_tests[] = {
-	{ "Start with no config", start_with_no_config },
-	{ "Call failed because of codecs", call_failed_because_of_codecs },
-	{ "Simple call with different codec mappings", simple_call_with_different_codec_mappings},
-	{ "AVP to AVP call", avp_to_avp_call },
-	{ "AVP to AVPF call", avp_to_avpf_call },
-	{ "AVP to SAVP call", avp_to_savp_call },
-	{ "AVP to SAVPF call", avp_to_savpf_call },
-	{ "AVPF to AVP call", avpf_to_avp_call },
-	{ "AVPF to AVPF call", avpf_to_avpf_call },
-	{ "AVPF to SAVP call", avpf_to_savp_call },
-	{ "AVPF to SAVPF call", avpf_to_savpf_call },
-	{ "SAVP to AVP call", savp_to_avp_call },
-	{ "SAVP to AVPF call", savp_to_avpf_call },
-	{ "SAVP to SAVP call", savp_to_savp_call },
-	{ "SAVP to SAVPF call", savp_to_savpf_call },
-	{ "SAVPF to AVP call", savpf_to_avp_call },
-	{ "SAVPF to AVPF call", savpf_to_avpf_call },
-	{ "SAVPF to SAVP call", savpf_to_savp_call },
-	{ "SAVPF to SAVPF call", savpf_to_savpf_call },
-	{ "SAVPF/DTLS to SAVPF/DTLS call", savpf_dtls_to_savpf_dtls_call},
-	{ "SAVPF/DTLS to SAVPF/DTLS encryption mandatory call", savpf_dtls_to_savpf_dtls_encryption_mandatory_call},
-	{ "SAVPF/DTLS to SAVPF call", savpf_dtls_to_savpf_call},
-	{ "SAVPF/DTLS to SAVPF encryption mandatory call", savpf_dtls_to_savpf_encryption_mandatory_call},
-	{ "SAVPF/DTLS to AVPF call", savpf_dtls_to_avpf_call},
+	TEST_NO_TAG("Start with no config", start_with_no_config),
+	TEST_NO_TAG("Call failed because of codecs", call_failed_because_of_codecs),
+	TEST_NO_TAG("Simple call with different codec mappings", simple_call_with_different_codec_mappings),
+	TEST_NO_TAG("AVP to AVP call", avp_to_avp_call),
+	TEST_NO_TAG("AVP to AVPF call", avp_to_avpf_call),
+	TEST_NO_TAG("AVP to SAVP call", avp_to_savp_call),
+	TEST_NO_TAG("AVP to SAVPF call", avp_to_savpf_call),
+	TEST_NO_TAG("AVPF to AVP call", avpf_to_avp_call),
+	TEST_NO_TAG("AVPF to AVPF call", avpf_to_avpf_call),
+	TEST_NO_TAG("AVPF to SAVP call", avpf_to_savp_call),
+	TEST_NO_TAG("AVPF to SAVPF call", avpf_to_savpf_call),
+	TEST_NO_TAG("SAVP to AVP call", savp_to_avp_call),
+	TEST_NO_TAG("SAVP to AVPF call", savp_to_avpf_call),
+	TEST_NO_TAG("SAVP to SAVP call", savp_to_savp_call),
+	TEST_NO_TAG("SAVP to SAVPF call", savp_to_savpf_call),
+	TEST_NO_TAG("SAVPF to AVP call", savpf_to_avp_call),
+	TEST_NO_TAG("SAVPF to AVPF call", savpf_to_avpf_call),
+	TEST_NO_TAG("SAVPF to SAVP call", savpf_to_savp_call),
+	TEST_NO_TAG("SAVPF to SAVPF call", savpf_to_savpf_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF/DTLS call", savpf_dtls_to_savpf_dtls_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF/DTLS encryption mandatory call", savpf_dtls_to_savpf_dtls_encryption_mandatory_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF call", savpf_dtls_to_savpf_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF encryption mandatory call", savpf_dtls_to_savpf_encryption_mandatory_call),
+	TEST_NO_TAG("SAVPF/DTLS to AVPF call", savpf_dtls_to_avpf_call),
 #ifdef VIDEO_ENABLED
-	{ "Compatible AVPF features", compatible_avpf_features },
-	{ "Incompatible AVPF features", incompatible_avpf_features },
+	TEST_NO_TAG("AVP to AVP video call", avp_to_avp_video_call),
+	TEST_NO_TAG("AVP to AVPF video call", avp_to_avpf_video_call),
+	TEST_NO_TAG("AVP to SAVP video call", avp_to_savp_video_call),
+	TEST_NO_TAG("AVP to SAVPF video call", avp_to_savpf_video_call),
+	TEST_NO_TAG("AVPF to AVP video call", avpf_to_avp_video_call),
+	TEST_NO_TAG("AVPF to AVPF video call", avpf_to_avpf_video_call),
+	TEST_NO_TAG("AVPF to SAVP video call", avpf_to_savp_video_call),
+	TEST_NO_TAG("AVPF to SAVPF video call", avpf_to_savpf_video_call),
+	TEST_NO_TAG("SAVP to AVP video call", savp_to_avp_video_call),
+	TEST_NO_TAG("SAVP to AVPF video call", savp_to_avpf_video_call),
+	TEST_NO_TAG("SAVP to SAVP video call", savp_to_savp_video_call),
+	TEST_NO_TAG("SAVP to SAVPF video call", savp_to_savpf_video_call),
+	TEST_NO_TAG("SAVPF to AVP video call", savpf_to_avp_video_call),
+	TEST_NO_TAG("SAVPF to AVPF video call", savpf_to_avpf_video_call),
+	TEST_NO_TAG("SAVPF to SAVP video call", savpf_to_savp_video_call),
+	TEST_NO_TAG("SAVPF to SAVPF video call", savpf_to_savpf_video_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF/DTLS video call", savpf_dtls_to_savpf_dtls_video_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF/DTLS encryption mandatory video call", savpf_dtls_to_savpf_dtls_encryption_mandatory_video_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF video call", savpf_dtls_to_savpf_video_call),
+	TEST_NO_TAG("SAVPF/DTLS to SAVPF encryption mandatory video call", savpf_dtls_to_savpf_encryption_mandatory_video_call),
+	TEST_NO_TAG("SAVPF/DTLS to AVPF video call", savpf_dtls_to_avpf_video_call),
+
+	TEST_NO_TAG("Compatible AVPF features", compatible_avpf_features),
+	TEST_NO_TAG("Incompatible AVPF features", incompatible_avpf_features)
 #endif
 };
 
-test_suite_t offeranswer_test_suite = {
-	"Offer-answer",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(offeranswer_tests) / sizeof(offeranswer_tests[0]),
-	offeranswer_tests
-};
+test_suite_t offeranswer_test_suite = {"Offer-answer", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+									   sizeof(offeranswer_tests) / sizeof(offeranswer_tests[0]), offeranswer_tests};
diff --git a/tester/player_tester.c b/tester/player_tester.c
index 332bcffbc..5f68c7ba2 100644
--- a/tester/player_tester.c
+++ b/tester/player_tester.c
@@ -32,36 +32,32 @@ static void eof_callback(LinphonePlayer *player, void *user_data) {
 	*eof = TRUE;
 }
 
-static void play_file(const char *filename, bool_t unsupported_format, const char *audio_mime, const char *video_mime) {
-	LinphoneCoreManager *lc_manager;
+static void play_file(const char *filename, bool_t supported_format, const char *audio_mime, const char *video_mime) {
+	LinphoneCoreManager *lc_manager = linphone_core_manager_new("marie_rc");
 	LinphonePlayer *player;
-	int res, time = 0;
+	int res, timer = 0;
 	bool_t eof = FALSE;
 
-	lc_manager = linphone_core_manager_new("marie_rc");
-	BC_ASSERT_PTR_NOT_NULL(lc_manager);
-	if(lc_manager == NULL) return;
+	bool_t audio_codec_supported = (audio_mime && ms_factory_get_decoder(linphone_core_get_ms_factory((void *)lc_manager->lc), audio_mime));
+	bool_t video_codec_supported = (video_mime && ms_factory_get_decoder(linphone_core_get_ms_factory((void *)lc_manager->lc), video_mime));
+	int expected_res = (supported_format && (audio_codec_supported || video_codec_supported)) ? 0 : -1;
 
-	player = linphone_core_create_local_player(lc_manager->lc, ms_snd_card_manager_get_default_card(ms_snd_card_manager_get()), video_stream_get_default_video_renderer(), 0);
+	player = linphone_core_create_local_player(lc_manager->lc,
+											   ms_snd_card_manager_get_default_card(ms_factory_get_snd_card_manager(linphone_core_get_ms_factory((void *)lc_manager->lc))),
+																					video_stream_get_default_video_renderer(), 0);
 	BC_ASSERT_PTR_NOT_NULL(player);
 	if(player == NULL) goto fail;
 
 	res = linphone_player_open(player, filename, eof_callback, &eof);
-	if(unsupported_format
-			|| (audio_mime == NULL && video_mime == NULL)
-			|| (video_mime == NULL && audio_mime && !ms_filter_codec_supported(audio_mime))
-			|| (audio_mime == NULL && video_mime && !ms_filter_codec_supported(video_mime))) {
-		BC_ASSERT_EQUAL(res, -1, int, "%d");
-	} else {
-		BC_ASSERT_EQUAL(res, 0, int, "%d");
-	}
+	BC_ASSERT_EQUAL(res, expected_res, int, "%d");
+
 	if(res == -1) goto fail;
 
 	res = linphone_player_start(player);
 	BC_ASSERT_EQUAL(res, 0, int, "%d");
 	if(res == -1) goto fail;
 
-	BC_ASSERT_TRUE(wait_for_eof(&eof, &time, 100, 13000));
+	BC_ASSERT_TRUE(wait_for_eof(&eof, &timer, 100, (int)(linphone_player_get_duration(player) * 1.05)));
 
 	linphone_player_close(player);
 
@@ -70,22 +66,35 @@ static void play_file(const char *filename, bool_t unsupported_format, const cha
 	if(lc_manager) linphone_core_manager_destroy(lc_manager);
 }
 
-static void playing_test(void) {
-	char *filename = bc_tester_res("sounds/hello_opus_h264.mkv");
+static void sintel_trailer_opus_h264_test(void) {
+	char *filename = bc_tester_res("sounds/sintel_trailer_opus_h264.mkv");
 	const char *audio_mime = "opus";
-	const char *video_mime = "h264";
-	play_file(filename, !linphone_local_player_matroska_supported(), audio_mime, video_mime);
+	const char *video_mime = "H264";
+	play_file(filename, linphone_local_player_matroska_supported(), audio_mime, video_mime);
+	ms_free(filename);
+}
+
+static void sintel_trailer_pcmu_h264_test(void) {
+	char *filename = bc_tester_res("sounds/sintel_trailer_pcmu_h264.mkv");
+	const char *audio_mime = "pcmu";
+	const char *video_mime = "H264";
+	play_file(filename, linphone_local_player_matroska_supported(), audio_mime, video_mime);
+	ms_free(filename);
+}
+
+static void sintel_trailer_opus_vp8_test(void) {
+	char *filename = bc_tester_res("sounds/sintel_trailer_opus_vp8.mkv");
+	const char *audio_mime = "opus";
+	const char *video_mime = "VP8";
+	play_file(filename, linphone_local_player_matroska_supported(), audio_mime, video_mime);
 	ms_free(filename);
 }
 
 test_t player_tests[] = {
-	{	"Local MKV file"	,	playing_test	}
+	TEST_NO_TAG("Sintel trailer opus/h264", sintel_trailer_opus_h264_test),
+	TEST_NO_TAG("Sintel trailer pcmu/h264", sintel_trailer_pcmu_h264_test),
+	TEST_NO_TAG("Sintel trailer opus/VP8", sintel_trailer_opus_vp8_test)
 };
 
-test_suite_t player_test_suite = {
-	"Player",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(player_tests) / sizeof(test_t),
-	player_tests
-};
+test_suite_t player_test_suite = {"Player", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								  sizeof(player_tests) / sizeof(test_t), player_tests};
diff --git a/tester/presence_server_tester.c b/tester/presence_server_tester.c
new file mode 100644
index 000000000..c26af0bb9
--- /dev/null
+++ b/tester/presence_server_tester.c
@@ -0,0 +1,834 @@
+/*
+    liblinphone_tester - liblinphone test suite
+    Copyright (C) 2013  Belledonne Communications SARL
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "linphonecore.h"
+#include "private.h"
+#include "liblinphone_tester.h"
+
+static void enable_publish(LinphoneCoreManager *mgr, bool_t enable) {
+	LinphoneProxyConfig *cfg = linphone_core_get_default_proxy_config(mgr->lc);
+	linphone_proxy_config_edit(cfg);
+	linphone_proxy_config_enable_publish(cfg, enable);
+	linphone_proxy_config_set_publish_expires(cfg, 60);
+	linphone_proxy_config_done(cfg);
+}
+
+const char * get_identity(LinphoneCoreManager *mgr) {
+	LinphoneProxyConfig *cfg = linphone_core_get_default_proxy_config(mgr->lc);
+	return linphone_proxy_config_get_identity(cfg);
+}
+
+static void enable_deflate_content_encoding(LinphoneCoreManager *mgr, bool_t enable) {
+	LinphoneCore *lc = mgr->lc;
+	if (enable == TRUE)
+		lp_config_set_string(lc->config, "sip", "handle_content_encoding", "deflate");
+	else
+		lp_config_set_string(lc->config, "sip", "handle_content_encoding", "none");
+}
+
+static void simple(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphonePresenceModel *pauline_presence = linphone_presence_model_new_with_activity(LinphonePresenceActivityDinner, NULL);
+	LinphoneFriend* f = linphone_core_create_friend_with_address(marie->lc, get_identity(pauline));
+	LinphonePresenceActivity *activity = NULL;
+	LinphoneCoreVTable *vtable = linphone_core_v_table_new();
+	vtable->publish_state_changed = linphone_publish_state_changed;
+	_linphone_core_add_listener(pauline->lc, vtable, TRUE, TRUE );
+
+	
+	lp_config_set_int(marie->lc->config, "sip", "subscribe_expires", 40);
+	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
+	enable_publish(pauline, TRUE);
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphonePublishOk,1));
+
+	linphone_friend_enable_subscribes(f, TRUE);
+	linphone_friend_set_inc_subscribe_policy(f,LinphoneSPAccept); /* Accept incoming subscription request for this friend*/
+	linphone_core_add_friend(marie->lc, f);
+
+	linphone_core_set_presence_model(pauline->lc, pauline_presence);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityDinner,1));
+	activity = linphone_presence_model_get_activity(linphone_friend_get_presence_model(f));
+	if (BC_ASSERT_PTR_NOT_NULL(activity)) {
+		BC_ASSERT_EQUAL(linphone_presence_activity_get_type(activity), LinphonePresenceActivityDinner, int, "%d");
+	}
+
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphonePublishOk,2));
+				   
+	linphone_friend_unref(f);
+	linphone_core_manager_destroy(marie);
+	
+	linphone_core_manager_stop(pauline);
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphonePublishCleared,1,int,"%i");
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphonePublishOk,2,int,"%i");
+	linphone_core_manager_destroy(pauline);
+	}
+
+static void fast_activity_change(void) {
+#if FIX_ME
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphonePresenceModel *pauline_presence;
+	LinphoneFriend* f = linphone_core_create_friend_with_address(marie->lc, get_identity(pauline));
+	LinphonePresenceActivity *activity = NULL;
+
+	lp_config_set_int(marie->lc->config, "sip", "subscribe_expires", 40);
+	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
+	enable_publish(pauline, TRUE);
+
+	linphone_friend_enable_subscribes(f, TRUE);
+	linphone_friend_set_inc_subscribe_policy(f,LinphoneSPAccept); /* Accept incoming subscription request for this friend*/
+	linphone_core_add_friend(marie->lc, f);
+
+	/* pauline_Presence activity without description. */
+	pauline_presence = linphone_presence_model_new_with_activity(LinphonePresenceActivityDinner, NULL);
+	linphone_core_set_presence_model(pauline->lc, pauline_presence);
+	pauline_presence = linphone_presence_model_new_with_activity(LinphonePresenceActivityTV, NULL);
+	linphone_core_set_presence_model(pauline->lc, pauline_presence);
+	pauline_presence = linphone_presence_model_new_with_activity(LinphonePresenceActivityAway, NULL);
+	linphone_core_set_presence_model(pauline->lc, pauline_presence);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityDinner,1));
+	activity = linphone_presence_model_get_activity(linphone_friend_get_presence_model(f));
+	if (BC_ASSERT_PTR_NOT_NULL(activity)) {
+		BC_ASSERT_EQUAL(linphone_presence_activity_get_type(activity), LinphonePresenceActivityDinner, int, "%d");
+	}
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityTV,1));
+	activity = linphone_presence_model_get_activity(linphone_friend_get_presence_model(f));
+	if (BC_ASSERT_PTR_NOT_NULL(activity)) {
+		BC_ASSERT_EQUAL(linphone_presence_activity_get_type(activity), LinphonePresenceActivityTV, int, "%d");
+	}
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityAway,1));
+	activity = linphone_presence_model_get_activity(linphone_friend_get_presence_model(f));
+	if (BC_ASSERT_PTR_NOT_NULL(activity)) {
+		BC_ASSERT_EQUAL(linphone_presence_activity_get_type(activity), LinphonePresenceActivityAway, int, "%d");
+	}
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+#endif
+}
+
+static void subscriber_no_longer_reachable(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline1 = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneFriend *lf;
+	bctbx_list_t *lcs = NULL;
+	LinphonePresenceModel * presence;
+	int previous_number_of_LinphonePresenceActivityOnline=0;
+	int previous_number_of_LinphonePresenceActivityOffline=0;
+
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline1->lc);
+
+	lp_config_set_int(marie->lc->config, "sip", "subscribe_expires", 40);
+	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(pauline1->lc, "full-presence-support", NULL);
+
+	enable_publish(pauline1, TRUE);
+
+	lf = linphone_core_create_friend(marie->lc);
+	linphone_friend_set_address(lf, pauline1->identity);
+	linphone_friend_enable_subscribes(lf, TRUE);
+
+	linphone_core_add_friend(marie->lc, lf);
+	linphone_friend_unref(lf);
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePresenceBasicStatusOpen,1, 2000));
+
+	/*make sure marie subscribe is not reset by accident because of code below located in linphone_core_iterate
+
+	 if (lc->sip_network_reachable && lc->netup_time!=0 && (current_real_time-lc->netup_time)>3){
+
+		linphone_core_send_initial_subscribes(lc);
+	}
+	 */
+	wait_for_until(pauline1->lc, marie->lc, 0, 0, 3000);
+
+	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityBusy,NULL);
+	linphone_core_set_presence_model(pauline1->lc,presence);
+
+	previous_number_of_LinphonePresenceActivityOnline=marie->stat.number_of_LinphonePresenceActivityOnline;
+
+	/*don't schedule marie to simulate Notify timeout server side*/
+	wait_for_until(pauline1->lc, NULL, 0, 0, 40000);
+
+	//sal_set_send_error(marie->lc->sal,0);
+
+	/*because of notify timeout detected by server, so subscription is reset*/
+	previous_number_of_LinphonePresenceActivityOffline = marie->stat.number_of_LinphonePresenceBasicStatusClosed;
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePresenceActivityOffline,previous_number_of_LinphonePresenceActivityOffline+1, 4000));
+
+	// now subscription is supposed to be dead because notify was not answered in time.
+	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityOnline,NULL);
+	linphone_core_set_presence_model(pauline1->lc,presence);
+
+	/*because subscription not is automatically restarted*/
+	BC_ASSERT_FALSE(wait_for_list(lcs,&marie->stat.number_of_LinphonePresenceActivityOnline,previous_number_of_LinphonePresenceActivityOnline+1, 4000));
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline1);
+
+	bctbx_list_free(lcs);
+
+}
+
+static void subscribe_with_late_publish(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneProxyConfig* proxy;
+	LinphonePresenceModel* presence;
+	LpConfig *pauline_lp;
+	char* lf_identity;
+ 	LinphoneFriend *lf;
+
+	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+	pauline_lp = linphone_core_get_config(pauline->lc);
+	lf_identity=linphone_address_as_string_uri_only(marie->identity);
+	lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
+
+	lp_config_set_int(pauline_lp,"sip","subscribe_expires",10);
+
+	linphone_core_add_friend(pauline->lc,lf);
+
+	/*wait for subscribe acknowledgment*/
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyPresenceReceived,1,2000));
+	/*BC_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf), int, "%d");*/
+
+
+	/*enable publish*/
+	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityPresentation,NULL);
+	linphone_core_set_presence_model(marie->lc,presence);
+	proxy = linphone_core_get_default_proxy_config(marie->lc);
+	linphone_proxy_config_edit(proxy);
+
+	linphone_proxy_config_enable_publish(proxy,TRUE);
+	linphone_proxy_config_set_publish_expires(proxy,3);
+	linphone_proxy_config_done(proxy);
+
+	/*wait for marie status*/
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphonePresenceActivityPresentation,1,2000));
+
+	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityBusy,NULL);
+	linphone_core_set_presence_model(marie->lc,presence);
+
+	/*wait for new status*/
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphonePresenceActivityBusy,1,2000));
+
+	/*wait for refresh*/
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphonePresenceActivityBusy,2,4000));
+
+	/*linphone_core_remove_friend(pauline->lc,lf);*/
+	/*wait for final notify*/
+	/*wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyPresenceReceived,4,5000);
+	BC_ASSERT_EQUAL(LinphonePresenceActivityOffline,linphone_friend_get_status(lf), int, "%d");
+	 */
+
+	/*Expect a notify at publication expiration because marie is no longuer scheduled*/
+	BC_ASSERT_FALSE(wait_for_until(pauline->lc,pauline->lc,&pauline->stat.number_of_LinphonePresenceActivityBusy,3,6000));
+	/*thanks to long term presence we are still online*/
+	BC_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf), int, "%d");
+
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphonePresenceActivityBusy,3,5000));/*re- schedule marie to clean up things*/
+
+	/*simulate a rapid presence change to make sure only first and last are transmited*/
+	linphone_core_set_presence_model(marie->lc,linphone_presence_model_new_with_activity(LinphonePresenceActivityAway,NULL));
+	linphone_core_set_presence_model(marie->lc,linphone_presence_model_new_with_activity(LinphonePresenceActivityBreakfast,NULL));
+	linphone_core_set_presence_model(marie->lc,linphone_presence_model_new_with_activity(LinphonePresenceActivityAppointment,NULL));
+
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphonePresenceActivityAppointment,1,5000));
+
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphonePresenceActivityAway, 1, int,"%i");
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphonePresenceActivityBreakfast, 0, int,"%i");
+	BC_ASSERT_EQUAL(pauline->stat.number_of_LinphonePresenceActivityAppointment, 1, int,"%i");
+
+	linphone_friend_unref(lf);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void test_forked_subscribe_notify_publish(void) {
+
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
+	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneProxyConfig* proxy;
+	LinphonePresenceModel* presence;
+	LpConfig *pauline_lp;
+	char* lf_identity;
+	LinphoneFriend *lf;
+	bctbx_list_t* lcs=bctbx_list_append(NULL,pauline->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie->lc);
+	lcs=bctbx_list_append(lcs,marie2->lc);
+	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(marie2->lc, "full-presence-support", NULL);
+	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+
+
+	pauline_lp = linphone_core_get_config(pauline->lc);
+	lf_identity=linphone_address_as_string_uri_only(marie->identity);
+	lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
+
+	lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);
+
+	linphone_core_add_friend(pauline->lc,lf);
+
+	/*wait for subscribe acknowledgment*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_NotifyPresenceReceived,1,3000));
+
+	/*enable publish*/
+
+	proxy = linphone_core_get_default_proxy_config(marie->lc);
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,TRUE);
+	linphone_proxy_config_set_publish_expires(proxy,3);
+	linphone_proxy_config_done(proxy);
+
+	proxy = linphone_core_get_default_proxy_config(marie2->lc);
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,TRUE);
+	linphone_proxy_config_set_publish_expires(proxy,3);
+	linphone_proxy_config_done(proxy);
+
+
+	/*wait for marie status*/
+	wait_for_list(lcs,&pauline->stat.number_of_LinphonePresenceActivityOnline,3,2000); /*initial + 2 from publish*/
+	BC_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf), int, "%d");
+
+	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityBusy,NULL);
+	linphone_core_set_presence_model(marie->lc,presence);
+
+	/*wait for new status*/
+	wait_for_list(lcs,&pauline->stat.number_of_LinphonePresenceActivityBusy,1,3000);
+	BC_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf), int, "%d");
+
+
+	presence =linphone_presence_model_new_with_activity(  LinphonePresenceActivityMeeting,NULL);
+	linphone_core_set_presence_model(marie2->lc,presence);
+	/*wait for new status*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphonePresenceActivityMeeting,1,3000));
+
+	linphone_friend_unref(lf);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(marie2);
+	linphone_core_manager_destroy(pauline);
+}
+
+
+static void test_presence_list_base(bool_t enable_compression) {
+	LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc");
+	LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	const char *rls_uri = "sip:rls@sip.example.org";
+	LinphoneFriendList *lfl;
+	LinphoneFriend *lf;
+	const char *laure_identity;
+	const char *marie_identity;
+	const char *pauline_identity;
+	bctbx_list_t* lcs = NULL;
+
+	laure_identity = get_identity(laure);
+	marie_identity = get_identity(marie);
+	pauline_identity = get_identity(pauline);
+	enable_publish(marie, TRUE);
+	enable_publish(pauline, TRUE);
+	enable_publish(laure, TRUE);
+	enable_deflate_content_encoding(marie, enable_compression);
+	enable_deflate_content_encoding(pauline, enable_compression);
+	enable_deflate_content_encoding(laure, enable_compression);
+
+	linphone_core_set_presence_model(marie->lc, linphone_core_create_presence_model_with_activity(marie->lc, LinphonePresenceActivityBusy, NULL));
+	linphone_core_set_presence_model(pauline->lc, linphone_core_create_presence_model_with_activity(pauline->lc, LinphonePresenceActivityVacation, NULL));
+
+	lfl = linphone_core_create_friend_list(laure->lc);
+	linphone_friend_list_set_rls_uri(lfl, rls_uri);
+	lf = linphone_core_create_friend_with_address(laure->lc, marie_identity);
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	lf = linphone_core_create_friend_with_address(laure->lc, pauline_identity);
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	lf = linphone_core_create_friend_with_address(laure->lc, "sip:michelle@sip.inexistentdomain.com");
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	linphone_core_remove_friend_list(laure->lc, linphone_core_get_default_friend_list(laure->lc));
+	linphone_core_add_friend_list(laure->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	linphone_core_set_presence_model(laure->lc, linphone_core_create_presence_model_with_activity(laure->lc, LinphonePresenceActivityOnline, NULL));
+
+	lcs = bctbx_list_append(lcs, laure->lc);
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+
+	wait_for_list(lcs, &laure->stat.number_of_NotifyPresenceReceived, 2, 4000);
+	BC_ASSERT_EQUAL(laure->stat.number_of_NotifyPresenceReceived, 2, int, "%d");
+	BC_ASSERT_EQUAL(linphone_core_get_default_friend_list(laure->lc)->expected_notification_version, 1, int, "%d");
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), marie_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusBusy, int, "%d");
+	if (!BC_ASSERT_TRUE(lf->presence_received)) goto end;
+	if (!BC_ASSERT_TRUE(lf->subscribe_active)) goto end;
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), pauline_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusVacation, int, "%d");
+	if (!BC_ASSERT_TRUE(lf->presence_received)) goto end;
+	if (!BC_ASSERT_TRUE(lf->subscribe_active)) goto end;
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), "sip:michelle@sip.inexistentdomain.com");
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOffline, int, "%d");
+	BC_ASSERT_FALSE(lf->presence_received);
+	if (!BC_ASSERT_TRUE(lf->subscribe_active)) goto end;
+
+	lfl = linphone_core_create_friend_list(marie->lc);
+	linphone_friend_list_set_rls_uri(lfl, rls_uri);
+	lf = linphone_core_create_friend_with_address(marie->lc, laure_identity);
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	linphone_core_remove_friend_list(marie->lc, linphone_core_get_default_friend_list(marie->lc));
+	linphone_core_add_friend_list(marie->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	linphone_friend_list_update_subscriptions(linphone_core_get_default_friend_list(marie->lc));
+
+	wait_for_list(lcs, &marie->stat.number_of_NotifyPresenceReceived, 1, 4000);
+	BC_ASSERT_EQUAL(marie->stat.number_of_NotifyPresenceReceived, 1, int, "%d");
+	BC_ASSERT_EQUAL(linphone_core_get_default_friend_list(marie->lc)->expected_notification_version, 1, int, "%d");
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(marie->lc), laure_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOnline, int, "%d");
+	if (!BC_ASSERT_TRUE(lf->presence_received)) goto end;
+	if (!BC_ASSERT_TRUE(lf->subscribe_active)) goto end;
+
+	lfl = linphone_core_create_friend_list(pauline->lc);
+	linphone_friend_list_set_rls_uri(lfl, rls_uri);
+	lf = linphone_core_create_friend_with_address(pauline->lc, marie_identity);
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	linphone_core_remove_friend_list(pauline->lc, linphone_core_get_default_friend_list(pauline->lc));
+	linphone_core_add_friend_list(pauline->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	linphone_friend_list_update_subscriptions(linphone_core_get_default_friend_list(pauline->lc));
+
+	wait_for_list(lcs, &pauline->stat.number_of_NotifyPresenceReceived, 1, 4000);
+	BC_ASSERT_EQUAL(pauline->stat.number_of_NotifyPresenceReceived, 1, int, "%d");
+	BC_ASSERT_EQUAL(linphone_core_get_default_friend_list(pauline->lc)->expected_notification_version, 1, int, "%d");
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(pauline->lc), marie_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusBusy, int, "%d");
+	if (!BC_ASSERT_TRUE(lf->presence_received)) goto end;
+	if (!BC_ASSERT_TRUE(lf->subscribe_active)) goto end;
+
+	linphone_core_set_presence_model(marie->lc, linphone_core_create_presence_model_with_activity(marie->lc, LinphonePresenceActivityOnThePhone, NULL));
+
+	wait_for_list(lcs, &laure->stat.number_of_NotifyPresenceReceived, 4, 4000);
+	/* The number of PresenceReceived events can be 3 or 4 here. TODO: ideally it should always be 3. */
+	BC_ASSERT_GREATER(laure->stat.number_of_NotifyPresenceReceived, 3, int, "%d");
+	BC_ASSERT_LOWER(laure->stat.number_of_NotifyPresenceReceived, 4, int, "%d");
+	BC_ASSERT_EQUAL(linphone_core_get_default_friend_list(laure->lc)->expected_notification_version, 2, int, "%d");
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), marie_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOnThePhone, int, "%d");
+
+	wait_for_list(lcs, &pauline->stat.number_of_NotifyPresenceReceived, 2, 4000);
+	BC_ASSERT_EQUAL(pauline->stat.number_of_NotifyPresenceReceived, 2, int, "%d");
+	BC_ASSERT_EQUAL(linphone_core_get_default_friend_list(pauline->lc)->expected_notification_version, 2, int, "%d");
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(pauline->lc), marie_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOnThePhone, int, "%d");
+
+	ms_message("Disabling publish");
+	enable_publish(laure, FALSE);
+	enable_publish(marie, FALSE);
+	enable_publish(pauline, FALSE);
+
+
+	reset_counters(&pauline->stat);
+	reset_counters(&laure->stat);
+	reset_counters(&marie->stat);
+
+	/*keep in mind long terme presence*/
+
+	if (!BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphonePresenceActivityOnline, 1, 4000)))
+		goto end;
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(pauline->lc), marie_identity);
+	/*BC_ASSERT_EQUAL(linphone_presence_activity_get_type(linphone_presence_model_get_activity(linphone_friend_get_presence_model(lf)))
+					, LinphonePresenceActivityOnline, int, "%d"); fixme, should be LinphonePresenceActivityUnknown*/
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOnline, int, "%d");
+
+
+	if (!BC_ASSERT_TRUE(wait_for_list(lcs, &laure->stat.number_of_LinphonePresenceActivityOnline, 2, 4000))) goto end;
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), pauline_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOnline, int, "%d");
+	/*BC_ASSERT_EQUAL(linphone_presence_activity_get_type(linphone_presence_model_get_activity(linphone_friend_get_presence_model(lf)))
+					, LinphonePresenceActivityOnline, int, "%d"); fixme, should be LinphonePresenceActivityUnknown*/
+
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), marie_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOnline, int, "%d");
+	/*BC_ASSERT_EQUAL(linphone_presence_activity_get_type(linphone_presence_model_get_activity(linphone_friend_get_presence_model(lf)))
+					, LinphonePresenceActivityOnline, int, "%d"); fixme, should be LinphonePresenceActivityUnknown*/
+
+
+	if (!BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphonePresenceActivityOnline, 1, 4000))) goto end;
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(marie->lc), laure_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOnline, int, "%d");
+	/*BC_ASSERT_EQUAL(linphone_presence_activity_get_type(linphone_presence_model_get_activity(linphone_friend_get_presence_model(lf)))
+					, LinphonePresenceActivityOnline, int, "%d"); fixme, should be LinphonePresenceActivityUnknown*/
+
+end:
+	bctbx_list_free(lcs);
+	linphone_core_manager_destroy(laure);
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void test_presence_list(void) {
+	test_presence_list_base(TRUE);
+}
+
+static void test_presence_list_without_compression(void) {
+	test_presence_list_base(FALSE);
+}
+
+#if 0
+static void test_presence_list_subscribe_before_publish(void) {
+	LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	const char *rls_uri = "sip:rls@sip.example.org";
+	LinphoneFriendList *lfl;
+	LinphoneFriend *lf;
+	const char *pauline_identity;
+	bctbx_list_t* lcs = NULL;
+	int dummy = 0;
+
+	pauline_identity = get_identity(pauline);
+
+	linphone_core_set_presence_model(pauline->lc, linphone_core_create_presence_model_with_activity(pauline->lc, LinphonePresenceActivityVacation, NULL));
+
+	lfl = linphone_core_create_friend_list(laure->lc);
+	linphone_friend_list_set_rls_uri(lfl, rls_uri);
+	lf = linphone_core_create_friend_with_address(laure->lc, pauline_identity);
+	linphone_friend_list_add_friend(lfl, lf);
+	lf = linphone_core_create_friend_with_address(laure->lc, "sip:michelle@sip.inexistentdomain.com");
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_core_remove_friend_list(laure->lc, linphone_core_get_default_friend_list(laure->lc));
+	linphone_core_add_friend_list(laure->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	linphone_core_set_presence_model(laure->lc, linphone_core_create_presence_model_with_activity(laure->lc, LinphonePresenceActivityOnline, NULL));
+	linphone_friend_list_update_subscriptions(linphone_core_get_default_friend_list(laure->lc), NULL, FALSE);
+
+	lcs = bctbx_list_append(lcs, laure->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+
+	wait_for_list(lcs, &dummy, 1, 2000); /* Wait a little bit for the subscribe to happen */
+
+	enable_publish(pauline, TRUE);
+	wait_for_list(lcs, &pauline->stat.number_of_NotifyPresenceReceived, 1, 4000);
+	BC_ASSERT_GREATER(laure->stat.number_of_NotifyPresenceReceived, 1, int, "%d");
+	BC_ASSERT_GREATER(linphone_core_get_default_friend_list(laure->lc)->expected_notification_version, 1, int, "%d");
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), pauline_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusVacation, int, "%d");
+	BC_ASSERT_TRUE(lf->presence_received);
+	BC_ASSERT_TRUE(lf->subscribe_active);
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), "sip:michelle@sip.inexistentdomain.com");
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOffline, int, "%d");
+	BC_ASSERT_FALSE(lf->presence_received);
+	BC_ASSERT_TRUE(lf->subscribe_active);
+
+	enable_publish(laure, FALSE);
+	enable_publish(pauline, FALSE);
+
+	linphone_core_manager_destroy(laure);
+	linphone_core_manager_destroy(pauline);
+}
+#endif
+
+static void test_presence_list_subscription_expire_for_unknown(void) {
+	LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc");
+	const char *rls_uri = "sip:rls@sip.example.org";
+	LinphoneFriendList *lfl;
+	LinphoneFriend *lf;
+	lp_config_set_int(laure->lc->config, "sip", "rls_presence_expires", 3);
+
+	lfl = linphone_core_create_friend_list(laure->lc);
+	linphone_friend_list_set_rls_uri(lfl, rls_uri);
+	lf = linphone_core_create_friend_with_address(laure->lc, "sip:michelle@sip.inexistentdomain.com");
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_core_remove_friend_list(laure->lc, linphone_core_get_default_friend_list(laure->lc));
+	linphone_core_add_friend_list(laure->lc, lfl);
+	linphone_friend_list_update_subscriptions(lfl);
+	linphone_friend_list_unref(lfl);
+
+	/* wait for refresh*/
+	BC_ASSERT_FALSE(wait_for_until(laure->lc, NULL, &laure->stat.number_of_NotifyPresenceReceived, 1, 4000));
+
+	linphone_friend_unref(lf);
+	linphone_core_manager_destroy(laure);
+}
+
+static void test_presence_list_subscribe_with_error(bool_t io_error) {
+	LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc");
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	const char *rls_uri = "sip:rls@sip.example.org";
+	LinphoneFriendList *lfl;
+	LinphoneFriend *lf;
+	const char *pauline_identity;
+	bctbx_list_t* lcs = NULL;
+	int dummy = 0;
+	lp_config_set_int(laure->lc->config, "sip", "rls_presence_expires", 5);
+
+
+	pauline_identity = get_identity(pauline);
+
+	linphone_core_set_presence_model(pauline->lc, linphone_core_create_presence_model_with_activity(pauline->lc, LinphonePresenceActivityVacation, NULL));
+
+	lfl = linphone_core_create_friend_list(laure->lc);
+	linphone_friend_list_set_rls_uri(lfl, rls_uri);
+	lf = linphone_core_create_friend_with_address(laure->lc, pauline_identity);
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	lf = linphone_core_create_friend_with_address(laure->lc, "sip:michelle@sip.inexistentdomain.com");
+	linphone_friend_list_add_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	linphone_core_remove_friend_list(laure->lc, linphone_core_get_default_friend_list(laure->lc));
+	linphone_core_add_friend_list(laure->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	linphone_core_set_presence_model(laure->lc, linphone_core_create_presence_model_with_activity(laure->lc, LinphonePresenceActivityOnline, NULL));
+	linphone_friend_list_update_subscriptions(linphone_core_get_default_friend_list(laure->lc));
+	lcs = bctbx_list_append(lcs, laure->lc);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+
+	wait_for_list(lcs, &dummy, 1, 2000); /* Wait a little bit for the subscribe to happen */
+
+	enable_publish(pauline, TRUE);
+	BC_ASSERT_TRUE(wait_for_until(laure->lc, pauline->lc, &laure->stat.number_of_LinphonePresenceActivityVacation, 1, 6000));
+	BC_ASSERT_GREATER(laure->stat.number_of_NotifyPresenceReceived, 1, int, "%d");
+	BC_ASSERT_GREATER(linphone_core_get_default_friend_list(laure->lc)->expected_notification_version, 1, int, "%d");
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), pauline_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusVacation, int, "%d");
+	BC_ASSERT_TRUE(lf->presence_received);
+	BC_ASSERT_TRUE(lf->subscribe_active);
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), "sip:michelle@sip.inexistentdomain.com");
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusOffline, int, "%d");
+	BC_ASSERT_FALSE(lf->presence_received);
+	BC_ASSERT_TRUE(lf->subscribe_active);
+
+	BC_ASSERT_TRUE(wait_for_until(laure->lc, pauline->lc, &laure->stat.number_of_LinphonePresenceActivityVacation, 2, 6000));
+	if (io_error) {
+		ms_message("Simulating socket error");
+		sal_set_recv_error(laure->lc->sal, -1);
+		wait_for_list(lcs, &dummy, 1, 500); /* just time for socket to be closed */
+	} else {
+		ms_message("Simulating in/out packets losses");
+		sal_set_send_error(laure->lc->sal,1500); /*make sure no refresh is sent, trash the message without generating error*/
+		sal_set_recv_error(laure->lc->sal, 1500); /*make sure server notify to close the dialog is also ignored*/
+		wait_for_list(lcs, &dummy, 1, 5000); /* Wait a little bit for the subscribe to happen */
+	}
+	/*restart normal behavior*/
+	sal_set_send_error(laure->lc->sal,0);
+	sal_set_recv_error(laure->lc->sal, 1);
+
+	BC_ASSERT_TRUE(wait_for_until(laure->lc, pauline->lc, &laure->stat.number_of_LinphonePresenceActivityVacation, 3, 6000)); /* give time for subscription to recover to avoid to receive 491 Request pending*/
+
+	linphone_core_set_presence_model(pauline->lc, linphone_core_create_presence_model_with_activity(pauline->lc, LinphonePresenceActivityAway, NULL));
+
+	BC_ASSERT_TRUE(wait_for_until(laure->lc, pauline->lc, &laure->stat.number_of_LinphonePresenceActivityAway, 1, 6000));
+	lf = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(laure->lc), pauline_identity);
+	BC_ASSERT_EQUAL(linphone_friend_get_status(lf), LinphoneStatusAway, int, "%d");
+
+	linphone_core_manager_destroy(laure);
+	linphone_core_manager_destroy(pauline);
+}
+
+static void presence_list_subscribe_dialog_expire(void) {
+	test_presence_list_subscribe_with_error(FALSE);
+}
+
+static void presence_list_subscribe_io_error(void) {
+	test_presence_list_subscribe_with_error(TRUE);
+}
+
+static void long_term_presence_base(const char* addr, bool_t exist, const char* contact) {
+	LinphoneFriend* friend2;
+	const LinphonePresenceModel* model;
+	char *presence_contact;
+	int *presence;
+	LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+
+	friend2=linphone_core_create_friend_with_address(pauline->lc,addr);
+	linphone_friend_edit(friend2);
+	linphone_friend_enable_subscribes(friend2,TRUE);
+	linphone_friend_done(friend2);
+	linphone_core_add_friend(pauline->lc,friend2);
+
+	presence = exist ? &pauline->stat.number_of_LinphonePresenceActivityOnline : &pauline->stat.number_of_LinphonePresenceActivityOffline;
+	BC_ASSERT_TRUE(wait_for(pauline->lc,NULL,presence,1));
+	BC_ASSERT_EQUAL(*presence, 1, int, "%d");
+	model = linphone_friend_get_presence_model(friend2);
+	if (BC_ASSERT_PTR_NOT_NULL(model)) {
+		BC_ASSERT_EQUAL(linphone_presence_model_get_basic_status(model),
+			exist ? LinphonePresenceBasicStatusOpen : LinphonePresenceBasicStatusClosed, int, "%d");
+		presence_contact = linphone_presence_model_get_contact(model);
+		if (exist && BC_ASSERT_PTR_NOT_NULL(presence_contact)) {
+			BC_ASSERT_STRING_EQUAL(presence_contact, contact);
+			ms_free(presence_contact);
+		} else if (!exist) {
+			BC_ASSERT_PTR_NULL(presence_contact);
+		}
+	}
+
+	linphone_friend_unref(friend2);
+	linphone_core_manager_destroy(pauline);
+}
+static void long_term_presence_existing_friend(void) {
+	// this friend is not online, but is known from flexisip to be registered (see flexisip/userdb.conf),
+	// so we expect to get a report that he is currently not online
+	long_term_presence_base("sip:liblinphone_tester@sip.example.org", TRUE, "sip:liblinphone_tester@sip.example.org");
+}
+static void long_term_presence_inexistent_friend(void) {
+	long_term_presence_base("sip:random_unknown@sip.example.org", FALSE, NULL);
+}
+
+static void long_term_presence_phone_alias(void) {
+	long_term_presence_base("sip:+33123456789@sip.example.org", TRUE, "sip:liblinphone_tester@sip.example.org");
+}
+
+static const char* random_phone_number(void) {
+	static char phone[10];
+	int i;
+	phone[0] = '+';
+	for (i = 1; i < 10; i++) {
+		phone[i] = '0' + rand() % 10;
+	}
+	return phone;
+}
+
+static void long_term_presence_phone_alias2(void) {
+	LinphoneCoreManager *marie = linphone_core_manager_new3("marie_rc", TRUE, random_phone_number());
+	char * identity = linphone_address_as_string_uri_only(marie->identity);
+	LinphoneAddress * phone_addr = linphone_core_interpret_url(marie->lc, marie->phone_alias);
+	char *phone_addr_uri = linphone_address_as_string(phone_addr);
+	long_term_presence_base(phone_addr_uri, TRUE, identity);
+	ms_free(identity);
+	ms_free(phone_addr_uri);
+	linphone_address_destroy(phone_addr);
+	linphone_core_manager_destroy(marie);
+}
+
+static void long_term_presence_list(void) {
+	if (linphone_core_vcard_supported()){
+	
+		LinphoneFriend *f1, *f2;
+		LinphoneFriendList* friends;
+		const LinphonePresenceModel *presence;
+		const char *phone_number = "+33123456789";
+		LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+		enable_publish(pauline, FALSE);
+		enable_deflate_content_encoding(pauline, FALSE);
+
+		friends = linphone_core_create_friend_list(pauline->lc);
+		linphone_friend_list_set_rls_uri(friends, "sip:rls@sip.example.org");
+		f1 = linphone_core_create_friend_with_address(pauline->lc, "sip:liblinphone_tester@sip.example.org");
+		linphone_friend_add_phone_number(f1, phone_number);
+		linphone_friend_list_add_friend(friends, f1);
+		linphone_friend_unref(f1);
+		f2 = linphone_core_create_friend_with_address(pauline->lc, "sip:random_unknown@sip.example.org");
+		linphone_friend_list_add_friend(friends, f2);
+		linphone_friend_unref(f2);
+		linphone_core_remove_friend_list(pauline->lc, linphone_core_get_default_friend_list(pauline->lc));
+		linphone_core_add_friend_list(pauline->lc, friends);
+		linphone_friend_list_unref(friends);
+
+		BC_ASSERT_TRUE(wait_for(pauline->lc,NULL,&pauline->stat.number_of_NotifyPresenceReceived,1));
+		BC_ASSERT_TRUE(wait_for(pauline->lc, NULL, &pauline->stat.number_of_NotifyPresenceReceivedForUriOrTel, 2));
+
+		f1 = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(pauline->lc), "sip:liblinphone_tester@sip.example.org");
+		BC_ASSERT_EQUAL(linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(f1)), LinphonePresenceBasicStatusOpen, int, "%d");
+		presence = linphone_friend_get_presence_model_for_uri_or_tel(f1, phone_number);
+		if (BC_ASSERT_PTR_NOT_NULL(presence)) {
+			BC_ASSERT_STRING_EQUAL(linphone_presence_model_get_contact(presence), "sip:liblinphone_tester@sip.example.org");
+		}
+		BC_ASSERT_TRUE(f1->presence_received);
+
+		f2 = linphone_friend_list_find_friend_by_uri(linphone_core_get_default_friend_list(pauline->lc), "sip:random_unknown@sip.example.org");
+		BC_ASSERT_EQUAL(linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(f2)), LinphonePresenceBasicStatusClosed, int, "%d");
+		BC_ASSERT_FALSE(f2->presence_received);
+
+		linphone_core_manager_destroy(pauline);
+	}else ms_warning("Test skipped, no vcard support");
+}
+
+static void long_term_presence_phone_without_sip(void) {
+	if (linphone_core_vcard_supported()){
+		LinphoneCoreManager *marie = linphone_core_manager_new3("marie_rc", TRUE, random_phone_number());
+		char * identity = linphone_address_as_string_uri_only(marie->identity);
+		LinphoneAddress * phone_addr = linphone_core_interpret_url(marie->lc, marie->phone_alias);
+		char *phone_addr_uri = linphone_address_as_string(phone_addr);
+
+		LinphoneFriend* friend2;
+		char *presence_contact;
+		LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+		linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
+
+		friend2=linphone_core_create_friend(pauline->lc);
+		linphone_friend_add_phone_number(friend2, marie->phone_alias);
+		linphone_core_add_friend(pauline->lc,friend2);
+
+		linphone_friend_list_set_rls_uri(linphone_core_get_default_friend_list(pauline->lc), "sip:rls@sip.example.org");
+		linphone_friend_list_enable_subscriptions(linphone_core_get_default_friend_list(pauline->lc), TRUE);
+		linphone_core_refresh_registers(pauline->lc);
+
+		BC_ASSERT_TRUE(wait_for(pauline->lc,NULL,&pauline->stat.number_of_LinphonePresenceActivityOnline,1));
+		BC_ASSERT_EQUAL(pauline->stat.number_of_LinphonePresenceActivityOnline, 1, int, "%d");
+		BC_ASSERT_EQUAL(linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(friend2)), LinphonePresenceBasicStatusOpen, int, "%d");
+		if(BC_ASSERT_PTR_NOT_NULL(linphone_friend_get_presence_model(friend2))) {
+			presence_contact = linphone_presence_model_get_contact(linphone_friend_get_presence_model(friend2));
+			if (BC_ASSERT_PTR_NOT_NULL(presence_contact)) {
+				BC_ASSERT_STRING_EQUAL(presence_contact, identity);
+				ms_free(presence_contact);
+			}
+		}
+		linphone_friend_unref(friend2);
+		linphone_core_manager_destroy(pauline);
+
+		ms_free(identity);
+		ms_free(phone_addr_uri);
+		linphone_address_destroy(phone_addr);
+		linphone_core_manager_destroy(marie);
+	}else ms_warning("Test skipped, no vcard support");
+}
+
+
+test_t presence_server_tests[] = {
+	TEST_NO_TAG("Simple", simple),
+	TEST_NO_TAG("Fast activity change", fast_activity_change),
+	TEST_NO_TAG("Forked subscribe with late publish", test_forked_subscribe_notify_publish),
+	TEST_NO_TAG("Presence list", test_presence_list),
+	TEST_NO_TAG("Presence list without compression", test_presence_list_without_compression),
+	TEST_NO_TAG("Presence list, subscription expiration for unknown contact",test_presence_list_subscription_expire_for_unknown),
+	TEST_NO_TAG("Presence list, silent subscription expiration", presence_list_subscribe_dialog_expire),
+	TEST_NO_TAG("Presence list, io error",presence_list_subscribe_io_error),
+	TEST_ONE_TAG("Long term presence existing friend",long_term_presence_existing_friend, "longterm"),
+	TEST_ONE_TAG("Long term presence inexistent friend",long_term_presence_inexistent_friend, "longterm"),
+	TEST_ONE_TAG("Long term presence phone alias",long_term_presence_phone_alias, "longterm"),
+	TEST_ONE_TAG("Long term presence phone alias 2",long_term_presence_phone_alias2, "longterm"),
+	TEST_ONE_TAG("Long term presence list",long_term_presence_list, "longterm"),
+	TEST_ONE_TAG("Long term presence phone without sip",long_term_presence_phone_without_sip, "longterm"),
+	TEST_NO_TAG("Subscriber no longer reachable using server",subscriber_no_longer_reachable),
+	TEST_NO_TAG("Subscribe with late publish", subscribe_with_late_publish),
+};
+
+test_suite_t presence_server_test_suite = {"Presence using server", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+									sizeof(presence_server_tests) / sizeof(presence_server_tests[0]), presence_server_tests};
diff --git a/tester/presence_tester.c b/tester/presence_tester.c
index a685aba7a..823dd19e6 100644
--- a/tester/presence_tester.c
+++ b/tester/presence_tester.c
@@ -21,20 +21,29 @@
 #include "private.h"
 #include "liblinphone_tester.h"
 
-static LinphoneCoreManager* presence_linphone_core_manager_new(char* username) {
-	LinphoneCoreManager* mgr= linphone_core_manager_new2( "empty_rc", FALSE);
+static LinphoneCoreManager* presence_linphone_core_manager_new_with_rc_name(char* username, char * rc_name) {
+	LinphoneCoreManager* mgr= linphone_core_manager_new2( rc_name, FALSE);
 	char* identity_char;
 	mgr->identity= linphone_core_get_primary_contact_parsed(mgr->lc);
 	linphone_address_set_username(mgr->identity,username);
 	identity_char=linphone_address_as_string(mgr->identity);
 	linphone_core_set_primary_contact(mgr->lc,identity_char);
+	ms_free(identity_char);
 	return mgr;
 }
+static LinphoneCoreManager* presence_linphone_core_manager_new(char* username) {
+	return presence_linphone_core_manager_new_with_rc_name(username, "empty_rc");
+}
+
+
 void new_subscription_requested(LinphoneCore *lc, LinphoneFriend *lf, const char *url){
-	char* from=linphone_address_as_string(linphone_friend_get_address(lf));
 	stats* counters;
-	ms_message("New subscription request  from [%s]  url [%s]",from,url);
-	ms_free(from);
+	const LinphoneAddress *addr = linphone_friend_get_address(lf);
+	if (addr != NULL) {
+		char* from=linphone_address_as_string(addr);
+		ms_message("New subscription request from [%s] url [%s]",from,url);
+		ms_free(from);
+	}
 	counters = get_stats(lc);
 	counters->number_of_NewSubscriptionRequest++;
 	linphone_core_add_friend(lc,lf); /*accept subscription*/
@@ -42,111 +51,158 @@ void new_subscription_requested(LinphoneCore *lc, LinphoneFriend *lf, const char
 
 void notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf) {
 	stats* counters;
-	LinphonePresenceActivity *activity = NULL;
-	char* from=linphone_address_as_string(linphone_friend_get_address(lf));
-	ms_message("New Notify request  from [%s] ",from);
-	ms_free(from);
+	unsigned int i;
+	const LinphoneAddress *addr = linphone_friend_get_address(lf);
+	if (addr != NULL) {
+		char* from=linphone_address_as_string(addr);
+		ms_message("New Notify request from [%s] ",from);
+		ms_free(from);
+	}
 	counters = get_stats(lc);
-	counters->number_of_NotifyReceived++;
-
+	counters->number_of_NotifyPresenceReceived++;
 	counters->last_received_presence = linphone_friend_get_presence_model(lf);
-	activity = linphone_presence_model_get_activity(counters->last_received_presence);
-	switch (linphone_presence_activity_get_type(activity)) {
-		case LinphonePresenceActivityOffline:
-			counters->number_of_LinphonePresenceActivityOffline++; break;
-		case LinphonePresenceActivityOnline:
-			counters->number_of_LinphonePresenceActivityOnline++; break;
-		case LinphonePresenceActivityAppointment:
-			counters->number_of_LinphonePresenceActivityAppointment++; break;
-		case LinphonePresenceActivityAway:
-			counters->number_of_LinphonePresenceActivityAway++; break;
-		case LinphonePresenceActivityBreakfast:
-			counters->number_of_LinphonePresenceActivityBreakfast++; break;
-		case LinphonePresenceActivityBusy:
-			counters->number_of_LinphonePresenceActivityBusy++; break;
-		case LinphonePresenceActivityDinner:
-			counters->number_of_LinphonePresenceActivityDinner++; break;
-		case LinphonePresenceActivityHoliday:
-			counters->number_of_LinphonePresenceActivityHoliday++; break;
-		case LinphonePresenceActivityInTransit:
-			counters->number_of_LinphonePresenceActivityInTransit++; break;
-		case LinphonePresenceActivityLookingForWork:
-			counters->number_of_LinphonePresenceActivityLookingForWork++; break;
-		case LinphonePresenceActivityLunch:
-			counters->number_of_LinphonePresenceActivityLunch++; break;
-		case LinphonePresenceActivityMeal:
-			counters->number_of_LinphonePresenceActivityMeal++; break;
-		case LinphonePresenceActivityMeeting:
-			counters->number_of_LinphonePresenceActivityMeeting++; break;
-		case LinphonePresenceActivityOnThePhone:
-			counters->number_of_LinphonePresenceActivityOnThePhone++; break;
-		case LinphonePresenceActivityOther:
-			counters->number_of_LinphonePresenceActivityOther++; break;
-		case LinphonePresenceActivityPerformance:
-			counters->number_of_LinphonePresenceActivityPerformance++; break;
-		case LinphonePresenceActivityPermanentAbsence:
-			counters->number_of_LinphonePresenceActivityPermanentAbsence++; break;
-		case LinphonePresenceActivityPlaying:
-			counters->number_of_LinphonePresenceActivityPlaying++; break;
-		case LinphonePresenceActivityPresentation:
-			counters->number_of_LinphonePresenceActivityPresentation++; break;
-		case LinphonePresenceActivityShopping:
-			counters->number_of_LinphonePresenceActivityShopping++; break;
-		case LinphonePresenceActivitySleeping:
-			counters->number_of_LinphonePresenceActivitySleeping++; break;
-		case LinphonePresenceActivitySpectator:
-			counters->number_of_LinphonePresenceActivitySpectator++; break;
-		case LinphonePresenceActivitySteering:
-			counters->number_of_LinphonePresenceActivitySteering++; break;
-		case LinphonePresenceActivityTravel:
-			counters->number_of_LinphonePresenceActivityTravel++; break;
-		case LinphonePresenceActivityTV:
-			counters->number_of_LinphonePresenceActivityTV++; break;
-		case LinphonePresenceActivityUnknown:
-			counters->number_of_LinphonePresenceActivityUnknown++; break;
-		case LinphonePresenceActivityVacation:
-			counters->number_of_LinphonePresenceActivityVacation++; break;
-		case LinphonePresenceActivityWorking:
-			counters->number_of_LinphonePresenceActivityWorking++; break;
-		case LinphonePresenceActivityWorship:
-			counters->number_of_LinphonePresenceActivityWorship++; break;
+	if (linphone_presence_model_get_basic_status(counters->last_received_presence) == LinphonePresenceBasicStatusOpen) {
+		counters->number_of_LinphonePresenceBasicStatusOpen++;
+	} else if (linphone_presence_model_get_basic_status(counters->last_received_presence) == LinphonePresenceBasicStatusClosed) {
+		counters->number_of_LinphonePresenceBasicStatusClosed++;
+	} else {
+		ms_error("Unexpected basic status [%i]",linphone_presence_model_get_basic_status(counters->last_received_presence));
+	}
+	for (i=0;counters->last_received_presence&&i<linphone_presence_model_get_nb_activities(counters->last_received_presence); i++) {
+		LinphonePresenceActivity *activity = linphone_presence_model_get_nth_activity(counters->last_received_presence, i);
+		switch (linphone_presence_activity_get_type(activity)) {
+			case LinphonePresenceActivityOffline:
+				counters->number_of_LinphonePresenceActivityOffline++; break;
+			case LinphonePresenceActivityOnline:
+				counters->number_of_LinphonePresenceActivityOnline++; break;
+			case LinphonePresenceActivityAppointment:
+				counters->number_of_LinphonePresenceActivityAppointment++; break;
+			case LinphonePresenceActivityAway:
+				counters->number_of_LinphonePresenceActivityAway++; break;
+			case LinphonePresenceActivityBreakfast:
+				counters->number_of_LinphonePresenceActivityBreakfast++; break;
+			case LinphonePresenceActivityBusy:
+				counters->number_of_LinphonePresenceActivityBusy++; break;
+			case LinphonePresenceActivityDinner:
+				counters->number_of_LinphonePresenceActivityDinner++; break;
+			case LinphonePresenceActivityHoliday:
+				counters->number_of_LinphonePresenceActivityHoliday++; break;
+			case LinphonePresenceActivityInTransit:
+				counters->number_of_LinphonePresenceActivityInTransit++; break;
+			case LinphonePresenceActivityLookingForWork:
+				counters->number_of_LinphonePresenceActivityLookingForWork++; break;
+			case LinphonePresenceActivityLunch:
+				counters->number_of_LinphonePresenceActivityLunch++; break;
+			case LinphonePresenceActivityMeal:
+				counters->number_of_LinphonePresenceActivityMeal++; break;
+			case LinphonePresenceActivityMeeting:
+				counters->number_of_LinphonePresenceActivityMeeting++; break;
+			case LinphonePresenceActivityOnThePhone:
+				counters->number_of_LinphonePresenceActivityOnThePhone++; break;
+			case LinphonePresenceActivityOther:
+				counters->number_of_LinphonePresenceActivityOther++; break;
+			case LinphonePresenceActivityPerformance:
+				counters->number_of_LinphonePresenceActivityPerformance++; break;
+			case LinphonePresenceActivityPermanentAbsence:
+				counters->number_of_LinphonePresenceActivityPermanentAbsence++; break;
+			case LinphonePresenceActivityPlaying:
+				counters->number_of_LinphonePresenceActivityPlaying++; break;
+			case LinphonePresenceActivityPresentation:
+				counters->number_of_LinphonePresenceActivityPresentation++; break;
+			case LinphonePresenceActivityShopping:
+				counters->number_of_LinphonePresenceActivityShopping++; break;
+			case LinphonePresenceActivitySleeping:
+				counters->number_of_LinphonePresenceActivitySleeping++; break;
+			case LinphonePresenceActivitySpectator:
+				counters->number_of_LinphonePresenceActivitySpectator++; break;
+			case LinphonePresenceActivitySteering:
+				counters->number_of_LinphonePresenceActivitySteering++; break;
+			case LinphonePresenceActivityTravel:
+				counters->number_of_LinphonePresenceActivityTravel++; break;
+			case LinphonePresenceActivityTV:
+				counters->number_of_LinphonePresenceActivityTV++; break;
+			case LinphonePresenceActivityUnknown:
+				counters->number_of_LinphonePresenceActivityUnknown++; break;
+			case LinphonePresenceActivityVacation:
+				counters->number_of_LinphonePresenceActivityVacation++; break;
+			case LinphonePresenceActivityWorking:
+				counters->number_of_LinphonePresenceActivityWorking++; break;
+			case LinphonePresenceActivityWorship:
+				counters->number_of_LinphonePresenceActivityWorship++; break;
+		}
 	}
 }
 
-static void wait_core(LinphoneCore *core) {
-	int i;
-
-	for (i = 0; i < 10; i++) {
-		linphone_core_iterate(core);
-		ms_usleep(100000);
-	}
+void notify_presence_received_for_uri_or_tel(LinphoneCore *lc, LinphoneFriend *lf, const char *uri_or_tel, const LinphonePresenceModel *presence) {
+	stats *counters = get_stats(lc);
+	ms_message("Presence notification for URI or phone number [%s]", uri_or_tel);
+	counters->number_of_NotifyPresenceReceivedForUriOrTel++;
 }
 
 static void simple_publish_with_expire(int expires) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneProxyConfig* proxy;
 	LinphonePresenceModel* presence;
+	LinphoneCoreVTable *vtable = linphone_core_v_table_new();
+	vtable->publish_state_changed = linphone_publish_state_changed;
+	_linphone_core_add_listener(marie->lc, vtable, TRUE, TRUE );
 
-	linphone_core_get_default_proxy(marie->lc,&proxy);
+	proxy = linphone_core_get_default_proxy_config(marie->lc);
 	linphone_proxy_config_edit(proxy);
-	if (expires >0) {
+	if (expires > 0) {
 		linphone_proxy_config_set_publish_expires(proxy,expires);
 	}
 	linphone_proxy_config_enable_publish(proxy,TRUE);
 	linphone_proxy_config_done(proxy);
-	wait_core(marie->lc);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishProgress,1));
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishOk,1));
+
 	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityOffline,NULL);
 	linphone_core_set_presence_model(marie->lc,presence);
-	wait_core(marie->lc);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishProgress,2));
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishOk,2));
+
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_done(proxy);
+	/*make sure no publish is sent*/
+	BC_ASSERT_FALSE(wait_for_until(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishProgress,3,2000));
+
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,FALSE);
+	linphone_proxy_config_done(proxy);
+
+
+	/*fixme PUBLISH state machine is too simple, clear state should only be propagated at API level  when 200ok is received*/
+	/*BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishProgress,3));*/
+	wait_for_until(marie->lc,marie->lc,NULL,0,2000);
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishCleared,1));
+
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_enable_publish(proxy,TRUE);
+	linphone_proxy_config_done(proxy);
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishProgress,3));
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishOk,3));
+
+	linphone_proxy_config_edit(proxy);
+	linphone_proxy_config_set_publish_expires(proxy, linphone_proxy_config_get_publish_expires(proxy)+1);
+	linphone_proxy_config_done(proxy);
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishProgress,4));
+	BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphonePublishOk,4));
+
+	linphone_core_manager_stop(marie);
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishCleared,3,int,"%i"); /*yes it is 3 because when we change the expires, a new LinphoneEvent is created*/
+	BC_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishOk,4,int,"%i");
 	linphone_core_manager_destroy(marie);
 }
 
-static void simple_publish() {
+static void simple_publish(void) {
 	simple_publish_with_expire(-1);
 }
 
-static void publish_with_expires() {
-	simple_publish_with_expire(1);
+static void publish_with_expires(void) {
+	simple_publish_with_expire(2);
 }
 
 static bool_t subscribe_to_callee_presence(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr) {
@@ -156,12 +212,13 @@ static bool_t subscribe_to_callee_presence(LinphoneCoreManager* caller_mgr,Linph
 	char* identity=linphone_address_as_string_uri_only(callee_mgr->identity);
 
 
-	LinphoneFriend* friend=linphone_friend_new_with_address(identity);
+	LinphoneFriend* friend=linphone_core_create_friend_with_address(caller_mgr->lc,identity);
 	linphone_friend_edit(friend);
 	linphone_friend_enable_subscribes(friend,TRUE);
 	linphone_friend_done(friend);
 
 	linphone_core_add_friend(caller_mgr->lc,friend);
+	linphone_friend_unref(friend);
 
 	result=wait_for(caller_mgr->lc,callee_mgr->lc,&caller_mgr->stat.number_of_LinphonePresenceActivityOnline,initial_caller.number_of_LinphonePresenceActivityOnline+1);
 	/*without proxy, callee cannot subscribe to caller
@@ -170,9 +227,9 @@ static bool_t subscribe_to_callee_presence(LinphoneCoreManager* caller_mgr,Linph
 
 	BC_ASSERT_EQUAL(callee_mgr->stat.number_of_NewSubscriptionRequest,initial_callee.number_of_NewSubscriptionRequest+1, int, "%d");
 	/*without proxy, callee cannot subscribe to caller
-	BC_ASSERT_EQUAL(callee_mgr->stat.number_of_NotifyReceived,initial_callee.number_of_NotifyReceived+1, int, "%d");
+	BC_ASSERT_EQUAL(callee_mgr->stat.number_of_NotifyPresenceReceived,initial_callee.number_of_NotifyPresenceReceived+1, int, "%d");
 	*/
-	BC_ASSERT_EQUAL(caller_mgr->stat.number_of_NotifyReceived,initial_caller.number_of_NotifyReceived+1, int, "%d");
+	BC_ASSERT_EQUAL(caller_mgr->stat.number_of_NotifyPresenceReceived,initial_caller.number_of_NotifyPresenceReceived+1, int, "%d");
 
 	ms_free(identity);
 	return result;
@@ -184,7 +241,8 @@ static void subscribe_failure_handle_by_app(void) {
 	LinphoneProxyConfig* config;
 	LinphoneFriend* lf;
 	char* lf_identity=linphone_address_as_string_uri_only(pauline->identity);
-	 linphone_core_get_default_proxy(marie->lc,&config);
+
+	config = linphone_core_get_default_proxy_config(marie->lc);
 
 	BC_ASSERT_TRUE(subscribe_to_callee_presence(marie,pauline));
 	wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_NewSubscriptionRequest,1); /*just to wait for unsubscription even if not notified*/
@@ -196,6 +254,8 @@ static void subscribe_failure_handle_by_app(void) {
 	sal_set_recv_error(marie->lc->sal, 1);
 
 	lf = linphone_core_get_friend_by_address(marie->lc,lf_identity);
+	ms_free(lf_identity);
+	BC_ASSERT_PTR_NOT_NULL(lf);
 	linphone_friend_edit(lf);
 	linphone_friend_enable_subscribes(lf,FALSE); /*disable subscription*/
 	linphone_friend_done(lf);
@@ -224,14 +284,62 @@ static void simple_subscribe(void) {
 
 	linphone_core_manager_destroy(pauline);
 }
+static void simple_subscribe_with_early_notify(void) {
+
+	LinphoneCoreManager* marie = presence_linphone_core_manager_new("marie");
+	LinphoneCoreManager* pauline = presence_linphone_core_manager_new("pauline");
+	LinphoneAddress *marie_identity_addr = linphone_address_clone(marie->identity);
+	LpConfig *pauline_lp;
+
+	char* pauline_identity=linphone_address_as_string_uri_only(pauline->identity);
+	char* marie_identity;
+
+	LinphoneFriend* pauline_s_friend;
+	LinphoneFriend* marie_s_friend=linphone_core_create_friend_with_address(marie->lc,pauline_identity);
+
+	pauline_lp = linphone_core_get_config(pauline->lc);
+	lp_config_set_int(pauline_lp,"sip","notify_pending_state",1);
+
+	linphone_friend_edit(marie_s_friend);
+	linphone_friend_enable_subscribes(marie_s_friend,TRUE);
+	linphone_friend_done(marie_s_friend);
+	linphone_core_add_friend(marie->lc,marie_s_friend);
+	ms_free(pauline_identity);
+
+
+	/*to simulate pending state.*/
+
+	linphone_address_set_port(marie_identity_addr,0);
+	marie_identity=linphone_address_as_string_uri_only(marie_identity_addr);
+	pauline_s_friend=linphone_core_create_friend_with_address(pauline->lc,marie_identity);
+	linphone_core_add_friend(pauline->lc,pauline_s_friend);
+
+	ms_free(marie_identity);
+
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_NotifyPresenceReceived,1));
+	BC_ASSERT_EQUAL(linphone_friend_get_subscription_state(marie_s_friend), LinphoneSubscriptionPending,int, "%d");
+
+	wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityOnline,marie->stat.number_of_LinphonePresenceActivityOnline+1);
+
+	BC_ASSERT_EQUAL(marie->stat.number_of_NotifyPresenceReceived,2, int, "%d");
+
+	linphone_friend_unref(marie_s_friend);
+	linphone_friend_unref(pauline_s_friend);
+	linphone_address_unref(marie_identity_addr);
+	linphone_core_manager_destroy(marie);
+
+	linphone_core_manager_destroy(pauline);
+}
+
 
 static void unsubscribe_while_subscribing(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneFriend* friend = linphone_friend_new_with_address("sip:toto@git.linphone.org"); /*any unexisting address*/
+	LinphoneFriend* friend = linphone_core_create_friend_with_address(marie->lc, "sip:toto@git.linphone.org"); /*any unexisting address*/
 	linphone_friend_edit(friend);
 	linphone_friend_enable_subscribes(friend,TRUE);
 	linphone_friend_done(friend);
 	linphone_core_add_friend(marie->lc,friend);
+	linphone_friend_unref(friend);
 	linphone_core_iterate(marie->lc);
 	linphone_core_manager_destroy(marie);
 }
@@ -341,152 +449,130 @@ static void presence_information(void) {
 	wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityShopping,1);
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphonePresenceActivityShopping, 1, int, "%d");
 	presence_timestamp = linphone_presence_model_get_timestamp(presence);
-	BC_ASSERT_GREATER(presence_timestamp , current_timestamp, unsigned, "%u");
+	BC_ASSERT_GREATER((unsigned)presence_timestamp , (unsigned)current_timestamp, unsigned, "%u");
 
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
-#define USE_PRESENCE_SERVER 0
 
-#if USE_PRESENCE_SERVER
-static void test_subscribe_notify_publish(void) {
 
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneProxyConfig* proxy;
-	LinphonePresenceModel* presence;
-
-	LpConfig *pauline_lp = linphone_core_get_config(pauline->lc);
-	char* lf_identity=linphone_address_as_string_uri_only(marie->identity);
-	LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
-
-	lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);
-
-	linphone_core_add_friend(pauline->lc,lf);
-
-	/*wait for subscribe acknowledgment*/
-	wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,1,2000);
-	BC_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf), int, "%d");
-
-	/*enable publish*/
-
-	linphone_core_get_default_proxy(marie->lc,&proxy);
-	linphone_proxy_config_edit(proxy);
-
-	linphone_proxy_config_enable_publish(proxy,TRUE);
-	linphone_proxy_config_set_publish_expires(proxy,3);
-	linphone_proxy_config_done(proxy);
-
-	/*wait for marie status*/
-	wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,2,2000);
-	BC_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf), int, "%d");
-
-	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityBusy,NULL);
-	linphone_core_set_presence_model(marie->lc,presence);
-
-	/*wait for new status*/
-	wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,3,2000);
-	BC_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf), int, "%d");
-
-	/*wait for refresh*/
-	wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,4,5000);
-	BC_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf), int, "%d");
-
-	/*linphone_core_remove_friend(pauline->lc,lf);*/
-	/*wait for final notify*/
-	/*wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_NotifyReceived,4,5000);
-	BC_ASSERT_EQUAL(LinphonePresenceActivityOffline,linphone_friend_get_status(lf), int, "%d");
-	 */
-	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(pauline);
-}
-static void test_forked_subscribe_notify_publish(void) {
-
-	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc");
-	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	LinphoneProxyConfig* proxy;
-	LinphonePresenceModel* presence;
-	LpConfig *pauline_lp;
-	char* lf_identity;
+static void subscribe_presence_forked(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline1 = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_tcp_rc" : "pauline_tcp_rc");
+	LinphoneCoreManager* pauline2 = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_tcp_rc" : "pauline_tcp_rc");
 	LinphoneFriend *lf;
-	MSList* lcs=ms_list_append(NULL,pauline->lc);
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie->lc);
-	lcs=ms_list_append(lcs,marie2->lc);
+	bctbx_list_t *lcs = NULL;
 
-	pauline_lp = linphone_core_get_config(pauline->lc);
-	lf_identity=linphone_address_as_string_uri_only(marie->identity);
-	lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity);
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline1->lc);
+	lcs = bctbx_list_append(lcs, pauline2->lc);
 
-	lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);
+	lf = linphone_core_create_friend(marie->lc);
+	linphone_friend_set_address(lf, pauline1->identity);
+	linphone_friend_enable_subscribes(lf, TRUE);
 
-	linphone_core_add_friend(pauline->lc,lf);
+	linphone_core_add_friend(marie->lc, lf);
+	linphone_friend_unref(lf);
 
-	/*wait for subscribe acknowledgment*/
-	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,1,2000);
-	BC_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf), int, "%d");
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_NewSubscriptionRequest,1, 10000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline2->stat.number_of_NewSubscriptionRequest,1, 2000));
 
-	/*enable publish*/
+	/*we should get only one notify*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePresenceActivityOnline,1, 10000));
+	BC_ASSERT_FALSE(wait_for_list(lcs,&marie->stat.number_of_LinphonePresenceActivityOnline,2, 2000));
 
-	linphone_core_get_default_proxy(marie->lc,&proxy);
-	linphone_proxy_config_edit(proxy);
-	linphone_proxy_config_enable_publish(proxy,TRUE);
-	linphone_proxy_config_set_publish_expires(proxy,3);
-	linphone_proxy_config_done(proxy);
-
-	linphone_core_get_default_proxy(marie2->lc,&proxy);
-	linphone_proxy_config_edit(proxy);
-	linphone_proxy_config_enable_publish(proxy,TRUE);
-	linphone_proxy_config_set_publish_expires(proxy,3);
-	linphone_proxy_config_done(proxy);
-
-
-	/*wait for marie status*/
-	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,3,2000);
-	BC_ASSERT_EQUAL(LinphoneStatusOnline,linphone_friend_get_status(lf), int, "%d");
-
-	presence =linphone_presence_model_new_with_activity(LinphonePresenceActivityBusy,NULL);
-	linphone_core_set_presence_model(marie->lc,presence);
-
-	/*wait for new status*/
-	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,4,2000);
-	BC_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf), int, "%d");
-
-
-	presence =linphone_presence_model_new_with_activity(  LinphonePresenceActivityMeeting,NULL);
-	linphone_core_set_presence_model(marie2->lc,presence);
-	/*wait for new status*/
-	wait_for_list(lcs,&pauline->stat.number_of_NotifyReceived,5,2000);
-	BC_ASSERT_EQUAL(LinphoneStatusBusy,linphone_friend_get_status(lf), int, "%d"); /*because liblinphone compositor is very simple for now (I.E only take first occurence)*/
+	/*marie also shall receive two SUBSCRIBEs from the two paulines, but won't be notified to the app since
+	 Marie set Pauline as a friend.*/
+	BC_ASSERT_EQUAL(marie->stat.number_of_NewSubscriptionRequest, 0, int, "%d");
+	/*and the two paulines shall be notified of marie's presence*/
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_LinphonePresenceActivityOnline,1, 3000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline2->stat.number_of_LinphonePresenceActivityOnline,1, 2000));
 
 	linphone_core_manager_destroy(marie);
-	linphone_core_manager_destroy(marie2);
-	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(pauline1);
+	linphone_core_manager_destroy(pauline2);
+
+	bctbx_list_free(lcs);
 }
 
+static void subscribe_presence_expired(void){
+	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+	LinphoneCoreManager* pauline1 = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
+	LinphoneFriend *lf;
+	bctbx_list_t *lcs = NULL;
 
-#endif
+	lcs = bctbx_list_append(lcs, marie->lc);
+	lcs = bctbx_list_append(lcs, pauline1->lc);
+
+	lp_config_set_int(marie->lc->config, "sip", "subscribe_expires", 10);
+
+	lf = linphone_core_create_friend(marie->lc);
+	linphone_friend_set_address(lf, pauline1->identity);
+	linphone_friend_enable_subscribes(lf, TRUE);
+
+	linphone_core_add_friend(marie->lc, lf);
+	linphone_friend_unref(lf);
+	BC_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_NewSubscriptionRequest,1, 5000));
+	BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePresenceActivityOnline,1, 2000));
+
+	lf = linphone_core_find_friend(pauline1->lc, marie->identity);
+	BC_ASSERT_PTR_NOT_NULL(lf);
+	if (lf) {
+		BC_ASSERT_PTR_NOT_NULL(lf->insubs);
+
+		/*marie comes offline suddenly*/
+		linphone_core_set_network_reachable(marie->lc, FALSE);
+		/*after a certain time, pauline shall see the incoming SUBSCRIBE expired*/
+		wait_for_list(lcs,NULL, 0, 11000);
+		BC_ASSERT_PTR_NULL(lf->insubs);
+
+		/*just make network reachable so that marie can unregister properly*/
+		linphone_core_set_network_reachable(marie->lc, TRUE);
+		BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneRegistrationOk,2, 10000));
+	}
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline1);
+
+	bctbx_list_free(lcs);
+}
+
+static void simple_subscribe_with_friend_from_rc(void) {
+	LinphoneCoreManager* pauline = presence_linphone_core_manager_new("pauline");
+	LinphoneCoreManager *marie = presence_linphone_core_manager_new_with_rc_name("marie", "pauline_as_friend_rc");
+	LinphoneFriend *pauline_as_friend;
+
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(linphone_core_get_friend_list(marie->lc)), 1, unsigned int , "%u");
+
+	if (bctbx_list_size(linphone_core_get_friend_list(marie->lc))>0) {
+		pauline_as_friend = (LinphoneFriend*)linphone_core_get_friend_list(marie->lc)->data;
+		linphone_friend_set_address(pauline_as_friend, pauline->identity); /*hack to update addr with port number*/
+	}
+
+	BC_ASSERT_TRUE (wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePresenceActivityOnline,1));
+
+	BC_ASSERT_EQUAL(pauline->stat.number_of_NewSubscriptionRequest,1, int, "%d");
+	BC_ASSERT_EQUAL(marie->stat.number_of_NotifyPresenceReceived,1, int, "%d");
+
+	linphone_core_manager_destroy(marie);
+	/*unsubscribe is not reported ?*/
+	BC_ASSERT_FALSE(wait_for(NULL,pauline->lc,&pauline->stat.number_of_NewSubscriptionRequest,2)); /*just to wait for unsubscription even if not notified*/
+
+	linphone_core_manager_destroy(pauline);
+}
 
 test_t presence_tests[] = {
-	{ "Simple Subscribe", simple_subscribe },
-	{ "Simple Publish", simple_publish },
-	{ "Simple Publish with expires", publish_with_expires },
-	/*{ "Call with presence", call_with_presence },*/
-	{ "Unsubscribe while subscribing", unsubscribe_while_subscribing },
-	{ "Presence information", presence_information },
-	{ "App managed presence failure", subscribe_failure_handle_by_app },
-#if USE_PRESENCE_SERVER
-	{ "Subscribe with late publish", test_subscribe_notify_publish },
-	{ "Forked subscribe with late publish", test_forked_subscribe_notify_publish },
-#endif
-};
-
-test_suite_t presence_test_suite = {
-	"Presence",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(presence_tests) / sizeof(presence_tests[0]),
-	presence_tests
+	TEST_ONE_TAG("Simple Subscribe", simple_subscribe,"presence"),
+	TEST_ONE_TAG("Simple Subscribe with early NOTIFY", simple_subscribe_with_early_notify,"presence"),
+	TEST_NO_TAG("Simple Subscribe with friend from rc", simple_subscribe_with_friend_from_rc),
+	TEST_NO_TAG("Simple Publish", simple_publish),
+	TEST_NO_TAG("Simple Publish with expires", publish_with_expires),
+	/*TEST_ONE_TAG("Call with presence", call_with_presence, "LeaksMemory"),*/
+	TEST_NO_TAG("Unsubscribe while subscribing", unsubscribe_while_subscribing),
+	TEST_NO_TAG("Presence information", presence_information),
+	TEST_NO_TAG("App managed presence failure", subscribe_failure_handle_by_app),
+	TEST_NO_TAG("Presence SUBSCRIBE forked", subscribe_presence_forked),
+	TEST_NO_TAG("Presence SUBSCRIBE expired", subscribe_presence_expired),
 };
 
+test_suite_t presence_test_suite = {"Presence", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+									sizeof(presence_tests) / sizeof(presence_tests[0]), presence_tests};
diff --git a/tester/proxy_config_tester.c b/tester/proxy_config_tester.c
index 29a169557..9e9afd6ec 100644
--- a/tester/proxy_config_tester.c
+++ b/tester/proxy_config_tester.c
@@ -18,13 +18,21 @@
 
 #include "liblinphone_tester.h"
 
+#include <stdlib.h>
+
 const char* phone_normalization(LinphoneProxyConfig *proxy, const char* in) {
 	static char result[255];
-	linphone_proxy_config_normalize_number(proxy, in, result, 255-1);
-	return result;
+	char * output = linphone_proxy_config_normalize_phone_number(proxy, in);
+	if (output) {
+		memcpy(result, output, strlen(output)+1);
+		ms_free(output);
+		return result;
+	} else {
+		return NULL;
+	}
 }
 
-static void phone_normalization_without_proxy() {
+static void phone_normalization_without_proxy(void) {
 	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "012 345 6789"), "0123456789");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "+33123456789"), "+33123456789");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "+33012345678"), "+33012345678");
@@ -32,10 +40,22 @@ static void phone_normalization_without_proxy() {
 	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "+33012345678"), "+33012345678");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "+3301234567891"), "+3301234567891");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "+33 01234567891"), "+3301234567891");
-	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "I_AM_NOT_A_NUMBER"), "I_AM_NOT_A_NUMBER"); // invalid phone number
+	BC_ASSERT_PTR_NULL(phone_normalization(NULL, "I_AM_NOT_A_NUMBER")); // invalid phone number
+
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "0"), "0");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "01"), "01");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "012"), "012");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "0123"), "0123");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "01234"), "01234");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "012345"), "012345");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "0123456"), "0123456");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "01234567"), "01234567");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "012345678"), "012345678");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "0123456789"), "0123456789");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(NULL, "01234567890"), "01234567890");
 }
 
-static void phone_normalization_with_proxy() {
+static void phone_normalization_with_proxy(void) {
 	LinphoneProxyConfig *proxy = linphone_proxy_config_new();
 	linphone_proxy_config_set_dial_prefix(proxy, "33");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012 3456 789"), "+33123456789");
@@ -44,13 +64,15 @@ static void phone_normalization_with_proxy() {
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+330012345678"), "+330012345678");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+3301 2345678"), "+33012345678");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+3301234567891"), "+3301234567891");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+33 (0) 1 23 45 67 89"), "+33123456789");
 
+	
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "123456789"), "+33123456789");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, " 0123456789"), "+33123456789");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0012345678"), "+12345678");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01 2345678"), "+33012345678");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234567891"), "+33234567891"); // invalid phone number (too long)
-	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "I_AM_NOT_A_NUMBER"), "I_AM_NOT_A_NUMBER"); // invalid phone number
+	BC_ASSERT_PTR_NULL(phone_normalization(proxy, "I_AM_NOT_A_NUMBER")); // invalid phone number
 
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+990012345678"), "+990012345678");
 
@@ -60,10 +82,47 @@ static void phone_normalization_with_proxy() {
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+31952636505"), "+31952636505");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0033952636505"), "+33952636505");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0033952636505"), "+33952636505");
-	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "toto"), "toto");
+	BC_ASSERT_PTR_NULL(phone_normalization(proxy, "toto"));
 
+
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0"), "+330");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01"), "+3301");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012"), "+33012");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123"), "+330123");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234"), "+3301234");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012345"), "+33012345");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123456"), "+330123456");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234567"), "+3301234567");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012345678"), "+33012345678");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123456789"), "+33123456789");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234567890"), "+33234567890");
+
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+330"), "+330");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+3301"), "+3301");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+33012"), "+33012");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+330123"), "+330123");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+3301234"), "+3301234");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+33012345"), "+33012345");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+330123456"), "+330123456");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+3301234567"), "+3301234567");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+33012345678"), "+33012345678");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+330123456789"), "+330123456789");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+3301234567890"), "+3301234567890");
+
+	// invalid prefix - use a generic dialplan with 10 max length
 	linphone_proxy_config_set_dial_prefix(proxy, "99");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0012345678"), "+12345678");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0"), "+990");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01"), "+9901");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012"), "+99012");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123"), "+990123");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234"), "+9901234");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012345"), "+99012345");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123456"), "+990123456");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234567"), "+9901234567");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012345678"), "+99012345678");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123456789"), "+990123456789");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234567890"), "+991234567890");
 
 	linphone_proxy_config_destroy(proxy);
 }
@@ -75,35 +134,52 @@ static void phone_normalization_with_dial_escape_plus(void){
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0033952636505"), "0033952636505");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0952636505"), "0033952636505");
 	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "+34952636505"), "0034952636505");
+
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0"), "00330");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01"), "003301");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012"), "0033012");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123"), "00330123");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234"), "003301234");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012345"), "0033012345");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123456"), "00330123456");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234567"), "003301234567");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "012345678"), "0033012345678");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "0123456789"), "0033123456789");
+	BC_ASSERT_STRING_EQUAL(phone_normalization(proxy, "01234567890"), "0033234567890");
+
+
 	linphone_proxy_config_destroy(proxy);
 }
 
 #define SIP_URI_CHECK(actual, expected) { \
-		LinphoneAddress* res = linphone_proxy_config_normalize_sip_uri(NULL, actual); \
-		char* actual_str = linphone_address_as_string_uri_only(res); \
+		LinphoneProxyConfig *proxy = linphone_proxy_config_new(); \
+		LinphoneAddress* res;\
+		char* actual_str;\
+		linphone_proxy_config_set_identity(proxy, "sip:username@linphone.org"); \
+		res  = linphone_proxy_config_normalize_sip_uri(proxy, actual); \
+		actual_str = linphone_address_as_string_uri_only(res); \
 		BC_ASSERT_STRING_EQUAL(actual_str, expected); \
 		ms_free(actual_str); \
 		linphone_address_destroy(res); \
+		linphone_proxy_config_destroy(proxy); \
 	}
 
 
 static void sip_uri_normalization(void) {
+	char* expected ="sip:%d9%a1@linphone.org";
 	BC_ASSERT_PTR_NULL(linphone_proxy_config_normalize_sip_uri(NULL, "test"));
 	SIP_URI_CHECK("test@linphone.org", "sip:test@linphone.org");
 	SIP_URI_CHECK("test@linphone.org;transport=tls", "sip:test@linphone.org;transport=tls");
+
+	SIP_URI_CHECK("١", expected); //test that no more invalid memory writes are made (valgrind only)
 }
 
 test_t proxy_config_tests[] = {
-	{ "Phone normalization without proxy", phone_normalization_without_proxy },
-	{ "Phone normalization with proxy", phone_normalization_with_proxy },
-	{ "Phone normalization with dial escape plus", phone_normalization_with_dial_escape_plus },
-	{ "SIP URI normalization", sip_uri_normalization },
+	TEST_NO_TAG("Phone normalization without proxy", phone_normalization_without_proxy),
+	TEST_NO_TAG("Phone normalization with proxy", phone_normalization_with_proxy),
+	TEST_NO_TAG("Phone normalization with dial escape plus", phone_normalization_with_dial_escape_plus),
+	TEST_NO_TAG("SIP URI normalization", sip_uri_normalization)
 };
 
-test_suite_t proxy_config_test_suite = {
-	"Proxy config",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(proxy_config_tests) / sizeof(proxy_config_tests[0]),
-	proxy_config_tests
-};
+test_suite_t proxy_config_test_suite = {"Proxy config", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+										sizeof(proxy_config_tests) / sizeof(proxy_config_tests[0]), proxy_config_tests};
diff --git a/tester/quality_reporting_tester.c b/tester/quality_reporting_tester.c
index debfb2608..5a15109c1 100644
--- a/tester/quality_reporting_tester.c
+++ b/tester/quality_reporting_tester.c
@@ -27,19 +27,11 @@
 void on_report_send_mandatory(const LinphoneCall *call, SalStreamType stream_type, const LinphoneContent *content){
 	char * body = (char *)linphone_content_get_buffer(content);
 	char * remote_metrics_start = __strstr(body, "RemoteMetrics:");
-	reporting_session_report_t * report = call->log->reporting.reports[stream_type];
-	MediaStream * ms;
-	if (stream_type == LINPHONE_CALL_STATS_AUDIO){
-		ms = (MediaStream*)call->audiostream;
-	}else{
-		ms = (MediaStream*)call->videostream;
-	}
 	BC_ASSERT_TRUE(
 			__strstr(body, "VQIntervalReport\r\n")			== body ||
 			__strstr(body, "VQSessionReport\r\n")			== body ||
 			__strstr(body, "VQSessionReport: CallTerm\r\n") == body
 	);
-
 	BC_ASSERT_PTR_NOT_NULL(body=__strstr(body, "CallID:"));
 	BC_ASSERT_PTR_NOT_NULL(body=__strstr(body, "LocalID:"));
 	BC_ASSERT_PTR_NOT_NULL(body=__strstr(body, "RemoteID:"));
@@ -68,12 +60,6 @@ void on_report_send_mandatory(const LinphoneCall *call, SalStreamType stream_typ
 	BC_ASSERT_TRUE(!remote_metrics_start || body < remote_metrics_start);
 
 	BC_ASSERT_PTR_NOT_NULL(body=__strstr(body, "DialogID:"));
-
-	if (report->remote_metrics.rtcp_sr_count>0&&ms!=NULL&&ms->rc!=NULL){
-		/* Hack: reset rtcp_sr_count to 0 because in case of interval reports, we need one RTCP SR by interval. */
-		report->remote_metrics.rtcp_sr_count=0;
-		BC_ASSERT_PTR_NOT_NULL(body=__strstr(body, "AdaptiveAlg:"));
-	}
 }
 
 char * on_report_send_verify_metrics(const reporting_content_metrics_t *metrics, char * body){
@@ -141,7 +127,7 @@ bool_t create_call_for_quality_reporting_tests(
 	return call_succeeded;
 }
 
-static void quality_reporting_not_used_without_config() {
+static void quality_reporting_not_used_without_config(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_quality_reporting_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCall* call_marie = NULL;
@@ -157,12 +143,14 @@ static void quality_reporting_not_used_without_config() {
 
 		// but not this one since it is updated at the end of call
 		BC_ASSERT_PTR_NULL(call_marie->log->reporting.reports[0]->dialog_id);
+		end_call(marie, pauline);
 	}
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-static void quality_reporting_not_sent_if_call_not_started() {
+static void quality_reporting_not_sent_if_call_not_started(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_quality_reporting_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCallLog* out_call_log;
@@ -177,7 +165,7 @@ static void quality_reporting_not_sent_if_call_not_started() {
 	BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallError,1, 10000));
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallError,1, int, "%d");
 
-	if (ms_list_size(linphone_core_get_call_logs(marie->lc))>0) {
+	if (bctbx_list_size(linphone_core_get_call_logs(marie->lc))>0) {
 		out_call_log=(LinphoneCallLog*)(linphone_core_get_call_logs(marie->lc)->data);
 		BC_ASSERT_PTR_NOT_NULL(out_call_log);
 		BC_ASSERT_EQUAL(linphone_call_log_get_status(out_call_log),LinphoneCallAborted, int, "%d");
@@ -190,22 +178,21 @@ static void quality_reporting_not_sent_if_call_not_started() {
 	// since the callee was busy, there should be no publish to do
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishProgress,0, int, "%d");
 	BC_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishOk,0, int, "%d");
-
 end:
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-static void quality_reporting_not_sent_if_low_bandwidth() {
+static void quality_reporting_not_sent_if_low_bandwidth(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_quality_reporting_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCallParams* marie_params;
 
-	marie_params=linphone_core_create_default_call_parameters(marie->lc);
+	marie_params=linphone_core_create_call_params(marie->lc, NULL);
 	linphone_call_params_enable_low_bandwidth(marie_params,TRUE);
 
 	if (create_call_for_quality_reporting_tests(marie, pauline, NULL, NULL, marie_params, NULL)) {
-		linphone_core_terminate_all_calls(marie->lc);
+		end_call(marie, pauline);
 
 		BC_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishProgress,0, int, "%d");
 		BC_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishOk,0, int, "%d");
@@ -221,7 +208,7 @@ void on_report_send_remove_fields(const LinphoneCall *call, SalStreamType stream
 	strncpy(body, "corrupted report is corrupted", strlen("corrupted report is corrupted"));
 }
 
-static void quality_reporting_invalid_report() {
+static void quality_reporting_invalid_report(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_quality_reporting_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCall* call_marie = NULL;
@@ -230,7 +217,7 @@ static void quality_reporting_invalid_report() {
 	if (create_call_for_quality_reporting_tests(marie, pauline, &call_marie, &call_pauline, NULL, NULL)) {
 		linphone_reporting_set_on_report_send(call_marie, on_report_send_remove_fields);
 
-		linphone_core_terminate_all_calls(marie->lc);
+		end_call(marie, pauline);
 
 		BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishProgress,1));
 		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishError,1,3000));
@@ -241,7 +228,7 @@ static void quality_reporting_invalid_report() {
 	linphone_core_manager_destroy(pauline);
 }
 
-static void quality_reporting_at_call_termination() {
+static void quality_reporting_at_call_termination(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_quality_reporting_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc_rtcp_xr");
 	LinphoneCall* call_marie = NULL;
@@ -270,7 +257,7 @@ static void quality_reporting_at_call_termination() {
 	linphone_core_manager_destroy(pauline);
 }
 
-static void quality_reporting_interval_report() {
+static void quality_reporting_interval_report(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc_rtcp_xr");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc_rtcp_xr");
 	LinphoneCall* call_marie = NULL;
@@ -286,12 +273,14 @@ static void quality_reporting_interval_report() {
 		// PUBLISH submission to the collector should be ok
 		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishProgress,1,60000));
 		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishOk,1,60000));
+		end_call(marie, pauline);
 	}
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
 
-static void quality_reporting_session_report_if_video_stopped() {
+#ifdef VIDEO_ENABLED
+static void quality_reporting_session_report_if_video_stopped(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc_rtcp_xr");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCall* call_pauline = NULL;
@@ -303,9 +292,9 @@ static void quality_reporting_session_report_if_video_stopped() {
 	linphone_core_enable_video_display(marie->lc, FALSE);
 	linphone_core_enable_video_capture(pauline->lc, TRUE);
 	linphone_core_enable_video_display(pauline->lc, FALSE);
-	marie_params=linphone_core_create_default_call_parameters(marie->lc);
+	marie_params=linphone_core_create_call_params(marie->lc, NULL);
 	linphone_call_params_enable_video(marie_params,TRUE);
-	pauline_params=linphone_core_create_default_call_parameters(pauline->lc);
+	pauline_params=linphone_core_create_call_params(pauline->lc, NULL);
 	linphone_call_params_enable_video(pauline_params,TRUE);
 
 	if (create_call_for_quality_reporting_tests(marie, pauline, &call_marie, &call_pauline, marie_params, pauline_params)) {
@@ -326,7 +315,7 @@ static void quality_reporting_session_report_if_video_stopped() {
 
 		BC_ASSERT_FALSE(linphone_call_params_video_enabled(linphone_call_get_current_params(call_pauline)));
 
-		linphone_core_terminate_all_calls(marie->lc);
+		end_call(marie, pauline);
 
 		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishProgress,2,5000));
 		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishOk,2,5000));
@@ -337,6 +326,7 @@ static void quality_reporting_session_report_if_video_stopped() {
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
+#endif
 
 void publish_report_with_route_state_changed(LinphoneCore *lc, LinphoneEvent *ev, LinphonePublishState state){
 	if (state == LinphonePublishProgress) {
@@ -344,7 +334,7 @@ void publish_report_with_route_state_changed(LinphoneCore *lc, LinphoneEvent *ev
 	}
 }
 
-static void quality_reporting_sent_using_custom_route() {
+static void quality_reporting_sent_using_custom_route(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_quality_reporting_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
 	LinphoneCall* call_marie = NULL;
@@ -358,9 +348,7 @@ static void quality_reporting_sent_using_custom_route() {
 	linphone_proxy_config_set_quality_reporting_collector(linphone_core_get_default_proxy_config(marie->lc), "sip:sip.linphone.org");
 
 	if (create_call_for_quality_reporting_tests(marie, pauline, &call_marie, &call_pauline, NULL, NULL)) {
-		linphone_core_terminate_all_calls(marie->lc);
-		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphoneCallReleased,1, 10000));
-		BC_ASSERT_TRUE(wait_for_until(pauline->lc,NULL,&pauline->stat.number_of_LinphoneCallReleased,1, 10000));
+		end_call(marie, pauline);
 
 		// PUBLISH submission to the collector should be ERROR since route is not valid
 		BC_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphonePublishProgress,1));
@@ -372,21 +360,85 @@ static void quality_reporting_sent_using_custom_route() {
 	linphone_core_manager_destroy(pauline);
 }
 
+#ifdef VIDEO_ENABLED
+static void quality_reporting_interval_report_video_and_rtt(void) {
+	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc_rtcp_xr");
+	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc_rtcp_xr");
+	LinphoneCall* call_marie = NULL;
+	LinphoneCall* call_pauline = NULL;
+	LinphoneCallParams* pauline_params;
+	LinphoneCallParams* marie_params;
+ 	LinphoneChatRoom *pauline_chat_room;
+
+	linphone_core_enable_video_capture(marie->lc, TRUE);
+	linphone_core_enable_video_display(marie->lc, FALSE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, FALSE);
+	marie_params=linphone_core_create_call_params(marie->lc, NULL);
+	linphone_call_params_enable_video(marie_params,TRUE);
+	linphone_call_params_enable_realtime_text(marie_params,TRUE);
+	pauline_params=linphone_core_create_call_params(pauline->lc, NULL);
+	linphone_call_params_enable_video(pauline_params,TRUE);
+	linphone_call_params_enable_realtime_text(pauline_params,TRUE);
+
+	if (create_call_for_quality_reporting_tests(marie, pauline, &call_marie, &call_pauline, marie_params, pauline_params))  {
+		linphone_reporting_set_on_report_send(call_marie, on_report_send_mandatory);
+		linphone_proxy_config_set_quality_reporting_interval(call_marie->dest_proxy, 1);
+
+		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,NULL,0,3000));
+		BC_ASSERT_TRUE(linphone_call_params_video_enabled(linphone_call_get_current_params(call_pauline)));
+		BC_ASSERT_TRUE(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(call_pauline)));
+
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(marie->lc));
+		BC_ASSERT_PTR_NOT_NULL(linphone_core_get_current_call(pauline->lc));
+
+		// PUBLISH submission to the collector should be ok
+		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishProgress,1,60000));
+		BC_ASSERT_TRUE(wait_for_until(marie->lc,pauline->lc,&marie->stat.number_of_LinphonePublishOk,1,60000));
+
+		pauline_chat_room = linphone_call_get_chat_room(call_pauline);
+		BC_ASSERT_PTR_NOT_NULL(pauline_chat_room);
+		if (pauline_chat_room) {
+			const char* message = "Lorem Ipsum Belledonnum Communicatum";
+			size_t i;
+			LinphoneChatMessage* rtt_message = linphone_chat_room_create_message(pauline_chat_room,NULL);
+			LinphoneChatRoom *marie_chat_room = linphone_call_get_chat_room(call_marie);
+
+			for (i = 0; i < strlen(message); i++) {
+				linphone_chat_message_put_char(rtt_message, message[i]);
+				BC_ASSERT_TRUE(wait_for_until(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneIsComposingActiveReceived, (int)i+1, 1000));
+				BC_ASSERT_EQUAL(linphone_chat_room_get_char(marie_chat_room), message[i], char, "%c");
+			}
+			linphone_chat_room_send_chat_message(pauline_chat_room, rtt_message);
+		}
+
+		end_call(marie, pauline);
+		/*wait for publish triggered by the end of call to be completed*/
+		wait_for_until(marie->lc,pauline->lc,NULL,0,3000);
+	}
+
+	linphone_call_params_destroy(marie_params);
+	linphone_call_params_destroy(pauline_params);
+
+	linphone_core_manager_destroy(marie);
+	linphone_core_manager_destroy(pauline);
+}
+#endif
+
 test_t quality_reporting_tests[] = {
-	{ "Not used if no config", quality_reporting_not_used_without_config},
-	{ "Call term session report not sent if call did not start", quality_reporting_not_sent_if_call_not_started},
-	{ "Call term session report not sent if low bandwidth", quality_reporting_not_sent_if_low_bandwidth},
-	{ "Call term session report invalid if missing mandatory fields", quality_reporting_invalid_report},
-	{ "Call term session report sent if call ended normally", quality_reporting_at_call_termination},
-	{ "Interval report if interval is configured", quality_reporting_interval_report},
-	{ "Session report sent if video stopped during call", quality_reporting_session_report_if_video_stopped},
-	{ "Sent using custom route", quality_reporting_sent_using_custom_route},
+	TEST_NO_TAG("Not used if no config", quality_reporting_not_used_without_config),
+	TEST_NO_TAG("Call term session report not sent if call did not start", quality_reporting_not_sent_if_call_not_started),
+	TEST_NO_TAG("Call term session report not sent if low bandwidth", quality_reporting_not_sent_if_low_bandwidth),
+	TEST_NO_TAG("Call term session report invalid if missing mandatory fields", quality_reporting_invalid_report),
+	TEST_NO_TAG("Call term session report sent if call ended normally", quality_reporting_at_call_termination),
+	TEST_NO_TAG("Interval report if interval is configured", quality_reporting_interval_report),
+	#ifdef VIDEO_ENABLED
+	TEST_NO_TAG("Interval report if interval is configured with video and realtime text", quality_reporting_interval_report_video_and_rtt),
+	TEST_NO_TAG("Session report sent if video stopped during call", quality_reporting_session_report_if_video_stopped),
+	#endif
+	TEST_NO_TAG("Sent using custom route", quality_reporting_sent_using_custom_route)
 };
 
-test_suite_t quality_reporting_test_suite = {
-	"QualityReporting",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(quality_reporting_tests) / sizeof(quality_reporting_tests[0]),
-	quality_reporting_tests
-};
+test_suite_t quality_reporting_test_suite = {"QualityReporting", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+											 sizeof(quality_reporting_tests) / sizeof(quality_reporting_tests[0]),
+											 quality_reporting_tests};
diff --git a/tester/rcfiles/carddav_rc b/tester/rcfiles/carddav_rc
new file mode 100644
index 000000000..0271df028
--- /dev/null
+++ b/tester/rcfiles/carddav_rc
@@ -0,0 +1,12 @@
+[net]
+mtu=1300
+
+[sip]
+ping_with_options=0
+sip_random_port=1
+
+[auth_info_0]
+domain=dav.linphone.org
+username=tester
+ha1=102bdd8ccafef75cf7572c97969afd9a
+realm=BaikalDAV
\ No newline at end of file
diff --git a/tester/rcfiles/conference_focus_rc b/tester/rcfiles/conference_focus_rc
new file mode 100644
index 000000000..c0cdd5aaa
--- /dev/null
+++ b/tester/rcfiles/conference_focus_rc
@@ -0,0 +1,26 @@
+[sip]
+default_proxy=0
+sip_port=-1
+sip_tcp_port=-1
+sip_dtls_port=-1
+sip_tls_port=-1
+
+[rtp]
+audio_rtp_port=18070-28000
+text_rtp_port=39000-49000
+video_rtp_port=28070-38000
+
+[proxy_0]
+reg_proxy=sip.example.org;transport=tcp
+reg_route=sip.example.org;transport=tcp;lr
+reg_identity="Focus" <sip:focus@sip.example.org>
+reg_expires=3600
+reg_sendregister=1
+publish=0
+
+[auth_info_0]
+username=focus
+userid=focus
+passwd=secret
+realm=sip.example.org
+
diff --git a/tester/rcfiles/friends_rc b/tester/rcfiles/friends_rc
new file mode 100644
index 000000000..0582c4d95
--- /dev/null
+++ b/tester/rcfiles/friends_rc
@@ -0,0 +1,21 @@
+[net]
+mtu=1300
+
+[sip]
+ping_with_options=0
+sip_random_port=1
+
+[friend_0]
+url=sip:sylvain@sip.linphone.org
+pol=wait
+subscribe=0
+
+[friend_1]
+url="François Grisez" <sip:francois.grisez@sip.linphone.org>
+pol=accept
+subscribe=1
+
+[friend_2]
+url=sip:margaux.clerc@sip.linphone.org
+pol=deny
+subscribe=0
diff --git a/tester/rcfiles/laure_call_logs_rc b/tester/rcfiles/laure_call_logs_rc
new file mode 100644
index 000000000..bbeafabeb
--- /dev/null
+++ b/tester/rcfiles/laure_call_logs_rc
@@ -0,0 +1,155 @@
+[sip]
+sip_port=5092
+sip_tcp_port=5092
+sip_tls_port=5093
+default_proxy=0
+ping_with_options=0
+
+
+[auth_info_0]
+username=laure
+userid=laure
+passwd=secret
+realm="sip.example.org"
+
+
+[proxy_0]
+reg_proxy=sip.example.org
+reg_identity=sip:laure@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+
+[rtp]
+audio_rtp_port=9010-9390
+video_rtp_port=9410-9910
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
+
+[call_log_0]
+dir=0
+status=0
+from=sip:pauline@sip.linphone.org
+to=sip:laure@sip.linphone.org
+start_date_time=1441738272
+duration=3
+quality=5.000000
+video_enabled=0
+call_id=o6mx-QSdKJ
+
+[call_log_1]
+dir=0
+status=1
+from=sip:pauline@sip.linphone.org
+to=sip:laure@sip.linphone.org
+start_date_time=1441738266
+duration=0
+quality=-1.000000
+video_enabled=0
+call_id=wnXDtOhURa
+
+[call_log_2]
+dir=1
+status=2
+from=sip:laure@sip.linphone.org
+to=sip:pauline@sip.linphone.org
+start_date_time=1441738258
+duration=0
+quality=-1.000000
+video_enabled=0
+call_id=81ZldO6dlk
+
+[call_log_3]
+dir=1
+status=1
+from=sip:laure@sip.linphone.org
+to=sip:pauline@sip.linphone.org
+start_date_time=1441738250
+duration=0
+quality=-1.000000
+video_enabled=0
+call_id=3yq7TlwS8Q
+
+[call_log_4]
+dir=1
+status=0
+from=sip:laure@sip.linphone.org
+to=sip:pauline@sip.linphone.org
+start_date_time=1441738243
+duration=0
+quality=-1.000000
+video_enabled=1
+call_id=EmoqEyeLbZ
+
+[call_log_5]
+dir=0
+status=1
+from=sip:pauline@sip.linphone.org
+to=sip:laure@sip.linphone.org
+start_date_time=1441738234
+duration=0
+quality=-1.000000
+video_enabled=0
+call_id=xl29jqHZ2N
+
+[call_log_6]
+dir=1
+status=0
+from=sip:laure@sip.linphone.org
+to=sip:pauline@sip.linphone.org
+start_date_time=1441738215
+duration=6
+quality=4.898808
+video_enabled=1
+call_id=2JNrT43eji
+
+[call_log_7]
+dir=0
+status=0
+from=sip:pauline@sip.linphone.org
+to=sip:laure@sip.linphone.org
+start_date_time=1441738200
+duration=5
+quality=4.715808
+video_enabled=1
+call_id=joyRwGhk-2
+
+[call_log_8]
+dir=1
+status=3
+from=sip:laure@sip.linphone.org
+to=sip:pauline@sip.linphone.org
+start_date_time=1441738122
+duration=0
+quality=-1.000000
+video_enabled=0
+call_id=az01erTY2U
+
+[call_log_9]
+dir=0
+status=3
+from=sip:pauline@sip.linphone.org
+to=sip:laure@sip.linphone.org
+start_date_time=1441738031
+duration=0
+quality=-1.000000
+video_enabled=0
+call_id=jk39dfZP0L
diff --git a/tester/rcfiles/laure_rc b/tester/rcfiles/laure_rc_udp
similarity index 95%
rename from tester/rcfiles/laure_rc
rename to tester/rcfiles/laure_rc_udp
index 283f917f7..c4016c4fa 100644
--- a/tester/rcfiles/laure_rc
+++ b/tester/rcfiles/laure_rc_udp
@@ -4,7 +4,7 @@ sip_tcp_port=5092
 sip_tls_port=5093
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 
 [auth_info_0]
 username=laure
diff --git a/tester/rcfiles/laure_tcp_rc b/tester/rcfiles/laure_tcp_rc
new file mode 100644
index 000000000..e39a83e49
--- /dev/null
+++ b/tester/rcfiles/laure_tcp_rc
@@ -0,0 +1,46 @@
+[sip]
+sip_port=5092
+sip_tcp_port=5092
+sip_tls_port=5093
+default_proxy=0
+ping_with_options=0
+
+
+[auth_info_0]
+username=laure
+userid=laure
+passwd=secret
+realm="sip.example.org"
+
+
+[proxy_0]
+reg_proxy=sip.example.org;transport=tcp
+reg_identity=sip:laure@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+
+[rtp]
+audio_rtp_port=9010-9390
+video_rtp_port=9410-9910
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
+
diff --git a/tester/rcfiles/marie2_rc b/tester/rcfiles/marie2_rc
new file mode 100644
index 000000000..2c3dae8ad
--- /dev/null
+++ b/tester/rcfiles/marie2_rc
@@ -0,0 +1,60 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+
+composing_idle_timeout=1
+store_ha1_passwd=0 #used for sipp
+
+[auth_info_0]
+username=marie
+userid=marie
+passwd=secret
+realm=sip.example.org
+
+
+[proxy_0]
+reg_proxy=sip.example.org:5070;transport=tcp
+reg_route=sip.example.org:5070;transport=tcp;lr
+reg_identity="Super Marie" <sip:marie@sip.example.org>
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+[friend_0]
+url="Paupoche" <sip:pauline@sip.example.org>
+pol=accept
+subscribe=0
+
+
+[rtp]
+audio_rtp_port=18070-28000
+video_rtp_port=28070-38000
+text_rtp_port=39000-49000
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
+
+#leave this section, which is used by "Codec setup" test of "Setup" suite.
+[video_codec_0]
+mime=VP8
+rate=90000
+enabled=1
diff --git a/tester/rcfiles/marie_early_rc b/tester/rcfiles/marie_early_rc
index efa5408bb..65936de01 100644
--- a/tester/rcfiles/marie_early_rc
+++ b/tester/rcfiles/marie_early_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 incoming_calls_early_media=1
 
 [auth_info_0]
diff --git a/tester/rcfiles/marie_h264_rc b/tester/rcfiles/marie_h264_rc
index 8cd970d24..d13359a02 100644
--- a/tester/rcfiles/marie_h264_rc
+++ b/tester/rcfiles/marie_h264_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
diff --git a/tester/rcfiles/marie_nat64_rc b/tester/rcfiles/marie_nat64_rc
new file mode 100644
index 000000000..58358b579
--- /dev/null
+++ b/tester/rcfiles/marie_nat64_rc
@@ -0,0 +1,55 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+use_ipv6=1
+composing_idle_timeout=1
+store_ha1_passwd=0 #used for sipp
+
+[auth_info_0]
+username=marie
+userid=marie
+passwd=secret
+realm=sip.example.org
+
+
+[proxy_0]
+reg_proxy=sipv4-nat64.example.org;transport=tcp
+reg_route=sipv4-nat64.example.org;transport=tcp;lr
+reg_identity="Super Marie" <sip:marie@sip.example.org>
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+[friend_0]
+url="Paupoche" <sip:pauline@sip.example.org>
+pol=accept
+subscribe=0
+
+
+[rtp]
+audio_rtp_port=18070-28000
+video_rtp_port=28070-38000
+text_rtp_port=39000-49000
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
+
diff --git a/tester/rcfiles/marie_quality_reporting_rc b/tester/rcfiles/marie_quality_reporting_rc
index 10cacfc7d..94c64c5d3 100644
--- a/tester/rcfiles/marie_quality_reporting_rc
+++ b/tester/rcfiles/marie_quality_reporting_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
diff --git a/tester/rcfiles/marie_rc b/tester/rcfiles/marie_rc
index 558671211..64c454bb1 100644
--- a/tester/rcfiles/marie_rc
+++ b/tester/rcfiles/marie_rc
@@ -4,8 +4,9 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
+store_ha1_passwd=0 #used for sipp
 
 [auth_info_0]
 username=marie
@@ -32,6 +33,7 @@ subscribe=0
 [rtp]
 audio_rtp_port=18070-28000
 video_rtp_port=28070-38000
+text_rtp_port=39000-49000
 
 [video]
 display=0
@@ -51,3 +53,8 @@ echocancellation=0 #to not overload cpu in case of VG
 dns_srv_enabled=0 #no srv needed in general
 stun_server=stun.linphone.org
 
+#leave this section, which is used by "Codec setup" test of "Setup" suite.
+[video_codec_0]
+mime=VP8
+rate=90000
+enabled=1
diff --git a/tester/rcfiles/marie_rc_rtcp_xr b/tester/rcfiles/marie_rc_rtcp_xr
index 801ef0ebd..d9197123b 100644
--- a/tester/rcfiles/marie_rc_rtcp_xr
+++ b/tester/rcfiles/marie_rc_rtcp_xr
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
@@ -33,6 +33,7 @@ subscribe=0
 [rtp]
 audio_rtp_port=20070-22070
 video_rtp_port=24000-25000
+text_rtp_port=26000-30000
 rtcp_xr_enabled=1
 rtcp_xr_rcvr_rtt_mode=all
 rtcp_xr_rcvr_rtt_max_size=10000
diff --git a/tester/rcfiles/marie_remote_localfile_rc b/tester/rcfiles/marie_remote_localfile_rc
index b2f947607..751bd5ee6 100644
--- a/tester/rcfiles/marie_remote_localfile_rc
+++ b/tester/rcfiles/marie_remote_localfile_rc
@@ -1,3 +1,3 @@
 [misc]
-config-uri=file://./rcfiles/marie_remote_localfile2_rc
+config-uri=file://marie_remote_localfile2_rc
 
diff --git a/tester/rcfiles/marie_remote_localfile_win10_rc b/tester/rcfiles/marie_remote_localfile_win10_rc
new file mode 100644
index 000000000..9c9eec7a6
--- /dev/null
+++ b/tester/rcfiles/marie_remote_localfile_win10_rc
@@ -0,0 +1,3 @@
+[misc]
+config-uri=file://./Assets/rcfiles/marie_remote_localfile2_rc
+
diff --git a/tester/rcfiles/marie_sips_rc b/tester/rcfiles/marie_sips_rc
index 3556248b0..2a62bbb03 100644
--- a/tester/rcfiles/marie_sips_rc
+++ b/tester/rcfiles/marie_sips_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
diff --git a/tester/rcfiles/marie_v4proxy_rc b/tester/rcfiles/marie_v4proxy_rc
new file mode 100644
index 000000000..a59516c72
--- /dev/null
+++ b/tester/rcfiles/marie_v4proxy_rc
@@ -0,0 +1,55 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+use_ipv6=1
+composing_idle_timeout=1
+store_ha1_passwd=0 #used for sipp
+
+[auth_info_0]
+username=marie
+userid=marie
+passwd=secret
+realm=sip.example.org
+
+
+[proxy_0]
+reg_proxy=sipv4.example.org;transport=tcp
+reg_route=sipv4.example.org;transport=tcp;lr
+reg_identity="Super Marie" <sip:marie@sip.example.org>
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+[friend_0]
+url="Paupoche" <sip:pauline@sip.example.org>
+pol=accept
+subscribe=0
+
+
+[rtp]
+audio_rtp_port=18070-28000
+video_rtp_port=28070-38000
+text_rtp_port=39000-49000
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
+
diff --git a/tester/rcfiles/marie_zrtp_aes256_rc b/tester/rcfiles/marie_zrtp_aes256_rc
index 2230535b6..c63c59121 100644
--- a/tester/rcfiles/marie_zrtp_aes256_rc
+++ b/tester/rcfiles/marie_zrtp_aes256_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 zrtp_cipher_suites=MS_ZRTP_CIPHER_AES3,MS_ZRTP_CIPHER_AES1
 
diff --git a/tester/rcfiles/marie_zrtp_b256_rc b/tester/rcfiles/marie_zrtp_b256_rc
index a9668f2f9..0b6f1c42c 100644
--- a/tester/rcfiles/marie_zrtp_b256_rc
+++ b/tester/rcfiles/marie_zrtp_b256_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 zrtp_sas_suites=MS_ZRTP_SAS_B256
 
diff --git a/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc b/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc
index 3dc5b4d6a..a6a0a5eaf 100644
--- a/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc
+++ b/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 srtp_crypto_suites=AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
 
diff --git a/tester/rcfiles/michelle_rc_udp b/tester/rcfiles/michelle_rc_udp
new file mode 100644
index 000000000..68ca11a7c
--- /dev/null
+++ b/tester/rcfiles/michelle_rc_udp
@@ -0,0 +1,44 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+
+[auth_info_0]
+username=michelle
+userid=michelle
+passwd=secret
+realm="sip.example.org"
+
+
+[proxy_0]
+reg_proxy=sip.example.org
+reg_identity=sip:michelle@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+
+[rtp]
+audio_rtp_port=9010-9390
+video_rtp_port=9410-9910
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
+
diff --git a/tester/rcfiles/pauline_alt_rc b/tester/rcfiles/pauline_alt_rc
index c8e730729..3eb1bfaa7 100644
--- a/tester/rcfiles/pauline_alt_rc
+++ b/tester/rcfiles/pauline_alt_rc
@@ -3,7 +3,7 @@ sip_port=-1
 sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
-register_only_when_network_is_up=0
+
 
 [auth_info_0]
 username=pauline
diff --git a/tester/rcfiles/pauline_as_friend_rc b/tester/rcfiles/pauline_as_friend_rc
new file mode 100644
index 000000000..91b7ac8ef
--- /dev/null
+++ b/tester/rcfiles/pauline_as_friend_rc
@@ -0,0 +1,12 @@
+[net]
+mtu=1300
+
+[sip]
+ping_with_options=0
+sip_random_port=1
+
+[friend_0]
+url=sip:pauline@localhost
+pol=accept
+subscribe=1
+
diff --git a/tester/rcfiles/pauline_h264_rc b/tester/rcfiles/pauline_h264_rc
index 158f45fe5..92b4d7ec8 100644
--- a/tester/rcfiles/pauline_h264_rc
+++ b/tester/rcfiles/pauline_h264_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
diff --git a/tester/rcfiles/pauline_nat64_rc b/tester/rcfiles/pauline_nat64_rc
new file mode 100644
index 000000000..6cfa5ace0
--- /dev/null
+++ b/tester/rcfiles/pauline_nat64_rc
@@ -0,0 +1,51 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+use_ipv6=1
+composing_idle_timeout=1
+
+[auth_info_0]
+username=pauline
+userid=pauline
+passwd=secret
+realm=sip.example.org
+
+
+[proxy_0]
+reg_proxy=sipv4-nat64.example.org;transport=tcp
+reg_route=sipv4-nat64.example.org;transport=tcp
+reg_identity=sip:pauline@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+#[friend_0]
+#url="Mariette" <sip:marie@sip.example.org>
+#pol=accept
+#subscribe=0
+
+[rtp]
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
diff --git a/tester/rcfiles/pauline_rc b/tester/rcfiles/pauline_rc
index 50920606b..c5f1fed4d 100644
--- a/tester/rcfiles/pauline_rc
+++ b/tester/rcfiles/pauline_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
@@ -15,6 +15,7 @@ realm=sip.example.org
 
 
 [proxy_0]
+realm=sip.example.org
 reg_proxy=sip2.linphone.org;transport=tls
 reg_route=sip2.linphone.org;transport=tls
 reg_identity=sip:pauline@sip.example.org
diff --git a/tester/rcfiles/pauline_rc_rtcp_xr b/tester/rcfiles/pauline_rc_rtcp_xr
index 1648b508a..57e48b7df 100644
--- a/tester/rcfiles/pauline_rc_rtcp_xr
+++ b/tester/rcfiles/pauline_rc_rtcp_xr
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
@@ -31,6 +31,7 @@ dial_escape_plus=0
 [rtp]
 audio_rtp_port=18070-28000
 video_rtp_port=39072-49000
+text_rtp_port=29000-38000
 rtcp_xr_enabled=1
 rtcp_xr_rcvr_rtt_mode=all
 rtcp_xr_rcvr_rtt_max_size=10000
diff --git a/tester/rcfiles/pauline_sips_rc b/tester/rcfiles/pauline_sips_rc
index f248cffc1..99b105a49 100644
--- a/tester/rcfiles/pauline_sips_rc
+++ b/tester/rcfiles/pauline_sips_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
diff --git a/tester/rcfiles/pauline_tcp_rc b/tester/rcfiles/pauline_tcp_rc
index f3a3ef568..5c6b183bd 100644
--- a/tester/rcfiles/pauline_tcp_rc
+++ b/tester/rcfiles/pauline_tcp_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 
 [auth_info_0]
@@ -15,6 +15,7 @@ realm=sip.example.org
 
 
 [proxy_0]
+realm=sip.example.org
 reg_proxy=sip2.linphone.org;transport=tcp
 reg_route=sip2.linphone.org;transport=tcp
 reg_identity=sip:pauline@sip.example.org
@@ -31,6 +32,7 @@ dial_escape_plus=0
 [rtp]
 audio_rtp_port=18070-28000
 video_rtp_port=39072-49000
+text_rtp_port=49001-55000
 
 [video]
 display=0
diff --git a/tester/rcfiles/pauline_tls_client_rc b/tester/rcfiles/pauline_tls_client_rc
new file mode 100644
index 000000000..8e886b3e2
--- /dev/null
+++ b/tester/rcfiles/pauline_tls_client_rc
@@ -0,0 +1,51 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+
+composing_idle_timeout=1
+
+[auth_info_0]
+username=pauline
+userid=pauline
+passwd=secret
+realm=sip.example.org
+
+[proxy_0]
+realm=sip.example.org
+reg_proxy=sip2.linphone.org:5063;transport=tls
+reg_route=sip2.linphone.org:5063;transport=tls
+reg_identity=sip:pauline@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+#[friend_0]
+#url="Mariette" <sip:marie@sip.example.org>
+#pol=accept
+#subscribe=0
+
+[rtp]
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
diff --git a/tester/rcfiles/pauline_tunnel_verify_server_certificate_rc b/tester/rcfiles/pauline_tunnel_verify_server_certificate_rc
new file mode 100644
index 000000000..ca9d1eeac
--- /dev/null
+++ b/tester/rcfiles/pauline_tunnel_verify_server_certificate_rc
@@ -0,0 +1,54 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+
+composing_idle_timeout=1
+
+[auth_info_0]
+username=pauline
+userid=pauline
+passwd=secret
+realm=sip.example.org
+
+
+[proxy_0]
+reg_proxy=sip2.linphone.org;transport=tls
+reg_route=sip2.linphone.org;transport=tls
+reg_identity=sip:pauline@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+#[friend_0]
+#url="Mariette" <sip:marie@sip.example.org>
+#pol=accept
+#subscribe=0
+
+[rtp]
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
+
+[tunnel]
+verifyCert=1
diff --git a/tester/rcfiles/pauline_v4proxy_rc b/tester/rcfiles/pauline_v4proxy_rc
new file mode 100644
index 000000000..9b850e715
--- /dev/null
+++ b/tester/rcfiles/pauline_v4proxy_rc
@@ -0,0 +1,51 @@
+[sip]
+sip_port=-1
+sip_tcp_port=-1
+sip_tls_port=-1
+default_proxy=0
+ping_with_options=0
+use_ipv6=1
+composing_idle_timeout=1
+
+[auth_info_0]
+username=pauline
+userid=pauline
+passwd=secret
+realm=sip.example.org
+
+
+[proxy_0]
+reg_proxy=sipv4.example.org;transport=tcp
+reg_route=sipv4.example.org;transport=tcp
+reg_identity=sip:pauline@sip.example.org
+reg_expires=3600
+reg_sendregister=1
+publish=0
+dial_escape_plus=0
+
+#[friend_0]
+#url="Mariette" <sip:marie@sip.example.org>
+#pol=accept
+#subscribe=0
+
+[rtp]
+audio_rtp_port=18070-28000
+video_rtp_port=39072-49000
+
+[video]
+display=0
+capture=0
+show_local=0
+size=qcif
+enabled=0
+self_view=0
+automatically_initiate=0
+automatically_accept=0
+device=StaticImage: Static picture
+
+[sound]
+echocancellation=0 #to not overload cpu in case of VG
+
+[net]
+dns_srv_enabled=0 #no srv needed in general
+stun_server=stun.linphone.org
diff --git a/tester/rcfiles/pauline_wild_rc b/tester/rcfiles/pauline_wild_rc
index 1d0d9b164..b0af339d3 100644
--- a/tester/rcfiles/pauline_wild_rc
+++ b/tester/rcfiles/pauline_wild_rc
@@ -3,7 +3,7 @@ sip_port=-1
 sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
-register_only_when_network_is_up=0
+
 
 [auth_info_0]
 username=pauline
diff --git a/tester/rcfiles/pauline_zrtp_aes256_rc b/tester/rcfiles/pauline_zrtp_aes256_rc
index 5f1af185d..f2bea3c2e 100644
--- a/tester/rcfiles/pauline_zrtp_aes256_rc
+++ b/tester/rcfiles/pauline_zrtp_aes256_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 zrtp_cipher_suites=MS_ZRTP_CIPHER_AES3,MS_ZRTP_CIPHER_AES1
 
diff --git a/tester/rcfiles/pauline_zrtp_b256_rc b/tester/rcfiles/pauline_zrtp_b256_rc
index cf74f3fa7..c11cdab8b 100644
--- a/tester/rcfiles/pauline_zrtp_b256_rc
+++ b/tester/rcfiles/pauline_zrtp_b256_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 zrtp_sas_suites=MS_ZRTP_SAS_B256
 
diff --git a/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc b/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc
index b79b11874..74e313c1a 100644
--- a/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc
+++ b/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc
@@ -4,7 +4,7 @@ sip_tcp_port=-1
 sip_tls_port=-1
 default_proxy=0
 ping_with_options=0
-register_only_when_network_is_up=0
+
 composing_idle_timeout=1
 srtp_crypto_suites=AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
 
diff --git a/tester/register_tester.c b/tester/register_tester.c
index ab159ea2a..9915bbe5b 100644
--- a/tester/register_tester.c
+++ b/tester/register_tester.c
@@ -22,30 +22,32 @@
 #include "liblinphone_tester.h"
 
 
-
 static void auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain) {
 	LinphoneAuthInfo *info;
-	info=linphone_auth_info_new(test_username,NULL,test_password,NULL,realm,domain); /*create authentication structure from identity*/
-	linphone_core_add_auth_info(lc,info); /*add authentication info to LinphoneCore*/
+	info=linphone_auth_info_new(test_username,NULL,test_password,NULL,realm,domain);
+	linphone_core_add_auth_info(lc,info);
 }
 
-
+static void authentication_requested(LinphoneCore *lc, LinphoneAuthInfo *auth_info, LinphoneAuthMethod method) {
+	linphone_auth_info_set_passwd(auth_info, test_password);
+	linphone_core_add_auth_info(lc, auth_info); /*add authentication info to LinphoneCore*/
+}
 
 static LinphoneCoreManager* create_lcm_with_auth(unsigned int with_auth) {
-	LinphoneCoreManager* lcm=linphone_core_manager_new(NULL);
+	LinphoneCoreManager* lcm = linphone_core_manager_new(NULL);
 
 	if (with_auth) {
 		LinphoneCoreVTable* vtable = linphone_core_v_table_new();
-		vtable->auth_info_requested=auth_info_requested;
-		linphone_core_add_listener(lcm->lc,vtable);
+		vtable->authentication_requested = authentication_requested;
+		linphone_core_add_listener(lcm->lc, vtable);
 	}
 
 	/*to allow testing with 127.0.0.1*/
-	linphone_core_set_network_reachable(lcm->lc,TRUE);
+	linphone_core_set_network_reachable(lcm->lc, TRUE);
 	return lcm;
 }
 
-static LinphoneCoreManager* create_lcm() {
+static LinphoneCoreManager* create_lcm(void) {
 	return create_lcm_with_auth(0);
 }
 
@@ -136,7 +138,7 @@ static void register_with_refresh_base_3(LinphoneCore* lc
 	} else
 		/*checking to be done outside this functions*/
 	BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationCleared,0, int, "%d");
-
+	linphone_proxy_config_destroy(proxy_cfg);
 }
 
 static void register_with_refresh_base_2(LinphoneCore* lc
@@ -159,7 +161,7 @@ static void register_with_refresh(LinphoneCoreManager* lcm, bool_t refresh,const
 	BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationCleared,1, int, "%d");
 }
 
-static void register_with_refresh_with_send_error() {
+static void register_with_refresh_with_send_error(void) {
 	int retry=0;
 	LinphoneCoreManager* lcm = create_lcm_with_auth(1);
 	stats* counters = &lcm->stat;
@@ -183,7 +185,7 @@ static void register_with_refresh_with_send_error() {
 	linphone_core_manager_destroy(lcm);
 }
 
-static void simple_register(){
+static void simple_register(void){
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
 	register_with_refresh(lcm,FALSE,NULL,NULL);
@@ -210,13 +212,13 @@ static void register_with_custom_headers(void){
 	linphone_core_manager_destroy(marie);
 }
 
-static void simple_unregister(){
+static void simple_unregister(void){
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
 	LinphoneProxyConfig* proxy_config;
 	register_with_refresh_base(lcm->lc,FALSE,NULL,NULL);
 
-	linphone_core_get_default_proxy(lcm->lc,&proxy_config);
+	proxy_config = linphone_core_get_default_proxy_config(lcm->lc);
 
 	linphone_proxy_config_edit(proxy_config);
 	reset_counters(counters); /*clear stats*/
@@ -229,35 +231,32 @@ static void simple_unregister(){
 	linphone_core_manager_destroy(lcm);
 }
 
-static void change_expires(){
+static void change_expires(void){
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
 	LinphoneProxyConfig* proxy_config;
 	register_with_refresh_base(lcm->lc,FALSE,NULL,NULL);
 
-	linphone_core_get_default_proxy(lcm->lc,&proxy_config);
+	proxy_config = linphone_core_get_default_proxy_config(lcm->lc);
 
 	linphone_proxy_config_edit(proxy_config);
-	reset_counters(counters); /*clear stats*/
 
 	/*nothing is supposed to arrive until done*/
 	BC_ASSERT_FALSE(wait_for_until(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationCleared,1,3000));
 
 	linphone_proxy_config_set_expires(proxy_config,3);
-
+	reset_counters(counters); /*clear stats*/
 	linphone_proxy_config_done(proxy_config);
 	BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,1));
 	/*wait 2s without receive refresh*/
 	BC_ASSERT_FALSE(wait_for_until(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,2,2000));
 	/* now, it should be ok*/
 	BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,2));
-
-
 	linphone_core_manager_destroy(lcm);
 }
 
 /*take care of min expires configuration from server*/
-static void simple_register_with_refresh() {
+static void simple_register_with_refresh(void) {
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
 	register_with_refresh(lcm,TRUE,NULL,NULL);
@@ -265,7 +264,7 @@ static void simple_register_with_refresh() {
 	linphone_core_manager_destroy(lcm);
 }
 
-static void simple_auth_register_with_refresh() {
+static void simple_auth_register_with_refresh(void) {
 	LinphoneCoreManager* lcm = create_lcm_with_auth(1);
 	stats* counters = &lcm->stat;
 	char route[256];
@@ -275,7 +274,7 @@ static void simple_auth_register_with_refresh() {
 	linphone_core_manager_destroy(lcm);
 }
 
-static void simple_tcp_register(){
+static void simple_tcp_register(void){
 	char route[256];
 	LinphoneCoreManager* lcm;
 	sprintf(route,"sip:%s;transport=tcp",test_route);
@@ -284,7 +283,7 @@ static void simple_tcp_register(){
 	linphone_core_manager_destroy(lcm);
 }
 
-static void simple_tcp_register_compatibility_mode(){
+static void simple_tcp_register_compatibility_mode(void){
 	char route[256];
 	LinphoneCoreManager* lcm;
 	LCSipTransports transport = {0,5070,0,0};
@@ -294,7 +293,7 @@ static void simple_tcp_register_compatibility_mode(){
 	linphone_core_manager_destroy(lcm);
 }
 
-static void simple_tls_register(){
+static void simple_tls_register(void){
 	if (transport_supported(LinphoneTransportTls)) {
 		char route[256];
 		LinphoneCoreManager* lcm = create_lcm();
@@ -305,7 +304,7 @@ static void simple_tls_register(){
 }
 
 
-static void simple_authenticated_register(){
+static void simple_authenticated_register(void){
 	stats* counters;
 	LinphoneCoreManager* lcm = create_lcm();
 	LinphoneAuthInfo *info=linphone_auth_info_new(test_username,NULL,test_password,NULL,auth_domain,NULL); /*create authentication structure from identity*/
@@ -318,7 +317,7 @@ static void simple_authenticated_register(){
 	linphone_core_manager_destroy(lcm);
 }
 
-static void ha1_authenticated_register(){
+static void ha1_authenticated_register(void){
 	stats* counters;
 	LinphoneCoreManager* lcm = create_lcm();
 	char ha1[33];
@@ -334,7 +333,7 @@ static void ha1_authenticated_register(){
 	linphone_core_manager_destroy(lcm);
 }
 
-static void authenticated_register_with_no_initial_credentials(){
+static void authenticated_register_with_no_initial_credentials(void){
 	LinphoneCoreManager *lcm;
 	LinphoneCoreVTable* vtable = linphone_core_v_table_new();
 	stats* counters;
@@ -355,11 +354,11 @@ static void authenticated_register_with_no_initial_credentials(){
 }
 
 
-static void authenticated_register_with_late_credentials(){
+static void authenticated_register_with_late_credentials(void){
 	LinphoneCoreManager *lcm;
 	stats* counters;
-	LCSipTransports transport = {5070,5070,0,5071};
 	char route[256];
+	LCSipTransports transport = {5070,5070,0,5071};
 
 	sprintf(route,"sip:%s",test_route);
 
@@ -371,7 +370,48 @@ static void authenticated_register_with_late_credentials(){
 	linphone_core_manager_destroy(lcm);
 }
 
-static void authenticated_register_with_wrong_late_credentials(){
+static void authenticated_register_with_provided_credentials(void){
+	LinphoneCoreManager *lcm;
+	stats* counters;
+	LinphoneProxyConfig *cfg;
+	char route[256];
+	LinphoneAddress *from;
+	char *addr;
+	LinphoneAuthInfo *ai;
+
+	sprintf(route,"sip:%s",test_route);
+
+	lcm =  linphone_core_manager_new(NULL);
+
+	counters = get_stats(lcm->lc);
+	cfg = linphone_core_create_proxy_config(lcm->lc);
+	from = create_linphone_address(auth_domain);
+
+	linphone_proxy_config_set_identity(cfg, addr=linphone_address_as_string(from));
+	ms_free(addr);
+
+	linphone_proxy_config_enable_register(cfg,TRUE);
+	linphone_proxy_config_set_expires(cfg,1);
+	linphone_proxy_config_set_route(cfg, test_route);
+	linphone_proxy_config_set_server_addr(cfg,test_route);
+	linphone_address_destroy(from);
+
+	ai = linphone_auth_info_new(test_username, NULL, test_password, NULL, NULL, NULL);
+	linphone_core_add_auth_info(lcm->lc, ai);
+
+	linphone_core_add_proxy_config(lcm->lc, cfg);
+
+	BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,1));
+	BC_ASSERT_EQUAL(counters->number_of_auth_info_requested,0, int, "%d");
+
+	BC_ASSERT_PTR_NULL(lp_config_get_string(lcm->lc->config, "auth_info_0", "passwd", NULL));
+	BC_ASSERT_PTR_NOT_NULL(lp_config_get_string(lcm->lc->config, "auth_info_0", "ha1", NULL));
+
+	linphone_proxy_config_destroy(cfg);
+	linphone_core_manager_destroy(lcm);
+}
+
+static void authenticated_register_with_wrong_late_credentials(void){
 	LinphoneCoreManager *lcm;
 	stats* counters;
 	LCSipTransports transport = {5070,5070,0,5071};
@@ -418,7 +458,7 @@ static void authenticated_register_with_wrong_credentials_with_params_base(const
 	/*check the detailed error info */
 	if (!user_agent || strcmp(user_agent,"tester-no-403")!=0){
 		LinphoneProxyConfig *cfg=NULL;
-		linphone_core_get_default_proxy(lcm->lc,&cfg);
+		cfg = linphone_core_get_default_proxy_config(lcm->lc);
 		BC_ASSERT_PTR_NOT_NULL(cfg);
 		if (cfg){
 			const LinphoneErrorInfo *ei=linphone_proxy_config_get_error_info(cfg);
@@ -436,10 +476,10 @@ static void authenticated_register_with_wrong_credentials_with_params(const char
 	authenticated_register_with_wrong_credentials_with_params_base(user_agent,lcm);
 	linphone_core_manager_destroy(lcm);
 }
-static void authenticated_register_with_wrong_credentials() {
+static void authenticated_register_with_wrong_credentials(void) {
 	authenticated_register_with_wrong_credentials_with_params(NULL);
 }
-static void authenticated_register_with_wrong_credentials_2() {
+static void authenticated_register_with_wrong_credentials_2(void) {
 	LinphoneCoreManager *lcm = linphone_core_manager_new(NULL);
 	stats* counters = get_stats(lcm->lc);
 	int current_in_progress;
@@ -447,7 +487,7 @@ static void authenticated_register_with_wrong_credentials_2() {
 
 	authenticated_register_with_wrong_credentials_with_params_base(NULL,lcm);
 
-	linphone_core_get_default_proxy(lcm->lc,&proxy);
+	proxy = linphone_core_get_default_proxy_config(lcm->lc);
 	/*Make sure registration attempts are stopped*/
 	linphone_proxy_config_edit(proxy);
 	linphone_proxy_config_enable_register(proxy,FALSE);
@@ -457,28 +497,28 @@ static void authenticated_register_with_wrong_credentials_2() {
 
 	linphone_core_manager_destroy(lcm);
 }
-static void authenticated_register_with_wrong_credentials_without_403() {
+static void authenticated_register_with_wrong_credentials_without_403(void) {
 	authenticated_register_with_wrong_credentials_with_params("tester-no-403");
 }
 static LinphoneCoreManager* configure_lcm(void) {
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager *lcm=linphone_core_manager_new2( "multi_account_rc", FALSE);
 		stats *counters=&lcm->stat;
-		BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,ms_list_size(linphone_core_get_proxy_config_list(lcm->lc))));
+		BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,(int)bctbx_list_size(linphone_core_get_proxy_config_list(lcm->lc))));
 		BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationFailed,0, int, "%d");
 		return lcm;
 	}
 	return NULL;
 }
 
-static void multiple_proxy(){
+static void multiple_proxy(void){
 	LinphoneCoreManager *lcm=configure_lcm();
 	if (lcm) {
 		linphone_core_manager_destroy(lcm);
 	}
 }
 
-static void network_state_change(){
+static void network_state_change(void){
 	int register_ok;
 	stats *counters;
 	LinphoneCoreManager *lcm=configure_lcm();
@@ -500,15 +540,15 @@ static void network_state_change(){
 static int get_number_of_udp_proxy(const LinphoneCore* lc) {
 	int number_of_udp_proxy=0;
 	LinphoneProxyConfig* proxy_cfg;
-	MSList* proxys;
-	for (proxys=(MSList*)linphone_core_get_proxy_config_list(lc);proxys!=NULL;proxys=proxys->next) {
+	const bctbx_list_t* proxys;
+	for (proxys=linphone_core_get_proxy_config_list(lc);proxys!=NULL;proxys=proxys->next) {
 			proxy_cfg=(LinphoneProxyConfig*)proxys->data;
 			if (strcmp("udp",linphone_proxy_config_get_transport(proxy_cfg))==0)
 				number_of_udp_proxy++;
 	}
 	return number_of_udp_proxy;
 }
-static void transport_change(){
+static void transport_change(void){
 	LinphoneCoreManager *lcm;
 	LinphoneCore* lc;
 	int register_ok;
@@ -526,7 +566,7 @@ static void transport_change(){
 		register_ok=counters->number_of_LinphoneRegistrationOk;
 
 		number_of_udp_proxy=get_number_of_udp_proxy(lc);
-		total_number_of_proxies=ms_list_size(linphone_core_get_proxy_config_list(lc));
+		total_number_of_proxies=(int)bctbx_list_size(linphone_core_get_proxy_config_list(lc));
 		linphone_core_get_sip_transports(lc,&sip_tr_orig);
 
 		sip_tr.udp_port=sip_tr_orig.udp_port;
@@ -541,7 +581,52 @@ static void transport_change(){
 	}
 }
 
-static void proxy_transport_change(){
+static void transport_dont_bind(void){
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
+	stats* counters = &pauline->stat;
+	LCSipTransports tr;
+	
+	memset(&tr, 0, sizeof(tr));
+	tr.udp_port = 0;
+	tr.tcp_port = LC_SIP_TRANSPORT_DONTBIND;
+	tr.tls_port = LC_SIP_TRANSPORT_DONTBIND;
+	
+	linphone_core_set_sip_transports(pauline->lc, &tr);
+	BC_ASSERT_TRUE(wait_for_until(pauline->lc,pauline->lc,&counters->number_of_LinphoneRegistrationOk,2,9000));
+	memset(&tr, 0, sizeof(tr));
+	linphone_core_get_sip_transports_used(pauline->lc, &tr);
+	BC_ASSERT_EQUAL(tr.udp_port, 0, int, "%i");
+	BC_ASSERT_EQUAL(tr.tcp_port, LC_SIP_TRANSPORT_DONTBIND, int, "%i");
+	BC_ASSERT_EQUAL(tr.tls_port, LC_SIP_TRANSPORT_DONTBIND, int, "%i");
+	linphone_core_manager_destroy(pauline);
+}
+
+static void transport_busy(void){
+	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
+	LCSipTransports tr;
+	
+	memset(&tr, 0, sizeof(tr));
+	tr.udp_port = 5070;
+	tr.tcp_port = 5070;
+	tr.tls_port = 5071;
+	
+	linphone_core_set_sip_transports(pauline->lc, &tr);
+	
+	{
+		LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
+		linphone_core_set_sip_transports(marie->lc, &tr);
+		memset(&tr, 0, sizeof(tr));
+		linphone_core_get_sip_transports_used(pauline->lc, &tr);
+		/*BC_ASSERT_EQUAL(tr.udp_port, 0, int, "%i");
+		BC_ASSERT_EQUAL(tr.tcp_port, 0, int, "%i");
+		BC_ASSERT_EQUAL(tr.tls_port, 0, int, "%i");*/
+		linphone_core_manager_destroy(marie);
+	}
+	
+	linphone_core_manager_destroy(pauline);
+}
+
+static void proxy_transport_change(void){
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
 	LinphoneProxyConfig* proxy_config;
@@ -552,7 +637,7 @@ static void proxy_transport_change(){
 
 	register_with_refresh_base(lcm->lc,FALSE,auth_domain,NULL);
 
-	linphone_core_get_default_proxy(lcm->lc,&proxy_config);
+	proxy_config = linphone_core_get_default_proxy_config(lcm->lc);
 	reset_counters(counters); /*clear stats*/
 	linphone_proxy_config_edit(proxy_config);
 
@@ -576,7 +661,7 @@ static void proxy_transport_change(){
 	linphone_core_manager_destroy(lcm);
 
 }
-static void proxy_transport_change_with_wrong_port() {
+static void proxy_transport_change_with_wrong_port(void) {
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
 	LinphoneProxyConfig* proxy_config;
@@ -589,7 +674,7 @@ static void proxy_transport_change_with_wrong_port() {
 
 	register_with_refresh_base_3(lcm->lc, FALSE, auth_domain, "sip2.linphone.org:5987", 0,transport,LinphoneRegistrationProgress);
 
-	linphone_core_get_default_proxy(lcm->lc,&proxy_config);
+	proxy_config = linphone_core_get_default_proxy_config(lcm->lc);
 	linphone_proxy_config_edit(proxy_config);
 
 	BC_ASSERT_FALSE(wait_for_until(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationCleared,1,3000));
@@ -607,7 +692,7 @@ static void proxy_transport_change_with_wrong_port() {
 
 }
 
-static void proxy_transport_change_with_wrong_port_givin_up() {
+static void proxy_transport_change_with_wrong_port_givin_up(void) {
 	LinphoneCoreManager* lcm = create_lcm();
 	stats* counters = &lcm->stat;
 	LinphoneProxyConfig* proxy_config;
@@ -620,7 +705,7 @@ static void proxy_transport_change_with_wrong_port_givin_up() {
 
 	register_with_refresh_base_3(lcm->lc, FALSE, auth_domain, "sip2.linphone.org:5987", 0,transport,LinphoneRegistrationProgress);
 
-	linphone_core_get_default_proxy(lcm->lc,&proxy_config);
+	proxy_config = linphone_core_get_default_proxy_config(lcm->lc);
 	linphone_proxy_config_edit(proxy_config);
 
 	BC_ASSERT_FALSE(wait_for_until(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationCleared,1,3000));
@@ -636,7 +721,7 @@ static void proxy_transport_change_with_wrong_port_givin_up() {
 
 }
 
-static void io_recv_error(){
+static void io_recv_error(void){
 	LinphoneCoreManager *lcm;
 	LinphoneCore* lc;
 	int register_ok;
@@ -661,7 +746,7 @@ static void io_recv_error(){
 	}
 }
 
-static void io_recv_error_retry_immediatly(){
+static void io_recv_error_retry_immediatly(void){
 	LinphoneCoreManager *lcm;
 	LinphoneCore* lc;
 	int register_ok;
@@ -686,19 +771,19 @@ static void io_recv_error_retry_immediatly(){
 	}
 }
 
-static void io_recv_error_late_recovery(){
+static void io_recv_error_late_recovery(void){
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager *lcm;
 		LinphoneCore* lc;
 		int register_ok;
 		stats* counters ;
 		int number_of_udp_proxy=0;
-		MSList* lcs;
+		bctbx_list_t* lcs;
 		lcm=linphone_core_manager_new2( "multi_account_rc",FALSE); /*to make sure iterates are not call yet*/
 		lc=lcm->lc;
 		sal_set_refresher_retry_after(lc->sal,1000);
 		counters=&lcm->stat;
-		BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,ms_list_size(linphone_core_get_proxy_config_list(lcm->lc))));
+		BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,(int)bctbx_list_size(linphone_core_get_proxy_config_list(lcm->lc))));
 
 
 		counters = get_stats(lc);
@@ -711,22 +796,22 @@ static void io_recv_error_late_recovery(){
 		BC_ASSERT_TRUE(wait_for(lc,NULL,&counters->number_of_LinphoneRegistrationProgress,(register_ok-number_of_udp_proxy)+register_ok /*because 1 udp*/));
 		BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationFailed,0,int,"%d");
 
-		BC_ASSERT_TRUE(wait_for_list(lcs=ms_list_append(NULL,lc),&counters->number_of_LinphoneRegistrationFailed,(register_ok-number_of_udp_proxy),sal_get_refresher_retry_after(lc->sal)+3000));
+		BC_ASSERT_TRUE(wait_for_list(lcs=bctbx_list_append(NULL,lc),&counters->number_of_LinphoneRegistrationFailed,(register_ok-number_of_udp_proxy),sal_get_refresher_retry_after(lc->sal)+3000));
 
 		sal_set_recv_error(lc->sal, 1); /*reset*/
 		sal_set_send_error(lc->sal, 0);
 
-		BC_ASSERT_TRUE(wait_for_list(lcs=ms_list_append(NULL,lc),&counters->number_of_LinphoneRegistrationOk,register_ok-number_of_udp_proxy +register_ok,sal_get_refresher_retry_after(lc->sal)+3000));
+		BC_ASSERT_TRUE(wait_for_list(lcs=bctbx_list_append(NULL,lc),&counters->number_of_LinphoneRegistrationOk,register_ok-number_of_udp_proxy +register_ok,sal_get_refresher_retry_after(lc->sal)+3000));
 		linphone_core_manager_destroy(lcm);
 	}
 }
 
-static void io_recv_error_without_active_register(){
+static void io_recv_error_without_active_register(void){
 	LinphoneCoreManager *lcm;
 	LinphoneCore* lc;
 	int register_ok;
 	stats* counters ;
-	MSList* proxys;
+	bctbx_list_t* proxys;
 	int dummy=0;
 
 	lcm=configure_lcm();
@@ -736,13 +821,13 @@ static void io_recv_error_without_active_register(){
 
 		register_ok=counters->number_of_LinphoneRegistrationOk;
 
-		for (proxys=ms_list_copy(linphone_core_get_proxy_config_list(lc));proxys!=NULL;proxys=proxys->next) {
+		for (proxys=bctbx_list_copy(linphone_core_get_proxy_config_list(lc));proxys!=NULL;proxys=proxys->next) {
 			LinphoneProxyConfig* proxy_cfg=(LinphoneProxyConfig*)proxys->data;
 			linphone_proxy_config_edit(proxy_cfg);
 			linphone_proxy_config_enableregister(proxy_cfg,FALSE);
 			linphone_proxy_config_done(proxy_cfg);
 		}
-		ms_list_free(proxys);
+		bctbx_list_free(proxys);
 		/*wait for unregistrations*/
 		BC_ASSERT_TRUE(wait_for(lc,lc,&counters->number_of_LinphoneRegistrationCleared,register_ok /*because 1 udp*/));
 
@@ -750,7 +835,7 @@ static void io_recv_error_without_active_register(){
 
 		/*nothing should happen because no active registration*/
 		wait_for_until(lc,lc, &dummy, 1, 3000);
-		BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationProgress, ms_list_size(linphone_core_get_proxy_config_list(lc)), int, "%d");
+		BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationProgress, (int)bctbx_list_size(linphone_core_get_proxy_config_list(lc)), int, "%d");
 
 		BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationFailed,0,int,"%d");
 
@@ -761,7 +846,7 @@ static void io_recv_error_without_active_register(){
 }
 
 
-static void tls_certificate_failure(){
+static void tls_certificate_failure(void){
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager* lcm;
 		LinphoneCore *lc;
@@ -786,8 +871,56 @@ static void tls_certificate_failure(){
 	}
 }
 
+char *read_file(const char *path) {
+	long  numbytes = 0;
+	size_t readbytes;
+	char *buffer = NULL;
+	FILE *infile = fopen(path, "rb");
+	
+	BC_ASSERT_PTR_NOT_NULL(infile);
+	if (infile) {
+		fseek(infile, 0L, SEEK_END);
+		numbytes = ftell(infile);
+		fseek(infile, 0L, SEEK_SET);
+		buffer = (char*)ms_malloc((numbytes + 1) * sizeof(char));
+		readbytes = fread(buffer, sizeof(char), numbytes, infile);
+		fclose(infile);
+		buffer[readbytes] = '\0';
+	}
+	return buffer;
+}
+
+static void tls_certificate_data(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager* lcm;
+		LinphoneCore *lc;
+		char *rootcapath = bc_tester_res("certificates/cn/agent.pem"); /*bad root ca*/
+		char *data = read_file(rootcapath);
+
+		lcm = linphone_core_manager_new2("pauline_rc",FALSE);
+		lc = lcm->lc;
+		linphone_core_set_root_ca_data(lcm->lc, data);
+		linphone_core_set_network_reachable(lc, TRUE);
+		BC_ASSERT_TRUE(wait_for(lcm->lc, lcm->lc, &lcm->stat.number_of_LinphoneRegistrationFailed, 1));
+		linphone_core_set_root_ca_data(lcm->lc, NULL); /*no root ca*/
+		linphone_core_refresh_registers(lcm->lc);
+		BC_ASSERT_TRUE(wait_for(lc, lc, &lcm->stat.number_of_LinphoneRegistrationFailed, 2));
+		ms_free(rootcapath);
+		ms_free(data);
+		rootcapath = bc_tester_res("certificates/cn/cafile.pem"); /*good root ca*/
+		data = read_file(rootcapath);
+		linphone_core_set_root_ca_data(lcm->lc, data);
+		linphone_core_refresh_registers(lcm->lc);
+		BC_ASSERT_TRUE(wait_for(lc, lc, &lcm->stat.number_of_LinphoneRegistrationOk, 1));
+		BC_ASSERT_EQUAL(lcm->stat.number_of_LinphoneRegistrationFailed, 2, int, "%d");
+		linphone_core_manager_destroy(lcm);
+		ms_free(rootcapath);
+		ms_free(data);
+	}
+}
+
 /*the purpose of this test is to check that will not block the proxy config during SSL handshake for entire life in case of mistaken configuration*/
-static void tls_with_non_tls_server(){
+static void tls_with_non_tls_server(void){
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager *lcm;
 		LinphoneProxyConfig* proxy_cfg;
@@ -798,7 +931,7 @@ static void tls_with_non_tls_server(){
 		lcm=linphone_core_manager_new2( "marie_rc", 0);
 		lc=lcm->lc;
 		sal_set_transport_timeout(lc->sal,3000);
-		linphone_core_get_default_proxy(lc,&proxy_cfg);
+		proxy_cfg = linphone_core_get_default_proxy_config(lc);
 		linphone_proxy_config_edit(proxy_cfg);
 		addr=linphone_address_new(linphone_proxy_config_get_addr(proxy_cfg));
 		snprintf(tmp,sizeof(tmp),"sip:%s:%i;transport=tls"	,linphone_address_get_domain(addr)
@@ -806,12 +939,12 @@ static void tls_with_non_tls_server(){
 		linphone_proxy_config_set_server_addr(proxy_cfg,tmp);
 		linphone_proxy_config_done(proxy_cfg);
 		linphone_address_destroy(addr);
-		BC_ASSERT_TRUE(wait_for_until(lc,lc,&lcm->stat.number_of_LinphoneRegistrationFailed,1,5000));
+		BC_ASSERT_TRUE(wait_for_until(lc,lc,&lcm->stat.number_of_LinphoneRegistrationFailed,1,10000));
 		linphone_core_manager_destroy(lcm);
 	}
 }
 
-static void tls_alt_name_register(){
+static void tls_alt_name_register(void){
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager* lcm;
 		LinphoneCore *lc;
@@ -828,7 +961,7 @@ static void tls_alt_name_register(){
 	}
 }
 
-static void tls_wildcard_register(){
+static void tls_wildcard_register(void){
 	if (transport_supported(LinphoneTransportTls)) {
 		LinphoneCoreManager* lcm;
 		LinphoneCore *lc;
@@ -845,7 +978,7 @@ static void tls_wildcard_register(){
 	}
 }
 
-static void redirect(){
+static void redirect(void){
 	char route[256];
 	LinphoneCoreManager* lcm;
 	LCSipTransports transport = {-1,0,0,0};
@@ -858,47 +991,203 @@ static void redirect(){
 	}
 }
 
+static void tls_auth_global_client_cert(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager *manager = ms_new0(LinphoneCoreManager, 1);
+		LpConfig *lpc = NULL;
+		char *cert_path = bc_tester_res("certificates/client/cert.pem");
+		char *key_path = bc_tester_res("certificates/client/key.pem");
+		linphone_core_manager_init(manager, "pauline_tls_client_rc", NULL);
+		lpc = manager->lc->config;
+		lp_config_set_string(lpc, "sip", "client_cert_chain", cert_path);
+		lp_config_set_string(lpc, "sip", "client_cert_key", key_path);
+		linphone_core_manager_start(manager, TRUE);
+		linphone_core_manager_destroy(manager);
+		ms_free(cert_path);
+		ms_free(key_path);
+	}
+}
+
+static void tls_auth_global_client_cert_api(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager *pauline = linphone_core_manager_new2("pauline_tls_client_rc", FALSE);
+		char *cert_path = bc_tester_res("certificates/client/cert.pem");
+		char *key_path = bc_tester_res("certificates/client/key.pem");
+		char *cert = read_file(cert_path);
+		char *key = read_file(key_path);
+		LinphoneCore *lc = pauline->lc;
+		linphone_core_set_tls_cert(lc, cert);
+		linphone_core_set_tls_key(lc, key);
+		BC_ASSERT_TRUE(wait_for(lc, lc, &pauline->stat.number_of_LinphoneRegistrationOk, 1));
+		linphone_core_manager_destroy(pauline);
+		ms_free(cert);
+		ms_free(key);
+		ms_free(cert_path);
+		ms_free(key_path);
+	}
+}
+
+static void tls_auth_global_client_cert_api_path(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager *pauline = linphone_core_manager_new2("pauline_tls_client_rc", FALSE);
+		char *cert = bc_tester_res("certificates/client/cert.pem");
+		char *key = bc_tester_res("certificates/client/key.pem");
+		LinphoneCore *lc = pauline->lc;
+		linphone_core_set_tls_cert_path(lc, cert);
+		linphone_core_set_tls_key_path(lc, key);
+		BC_ASSERT_TRUE(wait_for(lc, lc, &pauline->stat.number_of_LinphoneRegistrationOk, 1));
+		linphone_core_manager_destroy(pauline);
+		ms_free(cert);
+		ms_free(key);
+	}
+}
+
+static void tls_auth_info_client_cert_api(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager *pauline = linphone_core_manager_new2("pauline_tls_client_rc", FALSE);
+		char *cert_path = bc_tester_res("certificates/client/cert.pem");
+		char *key_path = bc_tester_res("certificates/client/key.pem");
+		char *cert = read_file(cert_path);
+		char *key = read_file(key_path);
+		LinphoneCore *lc = pauline->lc;
+		LinphoneAuthInfo *authInfo = (LinphoneAuthInfo *)lc->auth_info->data;
+		linphone_auth_info_set_tls_cert(authInfo, cert);
+		linphone_auth_info_set_tls_key(authInfo, key);
+		BC_ASSERT_TRUE(wait_for(lc, lc, &pauline->stat.number_of_LinphoneRegistrationOk, 1));
+		linphone_core_manager_destroy(pauline);
+		ms_free(cert);
+		ms_free(key);
+		ms_free(cert_path);
+		ms_free(key_path);
+	}
+}
+
+static void tls_auth_info_client_cert_api_path(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager *pauline = linphone_core_manager_new2("pauline_tls_client_rc", FALSE);
+		char *cert = bc_tester_res("certificates/client/cert.pem");
+		char *key = bc_tester_res("certificates/client/key.pem");
+		LinphoneCore *lc = pauline->lc;
+		LinphoneAuthInfo *authInfo = (LinphoneAuthInfo *)lc->auth_info->data;
+		linphone_auth_info_set_tls_cert_path(authInfo, cert);
+		linphone_auth_info_set_tls_key_path(authInfo, key);
+		BC_ASSERT_TRUE(wait_for(lc, lc, &pauline->stat.number_of_LinphoneRegistrationOk, 1));
+		linphone_core_manager_destroy(pauline);
+		ms_free(cert);
+		ms_free(key);
+	}
+}
+
+static void authentication_requested_2(LinphoneCore *lc, LinphoneAuthInfo *auth_info, LinphoneAuthMethod method) {
+	char *cert = bc_tester_res("certificates/client/cert.pem");
+	char *key = bc_tester_res("certificates/client/key.pem");
+	BC_ASSERT_EQUAL(method, LinphoneAuthTls, int, "%i");
+	linphone_auth_info_set_tls_cert_path(auth_info, cert);
+	linphone_auth_info_set_tls_key_path(auth_info, key);
+	linphone_core_add_auth_info(lc, auth_info);
+	ms_free(cert);
+	ms_free(key);
+}
+
+static void tls_auth_info_client_cert_cb(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager *lcm;
+		LinphoneCoreVTable* vtable = linphone_core_v_table_new();
+		stats* counters;
+
+		lcm = linphone_core_manager_new(NULL);
+
+		vtable->authentication_requested=authentication_requested_2;
+		linphone_core_add_listener(lcm->lc,vtable);
+
+		counters= get_stats(lcm->lc);
+		counters->number_of_auth_info_requested=0;
+		register_with_refresh(lcm,FALSE,auth_domain,"sip2.linphone.org:5063;transport=tls");
+		BC_ASSERT_EQUAL(counters->number_of_auth_info_requested,1, int, "%d");
+		linphone_core_manager_destroy(lcm);
+	}
+}
+
+static void authentication_requested_3(LinphoneCore *lc, LinphoneAuthInfo *auth_info, LinphoneAuthMethod method) {
+	char *cert_path = bc_tester_res("certificates/client/cert.pem");
+	char *key_path = bc_tester_res("certificates/client/key.pem");
+	char *cert = read_file(cert_path);
+	char *key = read_file(key_path);
+	BC_ASSERT_EQUAL(method, LinphoneAuthTls, int, "%i");
+	linphone_auth_info_set_tls_cert(auth_info, cert);
+	linphone_auth_info_set_tls_key(auth_info, key);
+	linphone_core_add_auth_info(lc, auth_info);
+	ms_free(cert);
+	ms_free(key);
+	ms_free(cert_path);
+	ms_free(key_path);
+}
+
+static void tls_auth_info_client_cert_cb_2(void) {
+	if (transport_supported(LinphoneTransportTls)) {
+		LinphoneCoreManager *lcm;
+		LinphoneCoreVTable* vtable = linphone_core_v_table_new();
+		stats* counters;
+
+		lcm = linphone_core_manager_new(NULL);
+
+		vtable->authentication_requested=authentication_requested_3;
+		linphone_core_add_listener(lcm->lc,vtable);
+
+		counters= get_stats(lcm->lc);
+		counters->number_of_auth_info_requested=0;
+		register_with_refresh(lcm,FALSE,auth_domain,"sip2.linphone.org:5063;transport=tls");
+		BC_ASSERT_EQUAL(counters->number_of_auth_info_requested,1, int, "%d");
+		linphone_core_manager_destroy(lcm);
+	}
+}
+
 test_t register_tests[] = {
-	{ "Simple register", simple_register },
-	{ "Simple register unregister", simple_unregister },
-	{ "TCP register", simple_tcp_register },
-	{ "Register with custom headers", register_with_custom_headers },
-	{ "TCP register compatibility mode", simple_tcp_register_compatibility_mode },
-	{ "TLS register", simple_tls_register },
-	{ "TLS register with alt. name certificate", tls_alt_name_register },
-	{ "TLS register with wildcard certificate", tls_wildcard_register },
-	{ "TLS certificate not verified",tls_certificate_failure},
-	{ "TLS with non tls server",tls_with_non_tls_server},
-	{ "Simple authenticated register", simple_authenticated_register },
-	{ "Ha1 authenticated register", ha1_authenticated_register },
-	{ "Digest auth without initial credentials", authenticated_register_with_no_initial_credentials },
-	{ "Digest auth with wrong credentials", authenticated_register_with_wrong_credentials },
-	{ "Digest auth with wrong credentials, check if registration attempts are stopped", authenticated_register_with_wrong_credentials_2 },
-	{ "Digest auth with wrong credentials without 403", authenticated_register_with_wrong_credentials_without_403},
-	{ "Authenticated register with wrong late credentials", authenticated_register_with_wrong_late_credentials},
-	{ "Authenticated register with late credentials", authenticated_register_with_late_credentials },
-	{ "Register with refresh", simple_register_with_refresh },
-	{ "Authenticated register with refresh", simple_auth_register_with_refresh },
-	{ "Register with refresh and send error", register_with_refresh_with_send_error },
-	{ "Multi account", multiple_proxy },
-	{ "Transport changes", transport_change },
-	{ "Proxy transport changes", proxy_transport_change},
-	{ "Proxy transport changes with wrong address at first", proxy_transport_change_with_wrong_port},
-	{ "Proxy transport changes with wrong address, giving up",proxy_transport_change_with_wrong_port_givin_up},
-	{ "Change expires", change_expires},
-	{ "Network state change", network_state_change },
-	{ "Io recv error", io_recv_error },
-	{ "Io recv error with recovery", io_recv_error_retry_immediatly},
-	{ "Io recv error with late recovery", io_recv_error_late_recovery},
-	{ "Io recv error without active registration", io_recv_error_without_active_register},
-	{ "Simple redirect", redirect}
-};
-
-test_suite_t register_test_suite = {
-	"Register",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(register_tests) / sizeof(register_tests[0]),
-	register_tests
+	TEST_NO_TAG("Simple register", simple_register),
+	TEST_NO_TAG("Simple register unregister", simple_unregister),
+	TEST_NO_TAG("TCP register", simple_tcp_register),
+	TEST_NO_TAG("Register with custom headers", register_with_custom_headers),
+	TEST_NO_TAG("TCP register compatibility mode", simple_tcp_register_compatibility_mode),
+	TEST_NO_TAG("TLS register", simple_tls_register),
+	TEST_NO_TAG("TLS register with alt. name certificate", tls_alt_name_register),
+	TEST_NO_TAG("TLS register with wildcard certificate", tls_wildcard_register),
+	TEST_NO_TAG("TLS certificate not verified",tls_certificate_failure),
+	TEST_NO_TAG("TLS certificate given by string instead of file",tls_certificate_data),
+	TEST_NO_TAG("TLS with non tls server",tls_with_non_tls_server),
+	TEST_NO_TAG("Simple authenticated register", simple_authenticated_register),
+	TEST_NO_TAG("Ha1 authenticated register", ha1_authenticated_register),
+	TEST_NO_TAG("Digest auth without initial credentials", authenticated_register_with_no_initial_credentials),
+	TEST_NO_TAG("Digest auth with wrong credentials", authenticated_register_with_wrong_credentials),
+	TEST_NO_TAG("Digest auth with wrong credentials, check if registration attempts are stopped", authenticated_register_with_wrong_credentials_2),
+	TEST_NO_TAG("Digest auth with wrong credentials without 403", authenticated_register_with_wrong_credentials_without_403),
+	TEST_NO_TAG("Authenticated register with wrong late credentials", authenticated_register_with_wrong_late_credentials),
+	TEST_NO_TAG("Authenticated register with late credentials", authenticated_register_with_late_credentials),
+	TEST_NO_TAG("Authenticated register with provided credentials", authenticated_register_with_provided_credentials),
+	TEST_NO_TAG("Register with refresh", simple_register_with_refresh),
+	TEST_NO_TAG("Authenticated register with refresh", simple_auth_register_with_refresh),
+	TEST_NO_TAG("Register with refresh and send error", register_with_refresh_with_send_error),
+	TEST_NO_TAG("Multi account", multiple_proxy),
+	TEST_NO_TAG("Transport changes", transport_change),
+	TEST_NO_TAG("Transport configured with dontbind option", transport_dont_bind),
+	TEST_NO_TAG("Transport busy", transport_busy),
+	TEST_NO_TAG("Proxy transport changes", proxy_transport_change),
+	TEST_NO_TAG("Proxy transport changes with wrong address at first", proxy_transport_change_with_wrong_port),
+	TEST_NO_TAG("Proxy transport changes with wrong address, giving up",proxy_transport_change_with_wrong_port_givin_up),
+	TEST_NO_TAG("Change expires", change_expires),
+	TEST_NO_TAG("Network state change", network_state_change),
+	TEST_NO_TAG("Io recv error", io_recv_error),
+	TEST_NO_TAG("Io recv error with recovery", io_recv_error_retry_immediatly),
+	TEST_NO_TAG("Io recv error with late recovery", io_recv_error_late_recovery),
+	TEST_NO_TAG("Io recv error without active registration", io_recv_error_without_active_register),
+	TEST_NO_TAG("Simple redirect", redirect),
+	TEST_NO_TAG("Global TLS client certificate authentication", tls_auth_global_client_cert),
+	TEST_NO_TAG("Global TLS client certificate authentication using API", tls_auth_global_client_cert_api),
+	TEST_NO_TAG("Global TLS client certificate authentication using API 2", tls_auth_global_client_cert_api_path),
+	TEST_NO_TAG("AuthInfo TLS client certificate authentication using API", tls_auth_info_client_cert_api),
+	TEST_NO_TAG("AuthInfo TLS client certificate authentication using API 2", tls_auth_info_client_cert_api_path),
+	TEST_NO_TAG("AuthInfo TLS client certificate authentication in callback", tls_auth_info_client_cert_cb),
+	TEST_NO_TAG("AuthInfo TLS client certificate authentication in callback 2", tls_auth_info_client_cert_cb_2),
 };
 
+test_suite_t register_test_suite = {"Register", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+									sizeof(register_tests) / sizeof(register_tests[0]), register_tests};
diff --git a/tester/remote_provisioning_tester.c b/tester/remote_provisioning_tester.c
index ac6e5602f..654fd9c82 100644
--- a/tester/remote_provisioning_tester.c
+++ b/tester/remote_provisioning_tester.c
@@ -110,8 +110,20 @@ static void remote_provisioning_file(void) {
 	return;
 #elif defined(ANDROID)
 	marie = linphone_core_manager_new2("marie_remote_localfile_android_rc", FALSE);
+#elif defined(LINPHONE_WINDOWS_UNIVERSAL)
+	marie = linphone_core_manager_new2("marie_remote_localfile_win10_rc", FALSE);
 #else
-	marie = linphone_core_manager_new2("marie_remote_localfile_rc", FALSE);
+	marie = ms_new0(LinphoneCoreManager, 1);
+	linphone_core_manager_init(marie, "marie_remote_localfile_rc",NULL);
+	// fix relative path to absolute path
+	{
+		char* path = bc_tester_res("rcfiles/marie_remote_localfile2_rc");
+		char* abspath = ms_strdup_printf("file://%s", path);
+		lp_config_set_string(marie->lc->config, "misc", "config-uri", abspath);
+		linphone_core_manager_start(marie, 1);
+		ms_free(path);
+		ms_free(abspath);
+	}
 #endif
 	BC_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphoneConfiguringSuccessful,1));
 
@@ -123,21 +135,17 @@ static void remote_provisioning_file(void) {
 
 
 test_t remote_provisioning_tests[] = {
-	{ "Remote provisioning skipped", remote_provisioning_skipped },
-	{ "Remote provisioning successful behind http", remote_provisioning_http },
-	{ "Remote provisioning successful behind https", remote_provisioning_https },
-	{ "Remote provisioning 404 not found", remote_provisioning_not_found },
-	{ "Remote provisioning invalid", remote_provisioning_invalid },
-	{ "Remote provisioning transient successful", remote_provisioning_transient },
-	{ "Remote provisioning default values", remote_provisioning_default_values },
-	{ "Remote provisioning from file", remote_provisioning_file },
-	{ "Remote provisioning invalid URI", remote_provisioning_invalid_uri }
+	TEST_NO_TAG("Remote provisioning skipped", remote_provisioning_skipped),
+	TEST_NO_TAG("Remote provisioning successful behind http", remote_provisioning_http),
+	TEST_NO_TAG("Remote provisioning successful behind https", remote_provisioning_https),
+	TEST_NO_TAG("Remote provisioning 404 not found", remote_provisioning_not_found),
+	TEST_NO_TAG("Remote provisioning invalid", remote_provisioning_invalid),
+	TEST_NO_TAG("Remote provisioning transient successful", remote_provisioning_transient),
+	TEST_NO_TAG("Remote provisioning default values", remote_provisioning_default_values),
+	TEST_NO_TAG("Remote provisioning from file", remote_provisioning_file),
+	TEST_NO_TAG("Remote provisioning invalid URI", remote_provisioning_invalid_uri)
 };
 
-test_suite_t remote_provisioning_test_suite = {
-	"RemoteProvisioning",
-	NULL,
-	NULL,
-	sizeof(remote_provisioning_tests) / sizeof(remote_provisioning_tests[0]),
-	remote_provisioning_tests
-};
+test_suite_t remote_provisioning_test_suite = {"RemoteProvisioning", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+											   sizeof(remote_provisioning_tests) / sizeof(remote_provisioning_tests[0]),
+											   remote_provisioning_tests};
diff --git a/tester/setup_tester.c b/tester/setup_tester.c
index c24aa27b8..a9225ae52 100644
--- a/tester/setup_tester.c
+++ b/tester/setup_tester.c
@@ -25,6 +25,7 @@
 static void linphone_version_test(void){
 	const char *version=linphone_core_get_version();
 	/*make sure the git version is always included in the version number*/
+	BC_ASSERT_PTR_NOT_NULL(version);
 	BC_ASSERT_PTR_NULL(strstr(version,"unknown"));
 }
 
@@ -35,12 +36,15 @@ static void core_init_test(void) {
 	lc = linphone_core_new(&v_table,NULL,NULL,NULL);
 	/* until we have good certificates on our test server... */
 	linphone_core_verify_server_certificates(lc,FALSE);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(lc);
-	linphone_core_destroy(lc);
+	if (BC_ASSERT_PTR_NOT_NULL(lc)) {
+		linphone_core_destroy(lc);
+	}
 }
 
 static void linphone_address_test(void) {
 	linphone_address_destroy(create_linphone_address(NULL));
+	BC_ASSERT_PTR_NULL(linphone_address_new("sip:@sip.linphone.org"));
+
 }
 
 static void core_sip_transport_test(void) {
@@ -49,7 +53,7 @@ static void core_sip_transport_test(void) {
 	LCSipTransports tr;
 	memset (&v_table,0,sizeof(v_table));
 	lc = linphone_core_new(&v_table,NULL,NULL,NULL);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(lc);
+	if (!BC_ASSERT_PTR_NOT_NULL(lc)) return;
 	linphone_core_get_sip_transports(lc,&tr);
 	BC_ASSERT_EQUAL(tr.udp_port,5060, int, "%d"); /*default config*/
 	BC_ASSERT_EQUAL(tr.tcp_port,5060, int, "%d"); /*default config*/
@@ -71,30 +75,60 @@ static void core_sip_transport_test(void) {
 	linphone_core_destroy(lc);
 }
 
-static void linphone_interpret_url_test()
+static void linphone_interpret_url_test(void)
 {
 	LinphoneCoreVTable v_table;
 	LinphoneCore* lc;
 	const char* sips_address = "sips:margaux@sip.linphone.org";
 	LinphoneAddress* address;
-
+	LinphoneProxyConfig *proxy_config;
+	char *tmp;
 	memset ( &v_table,0,sizeof ( v_table ) );
 	lc = linphone_core_new ( &v_table,NULL,NULL,NULL );
-	BC_ASSERT_PTR_NOT_NULL_FATAL ( lc );
+	if (!BC_ASSERT_PTR_NOT_NULL( lc )) return;
+
+	proxy_config =linphone_core_create_proxy_config(lc);
+	linphone_proxy_config_set_identity(proxy_config, "sip:moi@sip.linphone.org");
+	linphone_proxy_config_enable_register(proxy_config, FALSE);
+	linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org");
+	linphone_core_add_proxy_config(lc, proxy_config);
+	linphone_core_set_default_proxy_config(lc,proxy_config);
+	linphone_proxy_config_unref(proxy_config);
 
 	address = linphone_core_interpret_url(lc, sips_address);
-
-	BC_ASSERT_PTR_NOT_NULL_FATAL(address);
-	BC_ASSERT_STRING_EQUAL_FATAL(linphone_address_get_scheme(address), "sips");
-	BC_ASSERT_STRING_EQUAL_FATAL(linphone_address_get_username(address), "margaux");
-	BC_ASSERT_STRING_EQUAL_FATAL(linphone_address_get_domain(address), "sip.linphone.org");
-
+	BC_ASSERT_PTR_NOT_NULL(address);
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_scheme(address), "sips");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_username(address), "margaux");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_domain(address), "sip.linphone.org");
 	linphone_address_destroy(address);
 
-	linphone_core_destroy ( lc );
+	address = linphone_core_interpret_url(lc,"23");
+	BC_ASSERT_PTR_NOT_NULL(address);
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_scheme(address), "sip");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_username(address), "23");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_domain(address), "sip.linphone.org");
+	linphone_address_destroy(address);
+
+	address = linphone_core_interpret_url(lc,"#24");
+	BC_ASSERT_PTR_NOT_NULL(address);
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_scheme(address), "sip");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_username(address), "#24");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_domain(address), "sip.linphone.org");
+	tmp = linphone_address_as_string(address);
+	BC_ASSERT_TRUE(strcmp (tmp,"sip:%2324@sip.linphone.org") == 0);
+	linphone_address_destroy(address);
+
+	address = linphone_core_interpret_url(lc,tmp);
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_scheme(address), "sip");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_username(address), "#24");
+	BC_ASSERT_STRING_EQUAL(linphone_address_get_domain(address), "sip.linphone.org");
+	linphone_address_destroy(address);
+	ms_free(tmp);
+
+	linphone_core_destroy (lc);
 }
 
-static void linphone_lpconfig_from_buffer(){
+static void linphone_lpconfig_from_buffer(void){
 	const char* buffer = "[buffer]\ntest=ok";
 	const char* buffer_linebreaks = "[buffer_linebreaks]\n\n\n\r\n\n\r\ntest=ok";
 	LpConfig* conf;
@@ -108,7 +142,7 @@ static void linphone_lpconfig_from_buffer(){
 	lp_config_destroy(conf);
 }
 
-static void linphone_lpconfig_from_buffer_zerolen_value(){
+static void linphone_lpconfig_from_buffer_zerolen_value(void){
 	/* parameters that have no value should return NULL, not "". */
 	const char* zerolen = "[test]\nzero_len=\nnon_zero_len=test";
 	LpConfig* conf;
@@ -124,7 +158,7 @@ static void linphone_lpconfig_from_buffer_zerolen_value(){
 	lp_config_destroy(conf);
 }
 
-static void linphone_lpconfig_from_file_zerolen_value(){
+static void linphone_lpconfig_from_file_zerolen_value(void){
 	/* parameters that have no value should return NULL, not "". */
 	const char* zero_rc_file = "zero_length_params_rc";
 	char* rc_path = ms_strdup_printf("%s/rcfiles/%s", bc_tester_get_resource_dir_prefix(), zero_rc_file);
@@ -146,13 +180,19 @@ static void linphone_lpconfig_from_file_zerolen_value(){
 	lp_config_destroy(conf);
 }
 
-static void linphone_lpconfig_from_xml_zerolen_value(){
+static void linphone_lpconfig_from_xml_zerolen_value(void){
 	const char* zero_xml_file = "remote_zero_length_params_rc";
 	char* xml_path = ms_strdup_printf("%s/rcfiles/%s", bc_tester_get_resource_dir_prefix(), zero_xml_file);
 	LpConfig* conf;
 
 	LinphoneCoreManager* mgr = linphone_core_manager_new2("empty_rc",FALSE);
 
+	/* BUG
+	 * This test makes a provisionning by xml outside of the Configuring state of the LinphoneCore.
+	 * It is leaking memory because the config is litterally erased and rewritten by the invocation
+	 * of the private function linphone_remote_provisioning_load_file .
+	 */ 
+	
 	BC_ASSERT_EQUAL(linphone_remote_provisioning_load_file(mgr->lc, xml_path), 0, int, "%d");
 
 	conf = mgr->lc->config;
@@ -167,7 +207,7 @@ static void linphone_lpconfig_from_xml_zerolen_value(){
 	ms_free(xml_path);
 }
 
-void linphone_proxy_config_address_equal_test() {
+void linphone_proxy_config_address_equal_test(void) {
 	LinphoneAddress *a = linphone_address_new("sip:toto@titi");
 	LinphoneAddress *b = linphone_address_new("sips:toto@titi");
 	LinphoneAddress *c = linphone_address_new("sip:toto@titi;transport=tcp");
@@ -189,9 +229,11 @@ void linphone_proxy_config_address_equal_test() {
 	linphone_address_destroy(b);
 	linphone_address_destroy(c);
 	linphone_address_destroy(d);
+	linphone_address_destroy(e);
+	linphone_address_destroy(f);
 }
 
-void linphone_proxy_config_is_server_config_changed_test() {
+void linphone_proxy_config_is_server_config_changed_test(void) {
 	LinphoneProxyConfig* proxy_config = linphone_proxy_config_new();
 
 	linphone_proxy_config_done(proxy_config); /*test done without edit*/
@@ -238,7 +280,7 @@ static void chat_room_test(void) {
 	LinphoneCore* lc;
 	memset (&v_table,0,sizeof(v_table));
 	lc = linphone_core_new(&v_table,NULL,NULL,NULL);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(lc);
+	if (!BC_ASSERT_PTR_NOT_NULL(lc)) return;
 	BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room_from_uri(lc,"sip:toto@titi.com"));
 	linphone_core_destroy(lc);
 }
@@ -258,7 +300,13 @@ static void devices_reload_test(void) {
 	devid1 = ms_strdup(linphone_core_get_video_device(mgr->lc));
 	linphone_core_reload_video_devices(mgr->lc);
 	devid2 = ms_strdup(linphone_core_get_video_device(mgr->lc));
-	BC_ASSERT_STRING_EQUAL(devid1, devid2);
+
+	if (devid1 && devid2) {
+		BC_ASSERT_STRING_EQUAL(devid1, devid2);
+	} else {
+		BC_ASSERT_PTR_NULL(devid1);
+		BC_ASSERT_PTR_NULL(devid2);
+	}
 	ms_free(devid1);
 	ms_free(devid2);
 
@@ -289,28 +337,69 @@ end:
 	linphone_core_manager_destroy(mgr);
 }
 
+/*this test checks default codec list, assuming VP8 and H264 are both supported.
+ * - with an empty config, the order must be as expected: VP8 first, H264 second.
+ * - with a config that references only H264, VP8 must be added automatically as first codec.
+ * - with a config that references only VP8, H264 must be added in second position.
+**/
+static void codec_setup(void){
+	LinphoneCoreManager *mgr = linphone_core_manager_new2("empty_rc", FALSE);
+	PayloadType *vp8, *h264;
+	const bctbx_list_t *codecs;
+	if ((vp8 = linphone_core_find_payload_type(mgr->lc, "VP8", 90000, -1)) == NULL ||
+		(h264 = linphone_core_find_payload_type(mgr->lc, "H264", 90000, -1)) == NULL){
+		linphone_core_manager_destroy(mgr);
+		ms_error("H264 or VP8 not available, test skipped.");
+		BC_PASS("H264 or VP8 not available, test skipped.");
+		return;
+	}
+	codecs = linphone_core_get_video_codecs(mgr->lc);
+	BC_ASSERT_TRUE(bctbx_list_size(codecs)>=2);
+	BC_ASSERT_TRUE(codecs->data == vp8);
+	BC_ASSERT_TRUE(codecs->next->data == h264);
+	linphone_core_manager_destroy(mgr);
+	
+	mgr = linphone_core_manager_new2("marie_h264_rc", FALSE);
+	vp8 = linphone_core_find_payload_type(mgr->lc, "VP8", 90000, -1);
+	h264 = linphone_core_find_payload_type(mgr->lc, "H264", 90000, -1);
+	codecs = linphone_core_get_video_codecs(mgr->lc);
+	BC_ASSERT_TRUE(bctbx_list_size(codecs)>=2);
+	BC_ASSERT_PTR_NOT_NULL(vp8);
+	BC_ASSERT_PTR_NOT_NULL(h264);
+	BC_ASSERT_TRUE(codecs->data == vp8);
+	BC_ASSERT_TRUE(codecs->next->data == h264);
+	linphone_core_manager_destroy(mgr);
+	
+	mgr = linphone_core_manager_new2("marie_rc", FALSE);
+	vp8 = linphone_core_find_payload_type(mgr->lc, "VP8", 90000, -1);
+	h264 = linphone_core_find_payload_type(mgr->lc, "H264", 90000, -1);
+	codecs = linphone_core_get_video_codecs(mgr->lc);
+	BC_ASSERT_TRUE(bctbx_list_size(codecs)>=2);
+	BC_ASSERT_PTR_NOT_NULL(vp8);
+	BC_ASSERT_PTR_NOT_NULL(h264);
+	BC_ASSERT_TRUE(codecs->data == vp8);
+	BC_ASSERT_TRUE(codecs->next->data == h264);
+	linphone_core_manager_destroy(mgr);
+	
+}
+
 test_t setup_tests[] = {
-	{ "Version check", linphone_version_test },
-	{ "Linphone Address", linphone_address_test },
-	{ "Linphone proxy config address equal (internal api)", linphone_proxy_config_address_equal_test},
-	{ "Linphone proxy config server address change (internal api)", linphone_proxy_config_is_server_config_changed_test},
-	{ "Linphone core init/uninit", core_init_test },
-	{ "Linphone random transport port",core_sip_transport_test},
-	{ "Linphone interpret url", linphone_interpret_url_test },
-	{ "LPConfig from buffer", linphone_lpconfig_from_buffer },
-	{ "LPConfig zero_len value from buffer", linphone_lpconfig_from_buffer_zerolen_value },
-	{ "LPConfig zero_len value from file", linphone_lpconfig_from_file_zerolen_value },
-	{ "LPConfig zero_len value from XML", linphone_lpconfig_from_xml_zerolen_value },
-	{ "Chat room", chat_room_test },
-	{ "Devices reload", devices_reload_test },
-	{ "Codec usability", codec_usability_test }
-};
-
-test_suite_t setup_test_suite = {
-	"Setup",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(setup_tests) / sizeof(setup_tests[0]),
-	setup_tests
+	TEST_NO_TAG("Version check", linphone_version_test),
+	TEST_NO_TAG("Linphone Address", linphone_address_test),
+	TEST_NO_TAG("Linphone proxy config address equal (internal api)", linphone_proxy_config_address_equal_test),
+	TEST_NO_TAG("Linphone proxy config server address change (internal api)", linphone_proxy_config_is_server_config_changed_test),
+	TEST_NO_TAG("Linphone core init/uninit", core_init_test),
+	TEST_NO_TAG("Linphone random transport port",core_sip_transport_test),
+	TEST_NO_TAG("Linphone interpret url", linphone_interpret_url_test),
+	TEST_NO_TAG("LPConfig from buffer", linphone_lpconfig_from_buffer),
+	TEST_NO_TAG("LPConfig zero_len value from buffer", linphone_lpconfig_from_buffer_zerolen_value),
+	TEST_NO_TAG("LPConfig zero_len value from file", linphone_lpconfig_from_file_zerolen_value),
+	TEST_ONE_TAG("LPConfig zero_len value from XML", linphone_lpconfig_from_xml_zerolen_value, "LeaksMemory"),
+	TEST_NO_TAG("Chat room", chat_room_test),
+	TEST_NO_TAG("Devices reload", devices_reload_test),
+	TEST_NO_TAG("Codec usability", codec_usability_test),
+	TEST_NO_TAG("Codec setup", codec_setup)
 };
 
+test_suite_t setup_test_suite = {"Setup", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								 sizeof(setup_tests) / sizeof(setup_tests[0]), setup_tests};
diff --git a/tester/sipp/call_invite_200ok_without_contact_header.xml b/tester/sipp/call_invite_200ok_without_contact_header.xml
new file mode 100644
index 000000000..d53913047
--- /dev/null
+++ b/tester/sipp/call_invite_200ok_without_contact_header.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uas' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic UAS responder">
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv request="INVITE" crlf="true">
+  </recv>
+
+  <!-- The '[last_*]' keyword is replaced automatically by the          -->
+  <!-- specified header if it was present in the last message received  -->
+  <!-- (except if it was a retransmission). If the header was not       -->
+  <!-- present or if no message has been received, the '[last_*]'       -->
+  <!-- keyword is discarded, and all bytes until the end of the line    -->
+  <!-- are also discarded.                                              -->
+  <!--                                                                  -->
+  <!-- If the specified header was present several times in the         -->
+  <!-- message, all occurences are concatenated (CRLF seperated)        -->
+  <!-- to be used in place of the '[last_*]' keyword.                   -->
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 180 Ringing
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 96 97 0 8 101 98
+      a=rtpmap:96 speex/16000
+      a=fmtp:96 vbr=on
+      a=rtpmap:97 speex/8000
+      a=fmtp:97 vbr=on
+      a=rtpmap:101 telephone-event/16000
+      a=rtpmap:98 telephone-event/8000
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        optional="true"
+        rtd="true"
+        crlf="true">
+  </recv>
+
+  <recv request="BYE">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Keep the call open for a while in case the 200 is lost to be     -->
+  <!-- able to retransmit it if we receive the BYE again.               -->
+  <pause milliseconds="1000"/>
+
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
\ No newline at end of file
diff --git a/tester/sipp/call_with_audio_mline_before_video_in_sdp.xml b/tester/sipp/call_with_audio_mline_before_video_in_sdp.xml
new file mode 100644
index 000000000..dabe990e4
--- /dev/null
+++ b/tester/sipp/call_with_audio_mline_before_video_in_sdp.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uac' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone UAC">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[media_ip_type] [media_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 96 97 0 8 101 98
+      a=rtpmap:96 speex/16000
+      a=fmtp:96 vbr=on
+      a=rtpmap:97 speex/8000
+      a=fmtp:97 vbr=on
+      a=rtpmap:101 telephone-event/16000
+      a=rtpmap:98 telephone-event/8000
+      m=video [media_port+2] RTP/AVP 96
+      a=rtpmap:96 VP8/90000
+
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <recv response="183" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- This delay can be customized by the -d command-line option       -->
+  <!-- or by adding a 'milliseconds = "value"' option here.             -->
+  <pause/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/tester/sipp/call_with_multiple_audio_mline_in_sdp.xml b/tester/sipp/call_with_multiple_audio_mline_in_sdp.xml
new file mode 100644
index 000000000..ec4f70a4d
--- /dev/null
+++ b/tester/sipp/call_with_multiple_audio_mline_in_sdp.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uac' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone UAC">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[media_ip_type] [media_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 96 97 0 8 101 98
+      a=rtpmap:96 speex/16000
+      a=fmtp:96 vbr=on
+      a=rtpmap:97 speex/8000
+      a=fmtp:97 vbr=on
+      a=rtpmap:101 telephone-event/16000
+      a=rtpmap:98 telephone-event/8000
+      m=audio [media_port+1] RTP/AVP 96 97 0 8 101 98
+      a=rtpmap:96 speex/16000
+      a=fmtp:96 vbr=on
+      a=rtpmap:97 speex/8000
+      a=fmtp:97 vbr=on
+      a=rtpmap:101 telephone-event/16000
+      a=rtpmap:98 telephone-event/8000
+      m=video [media_port+2] RTP/AVP 96
+      a=rtpmap:96 VP8/90000
+
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <recv response="183" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- This delay can be customized by the -d command-line option       -->
+  <!-- or by adding a 'milliseconds = "value"' option here.             -->
+  <pause/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/tester/sipp/call_with_multiple_video_mline_in_sdp.xml b/tester/sipp/call_with_multiple_video_mline_in_sdp.xml
new file mode 100644
index 000000000..dfd317e55
--- /dev/null
+++ b/tester/sipp/call_with_multiple_video_mline_in_sdp.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uac' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone UAC">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[media_ip_type] [media_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 96 97 0 8 101 98
+      a=rtpmap:96 speex/16000
+      a=fmtp:96 vbr=on
+      a=rtpmap:97 speex/8000
+      a=fmtp:97 vbr=on
+      a=rtpmap:101 telephone-event/16000
+      a=rtpmap:98 telephone-event/8000
+      m=video [media_port+2] RTP/AVP 96
+      a=rtpmap:96 VP8/90000
+      m=video [media_port+3] RTP/AVP 96
+      a=rtpmap:96 VP8/90000
+      m=video [media_port+4] RTP/AVP 96
+      a=rtpmap:96 VP8/90000
+
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <recv response="183" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- This delay can be customized by the -d command-line option       -->
+  <!-- or by adding a 'milliseconds = "value"' option here.             -->
+  <pause/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/tester/sipp/call_with_video_mline_before_audio_in_sdp.xml b/tester/sipp/call_with_video_mline_before_audio_in_sdp.xml
new file mode 100644
index 000000000..d4d419597
--- /dev/null
+++ b/tester/sipp/call_with_video_mline_before_audio_in_sdp.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uac' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone UAC">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[media_ip_type] [media_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=video [media_port+2] RTP/AVP 96
+      a=rtpmap:96 VP8/90000
+      m=audio [media_port] RTP/AVP 96 97 0 8 101 98
+      a=rtpmap:96 speex/16000
+      a=fmtp:96 vbr=on
+      a=rtpmap:97 speex/8000
+      a=fmtp:97 vbr=on
+      a=rtpmap:101 telephone-event/16000
+      a=rtpmap:98 telephone-event/8000
+
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <recv response="183" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- This delay can be customized by the -d command-line option       -->
+  <!-- or by adding a 'milliseconds = "value"' option here.             -->
+  <pause/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/tester/sipp/double_publish_with_error.xml b/tester/sipp/double_publish_with_error.xml
new file mode 100644
index 000000000..7527aa78a
--- /dev/null
+++ b/tester/sipp/double_publish_with_error.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uac' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone publish">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      PUBLISH sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:[service]@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sipp <sip:[service]@sip.example.org>
+      Call-ID: [call_id]
+      CSeq: 1 PUBLISH
+      Max-Forwards: 70
+      Expire: 60
+      Event: presence
+      Content-Type: application/pidf+xml
+      Content-Length: [len]
+
+      <?xml version="1.0" encoding="UTF-8"?>
+      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
+            <tuple id="jjlson">
+                  <status>
+                        <basic>open</basic>
+                  </status>
+                  <contact priority="0.8">sip:[service]@[local_ip]:[local_port]</contact>
+                  <timestamp>2015-09-28T15:49:00Z</timestamp>
+            </tuple>
+      </presence>
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rrs="true">
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      PUBLISH sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:[service]@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sipp <sip:[service]-2@sip.example.org>
+      Call-ID: [call_id]-2
+      CSeq: 1 PUBLISH
+      Max-Forwards: 70
+      Expire: 60
+      Event: presence
+      Content-Type: application/pidf+xml
+      Content-Length: [len]
+
+      <?xml version="1.0" encoding="UTF-8"?>
+      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
+            <tuple id="jjlson">
+                  <status>
+                        <basic>open</basic>
+                  </status>
+                  <contact priority="0.8">sip:[service]@[local_ip]:[local_port]</contact>
+                  <timestamp>2015-09-28T15:49:00Z</timestamp>
+            </tuple>
+      </presence>
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rrs="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/tester/sipp/simple_publish.xml b/tester/sipp/simple_publish.xml
new file mode 100644
index 000000000..4040471ce
--- /dev/null
+++ b/tester/sipp/simple_publish.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uac' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone publish">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      PUBLISH sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:[service]@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sipp <sip:[service]@sip.example.org>
+      Call-ID: [call_id]
+      CSeq: 1 PUBLISH
+      Max-Forwards: 70
+      Expire: 60
+      Event: presence
+      Content-Type: application/pidf+xml
+      Content-Length: [len]
+
+      <?xml version="1.0" encoding="UTF-8"?>
+      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
+            <tuple id="jjlson">
+                  <status>
+                        <basic>open</basic>
+                  </status>
+                  <contact priority="0.8">sip:[service]@[local_ip]:[local_port]</contact>
+                  <timestamp>2015-09-28T15:49:00Z</timestamp>
+            </tuple>
+      </presence>
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+ 
+  <recv response="407" auth="true">
+  </recv>
+
+ <send retrans="500">
+    <![CDATA[
+
+      PUBLISH sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:[service]@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sipp <sip:[service]@sip.example.org>
+      Call-ID: [call_id]
+      CSeq: 2 PUBLISH
+      Max-Forwards: 70
+      [authentication]
+      Expire: 60
+      Event: presence
+      Content-Type: application/pidf+xml
+      Content-Length: [len]
+
+      <?xml version="1.0" encoding="UTF-8"?>
+      <presence xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" entity="sip:[service]@sip.example.org" xmlns="urn:ietf:params:xml:ns:pidf">
+            <tuple id="jjlson">
+                  <status>
+                        <basic>open</basic>
+                  </status>
+                  <contact priority="0.8">sip:[service]@[local_ip]:[local_port]</contact>
+                  <timestamp>2015-09-28T15:49:00Z</timestamp>
+            </tuple>
+      </presence>
+    ]]>
+  </send>
+
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rrs="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/tester/sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml b/tester/sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml
new file mode 100644
index 000000000..9fffd4ff9
--- /dev/null
+++ b/tester/sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uac' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone UAC">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:[service]@sip.example.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[media_ip_type] [media_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+  <recv response="100"
+        optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <recv response="200" rrs="true" rtd="true">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:[service]@sip.example.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+    <recv response="100"
+        optional="true">
+  </recv>
+
+
+  <recv response="200" rtd="true">
+  </recv>
+ 
+
+<send retrans="500">
+    <![CDATA[
+  
+      UPDATE sip:[service]@sip.example.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 3 UPDATE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+  <recv response="200" optionnal="true" rtd="true">
+  </recv>
+ <send >
+    <![CDATA[
+      ACK sip:[service]@sip.example.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[media_ip_type] [media_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+  <pause/>
+
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:[service]@sip.example.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 4 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+<!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff --git a/tester/sipp/subscribe_on_wrong_dialog.xml b/tester/sipp/subscribe_on_wrong_dialog.xml
new file mode 100644
index 000000000..ab583e0b9
--- /dev/null
+++ b/tester/sipp/subscribe_on_wrong_dialog.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                                                                    -->
+
+<scenario name="Basic Sipstone UAC">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+ 
+      SUBSCRIBE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:[service]@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org> ;tag=pasdetagicinormalement
+      Call-ID: [call_id]
+      CSeq: 1 SUBSCRIBE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Event: presence
+      Expires: 60
+      Accept: application/pidf+xml
+      Allow-Events: presence
+      User-Agent: full-presence-support
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+  <recv response="407" auth="true">
+  </recv>
+ 
+ <send retrans="500">
+    <![CDATA[
+ 
+      SUBSCRIBE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:[service]@sip.example.org>;tag=[pid]SIPpTag00[call_number]
+      To: sut <sip:[service]@sip.example.org> ;tag=pasdetagicinormalement
+      Call-ID: [call_id]
+      CSeq: 2 SUBSCRIBE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Event: presence
+      [authentication]
+      Expires: 60
+      Accept: application/pidf+xml
+      Allow-Events: presence
+      User-Agent: full-presence-support
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="481" rtd="true">
+  </recv>
+
+</scenario>
+
diff --git a/tester/sounds/hello44100.wav b/tester/sounds/hello44100.wav
new file mode 100644
index 000000000..0e01d8d23
Binary files /dev/null and b/tester/sounds/hello44100.wav differ
diff --git a/tester/sounds/hello_opus_h264.mkv b/tester/sounds/hello_opus_h264.mkv
deleted file mode 100644
index 4aa5d338b..000000000
Binary files a/tester/sounds/hello_opus_h264.mkv and /dev/null differ
diff --git a/tester/sounds/sintel_trailer_opus_h264.mkv b/tester/sounds/sintel_trailer_opus_h264.mkv
new file mode 100644
index 000000000..420f5c291
Binary files /dev/null and b/tester/sounds/sintel_trailer_opus_h264.mkv differ
diff --git a/tester/sounds/sintel_trailer_opus_vp8.mkv b/tester/sounds/sintel_trailer_opus_vp8.mkv
new file mode 100644
index 000000000..de7b37a3c
Binary files /dev/null and b/tester/sounds/sintel_trailer_opus_vp8.mkv differ
diff --git a/tester/sounds/sintel_trailer_pcmu_h264.mkv b/tester/sounds/sintel_trailer_pcmu_h264.mkv
new file mode 100644
index 000000000..84b9bfa24
Binary files /dev/null and b/tester/sounds/sintel_trailer_pcmu_h264.mkv differ
diff --git a/tester/sounds/vrroom.wav b/tester/sounds/vrroom.wav
index 673a3addc..a78e25820 100644
Binary files a/tester/sounds/vrroom.wav and b/tester/sounds/vrroom.wav differ
diff --git a/tester/stun_tester.c b/tester/stun_tester.c
index 89762cab3..0a2b1b608 100644
--- a/tester/stun_tester.c
+++ b/tester/stun_tester.c
@@ -16,7 +16,6 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
@@ -24,96 +23,239 @@
 #include "ortp/port.h"
 
 
-static const char* stun_address = "stun.linphone.org";
+static const char *stun_address = "stun.linphone.org";
 
 
-static int test_stun_encode( char*buffer, size_t len, bool_t expect_fail )
+static size_t test_stun_encode(char **buffer)
 {
-	StunAtrString username;
-	StunAtrString password;
-	StunMessage req;
-	memset(&req, 0, sizeof(StunMessage));
-	memset(&username,0,sizeof(username));
-	memset(&password,0,sizeof(password));
-	stunBuildReqSimple( &req, &username, TRUE , TRUE , 11);
-	len = stunEncodeMessage( &req, buffer, len, &password);
-	if (len<=0){
-		if( expect_fail )
-			ms_message("Fail to encode stun message (EXPECTED).\n");
-		else
-			ms_error("Fail to encode stun message.\n");
-		return -1;
-	}
-	return len;
+	MSStunMessage *req = ms_stun_binding_request_create();
+	UInt96 tr_id = ms_stun_message_get_tr_id(req);
+	tr_id.octet[0] = 11;
+	ms_stun_message_set_tr_id(req, tr_id);
+	return ms_stun_message_encode(req, buffer);
 }
 
-
-static void linphone_stun_test_encode()
+static void linphone_stun_test_encode(void)
 {
-	char smallBuff[12];
-	size_t smallLen = 12;
-	char bigBuff[STUN_MAX_MESSAGE_SIZE];
-	size_t bigLen = STUN_MAX_MESSAGE_SIZE;
-
-	size_t len = test_stun_encode(smallBuff, smallLen, TRUE);
-	BC_ASSERT(len == -1);
-
-	len = test_stun_encode(bigBuff, bigLen, TRUE);
+	char *buffer = NULL;
+	size_t len = test_stun_encode(&buffer);
 	BC_ASSERT(len > 0);
+	BC_ASSERT_PTR_NOT_NULL(buffer);
+	if (buffer != NULL) ms_free(buffer);
 	ms_message("STUN message encoded in %i bytes", (int)len);
 }
 
-
-static void linphone_stun_test_grab_ip()
+static void linphone_stun_test_grab_ip(void)
 {
-	LinphoneCoreManager* lc_stun = linphone_core_manager_new2( "stun_rc", FALSE);
+	
+	LinphoneCoreManager* lc_stun = linphone_core_manager_new2("stun_rc", FALSE);
 	LinphoneCall dummy_call;
 	int ping_time;
-	int tmp=0;
+	int tmp = 0;
 
+	/*this test verifies the very basic STUN support of liblinphone, which is deprecated.
+	 * It works only in IPv4 mode and there is no plan to make it work over ipv6.*/
+	if (liblinphone_tester_ipv4_available()){
+		goto end;
+	}
+	linphone_core_enable_ipv6(lc_stun->lc, FALSE);
+	
 	memset(&dummy_call, 0, sizeof(LinphoneCall));
-	dummy_call.media_ports[0].rtp_port = 7078;
-	dummy_call.media_ports[1].rtp_port = 9078;
+	dummy_call.main_audio_stream_index = 0;
+	dummy_call.main_video_stream_index = 1;
+	dummy_call.main_text_stream_index = 2;
+	dummy_call.media_ports[dummy_call.main_audio_stream_index].rtp_port = 7078;
+	dummy_call.media_ports[dummy_call.main_video_stream_index].rtp_port = 9078;
+	dummy_call.media_ports[dummy_call.main_text_stream_index].rtp_port = 11078;
 
 	linphone_core_set_stun_server(lc_stun->lc, stun_address);
 	BC_ASSERT_STRING_EQUAL(stun_address, linphone_core_get_stun_server(lc_stun->lc));
 
-	wait_for(lc_stun->lc,lc_stun->lc,&tmp,1);
+	wait_for(lc_stun->lc, lc_stun->lc, &tmp, 1);
 
 	ping_time = linphone_core_run_stun_tests(lc_stun->lc, &dummy_call);
 	BC_ASSERT(ping_time != -1);
 
 	ms_message("Round trip to STUN: %d ms", ping_time);
 
-	BC_ASSERT( dummy_call.ac.addr[0] != '\0');
-	BC_ASSERT( dummy_call.ac.port != 0);
+	BC_ASSERT(dummy_call.ac.addr[0] != '\0');
+	BC_ASSERT(dummy_call.ac.port != 0);
 #ifdef VIDEO_ENABLED
-	BC_ASSERT( dummy_call.vc.addr[0] != '\0');
-	BC_ASSERT( dummy_call.vc.port != 0);
+	BC_ASSERT(dummy_call.vc.addr[0] != '\0');
+	BC_ASSERT(dummy_call.vc.port != 0);
 #endif
+	BC_ASSERT(dummy_call.tc.addr[0] != '\0');
+	BC_ASSERT(dummy_call.tc.port != 0);
 
-	ms_message("STUN test result: local audio port maps to %s:%i",
-			dummy_call.ac.addr,
-			dummy_call.ac.port);
+	ms_message("STUN test result: local audio port maps to %s:%i", dummy_call.ac.addr, dummy_call.ac.port);
 #ifdef VIDEO_ENABLED
-	ms_message("STUN test result: local video port maps to %s:%i",
-			dummy_call.vc.addr,
-			dummy_call.vc.port);
+	ms_message("STUN test result: local video port maps to %s:%i", dummy_call.vc.addr, dummy_call.vc.port);
 #endif
+	ms_message("STUN test result: local text port maps to %s:%i", dummy_call.tc.addr, dummy_call.tc.port);
 
+end:
 	linphone_core_manager_destroy(lc_stun);
 }
 
+static void configure_nat_policy(LinphoneCore *lc, bool_t turn_enabled) {
+	const char *username = "liblinphone-tester";
+	const char *password = "retset-enohpnilbil";
+	LinphoneAuthInfo *auth_info = linphone_core_create_auth_info(lc, username, NULL, password, NULL, "sip.linphone.org", NULL);
+	LinphoneNatPolicy *nat_policy = linphone_core_create_nat_policy(lc);
+	linphone_nat_policy_enable_ice(nat_policy, TRUE);
+	if (turn_enabled) {
+		linphone_nat_policy_enable_turn(nat_policy, TRUE);
+		linphone_nat_policy_set_stun_server(nat_policy, "sip1.linphone.org:3479");
+		linphone_nat_policy_set_stun_server_username(nat_policy, username);
+	} else {
+		linphone_nat_policy_enable_stun(nat_policy, TRUE);
+		linphone_nat_policy_set_stun_server(nat_policy, "stun.linphone.org");
+	}
+	linphone_core_set_nat_policy(lc, nat_policy);
+	linphone_core_add_auth_info(lc, auth_info);
+	linphone_nat_policy_unref(nat_policy);
+	linphone_auth_info_destroy(auth_info);
+}
+
+static void check_turn_context_statistics(MSTurnContext *turn_context, bool_t forced_relay) {
+	BC_ASSERT_TRUE(turn_context->stats.nb_successful_allocate > 1);
+	if (forced_relay == TRUE) {
+		BC_ASSERT_TRUE(turn_context->stats.nb_send_indication > 0);
+		BC_ASSERT_TRUE(turn_context->stats.nb_data_indication > 0);
+		BC_ASSERT_TRUE(turn_context->stats.nb_received_channel_msg > 0);
+		BC_ASSERT_TRUE(turn_context->stats.nb_sent_channel_msg > 0);
+		BC_ASSERT_TRUE(turn_context->stats.nb_successful_refresh > 0);
+		BC_ASSERT_TRUE(turn_context->stats.nb_successful_create_permission > 1);
+		BC_ASSERT_TRUE(turn_context->stats.nb_successful_channel_bind > 1);
+	}
+}
+
+static void ice_turn_call_base(bool_t video_enabled, bool_t forced_relay, bool_t caller_turn_enabled, bool_t callee_turn_enabled, bool_t rtcp_mux_enabled, bool_t ipv6) {
+	LinphoneCoreManager *marie;
+	LinphoneCoreManager *pauline;
+	LinphoneCall *lcall;
+	LinphoneIceState expected_ice_state = LinphoneIceStateHostConnection;
+	LinphoneMediaDirection expected_video_dir = LinphoneMediaDirectionInactive;
+	bctbx_list_t *lcs = NULL;
+
+	marie = linphone_core_manager_new2("marie_rc", FALSE);
+	lcs = bctbx_list_append(lcs, marie->lc);
+	pauline = linphone_core_manager_new2(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc", FALSE);
+	lcs = bctbx_list_append(lcs, pauline->lc);
+
+	if (ipv6) {
+		linphone_core_enable_ipv6(marie->lc, TRUE);
+		linphone_core_enable_ipv6(pauline->lc, TRUE);
+	} else {
+		linphone_core_enable_ipv6(marie->lc, FALSE);
+		linphone_core_enable_ipv6(pauline->lc, FALSE);
+	}
+
+	configure_nat_policy(marie->lc, caller_turn_enabled);
+	configure_nat_policy(pauline->lc, callee_turn_enabled);
+	if (forced_relay == TRUE) {
+		linphone_core_enable_forced_ice_relay(marie->lc, TRUE);
+		linphone_core_enable_forced_ice_relay(pauline->lc, TRUE);
+		linphone_core_enable_short_turn_refresh(marie->lc, TRUE);
+		linphone_core_enable_short_turn_refresh(pauline->lc, TRUE);
+		expected_ice_state = LinphoneIceStateRelayConnection;
+	}
+	if (rtcp_mux_enabled == TRUE) {
+		lp_config_set_int(linphone_core_get_config(marie->lc), "rtp", "rtcp_mux", 1);
+		lp_config_set_int(linphone_core_get_config(pauline->lc), "rtp", "rtcp_mux", 1);
+	}
+
+	linphone_core_manager_start(marie, TRUE);
+	linphone_core_manager_start(pauline, TRUE);
+
+	if (video_enabled) {
+#ifdef VIDEO_ENABLED
+		video_call_base_2(marie, pauline, FALSE, LinphoneMediaEncryptionNone, TRUE, TRUE);
+		expected_video_dir = LinphoneMediaDirectionSendRecv;
+#endif
+	} else {
+		BC_ASSERT_TRUE(call(marie, pauline));
+	}
+
+	/* Wait for the ICE reINVITE to complete */
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 2));
+	BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 2));
+	BC_ASSERT_TRUE(check_ice(pauline, marie, expected_ice_state));
+	check_nb_media_starts(pauline, marie, 1, 1);
+	check_media_direction(marie, linphone_core_get_current_call(marie->lc), lcs, LinphoneMediaDirectionSendRecv, expected_video_dir);
+	check_media_direction(pauline, linphone_core_get_current_call(pauline->lc), lcs, LinphoneMediaDirectionSendRecv, expected_video_dir);
+	liblinphone_tester_check_rtcp(marie, pauline);
+	lcall = linphone_core_get_current_call(marie->lc);
+	BC_ASSERT_PTR_NOT_NULL(lcall);
+	if (lcall != NULL) {
+		BC_ASSERT_PTR_NOT_NULL(lcall->ice_session);
+		if (lcall->ice_session != NULL) {
+			IceCheckList *cl = ice_session_check_list(lcall->ice_session, 0);
+			BC_ASSERT_PTR_NOT_NULL(cl);
+			if (cl != NULL) {
+				check_turn_context_statistics(cl->rtp_turn_context, forced_relay);
+				if (!rtcp_mux_enabled) check_turn_context_statistics(cl->rtcp_turn_context, forced_relay);
+			}
+		}
+	}
+
+	end_call(marie, pauline);
+
+	linphone_core_manager_destroy(pauline);
+	linphone_core_manager_destroy(marie);
+	bctbx_list_free(lcs);
+}
+
+static void basic_ice_turn_call(void) {
+	ice_turn_call_base(FALSE, FALSE, TRUE, TRUE, FALSE, FALSE);
+}
+
+static void basic_ipv6_ice_turn_call(void) {
+	if (liblinphone_tester_ipv6_available()) {
+		ice_turn_call_base(FALSE, FALSE, TRUE, TRUE, FALSE, TRUE);
+	} else {
+		ms_warning("Test skipped, no ipv6 available");
+	}
+}
+
+#ifdef VIDEO_ENABLED
+static void video_ice_turn_call(void) {
+	ice_turn_call_base(TRUE, FALSE, TRUE, TRUE, FALSE, FALSE);
+}
+#endif
+
+static void relayed_ice_turn_call(void) {
+	ice_turn_call_base(FALSE, TRUE, TRUE, TRUE, FALSE, FALSE);
+}
+
+#ifdef VIDEO_ENABLED
+static void relayed_video_ice_turn_call(void) {
+	ice_turn_call_base(TRUE, TRUE, TRUE, TRUE, FALSE, FALSE);
+}
+#endif
+
+static void relayed_ice_turn_call_with_rtcp_mux(void) {
+	ice_turn_call_base(FALSE, TRUE, TRUE, TRUE, TRUE, FALSE);
+}
+
+static void relayed_ice_turn_to_ice_stun_call(void) {
+	ice_turn_call_base(FALSE, TRUE, TRUE, FALSE, FALSE, FALSE);
+}
+
 
 test_t stun_tests[] = {
-	{ "Basic Stun test (Ping/public IP)", linphone_stun_test_grab_ip },
-	{ "STUN encode buffer protection", linphone_stun_test_encode },
+	TEST_ONE_TAG("Basic Stun test (Ping/public IP)", linphone_stun_test_grab_ip, "STUN"),
+	TEST_ONE_TAG("STUN encode", linphone_stun_test_encode, "STUN"),
+	TEST_TWO_TAGS("Basic ICE+TURN call", basic_ice_turn_call, "ICE", "TURN"),
+	TEST_TWO_TAGS("Basic IPv6 ICE+TURN call", basic_ipv6_ice_turn_call, "ICE", "TURN"),
+#ifdef VIDEO_ENABLED
+	TEST_TWO_TAGS("Video ICE+TURN call", video_ice_turn_call, "ICE", "TURN"),
+	TEST_TWO_TAGS("Relayed video ICE+TURN call", relayed_video_ice_turn_call, "ICE", "TURN"),
+#endif
+	TEST_TWO_TAGS("Relayed ICE+TURN call", relayed_ice_turn_call, "ICE", "TURN"),
+	TEST_TWO_TAGS("Relayed ICE+TURN call with rtcp-mux", relayed_ice_turn_call_with_rtcp_mux, "ICE", "TURN"),
+	TEST_TWO_TAGS("Relayed ICE+TURN to ICE+STUN call", relayed_ice_turn_to_ice_stun_call, "ICE", "TURN")
 };
 
-test_suite_t stun_test_suite = {
-	"Stun",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(stun_tests) / sizeof(stun_tests[0]),
-	stun_tests
-};
+test_suite_t stun_test_suite = {"Stun", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								sizeof(stun_tests) / sizeof(stun_tests[0]), stun_tests};
diff --git a/tester/tester.c b/tester/tester.c
index eded255ed..6ea047c8c 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -17,25 +17,39 @@
  */
 
 #include <stdio.h>
-#include "CUnit/TestRun.h"
-#include "CUnit/Automated.h"
+#include <stdlib.h>
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
-#if HAVE_CU_CURSES
-#include "CUnit/CUCurses.h"
+#include <bctoolbox/tester.h>
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
 #endif
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#endif
+
 #ifdef HAVE_GTK
 #include <gtk/gtk.h>
 #endif
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
 #if _WIN32
 #define unlink _unlink
 #endif
 
-static bool_t liblinphone_tester_ipv6_enabled=FALSE;
+
 static int liblinphone_tester_keep_accounts_flag = 0;
 static int liblinphone_tester_keep_record_files = FALSE;
+static int liblinphone_tester_leak_detector_disabled = FALSE;
+bool_t liblinphone_tester_tls_support_disabled = FALSE;
 int manager_count = 0;
+int leaked_objects_count = 0;
+const MSAudioDiffParams audio_cmp_params = {10,2000};
 
 const char* test_domain="sipopen.example.org";
 const char* auth_domain="sip.example.org";
@@ -43,6 +57,11 @@ const char* test_username="liblinphone_tester";
 const char* test_password="secret";
 const char* test_route="sip2.linphone.org";
 const char *userhostsfile = "tester_hosts";
+bool_t liblinphonetester_ipv6 = TRUE;
+bool_t liblinphonetester_show_account_manager_logs = FALSE;
+int liblinphonetester_transport_timeout = 9000; /*milliseconds. it is set to such low value to workaround a problem with our Freebox v6 when connecting to Ipv6 addresses.
+			It was found that the freebox sometimes block SYN-ACK packets, which prevents connection to be succesful.
+			Thanks to the timeout, it will fallback to IPv4*/
 
 const char *liblinphone_tester_mire_id="Mire: Mire (synthetic moving picture)";
 
@@ -67,13 +86,10 @@ bool_t liblinphone_tester_clock_elapsed(const MSTimeSpec *start, int value_ms){
 	return FALSE;
 }
 
-void liblinphone_tester_enable_ipv6(bool_t enabled){
-	liblinphone_tester_ipv6_enabled=enabled;
-}
 
 LinphoneAddress * create_linphone_address(const char * domain) {
 	LinphoneAddress *addr = linphone_address_new(NULL);
-	BC_ASSERT_PTR_NOT_NULL_FATAL(addr);
+	if (!BC_ASSERT_PTR_NOT_NULL(addr)) return NULL;
 	linphone_address_set_username(addr,test_username);
 	BC_ASSERT_STRING_EQUAL(test_username,linphone_address_get_username(addr));
 	if (!domain) domain= test_route;
@@ -96,6 +112,7 @@ static void auth_info_requested(LinphoneCore *lc, const char *realm, const char
 
 void reset_counters( stats* counters) {
 	if (counters->last_received_chat_message) linphone_chat_message_unref(counters->last_received_chat_message);
+	if (counters->last_received_info_message) linphone_info_message_destroy(counters->last_received_info_message);
 	memset(counters,0,sizeof(stats));
 }
 
@@ -108,12 +125,15 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, c
 	char *rootcapath       = NULL;
 	char *dnsuserhostspath = NULL;
 	char *nowebcampath     = NULL;
+	char *chatdb     = NULL;
 
 	if (path==NULL) path=".";
 
 	if (file){
 		filepath = ms_strdup_printf("%s/%s", path, file);
-		BC_ASSERT_EQUAL_FATAL(ortp_file_exist(filepath),0,int, "%d");
+		if (ortp_file_exist(filepath) != 0) {
+			ms_fatal("Could not find file %s in path %s, did you configured resources directory correctly?", file, path);
+		}
 		config = lp_config_new_with_factory(NULL,filepath);
 	}
 
@@ -123,7 +143,7 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, c
 	ringbackpath     = ms_strdup_printf("%s/sounds/ringback.wav", path);
 	nowebcampath     = ms_strdup_printf("%s/images/nowebcamCIF.jpg", path);
 	rootcapath       = ms_strdup_printf("%s/certificates/cn/cafile.pem", path);
-	dnsuserhostspath = ms_strdup_printf( "%s/%s", path, userhostsfile);
+	dnsuserhostspath = userhostsfile[0]=='/' ? ms_strdup(userhostsfile) : ms_strdup_printf("%s/%s", path, userhostsfile);
 
 
 	if( config != NULL ) {
@@ -138,18 +158,25 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, c
 		linphone_core_set_ringback(lc, ringbackpath);
 		linphone_core_set_root_ca(lc,rootcapath);
 	}
+	chatdb = ms_strdup_printf("%s/messages-%p.db",bc_tester_get_writable_dir_prefix(),lc);
+
+	linphone_core_enable_ipv6(lc, liblinphonetester_ipv6);
+	linphone_core_set_sip_transport_timeout(lc, liblinphonetester_transport_timeout);
 
 	sal_enable_test_features(lc->sal,TRUE);
 	sal_set_dns_user_hosts_file(lc->sal, dnsuserhostspath);
+#ifdef VIDEO_ENABLED
 	linphone_core_set_static_picture(lc,nowebcampath);
+#endif
 
-	linphone_core_enable_ipv6(lc, liblinphone_tester_ipv6_enabled);
+	linphone_core_set_chat_database_path(lc, chatdb);
 
 	ms_free(ringpath);
 	ms_free(ringbackpath);
 	ms_free(nowebcampath);
 	ms_free(rootcapath);
 	ms_free(dnsuserhostspath);
+	ms_free(chatdb);
 
 	if( filepath ) ms_free(filepath);
 
@@ -160,14 +187,14 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, c
 
 
 bool_t wait_for_until(LinphoneCore* lc_1, LinphoneCore* lc_2,int* counter,int value,int timout) {
-	MSList* lcs=NULL;
+	bctbx_list_t* lcs=NULL;
 	bool_t result;
 	if (lc_1)
-		lcs=ms_list_append(lcs,lc_1);
+		lcs=bctbx_list_append(lcs,lc_1);
 	if (lc_2)
-		lcs=ms_list_append(lcs,lc_2);
+		lcs=bctbx_list_append(lcs,lc_2);
 	result=wait_for_list(lcs,counter,value,timout);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 	return result;
 }
 
@@ -175,8 +202,8 @@ bool_t wait_for(LinphoneCore* lc_1, LinphoneCore* lc_2,int* counter,int value) {
 	return wait_for_until(lc_1, lc_2,counter,value,10000);
 }
 
-bool_t wait_for_list(MSList* lcs,int* counter,int value,int timeout_ms) {
-	MSList* iterator;
+bool_t wait_for_list(bctbx_list_t* lcs,int* counter,int value,int timeout_ms) {
+	bctbx_list_t* iterator;
 	MSTimeSpec start;
 
 	liblinphone_tester_clock_start(&start);
@@ -204,17 +231,28 @@ bool_t wait_for_list(MSList* lcs,int* counter,int value,int timeout_ms) {
 	else return TRUE;
 }
 
+bool_t wait_for_stun_resolution(LinphoneCoreManager *m) {
+	MSTimeSpec start;
+	int timeout_ms = 10000;
+	liblinphone_tester_clock_start(&start);
+	while (linphone_core_get_stun_server_addrinfo(m->lc) == NULL && !liblinphone_tester_clock_elapsed(&start,timeout_ms)) {
+		linphone_core_iterate(m->lc);
+		ms_usleep(20000);
+	}
+	return linphone_core_get_stun_server_addrinfo(m->lc) != NULL;
+}
+
 static void set_codec_enable(LinphoneCore* lc,const char* type,int rate,bool_t enable) {
-	MSList* codecs=ms_list_copy(linphone_core_get_audio_codecs(lc));
-	MSList* codecs_it;
+	bctbx_list_t* codecs=bctbx_list_copy(linphone_core_get_audio_codecs(lc));
+	bctbx_list_t* codecs_it;
 	PayloadType* pt;
 	for (codecs_it=codecs;codecs_it!=NULL;codecs_it=codecs_it->next) {
 		linphone_core_enable_payload_type(lc,(PayloadType*)codecs_it->data,0);
 	}
-	if((pt = linphone_core_find_payload_type(lc,type,rate,1))) {
+	if ((pt = linphone_core_find_payload_type(lc,type,rate,1))) {
 		linphone_core_enable_payload_type(lc,pt, enable);
 	}
-	ms_list_free(codecs);
+	bctbx_list_free(codecs);
 }
 
 static void enable_codec(LinphoneCore* lc,const char* type,int rate) {
@@ -231,23 +269,29 @@ LinphoneCoreManager *get_manager(LinphoneCore *lc){
 }
 
 bool_t transport_supported(LinphoneTransportType transport) {
-	Sal *sal = sal_init();
-	bool_t supported = sal_transport_available(sal,(SalTransport)transport);
-	if (!supported) ms_message("TLS transport not supported, falling back to TCP if possible otherwise skipping test.");
-	sal_uninit(sal);
-	return supported;
+	if ((transport == LinphoneTransportDtls || transport == LinphoneTransportTls) && liblinphone_tester_tls_support_disabled == TRUE) {
+		return FALSE;
+	} else {
+		Sal *sal = sal_init(NULL);
+		bool_t supported = sal_transport_available(sal,(SalTransport)transport);
+		if (!supported) ms_message("TLS transport not supported, falling back to TCP if possible otherwise skipping test.");
+		sal_uninit(sal);
+		return  supported;
+	}
 }
 
-
-static void display_status(LinphoneCore *lc, const char *status){
-	ms_message("display_status(): %s",status);
-}
-
-LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
-	LinphoneCoreManager* mgr= ms_new0(LinphoneCoreManager,1);
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+void linphone_core_manager_init(LinphoneCoreManager *mgr, const char* rc_file, const char* phone_alias) {
 	char *rc_path = NULL;
 	char *hellopath = bc_tester_res("sounds/hello8000.wav");
-	mgr->number_of_cunit_error_at_creation = CU_get_number_of_failures();
+	mgr->number_of_bcunit_error_at_creation =  bc_get_number_of_failures();
 	mgr->v_table.registration_state_changed=registration_state_changed;
 	mgr->v_table.auth_info_requested=auth_info_requested;
 	mgr->v_table.call_state_changed=call_state_changed;
@@ -256,6 +300,7 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
 	mgr->v_table.is_composing_received=is_composing_received;
 	mgr->v_table.new_subscription_requested=new_subscription_requested;
 	mgr->v_table.notify_presence_received=notify_presence_received;
+	mgr->v_table.notify_presence_received_for_uri_or_tel=notify_presence_received_for_uri_or_tel;
 	mgr->v_table.transfer_state_changed=linphone_transfer_state_changed;
 	mgr->v_table.info_received=info_message_received;
 	mgr->v_table.subscription_state_changed=linphone_subscription_state_change;
@@ -266,7 +311,8 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
 	mgr->v_table.network_reachable=network_reachable;
 	mgr->v_table.dtmf_received=dtmf_received;
 	mgr->v_table.call_stats_updated=call_stats_updated;
-	mgr->v_table.display_status=display_status;
+
+	mgr->phone_alias = phone_alias ? ms_strdup(phone_alias) : NULL;
 
 	reset_counters(&mgr->stat);
 	if (rc_file) rc_path = ms_strdup_printf("rcfiles/%s", rc_file);
@@ -278,19 +324,21 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
 #if TARGET_OS_IPHONE
 	linphone_core_set_ringer_device( mgr->lc, "AQ: Audio Queue Device");
 	linphone_core_set_ringback(mgr->lc, NULL);
+#elif __QNX__
+	linphone_core_set_playback_device(mgr->lc, "QSA: voice");
 #endif
 
 #ifdef VIDEO_ENABLED
 	{
 		MSWebCam *cam;
 
-		cam = ms_web_cam_manager_get_cam(ms_web_cam_manager_get(), "Mire: Mire (synthetic moving picture)");
+		cam = ms_web_cam_manager_get_cam(ms_factory_get_web_cam_manager(mgr->lc->factory), "Mire: Mire (synthetic moving picture)");
 
 		if (cam == NULL) {
 			MSWebCamDesc *desc = ms_mire_webcam_desc_get();
 			if (desc){
 				cam=ms_web_cam_new(desc);
-				ms_web_cam_manager_add_cam(ms_web_cam_manager_get(), cam);
+				ms_web_cam_manager_add_cam(ms_factory_get_web_cam_manager(mgr->lc->factory), cam);
 			}
 		}
 	}
@@ -309,21 +357,27 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) {
 	}
 
 	linphone_core_set_user_certificates_path(mgr->lc,bc_tester_get_writable_dir_prefix());
+	/*for now, we need the periodical updates facility to compute bandwidth measurements correctly during tests*/
+	lp_config_set_int(linphone_core_get_config(mgr->lc), "misc", "send_call_stats_periodical_updates", 1);
 
 	if (rc_path) ms_free(rc_path);
-
-	return mgr;
 }
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
 
-void linphone_core_manager_start(LinphoneCoreManager *mgr, const char* rc_file, int check_for_proxies) {
+void linphone_core_manager_start(LinphoneCoreManager *mgr, int check_for_proxies) {
 	LinphoneProxyConfig* proxy;
 	int proxy_count;
 
-	/*BC_ASSERT_EQUAL(ms_list_size(linphone_core_get_proxy_config_list(lc)),proxy_count, int, "%d");*/
-	if (check_for_proxies && rc_file) /**/
-		proxy_count=ms_list_size(linphone_core_get_proxy_config_list(mgr->lc));
-	else
+	/*BC_ASSERT_EQUAL(bctbx_list_size(linphone_core_get_proxy_config_list(lc)),proxy_count, int, "%d");*/
+	if (check_for_proxies){ /**/
+		proxy_count=(int)bctbx_list_size(linphone_core_get_proxy_config_list(mgr->lc));
+	}else{
 		proxy_count=0;
+		/*this is to prevent registration to go on*/
+		linphone_core_set_network_reachable(mgr->lc, FALSE);
+	}
 
 	if (proxy_count){
 #define REGISTER_TIMEOUT 20 /* seconds */
@@ -336,69 +390,136 @@ void linphone_core_manager_start(LinphoneCoreManager *mgr, const char* rc_file,
 	BC_ASSERT_EQUAL(mgr->stat.number_of_LinphoneRegistrationOk,proxy_count, int, "%d");
 	enable_codec(mgr->lc,"PCMU",8000);
 
-	linphone_core_get_default_proxy(mgr->lc,&proxy);
+	proxy = linphone_core_get_default_proxy_config(mgr->lc);
 	if (proxy) {
+		if (mgr->identity){
+			linphone_address_destroy(mgr->identity);
+		}
 		mgr->identity = linphone_address_clone(linphone_proxy_config_get_identity_address(proxy));
 		linphone_address_clean(mgr->identity);
 	}
+
+	linphone_core_manager_wait_for_stun_resolution(mgr);
+	if (!check_for_proxies){
+		/*now that stun server resolution is done, we can start registering*/
+		linphone_core_set_network_reachable(mgr->lc, TRUE);
+	}
+
+}
+
+LinphoneCoreManager* linphone_core_manager_new3(const char* rc_file, int check_for_proxies, const char* phone_alias) {
+	LinphoneCoreManager *manager = ms_new0(LinphoneCoreManager, 1);
+	
+	linphone_core_manager_init(manager, rc_file, phone_alias);
+	linphone_core_manager_start(manager, check_for_proxies);
+	return manager;
+}
+
+LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_for_proxies) {
+	return linphone_core_manager_new3(rc_file, check_for_proxies, NULL);
 }
 
 LinphoneCoreManager* linphone_core_manager_new( const char* rc_file) {
-	LinphoneCoreManager *manager = linphone_core_manager_init(rc_file);
-	linphone_core_manager_start(manager, rc_file, TRUE);
-	return manager;
+	return linphone_core_manager_new2(rc_file, TRUE);
 }
 
-LinphoneCoreManager* linphone_core_manager_new2( const char* rc_file, int check_for_proxies) {
-	LinphoneCoreManager *manager = linphone_core_manager_init(rc_file);
-	linphone_core_manager_start(manager, rc_file, check_for_proxies);
-	return manager;
-}
 
 void linphone_core_manager_stop(LinphoneCoreManager *mgr){
 	if (mgr->lc) {
-		linphone_core_destroy(mgr->lc);
-		mgr->lc=NULL;
-	}
-}
-
-void linphone_core_manager_destroy(LinphoneCoreManager* mgr) {
-	if (mgr->lc){
-		const char *record_file=linphone_core_get_record_file(mgr->lc);
-		if (!liblinphone_tester_keep_record_files && record_file){
-			if ((CU_get_number_of_failures()-mgr->number_of_cunit_error_at_creation)>0) {
-				ms_message ("Test has failed, keeping recorded file [%s]",record_file);
-			} else {
+		const char *record_file = linphone_core_get_record_file(mgr->lc);
+		char *chatdb = ms_strdup(linphone_core_get_chat_database_path(mgr->lc));
+		if (!liblinphone_tester_keep_record_files && record_file && ortp_file_exist(record_file)==0) {
+			if ((bc_get_number_of_failures() - mgr->number_of_bcunit_error_at_creation)>0) {
+				ms_error("Test has failed, keeping recorded file [%s]", record_file);
+			}
+			else {
 				unlink(record_file);
 			}
 		}
 		linphone_core_destroy(mgr->lc);
+		if (chatdb) {
+			if (unlink(chatdb) != 0){
+				ms_error("Could not delete %s: %s", chatdb, strerror(errno));
+			}
+			ms_free(chatdb);
+		}
+		mgr->lc = NULL;
 	}
-	if (mgr->identity) linphone_address_destroy(mgr->identity);
-	if (mgr->stat.last_received_chat_message) linphone_chat_message_unref(mgr->stat.last_received_chat_message);
-	manager_count--;
+}
 
+void linphone_core_manager_uninit(LinphoneCoreManager *mgr) {
+	int old_log_level = ortp_get_log_level_mask(NULL);
+	linphone_core_set_log_level(ORTP_ERROR);
+	if (mgr->phone_alias) {
+		ms_free(mgr->phone_alias);
+	}
+	if (mgr->stat.last_received_chat_message) {
+		linphone_chat_message_unref(mgr->stat.last_received_chat_message);
+	}
+	if (mgr->stat.last_received_info_message) linphone_info_message_destroy(mgr->stat.last_received_info_message);
+	if (mgr->identity) {
+		linphone_address_destroy(mgr->identity);
+	}
+
+	manager_count--;
+	linphone_core_set_log_level(old_log_level);
+}
+
+void linphone_core_manager_wait_for_stun_resolution(LinphoneCoreManager *mgr) {
+	LinphoneNatPolicy *nat_policy = linphone_core_get_nat_policy(mgr->lc);
+	if ((nat_policy != NULL) && (linphone_nat_policy_get_stun_server(nat_policy) != NULL) &&
+		(linphone_nat_policy_stun_enabled(nat_policy) || linphone_nat_policy_turn_enabled(nat_policy)) &&
+		(linphone_nat_policy_ice_enabled(nat_policy))) {
+		/*before we go, ensure that the stun server is resolved, otherwise all ice related test will fail*/
+		BC_ASSERT_TRUE(wait_for_stun_resolution(mgr));
+	}
+}
+
+void linphone_core_manager_destroy(LinphoneCoreManager* mgr) {
+	linphone_core_manager_stop(mgr);
+	linphone_core_manager_uninit(mgr);
 	ms_free(mgr);
 }
 
 int liblinphone_tester_ipv6_available(void){
-	struct addrinfo *ai=belle_sip_ip_address_to_addrinfo(AF_INET6,"2a01:e00::2",53);
+	if (liblinphonetester_ipv6) {
+		struct addrinfo *ai=bctbx_ip_address_to_addrinfo(AF_INET6,SOCK_STREAM,"2a01:e00::2",53);
+		if (ai){
+			struct sockaddr_storage ss;
+			struct addrinfo src;
+			socklen_t slen=sizeof(ss);
+			char localip[128];
+			int port=0;
+			belle_sip_get_src_addr_for(ai->ai_addr,(socklen_t)ai->ai_addrlen,(struct sockaddr*) &ss,&slen,4444);
+			src.ai_addr=(struct sockaddr*) &ss;
+			src.ai_addrlen=slen;
+			bctbx_addrinfo_to_ip_address(&src,localip, sizeof(localip),&port);
+			freeaddrinfo(ai);
+			return strcmp(localip,"::1")!=0;
+		}
+	}
+	return FALSE;
+}
+
+int liblinphone_tester_ipv4_available(void){
+	struct addrinfo *ai=bctbx_ip_address_to_addrinfo(AF_INET,SOCK_STREAM,"212.27.40.240",53);
 	if (ai){
 		struct sockaddr_storage ss;
 		struct addrinfo src;
 		socklen_t slen=sizeof(ss);
 		char localip[128];
 		int port=0;
-		belle_sip_get_src_addr_for(ai->ai_addr,ai->ai_addrlen,(struct sockaddr*) &ss,&slen,4444);
+		belle_sip_get_src_addr_for(ai->ai_addr,(socklen_t)ai->ai_addrlen,(struct sockaddr*) &ss,&slen,4444);
 		src.ai_addr=(struct sockaddr*) &ss;
 		src.ai_addrlen=slen;
-		belle_sip_addrinfo_to_ip(&src,localip, sizeof(localip),&port);
+		bctbx_addrinfo_to_ip_address(&src,localip, sizeof(localip),&port);
 		freeaddrinfo(ai);
-		return strcmp(localip,"::1")!=0;
+		return strcmp(localip,"127.0.0.1")!=0;
 	}
 	return FALSE;
 }
 
+
 void liblinphone_tester_keep_accounts( int keep ){
 	liblinphone_tester_keep_accounts_flag = keep;
 }
@@ -407,6 +528,10 @@ void liblinphone_tester_keep_recorded_files(int keep){
 	liblinphone_tester_keep_record_files = keep;
 }
 
+void liblinphone_tester_disable_leak_detector(int disabled){
+	liblinphone_tester_leak_detector_disabled = disabled;
+}
+
 void liblinphone_tester_clear_accounts(void){
 	account_manager_destroy();
 }
@@ -414,11 +539,15 @@ void liblinphone_tester_clear_accounts(void){
 void liblinphone_tester_add_suites() {
 	bc_tester_add_suite(&setup_test_suite);
 	bc_tester_add_suite(&register_test_suite);
+	bc_tester_add_suite(&tunnel_test_suite);
 	bc_tester_add_suite(&offeranswer_test_suite);
 	bc_tester_add_suite(&call_test_suite);
+	bc_tester_add_suite(&call_video_test_suite);
+	bc_tester_add_suite(&audio_bypass_suite);
 	bc_tester_add_suite(&multi_call_test_suite);
 	bc_tester_add_suite(&message_test_suite);
 	bc_tester_add_suite(&presence_test_suite);
+	bc_tester_add_suite(&presence_server_test_suite);
 #ifdef UPNP
 	bc_tester_add_suite(&upnp_test_suite);
 #endif
@@ -428,7 +557,6 @@ void liblinphone_tester_add_suites() {
 	bc_tester_add_suite(&remote_provisioning_test_suite);
 	bc_tester_add_suite(&quality_reporting_test_suite);
 	bc_tester_add_suite(&log_collection_test_suite);
-	bc_tester_add_suite(&tunnel_test_suite);
 	bc_tester_add_suite(&player_test_suite);
 	bc_tester_add_suite(&dtmf_test_suite);
 #if defined(VIDEO_ENABLED) && defined(HAVE_GTK)
@@ -436,6 +564,12 @@ void liblinphone_tester_add_suites() {
 #endif
 	bc_tester_add_suite(&multicast_call_test_suite);
 	bc_tester_add_suite(&proxy_config_test_suite);
+#if HAVE_SIPP
+	bc_tester_add_suite(&complex_sip_call_test_suite);
+#endif
+#ifdef VCARD_ENABLED
+	bc_tester_add_suite(&vcard_test_suite);
+#endif
 }
 
 static int linphone_core_manager_get_max_audio_bw_base(const int array[],int array_size) {
@@ -472,12 +606,275 @@ int linphone_core_manager_get_mean_audio_up_bw(const LinphoneCoreManager *mgr) {
 			, sizeof(mgr->stat.audio_upload_bandwidth)/sizeof(int));
 }
 
-int liblinphone_tester_setup() {
-	if (manager_count != 0) {
-		// crash in some linphone core have not been destroyed because if we continue
-		// it will crash in CUnit AND we should NEVER keep a manager alive
-		ms_fatal("%d linphone core manager still alive!", manager_count);
-		return 1;
+void liblinphone_tester_before_each(void) {
+	if (!liblinphone_tester_leak_detector_disabled){
+		belle_sip_object_enable_leak_detector(TRUE);
+		leaked_objects_count = belle_sip_object_get_object_count();
 	}
-	return 0;
+}
+
+static char* all_leaks_buffer = NULL;
+
+void liblinphone_tester_after_each(void) {
+
+	if (!liblinphone_tester_leak_detector_disabled){
+		int leaked_objects = belle_sip_object_get_object_count() - leaked_objects_count;
+		if (leaked_objects > 0) {
+			char* format = ms_strdup_printf("%d object%s leaked in suite [%s] test [%s], please fix that!",
+											leaked_objects, leaked_objects>1?"s were":" was",
+											bc_tester_current_suite_name(), bc_tester_current_test_name());
+			belle_sip_object_dump_active_objects();
+			belle_sip_object_flush_active_objects();
+			bc_tester_printf(ORTP_MESSAGE, format);
+			ms_error("%s", format);
+
+			all_leaks_buffer = ms_strcat_printf(all_leaks_buffer, "\n%s", format);
+			ms_free(format);
+		}
+
+		// prevent any future leaks
+		{
+			const char **tags = bc_tester_current_test_tags();
+			int leaks_expected =
+				(tags && ((tags[0] && !strcmp(tags[0], "LeaksMemory")) || (tags[1] && !strcmp(tags[1], "LeaksMemory"))));
+			// if the test is NOT marked as leaking memory and it actually is, we should make it fail
+			if (!leaks_expected && leaked_objects > 0) {
+				BC_FAIL("This test is leaking memory!");
+				// and reciprocally
+			} else if (leaks_expected && leaked_objects == 0) {
+				BC_FAIL("This test is not leaking anymore, please remove LeaksMemory tag!");
+			}
+		}
+	}
+
+	if (manager_count != 0) {
+		ms_fatal("%d Linphone core managers are still alive!", manager_count);
+	}
+}
+
+void liblinphone_tester_uninit(void) {
+	// show all leaks that happened during the test
+	if (all_leaks_buffer) {
+		bc_tester_printf(ORTP_MESSAGE, all_leaks_buffer);
+		ms_free(all_leaks_buffer);
+		all_leaks_buffer = NULL;
+	}
+	bc_tester_uninit();
+}
+
+static void check_ice_from_rtp(LinphoneCall *c1, LinphoneCall *c2, LinphoneStreamType stream_type) {
+	MediaStream *ms;
+	switch (stream_type) {
+	case LinphoneStreamTypeAudio:
+		ms=&c1->audiostream->ms;
+		break;
+	case LinphoneStreamTypeVideo:
+		ms=&c1->videostream->ms;
+		break;
+	case LinphoneStreamTypeText:
+		ms=&c1->textstream->ms;
+		break;
+	default:
+		ms_error("Unknown stream type [%s]",  linphone_stream_type_to_string(stream_type));
+		BC_ASSERT_FALSE(stream_type >= LinphoneStreamTypeUnknown);
+		return;
+	}
+
+	if (linphone_call_get_audio_stats(c1)->ice_state == LinphoneIceStateHostConnection && media_stream_started(ms)) {
+		struct sockaddr_storage remaddr;
+		socklen_t remaddrlen = sizeof(remaddr);
+		char ip[NI_MAXHOST] = { 0 };
+		int port = 0;
+		SalMediaDescription *result_desc;
+		char *expected_addr = NULL;
+
+		const LinphoneCallParams *cp1 = linphone_call_get_current_params(c1);
+		const LinphoneCallParams *cp2 = linphone_call_get_current_params(c2);
+		if (cp1->update_call_when_ice_completed && cp2->update_call_when_ice_completed) {
+			memset(&remaddr, 0, remaddrlen);
+			result_desc = sal_call_get_final_media_description(c2->op);
+			expected_addr = result_desc->streams[0].rtp_addr;
+			if (expected_addr[0] == '\0') expected_addr = result_desc->addr;
+			if ((strchr(expected_addr, ':') == NULL) && (c1->audiostream->ms.sessions.rtp_session->rtp.gs.rem_addr.ss_family == AF_INET6)) {
+				bctbx_sockaddr_ipv6_to_ipv4((struct sockaddr *)&c1->audiostream->ms.sessions.rtp_session->rtp.gs.rem_addr, (struct sockaddr *)&remaddr, &remaddrlen);
+			} else {
+				memcpy(&remaddr, &c1->audiostream->ms.sessions.rtp_session->rtp.gs.rem_addr, c1->audiostream->ms.sessions.rtp_session->rtp.gs.rem_addrlen);
+			}
+			bctbx_sockaddr_to_ip_address((struct sockaddr *)&remaddr, remaddrlen, ip, sizeof(ip), &port);
+
+			BC_ASSERT_STRING_EQUAL(ip, expected_addr);
+		}
+	}
+}
+
+bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee, LinphoneIceState state) {
+	LinphoneCall *c1,*c2;
+	bool_t audio_success=FALSE;
+	bool_t video_success=FALSE;
+	bool_t text_success=FALSE;
+	bool_t video_enabled, realtime_text_enabled;
+	MSTimeSpec ts;
+
+	c1=linphone_core_get_current_call(caller->lc);
+	c2=linphone_core_get_current_call(callee->lc);
+
+	BC_ASSERT_PTR_NOT_NULL(c1);
+	BC_ASSERT_PTR_NOT_NULL(c2);
+	if (!c1 || !c2) return FALSE;
+	linphone_call_ref(c1);
+	linphone_call_ref(c2);
+
+	BC_ASSERT_EQUAL(linphone_call_params_video_enabled(linphone_call_get_current_params(c1)),linphone_call_params_video_enabled(linphone_call_get_current_params(c2)), int, "%d");
+	BC_ASSERT_EQUAL(linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(c1)),linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(c2)), int, "%d");
+	video_enabled=linphone_call_params_video_enabled(linphone_call_get_current_params(c1));
+	realtime_text_enabled=linphone_call_params_realtime_text_enabled(linphone_call_get_current_params(c1));
+	liblinphone_tester_clock_start(&ts);
+	do{
+		if ((c1 != NULL) && (c2 != NULL)) {
+			if (linphone_call_get_audio_stats(c1)->ice_state==state &&
+				linphone_call_get_audio_stats(c2)->ice_state==state ){
+				audio_success=TRUE;
+				check_ice_from_rtp(c1,c2,LinphoneStreamTypeAudio);
+				check_ice_from_rtp(c2,c1,LinphoneStreamTypeAudio);
+				break;
+			}
+			linphone_core_iterate(caller->lc);
+			linphone_core_iterate(callee->lc);
+		}
+		ms_usleep(20000);
+	}while(!liblinphone_tester_clock_elapsed(&ts,10000));
+
+	if (video_enabled){
+		liblinphone_tester_clock_start(&ts);
+		do{
+			if ((c1 != NULL) && (c2 != NULL)) {
+				if (linphone_call_get_video_stats(c1)->ice_state==state &&
+					linphone_call_get_video_stats(c2)->ice_state==state ){
+					video_success=TRUE;
+					check_ice_from_rtp(c1,c2,LinphoneStreamTypeVideo);
+					check_ice_from_rtp(c2,c1,LinphoneStreamTypeVideo);
+					break;
+				}
+				linphone_core_iterate(caller->lc);
+				linphone_core_iterate(callee->lc);
+			}
+			ms_usleep(20000);
+		}while(!liblinphone_tester_clock_elapsed(&ts,10000));
+	}
+
+	if (realtime_text_enabled){
+		liblinphone_tester_clock_start(&ts);
+		do{
+			if ((c1 != NULL) && (c2 != NULL)) {
+				if (linphone_call_get_text_stats(c1)->ice_state==state &&
+					linphone_call_get_text_stats(c2)->ice_state==state ){
+					text_success=TRUE;
+					check_ice_from_rtp(c1,c2,LinphoneStreamTypeText);
+					check_ice_from_rtp(c2,c1,LinphoneStreamTypeText);
+					break;
+				}
+				linphone_core_iterate(caller->lc);
+				linphone_core_iterate(callee->lc);
+			}
+			ms_usleep(20000);
+		}while(!liblinphone_tester_clock_elapsed(&ts,10000));
+	}
+
+	/*make sure encryption mode are preserved*/
+	if (c1) {
+		const LinphoneCallParams* call_param = linphone_call_get_current_params(c1);
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(caller->lc), int, "%d");
+	}
+	if (c2) {
+		const LinphoneCallParams* call_param = linphone_call_get_current_params(c2);
+		BC_ASSERT_EQUAL(linphone_call_params_get_media_encryption(call_param),linphone_core_get_media_encryption(callee->lc), int, "%d");
+	}
+	linphone_call_unref(c1);
+	linphone_call_unref(c2);
+	return video_enabled ? (realtime_text_enabled ? text_success && audio_success && video_success : audio_success && video_success) : realtime_text_enabled ? text_success && audio_success : audio_success;
+}
+
+static void linphone_conference_server_call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCallState cstate, const char *msg) {
+	LinphoneCoreVTable *vtable = linphone_core_get_current_vtable(lc);
+	LinphoneConferenceServer *conf_srv = (LinphoneConferenceServer *)vtable->user_data;
+
+	switch(cstate) {
+		case LinphoneCallIncomingReceived:
+			linphone_core_accept_call(lc, call);
+			break;
+
+		case LinphoneCallStreamsRunning:
+			if(linphone_call_get_conference(call) == NULL) {
+				linphone_core_add_to_conference(lc, call);
+				linphone_core_leave_conference(lc);
+				if(conf_srv->first_call == NULL) conf_srv->first_call = call;
+			}
+			break;
+
+		case LinphoneCallEnd:
+			if(call == conf_srv->first_call) {
+				if(linphone_core_get_conference(lc)) {
+					linphone_core_terminate_conference(lc);
+				}
+				conf_srv->first_call = NULL;
+			}
+			break;
+
+		default: break;
+	}
+}
+
+static void linphone_conference_server_refer_received(LinphoneCore *core, const char *refer_to) {
+	char method[20];
+	LinphoneAddress *refer_to_addr = linphone_address_new(refer_to);
+	char *uri;
+	LinphoneCall *call;
+
+	if(refer_to_addr == NULL) return;
+	strncpy(method, linphone_address_get_method_param(refer_to_addr), sizeof(method));
+	if(strcmp(method, "BYE") == 0) {
+		linphone_address_clean(refer_to_addr);
+		uri = linphone_address_as_string_uri_only(refer_to_addr);
+		call = linphone_core_find_call_from_uri(core, uri);
+		if(call) linphone_core_terminate_call(core, call);
+		ms_free(uri);
+	}
+	linphone_address_destroy(refer_to_addr);
+}
+
+static void linphone_conference_server_registration_state_changed(LinphoneCore *core,
+																  LinphoneProxyConfig *cfg,
+																  LinphoneRegistrationState cstate,
+																  const char *message) {
+	LinphoneCoreVTable *vtable = linphone_core_get_current_vtable(core);
+	LinphoneConferenceServer *m = (LinphoneConferenceServer *)linphone_core_v_table_get_user_data(vtable);
+	if(cfg == linphone_core_get_default_proxy_config(core)) {
+		m->reg_state = cstate;
+	}
+}
+
+LinphoneConferenceServer* linphone_conference_server_new(const char *rc_file, bool_t do_registration) {
+	LinphoneConferenceServer *conf_srv = (LinphoneConferenceServer *)ms_new0(LinphoneConferenceServer, 1);
+	LinphoneCoreManager *lm = (LinphoneCoreManager *)conf_srv;
+	LinphoneProxyConfig *proxy;
+	conf_srv->vtable = linphone_core_v_table_new();
+	conf_srv->vtable->call_state_changed = linphone_conference_server_call_state_changed;
+	conf_srv->vtable->refer_received = linphone_conference_server_refer_received;
+	conf_srv->vtable->registration_state_changed = linphone_conference_server_registration_state_changed;
+	conf_srv->vtable->user_data = conf_srv;
+	conf_srv->reg_state = LinphoneRegistrationNone;
+	linphone_core_manager_init(lm, rc_file,NULL);
+	if (!do_registration) {
+		proxy = linphone_core_get_default_proxy_config(lm->lc);
+		linphone_proxy_config_edit(proxy);
+		linphone_proxy_config_enable_register(proxy,FALSE);
+		linphone_proxy_config_done(proxy);
+	}
+	linphone_core_add_listener(lm->lc, conf_srv->vtable);
+	linphone_core_manager_start(lm, do_registration);
+	return conf_srv;
+}
+
+void linphone_conference_server_destroy(LinphoneConferenceServer *conf_srv) {
+	linphone_core_manager_destroy((LinphoneCoreManager *)conf_srv);
 }
diff --git a/tester/tester_hosts b/tester/tester_hosts
index 872dd4a63..686c42b88 100644
--- a/tester/tester_hosts
+++ b/tester/tester_hosts
@@ -1,2 +1,4 @@
-94.23.19.176	sip2.linphone.org sip.example.org sipopen.example.org auth.example.org auth1.example.org auth2.example.org altname.linphone.org sip.wildcard1.linphone.org altname.wildcard2.linphone.org 
-2001:41d0:2:14b0::1 sip2.linphone.org sip.example.org sipopen.example.org auth.example.org auth1.example.org auth2.example.org altname.linphone.org sip.wildcard1.linphone.org altname.wildcard2.linphone.org
\ No newline at end of file
+94.23.19.176	sip2.linphone.org sip.example.org sipopen.example.org auth.example.org auth1.example.org auth2.example.org altname.linphone.org sip.wildcard1.linphone.org altname.wildcard2.linphone.org sipv4.example.org
+2001:41d0:2:14b0::1 sip2.linphone.org sip.example.org sipopen.example.org auth.example.org auth1.example.org auth2.example.org altname.linphone.org sip.wildcard1.linphone.org altname.wildcard2.linphone.org
+188.165.46.90 tunnel.wildcard2.linphone.org
+64:ff9b::94.23.19.176 sipv4-nat64.example.org 
diff --git a/tester/tunnel_tester.c b/tester/tunnel_tester.c
index 76ce2a826..7b86b0a6d 100644
--- a/tester/tunnel_tester.c
+++ b/tester/tunnel_tester.c
@@ -24,26 +24,21 @@
 #include "liblinphone_tester.h"
 
 /* Retrieve the public IP from a given hostname */
-static const char* get_ip_from_hostname(const char * tunnel_hostname){
+int get_ip_from_hostname(const char * tunnel_hostname, char *ip, size_t ip_size){
 	struct addrinfo hints;
-	struct addrinfo *res = NULL, *it = NULL;
-	struct sockaddr_in *add;
-	char * output = NULL;
+	struct addrinfo *res = NULL;
 	int err;
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 	if ((err = getaddrinfo(tunnel_hostname, NULL, &hints, &res))){
 		ms_error("error while retrieving IP from %s: %s", tunnel_hostname, gai_strerror(err));
-		return NULL;
+		return err;
 	}
 
-	for (it=res; it!=NULL; it=it->ai_next){
-		add = (struct sockaddr_in *) it->ai_addr;
-		output = inet_ntoa( add->sin_addr );
-	}
+	bctbx_addrinfo_to_ip_address(res, ip, ip_size, NULL);
 	freeaddrinfo(res);
-	return output;
+	return err;
 }
 static char* get_public_contact_ip(LinphoneCore* lc)  {
 	const LinphoneAddress * contact = linphone_proxy_config_get_contact(linphone_core_get_default_proxy_config(lc));
@@ -60,9 +55,10 @@ static void call_with_tunnel_base(LinphoneTunnelMode tunnel_mode, bool_t with_si
 		LinphoneProxyConfig *proxy = linphone_core_get_default_proxy_config(pauline->lc);
 		LinphoneAddress *server_addr = linphone_address_new(linphone_proxy_config_get_server_addr(proxy));
 		LinphoneAddress *route = linphone_address_new(linphone_proxy_config_get_route(proxy));
-		const char * tunnel_ip = get_ip_from_hostname("tunnel.linphone.org");
+		char  tunnel_ip[64];
 		char *public_ip, *public_ip2=NULL;
-
+		BC_ASSERT_FALSE(get_ip_from_hostname("tunnel.linphone.org",tunnel_ip,sizeof(tunnel_ip)));
+						
 		BC_ASSERT_TRUE(wait_for(pauline->lc,NULL,&pauline->stat.number_of_LinphoneRegistrationOk,1));
 		public_ip = get_public_contact_ip(pauline->lc);
 		BC_ASSERT_STRING_NOT_EQUAL(public_ip, tunnel_ip);
@@ -80,13 +76,6 @@ static void call_with_tunnel_base(LinphoneTunnelMode tunnel_mode, bool_t with_si
 				linphone_core_find_payload_type(pauline->lc, "speex", 16000, 1), TRUE);
 			linphone_core_enable_payload_type(pauline->lc,
 				linphone_core_find_payload_type(pauline->lc, "G722", 8000, 1), TRUE);
-			linphone_core_enable_payload_type(marie->lc,
-				linphone_core_find_payload_type(marie->lc, "speex", 32000, 1), TRUE);
-			linphone_core_enable_payload_type(marie->lc,
-				linphone_core_find_payload_type(marie->lc, "speex", 16000, 1), TRUE);
-			linphone_core_enable_payload_type(marie->lc,
-				linphone_core_find_payload_type(marie->lc, "G722", 8000, 1), TRUE);
-
 		}
 
 		if (tunnel_mode != LinphoneTunnelModeDisable){
@@ -99,6 +88,7 @@ static void call_with_tunnel_base(LinphoneTunnelMode tunnel_mode, bool_t with_si
 			linphone_tunnel_add_server(tunnel, config);
 			linphone_tunnel_set_mode(tunnel, tunnel_mode);
 			linphone_tunnel_enable_sip(tunnel, with_sip);
+			linphone_tunnel_config_unref(config);
 
 			/*
 			 * Enabling the tunnel with sip cause another REGISTER to be made.
@@ -150,7 +140,7 @@ static void call_with_tunnel_base(LinphoneTunnelMode tunnel_mode, bool_t with_si
 		}
 #ifdef VIDEO_ENABLED
 		if (with_video_and_ice){
-			BC_ASSERT_TRUE(add_video(pauline, marie, TRUE));
+			BC_ASSERT_TRUE(request_video(pauline, marie, TRUE));
 		}
 #endif
 		end_call(pauline,marie);
@@ -244,28 +234,71 @@ static void tunnel_ice_call(void) {
 	else
 		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
 }
+
+static void register_on_second_tunnel(void) {
+	if (linphone_core_tunnel_available()) {
+		LinphoneCoreManager *pauline = linphone_core_manager_new( "pauline_rc");
+		LinphoneTunnel *tunnel = linphone_core_get_tunnel(pauline->lc);
+		LinphoneTunnelConfig *config1 = linphone_tunnel_config_new();
+		LinphoneTunnelConfig *config2 = linphone_tunnel_config_new();
+		char tunnel_ip[64];
+		char* public_ip;
+		
+		BC_ASSERT_FALSE(get_ip_from_hostname("tunnel.linphone.org",tunnel_ip,sizeof(tunnel_ip)));
+		linphone_tunnel_simulate_udp_loss(tunnel, TRUE);
+
+		// add a first tunnel config with an invalid port
+		linphone_tunnel_config_set_host(config1, "sip3.linphone.org");
+		linphone_tunnel_config_set_port(config1, 4141);
+		linphone_tunnel_config_set_remote_udp_mirror_port(config1, 54321);
+		linphone_tunnel_add_server(tunnel, config1);
+
+		// then a proper server
+		linphone_tunnel_config_set_host(config2, "tunnel.linphone.org");
+		linphone_tunnel_config_set_port(config2, 443);
+		linphone_tunnel_config_set_remote_udp_mirror_port(config2, 12345);
+		linphone_tunnel_add_server(tunnel, config2);
+
+		linphone_tunnel_set_mode(tunnel, LinphoneTunnelModeAuto);
+		linphone_tunnel_enable_sip(tunnel, TRUE);
+
+		reset_counters(&pauline->stat);
+
+		linphone_core_refresh_registers(pauline->lc);
+		// we should expect 2 registers: since tunnel autodetection takes several seconds, a first
+		// register will be made, then tunnel will be configured and another register will be fired up
+		BC_ASSERT_TRUE(wait_for(pauline->lc, NULL, &pauline->stat.number_of_LinphoneRegistrationOk,2));
+
+		public_ip = get_public_contact_ip(pauline->lc);
+		BC_ASSERT_STRING_EQUAL(public_ip, tunnel_ip);
+		ms_free(public_ip);
+
+		linphone_tunnel_config_unref(config1);
+		linphone_tunnel_config_unref(config2);
+		linphone_core_manager_destroy(pauline);
+	} else {
+		ms_warning("Could not test %s because tunnel functionality is not available",__FUNCTION__);
+	}
+}
+
 test_t tunnel_tests[] = {
-	{ "Simple", call_with_tunnel },
-	{ "With SRTP", call_with_tunnel_srtp },
-	{ "Without SIP", call_with_tunnel_without_sip },
-	{ "In automatic mode", call_with_tunnel_auto },
-	{ "In automatic mode with SRTP without SIP", call_with_tunnel_auto_without_sip_with_srtp },
-	{ "Ice call", tunnel_ice_call },
-	{ "SRTP ice call", tunnel_srtp_ice_call },
-	{ "ZRTP ice call", tunnel_zrtp_ice_call },
+	TEST_NO_TAG("Simple", call_with_tunnel),
+	TEST_NO_TAG("With SRTP", call_with_tunnel_srtp),
+	TEST_NO_TAG("Without SIP", call_with_tunnel_without_sip),
+	TEST_NO_TAG("In automatic mode", call_with_tunnel_auto),
+	TEST_NO_TAG("In automatic mode with SRTP without SIP", call_with_tunnel_auto_without_sip_with_srtp),
+	TEST_NO_TAG("Ice call", tunnel_ice_call),
+	TEST_NO_TAG("SRTP ice call", tunnel_srtp_ice_call),
+	TEST_NO_TAG("ZRTP ice call", tunnel_zrtp_ice_call),
 #ifdef VIDEO_ENABLED
-	{ "Ice video call", tunnel_video_ice_call },
-	{ "With SIP - ice video call", full_tunnel_video_ice_call },
-	{ "SRTP ice video call", tunnel_srtp_video_ice_call },
-	{ "DTLS ice video call", tunnel_dtls_video_ice_call },
-	{ "ZRTP ice video call", tunnel_zrtp_video_ice_call },
+	TEST_NO_TAG("Ice video call", tunnel_video_ice_call),
+	TEST_NO_TAG("With SIP - ice video call", full_tunnel_video_ice_call),
+	TEST_NO_TAG("SRTP ice video call", tunnel_srtp_video_ice_call),
+	TEST_NO_TAG("DTLS ice video call", tunnel_dtls_video_ice_call),
+	TEST_NO_TAG("ZRTP ice video call", tunnel_zrtp_video_ice_call),
 #endif
+	TEST_NO_TAG("Register on second tunnel", register_on_second_tunnel),
 };
 
-test_suite_t tunnel_test_suite = {
-	"Tunnel",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(tunnel_tests) / sizeof(tunnel_tests[0]),
-	tunnel_tests
-};
+test_suite_t tunnel_test_suite = {"Tunnel", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								  sizeof(tunnel_tests) / sizeof(tunnel_tests[0]), tunnel_tests};
diff --git a/tester/upnp_tester.c b/tester/upnp_tester.c
index fc487b75e..b915606bb 100644
--- a/tester/upnp_tester.c
+++ b/tester/upnp_tester.c
@@ -48,21 +48,16 @@ static void upnp_check_ipaddress(void) {
 	addr = linphone_core_get_upnp_external_ipaddress(lc_upnp->lc);
 	BC_ASSERT_PTR_NOT_NULL(addr);
 	if (addr!=NULL) {
-		BC_ASSERT_GREATER(strlen(addr),7,int,"%d");
+		BC_ASSERT_GREATER((int)strlen(addr),7,int,"%d");
 	}
 	linphone_core_manager_destroy(lc_upnp);
 }
 
 test_t upnp_tests[] = {
-	{ "Start and stop", upnp_start_n_stop },
-	{ "Check state", upnp_check_state },
-	{ "Check ip address", upnp_check_ipaddress },
+	TEST_NO_TAG("Start and stop", upnp_start_n_stop),
+	TEST_NO_TAG("Check state", upnp_check_state),
+	TEST_NO_TAG("Check ip address", upnp_check_ipaddress)
 };
 
-test_suite_t upnp_test_suite = {
-	"Upnp",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(upnp_tests) / sizeof(upnp_tests[0]),
-	upnp_tests
-};
+test_suite_t upnp_test_suite = {"Upnp", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								sizeof(upnp_tests) / sizeof(upnp_tests[0]), upnp_tests};
diff --git a/tester/vcard_tester.c b/tester/vcard_tester.c
new file mode 100644
index 000000000..3bbff9141
--- /dev/null
+++ b/tester/vcard_tester.c
@@ -0,0 +1,821 @@
+/*
+	vcard_tester.c
+	Copyright (C) 2015  Belledonne Communications SARL
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "linphonecore.h"
+#include "private.h"
+
+#ifdef VCARD_ENABLED
+
+
+#include "liblinphone_tester.h"
+#include "carddav.h"
+
+#include <time.h>
+
+#define CARDDAV_SERVER "http://dav.linphone.org/card.php/addressbooks/tester/default"
+
+static void linphone_vcard_import_export_friends_test(void) {
+	LinphoneCoreManager* manager = linphone_core_manager_new2("empty_rc", FALSE);
+	LinphoneFriendList *lfl = linphone_core_get_default_friend_list(manager->lc);
+	const bctbx_list_t *friends = linphone_friend_list_get_friends(lfl);
+	char *import_filepath = bc_tester_res("vcards/vcards.vcf");
+	char *export_filepath = bc_tester_file("export_vcards.vcf");
+	int count = 0;
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 0, unsigned int, "%u");
+	
+	count = linphone_friend_list_import_friends_from_vcard4_file(lfl, import_filepath);
+	BC_ASSERT_EQUAL(count, 3, int, "%d");
+	friends = linphone_friend_list_get_friends(lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 3, unsigned int, "%u");
+
+	linphone_friend_list_export_friends_as_vcard4_file(lfl, export_filepath);
+
+	lfl = linphone_core_create_friend_list(manager->lc);
+	count = linphone_friend_list_import_friends_from_vcard4_file(lfl, export_filepath);
+	BC_ASSERT_EQUAL(count, 3, int, "%d");
+	friends = linphone_friend_list_get_friends(lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 3, unsigned int, "%u");
+	linphone_friend_list_unref(lfl);
+
+	remove(export_filepath);
+	ms_free(import_filepath);
+	ms_free(export_filepath);
+	linphone_core_manager_destroy(manager);
+}
+
+static void linphone_vcard_import_a_lot_of_friends_test(void) {
+	LinphoneCoreManager* manager = linphone_core_manager_new2("empty_rc", FALSE);
+	LinphoneFriendList *lfl = linphone_core_get_default_friend_list(manager->lc);
+	char *import_filepath = bc_tester_res("vcards/thousand_vcards.vcf");
+	clock_t start, end;
+	double elapsed = 0;
+	const bctbx_list_t *friends = NULL;
+	FILE    *infile = NULL;
+	char    *buffer = NULL;
+	long    numbytes = 0;
+	size_t readbytes;
+
+	start = clock();
+	linphone_friend_list_import_friends_from_vcard4_file(lfl, import_filepath);
+	end = clock();
+
+	friends = linphone_friend_list_get_friends(lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 1000, unsigned int, "%u"); // Now that we accept Friends without a SIP URI, the result must be equal to 1000
+
+	elapsed = (double)(end - start);
+	ms_message("Imported a thousand of vCards from file in %f seconds", elapsed / CLOCKS_PER_SEC);
+
+	lfl = linphone_core_create_friend_list(manager->lc);
+	infile = fopen(import_filepath, "rb");
+	BC_ASSERT_PTR_NOT_NULL(infile);
+	if (infile) {
+		fseek(infile, 0L, SEEK_END);
+		numbytes = ftell(infile);
+		fseek(infile, 0L, SEEK_SET);
+		buffer = (char*)ms_malloc((numbytes + 1) * sizeof(char));
+		readbytes = fread(buffer, sizeof(char), numbytes, infile);
+		fclose(infile);
+		buffer[readbytes] = '\0';
+
+		start = clock();
+		linphone_friend_list_import_friends_from_vcard4_buffer(lfl, buffer);
+		end = clock();
+		ms_free(buffer);
+	}
+
+	friends = linphone_friend_list_get_friends(lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 1000, unsigned int, "%u"); // Now that we accept Friends without a SIP URI, the result must be equal to 1000
+
+	elapsed = (double)(end - start);
+	ms_message("Imported a thousand of vCards from buffer in %f seconds", elapsed / CLOCKS_PER_SEC);
+
+	linphone_friend_list_unref(lfl);
+
+	ms_free(import_filepath);
+	linphone_core_manager_destroy(manager);
+}
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+static void linphone_vcard_update_existing_friends_test(void) {
+	LinphoneFriend *lf = linphone_friend_new_with_addr("sip:oldfriend@sip.linphone.org");
+
+	BC_ASSERT_PTR_NOT_NULL(lf);
+	if (linphone_core_vcard_supported()) {
+		BC_ASSERT_PTR_NOT_NULL(linphone_friend_get_vcard(lf));
+	} else {
+		BC_ASSERT_PTR_NULL(linphone_friend_get_vcard(lf));
+	}
+
+	linphone_friend_edit(lf);
+	linphone_friend_set_name(lf, "Old Friend");
+	linphone_friend_done(lf);
+
+	BC_ASSERT_PTR_NOT_NULL(linphone_friend_get_vcard(lf));
+	BC_ASSERT_STRING_EQUAL(linphone_vcard_get_full_name(linphone_friend_get_vcard(lf)), "Old Friend");
+	linphone_friend_unref(lf);
+	lf = NULL;
+}
+
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
+static void linphone_vcard_phone_numbers_and_sip_addresses(void) {
+	LinphoneCoreManager* manager = linphone_core_manager_new2("empty_rc", FALSE);
+	LinphoneVcard *lvc = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Sylvain Berfini\r\nIMPP:sip:sberfini@sip.linphone.org\r\nIMPP;TYPE=home:sip:sylvain@sip.linphone.org\r\nTEL;TYPE=work:0952636505\r\nEND:VCARD\r\n");
+	LinphoneFriend *lf = linphone_friend_new_from_vcard(lvc);
+	const bctbx_list_t *sip_addresses = linphone_friend_get_addresses(lf);
+	bctbx_list_t *phone_numbers = linphone_friend_get_phone_numbers(lf);
+	LinphoneAddress *addr = NULL;
+
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(sip_addresses), 2, unsigned int, "%u");
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(phone_numbers), 1, unsigned int, "%u");
+	if (phone_numbers) bctbx_list_free(phone_numbers);
+	linphone_friend_unref(lf);
+
+	lvc = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Sylvain Berfini\r\nTEL;TYPE=work:0952636505\r\nTEL:0476010203\r\nEND:VCARD\r\n");
+	lf = linphone_friend_new_from_vcard(lvc);
+	lf->lc = manager->lc;
+	sip_addresses = linphone_friend_get_addresses(lf);
+	phone_numbers = linphone_friend_get_phone_numbers(lf);
+
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(sip_addresses), 0, unsigned int, "%u");
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(phone_numbers), 2, unsigned int, "%u");
+	if (phone_numbers) bctbx_list_free(phone_numbers);
+
+	addr = linphone_address_new("sip:sylvain@sip.linphone.org");
+	linphone_friend_add_address(lf, addr);
+	sip_addresses = linphone_friend_get_addresses(lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(sip_addresses), 1, unsigned int, "%u");
+
+	linphone_friend_remove_phone_number(lf, "0952636505");
+	phone_numbers = linphone_friend_get_phone_numbers(lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(phone_numbers), 1, unsigned int, "%u");
+	if (phone_numbers) bctbx_list_free(phone_numbers);
+
+	linphone_friend_remove_phone_number(lf, "0476010203");
+	phone_numbers = linphone_friend_get_phone_numbers(lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(phone_numbers), 0, unsigned int, "%u");
+	if (phone_numbers) bctbx_list_free(phone_numbers);
+
+	linphone_friend_edit(lf);
+	linphone_friend_remove_address(lf, addr);
+	linphone_friend_done(lf);
+	sip_addresses = linphone_friend_get_addresses(lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(sip_addresses), 0, unsigned int, "%u");
+
+	linphone_friend_add_phone_number(lf, "+33952636505");
+	phone_numbers = linphone_friend_get_phone_numbers(lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(phone_numbers), 1, unsigned int, "%u");
+	if (phone_numbers) bctbx_list_free(phone_numbers);
+
+	linphone_address_unref(addr);
+	linphone_friend_unref(lf);
+	lf = NULL;
+	lvc = NULL;
+	linphone_core_manager_destroy(manager);
+}
+
+#ifdef SQLITE_STORAGE_ENABLED
+static void friends_if_no_db_set(void) {
+	LinphoneCoreManager* manager = linphone_core_manager_new2("empty_rc", FALSE);
+	LinphoneFriend *lf = linphone_core_create_friend(manager->lc);
+	LinphoneAddress *addr = linphone_address_new("sip:sylvain@sip.linphone.org");
+	const bctbx_list_t *friends = NULL;
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+
+	linphone_friend_set_address(lf, addr);
+	linphone_friend_set_name(lf, "Sylvain");
+	linphone_friend_list_add_friend(lfl, lf);
+	friends = linphone_friend_list_get_friends(lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 1, unsigned int, "%u");
+
+	linphone_friend_list_remove_friend(lfl, lf);
+	linphone_friend_unref(lf);
+	friends = linphone_friend_list_get_friends(lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 0, unsigned int, "%u");
+
+	linphone_friend_list_unref(lfl);
+	linphone_address_unref(addr);
+	linphone_core_manager_destroy(manager);
+}
+
+static void friends_migration(void) {
+	LinphoneCoreManager* manager = linphone_core_manager_new2("friends_rc", FALSE);
+	LpConfig *lpc = linphone_core_get_config(manager->lc);
+	LinphoneFriendList *lfl = linphone_core_get_default_friend_list(manager->lc);
+	const bctbx_list_t *friends = linphone_friend_list_get_friends(lfl);
+	bctbx_list_t *friends_from_db = NULL;
+	char *friends_db = bc_tester_file("friends.db");
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 3, unsigned int, "%u");
+	BC_ASSERT_EQUAL(lp_config_get_int(lpc, "misc", "friends_migration_done", 0), 0, int, "%i");
+
+	unlink(friends_db);
+	linphone_core_set_friends_database_path(manager->lc, friends_db);
+	lfl = linphone_core_get_default_friend_list(manager->lc);
+	friends = linphone_friend_list_get_friends(lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 3, unsigned int, "%u");
+	friends_from_db = linphone_core_fetch_friends_from_db(manager->lc, lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends_from_db), 3, unsigned int, "%u");
+	BC_ASSERT_EQUAL(lp_config_get_int(lpc, "misc", "friends_migration_done", 0), 1, int, "%i");
+
+	friends_from_db = bctbx_list_free_with_data(friends_from_db, (void (*)(void *))linphone_friend_unref);
+	unlink(friends_db);
+	ms_free(friends_db);
+	linphone_core_manager_destroy(manager);
+}
+
+typedef struct _LinphoneFriendListStats {
+	int new_list_count;
+	int removed_list_count;
+} LinphoneFriendListStats;
+
+static void friend_list_created_cb(LinphoneCore *lc, LinphoneFriendList *list) {
+	LinphoneFriendListStats *stats = (LinphoneFriendListStats *)linphone_friend_list_get_user_data(list);
+	if (stats) {
+		stats->new_list_count++;
+	}
+}
+
+static void friend_list_removed_cb(LinphoneCore *lc, LinphoneFriendList *list) {
+	LinphoneFriendListStats *stats = (LinphoneFriendListStats *)linphone_friend_list_get_user_data(list);
+	if (stats) {
+		stats->removed_list_count++;
+	}
+}
+
+static void friends_sqlite_storage(void) {
+	LinphoneCoreVTable *v_table = linphone_core_v_table_new();
+	LinphoneCore* lc = NULL;
+	LinphoneFriendList *lfl = NULL;
+	LinphoneFriend *lf = NULL;
+	LinphoneFriend *lf2 = NULL;
+	LinphoneVcard *lvc = linphone_vcard_new();
+	LinphoneAddress *addr = linphone_address_new("sip:sylvain@sip.linphone.org");
+	const bctbx_list_t *friends = NULL;
+	bctbx_list_t *friends_from_db = NULL;
+	bctbx_list_t *friends_lists_from_db = NULL;
+	char *friends_db = bc_tester_file("friends.db");
+	LinphoneFriendListStats *stats = (LinphoneFriendListStats *)ms_new0(LinphoneFriendListStats, 1);
+	const LinphoneAddress *laddress = NULL, *laddress2 = NULL;
+	char *address = NULL, *address2 = NULL;
+
+	v_table->friend_list_created = friend_list_created_cb;
+	v_table->friend_list_removed = friend_list_removed_cb;
+	lc = linphone_core_new(v_table, NULL, NULL, NULL);
+	friends = linphone_friend_list_get_friends(linphone_core_get_default_friend_list(lc));
+	lfl = linphone_core_create_friend_list(lc);
+	linphone_friend_list_set_user_data(lfl, stats);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 0, unsigned int, "%u");
+
+	unlink(friends_db);
+	linphone_core_set_friends_database_path(lc, friends_db);
+	friends_from_db = linphone_core_fetch_friends_from_db(lc, linphone_core_get_default_friend_list(lc));
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends_from_db), 0, unsigned int, "%u");
+
+	linphone_vcard_set_etag(lvc, "\"123-456789\"");
+	linphone_vcard_set_url(lvc, "http://dav.somewhere.fr/addressbook/me/someone.vcf");
+	lf = linphone_friend_new_from_vcard(lvc);
+	linphone_friend_set_address(lf, addr);
+	linphone_friend_set_name(lf, "Sylvain");
+
+	linphone_core_add_friend_list(lc, lfl);
+	wait_for_until(lc, NULL, &stats->new_list_count, 1, 1000);
+	BC_ASSERT_EQUAL(stats->new_list_count, 1, int, "%i");
+	linphone_friend_list_unref(lfl);
+	linphone_friend_list_set_display_name(lfl, "Test");
+	BC_ASSERT_EQUAL(linphone_friend_list_add_friend(lfl, lf), LinphoneFriendListOK, int, "%i");
+	linphone_friend_unref(lf);
+	BC_ASSERT_EQUAL(lfl->storage_id, 1, unsigned int, "%u");
+	BC_ASSERT_EQUAL(lf->storage_id, 1, unsigned int, "%u");
+
+	friends = linphone_friend_list_get_friends(linphone_core_get_default_friend_list(lc));
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 0, unsigned int, "%u");
+
+	friends_lists_from_db = linphone_core_fetch_friends_lists_from_db(lc);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends_lists_from_db), 1, unsigned int, "%u");
+	friends_from_db = ((LinphoneFriendList *)friends_lists_from_db->data)->friends;
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends_from_db), 1, unsigned int, "%u");
+	lf2 = (LinphoneFriend *)friends_from_db->data;
+	BC_ASSERT_PTR_NOT_NULL(lf2->lc);
+	BC_ASSERT_PTR_NOT_NULL(lf2->friend_list);
+	friends_lists_from_db = bctbx_list_free_with_data(friends_lists_from_db, (void (*)(void *))linphone_friend_list_unref);
+
+	friends_from_db = linphone_core_fetch_friends_from_db(lc, lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends_from_db), 1, unsigned int, "%u");
+	if (bctbx_list_size(friends_from_db) < 1) {
+		goto end;
+	}
+	lf2 = (LinphoneFriend *)friends_from_db->data;
+	BC_ASSERT_STRING_EQUAL(linphone_friend_get_name(lf2), linphone_friend_get_name(lf));
+	BC_ASSERT_EQUAL(lf2->storage_id, lf->storage_id, unsigned int, "%u");
+	BC_ASSERT_STRING_EQUAL(linphone_vcard_get_etag(linphone_friend_get_vcard(lf2)), linphone_vcard_get_etag(linphone_friend_get_vcard(lf)));
+	BC_ASSERT_STRING_EQUAL(linphone_vcard_get_url(linphone_friend_get_vcard(lf2)), linphone_vcard_get_url(linphone_friend_get_vcard(lf)));
+	laddress = linphone_friend_get_address(lf);
+	address = linphone_address_as_string(laddress);
+	laddress2 = linphone_friend_get_address(lf2);
+	address2 = linphone_address_as_string(laddress2);
+	BC_ASSERT_STRING_EQUAL(address2, address);
+	
+	ms_free(address);
+	ms_free(address2);
+
+	linphone_friend_edit(lf);
+	linphone_friend_set_name(lf, "Margaux");
+	linphone_friend_done(lf);
+	friends_from_db = bctbx_list_free_with_data(friends_from_db, (void (*)(void *))linphone_friend_unref);
+	friends_from_db = linphone_core_fetch_friends_from_db(lc, lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends_from_db), 1, unsigned int, "%u");
+	if (bctbx_list_size(friends_from_db) < 1) {
+		goto end;
+	}
+	lf2 = (LinphoneFriend *)friends_from_db->data;
+	BC_ASSERT_STRING_EQUAL(linphone_friend_get_name(lf2), "Margaux");
+	friends_from_db = bctbx_list_free_with_data(friends_from_db, (void (*)(void *))linphone_friend_unref);
+
+	linphone_friend_list_remove_friend(lfl, lf);
+	friends = linphone_friend_list_get_friends(linphone_core_get_default_friend_list(lc));
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends), 0, unsigned int, "%u");
+	friends_from_db = linphone_core_fetch_friends_from_db(lc, lfl);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(friends_from_db), 0, unsigned int, "%u");
+
+	linphone_core_remove_friend_list(lc, lfl);
+	wait_for_until(lc, NULL, &stats->removed_list_count, 1, 1000);
+	BC_ASSERT_EQUAL(stats->removed_list_count, 1, int, "%i");
+
+end:
+	ms_free(stats);
+	unlink(friends_db);
+	ms_free(friends_db);
+	linphone_address_unref(addr);
+	linphone_core_destroy(lc);
+	linphone_core_v_table_destroy(v_table);
+}
+#endif
+
+typedef struct _LinphoneCardDAVStats {
+	int sync_done_count;
+	int new_contact_count;
+	int removed_contact_count;
+	int updated_contact_count;
+} LinphoneCardDAVStats;
+
+static void carddav_sync_done(LinphoneCardDavContext *c, bool_t success, const char *message) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_carddav_get_user_data(c);
+	BC_ASSERT_TRUE(success);
+	stats->sync_done_count++;
+}
+
+static void carddav_new_contact(LinphoneCardDavContext *c, LinphoneFriend *lf) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_carddav_get_user_data(c);
+	BC_ASSERT_PTR_NOT_NULL(lf);
+	stats->new_contact_count++;
+}
+
+static void carddav_removed_contact(LinphoneCardDavContext *c, LinphoneFriend *lf) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_carddav_get_user_data(c);
+	BC_ASSERT_PTR_NOT_NULL(lf);
+	stats->removed_contact_count++;
+}
+
+static void carddav_updated_contact(LinphoneCardDavContext *c, LinphoneFriend *new_lf, LinphoneFriend *old_lf) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_carddav_get_user_data(c);
+	BC_ASSERT_PTR_NOT_NULL(new_lf);
+	BC_ASSERT_PTR_NOT_NULL(old_lf);
+	stats->updated_contact_count++;
+}
+
+static void carddav_sync(void) {
+	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+	LinphoneCardDavContext *c = NULL;
+
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+	linphone_core_add_friend_list(manager->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	c = linphone_carddav_context_new(lfl);
+	BC_ASSERT_PTR_NOT_NULL(c);
+
+	linphone_carddav_set_user_data(c, stats);
+	linphone_carddav_set_synchronization_done_callback(c, carddav_sync_done);
+	linphone_carddav_set_new_contact_callback(c, carddav_new_contact);
+	linphone_carddav_set_removed_contact_callback(c, carddav_removed_contact);
+	linphone_carddav_set_updated_contact_callback(c, carddav_updated_contact);
+	linphone_carddav_synchronize(c);
+
+	wait_for_until(manager->lc, NULL, &stats->new_contact_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->new_contact_count, 1, int, "%i");
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+
+	ms_free(stats);
+	linphone_carddav_context_destroy(c);
+	linphone_core_manager_destroy(manager);
+}
+
+static void carddav_sync_2(void) {
+	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+	LinphoneFriend *lf = linphone_core_create_friend_with_address(manager->lc, "\"Sylvain\" <sip:sylvain@sip.linphone.org>");
+	char *friends_db = bc_tester_file("friends.db");
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+	LinphoneCardDavContext *c = NULL;
+
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+	linphone_core_add_friend_list(manager->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	c = linphone_carddav_context_new(lfl);
+	BC_ASSERT_PTR_NOT_NULL(c);
+
+	unlink(friends_db);
+	linphone_core_set_friends_database_path(manager->lc, friends_db);
+	BC_ASSERT_EQUAL(linphone_friend_list_add_local_friend(lfl, lf), LinphoneFriendListOK, int, "%d");
+	linphone_friend_unref(lf);
+
+	linphone_carddav_set_user_data(c, stats);
+	linphone_carddav_set_synchronization_done_callback(c, carddav_sync_done);
+	linphone_carddav_set_new_contact_callback(c, carddav_new_contact);
+	linphone_carddav_set_removed_contact_callback(c, carddav_removed_contact);
+	linphone_carddav_set_updated_contact_callback(c, carddav_updated_contact);
+
+	linphone_carddav_synchronize(c);
+
+	wait_for_until(manager->lc, NULL, &stats->new_contact_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->new_contact_count, 1, int, "%i");
+	wait_for_until(manager->lc, NULL, &stats->removed_contact_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->removed_contact_count, 1, int, "%i");
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+
+	ms_free(stats);
+	unlink(friends_db);
+	ms_free(friends_db);
+	linphone_carddav_context_destroy(c);
+	linphone_core_manager_destroy(manager);
+}
+
+static void carddav_sync_3(void) {
+	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+	LinphoneVcard *lvc = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:1f08dd48-29ac-4097-8e48-8596d7776283\r\nFN:Sylvain Berfini\r\nIMPP;TYPE=work:sip:sylvain@sip.linphone.org\r\nEND:VCARD\r\n");
+	LinphoneFriend *lf = linphone_friend_new_from_vcard(lvc);
+	char *friends_db = bc_tester_file("friends.db");
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+	LinphoneCardDavContext *c = NULL;
+
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+	linphone_core_add_friend_list(manager->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	c = linphone_carddav_context_new(lfl);
+	BC_ASSERT_PTR_NOT_NULL(c);
+
+	unlink(friends_db);
+	linphone_core_set_friends_database_path(manager->lc, friends_db);
+	BC_ASSERT_EQUAL(linphone_friend_list_add_local_friend(lfl, lf), LinphoneFriendListOK, int, "%d");
+	linphone_friend_unref(lf);
+
+	linphone_carddav_set_user_data(c, stats);
+	linphone_carddav_set_synchronization_done_callback(c, carddav_sync_done);
+	linphone_carddav_set_new_contact_callback(c, carddav_new_contact);
+	linphone_carddav_set_removed_contact_callback(c, carddav_removed_contact);
+	linphone_carddav_set_updated_contact_callback(c, carddav_updated_contact);
+
+	linphone_carddav_synchronize(c);
+
+	wait_for_until(manager->lc, NULL, &stats->updated_contact_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->updated_contact_count, 1, int, "%i");
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+
+	ms_free(stats);
+	unlink(friends_db);
+	ms_free(friends_db);
+	linphone_carddav_context_destroy(c);
+	c = NULL;
+	linphone_core_manager_destroy(manager);
+}
+
+static void carddav_sync_4(void) {
+	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+	LinphoneVcard *lvc = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Margaux Clerc\r\nIMPP;TYPE=work:sip:margaux@sip.linphone.org\r\nEND:VCARD\r\n");
+	LinphoneFriend *lf = linphone_friend_new_from_vcard(lvc);
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+	LinphoneCardDavContext *c = NULL;
+
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+	linphone_core_add_friend_list(manager->lc, lfl);
+	linphone_friend_list_unref(lfl);
+	c = linphone_carddav_context_new(lfl);
+	BC_ASSERT_PTR_NOT_NULL(c);
+
+	linphone_carddav_set_user_data(c, stats);
+	linphone_carddav_set_synchronization_done_callback(c, carddav_sync_done);
+	linphone_carddav_set_new_contact_callback(c, carddav_new_contact);
+	linphone_carddav_set_removed_contact_callback(c, carddav_removed_contact);
+	linphone_carddav_set_updated_contact_callback(c, carddav_updated_contact);
+
+	BC_ASSERT_PTR_NULL(linphone_vcard_get_uid(lvc));
+	linphone_carddav_put_vcard(c, lf);
+	BC_ASSERT_PTR_NOT_NULL(linphone_vcard_get_uid(lvc));
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+
+	linphone_carddav_delete_vcard(c, lf);
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 2, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 2, int, "%i");
+
+	linphone_friend_unref(lf);
+	ms_free(stats);
+	linphone_carddav_context_destroy(c);
+	linphone_core_manager_destroy(manager);
+}
+
+static void carddav_contact_created(LinphoneFriendList *list, LinphoneFriend *lf) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_friend_list_cbs_get_user_data(list->cbs);
+	stats->new_contact_count++;
+}
+
+static void carddav_contact_deleted(LinphoneFriendList *list, LinphoneFriend *lf) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_friend_list_cbs_get_user_data(list->cbs);
+	stats->removed_contact_count++;
+}
+
+static void carddav_contact_updated(LinphoneFriendList *list, LinphoneFriend *new_friend, LinphoneFriend *old_friend) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_friend_list_cbs_get_user_data(list->cbs);
+	BC_ASSERT_STRING_EQUAL(linphone_vcard_get_full_name(linphone_friend_get_vcard(new_friend)), linphone_vcard_get_full_name(linphone_friend_get_vcard(old_friend)));
+	stats->updated_contact_count++;
+}
+
+static void carddav_sync_status_changed(LinphoneFriendList *list, LinphoneFriendListSyncStatus status, const char *msg) {
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)linphone_friend_list_cbs_get_user_data(list->cbs);
+	char *state = status == LinphoneFriendListSyncStarted ? "Sync started" : (status == LinphoneFriendListSyncFailure ? "Sync failure" : "Sync successful");
+	ms_message("[CardDAV] %s : %s", state, msg);
+	if (status == LinphoneFriendListSyncFailure || status == LinphoneFriendListSyncSuccessful) {
+		stats->sync_done_count++;
+	}
+}
+
+static void carddav_integration(void) {
+	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+	LinphoneVcard *lvc = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Margaux Clerc\r\nIMPP;TYPE=work:sip:margaux@sip.linphone.org\r\nEND:VCARD\r\n");
+	LinphoneFriend *lf = linphone_friend_new_from_vcard(lvc);
+	LinphoneVcard *lvc2 = NULL;
+	LinphoneFriend *lf2 = NULL;
+	LinphoneFriendListCbs *cbs = NULL;
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+	const char *refkey = "toto";
+	char *address = NULL;
+	const LinphoneAddress *addr;
+
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+	cbs = linphone_friend_list_get_callbacks(lfl);
+	linphone_friend_list_cbs_set_user_data(cbs, stats);
+	linphone_friend_list_cbs_set_contact_created(cbs, carddav_contact_created);
+	linphone_friend_list_cbs_set_contact_deleted(cbs, carddav_contact_deleted);
+	linphone_friend_list_cbs_set_contact_updated(cbs, carddav_contact_updated);
+	linphone_friend_list_cbs_set_sync_status_changed(cbs, carddav_sync_status_changed);
+	linphone_core_add_friend_list(manager->lc, lfl);
+
+	BC_ASSERT_PTR_NULL(linphone_vcard_get_uid(lvc));
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(lfl->dirty_friends_to_update), 0, unsigned int, "%u");
+	BC_ASSERT_EQUAL(linphone_friend_list_add_friend(lfl, lf), LinphoneFriendListOK, int, "%d");
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(lfl->dirty_friends_to_update), 1, unsigned int, "%u");
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(lfl->dirty_friends_to_update), 0, unsigned int, "%u");
+	BC_ASSERT_PTR_NOT_NULL(linphone_vcard_get_uid(lvc));
+	linphone_friend_list_remove_friend(lfl, lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(lfl->friends), 0, unsigned int, "%u");
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 2, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 2, int, "%i");
+	linphone_friend_unref(lf);
+	lf = NULL;
+
+	lvc = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Ghislain Mary\r\nIMPP;TYPE=work:sip:ghislain@sip.linphone.org\r\nEND:VCARD\r\n");
+	lf = linphone_friend_new_from_vcard(lvc);
+	BC_ASSERT_EQUAL(linphone_friend_list_add_local_friend(lfl, lf), LinphoneFriendListOK, int, "%d");
+	linphone_friend_unref(lf);
+
+	lvc2 = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Sylvain Berfini\r\nIMPP:sip:sberfini@sip.linphone.org\r\nUID:1f08dd48-29ac-4097-8e48-8596d7776283\r\nEND:VCARD\r\n");
+	linphone_vcard_set_url(lvc2, "/card.php/addressbooks/tester/default/me.vcf");
+	lf2 = linphone_friend_new_from_vcard(lvc2);
+	linphone_friend_set_ref_key(lf2, refkey);
+	BC_ASSERT_EQUAL(linphone_friend_list_add_local_friend(lfl, lf2), LinphoneFriendListOK, int, "%d");
+
+	BC_ASSERT_EQUAL(lfl->revision, 0, int, "%i");
+	linphone_friend_list_synchronize_friends_from_server(lfl);
+	wait_for_until(manager->lc, NULL, &stats->new_contact_count, 0, 5000);
+	BC_ASSERT_EQUAL(stats->new_contact_count, 0, int, "%i");
+	wait_for_until(manager->lc, NULL, &stats->removed_contact_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->removed_contact_count, 1, int, "%i");
+	wait_for_until(manager->lc, NULL, &stats->updated_contact_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->updated_contact_count, 1, int, "%i");
+	BC_ASSERT_NOT_EQUAL(lfl->revision, 0, int, "%i");
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 3, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 3, int, "%i");
+
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(lfl->friends), 1, unsigned int, "%u");
+	lf = (LinphoneFriend *)lfl->friends->data;
+	BC_ASSERT_STRING_EQUAL(lf->refkey, refkey);
+	BC_ASSERT_EQUAL(lf->storage_id, lf2->storage_id, unsigned int, "%u");
+	linphone_friend_unref(lf2);
+	addr = linphone_friend_get_address(lf);
+	address = linphone_address_as_string_uri_only(addr);
+	BC_ASSERT_STRING_EQUAL(address, "sip:sylvain@sip.linphone.org");
+	ms_free(address);
+
+
+	linphone_friend_edit(lf);
+	linphone_friend_done(lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(lf->friend_list->dirty_friends_to_update), 0, unsigned int, "%u");
+
+	linphone_core_set_network_reachable(manager->lc, FALSE); //To prevent the CardDAV update
+	linphone_friend_edit(lf);
+	linphone_friend_set_name(lf, "François Grisez");
+	linphone_friend_done(lf);
+	BC_ASSERT_EQUAL((unsigned int)bctbx_list_size(lf->friend_list->dirty_friends_to_update), 1, unsigned int, "%u");
+
+	ms_free(stats);
+	linphone_friend_list_unref(lfl);
+	linphone_core_manager_destroy(manager);
+}
+
+static void carddav_clean(void) {  // This is to ensure the content of the test addressbook is in the correct state for the following tests
+	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(lfl);
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+	bctbx_list_t *friends = NULL;
+	bctbx_list_t *friends_iterator = NULL;
+	LinphoneFriend *lf = NULL;
+	LinphoneVcard *lvc = NULL;
+
+	linphone_friend_list_cbs_set_user_data(cbs, stats);
+	linphone_friend_list_cbs_set_contact_created(cbs, carddav_contact_created);
+	linphone_friend_list_cbs_set_contact_deleted(cbs, carddav_contact_deleted);
+	linphone_friend_list_cbs_set_contact_updated(cbs, carddav_contact_updated);
+	linphone_friend_list_cbs_set_sync_status_changed(cbs, carddav_sync_status_changed);
+	linphone_core_add_friend_list(manager->lc, lfl);
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+
+	linphone_friend_list_synchronize_friends_from_server(lfl);
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+	stats->sync_done_count = 0;
+
+	friends = bctbx_list_copy(lfl->friends);
+	friends_iterator = friends;
+	while (friends_iterator) {
+		LinphoneFriend *lf = (LinphoneFriend *)friends_iterator->data;
+		linphone_friend_list_remove_friend(lfl, lf);
+		wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+		BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+		stats->sync_done_count = 0;
+		stats->removed_contact_count = 0;
+		friends_iterator = bctbx_list_next(friends_iterator);
+	}
+	bctbx_list_free(friends);
+
+	lvc = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Sylvain Berfini\r\nIMPP:sip:sylvain@sip.linphone.org\r\nUID:1f08dd48-29ac-4097-8e48-8596d7776283\r\nEND:VCARD\r\n");
+	linphone_vcard_set_url(lvc, "http://dav.linphone.org/card.php/addressbooks/tester/default/me.vcf");
+	lf = linphone_friend_new_from_vcard(lvc);
+	linphone_friend_list_add_friend(lfl, lf);
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+
+	ms_free(stats);
+	linphone_friend_unref(lf);
+	linphone_friend_list_unref(lfl);
+	linphone_core_manager_destroy(manager);
+}
+
+static void carddav_multiple_sync(void) {
+	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
+	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(lfl);
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+
+	linphone_friend_list_cbs_set_user_data(cbs, stats);
+	linphone_friend_list_cbs_set_contact_created(cbs, carddav_contact_created);
+	linphone_friend_list_cbs_set_contact_deleted(cbs, carddav_contact_deleted);
+	linphone_friend_list_cbs_set_contact_updated(cbs, carddav_contact_updated);
+	linphone_friend_list_cbs_set_sync_status_changed(cbs, carddav_sync_status_changed);
+	linphone_core_add_friend_list(manager->lc, lfl);
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+
+	linphone_friend_list_synchronize_friends_from_server(lfl);
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+	linphone_friend_list_synchronize_friends_from_server(lfl);
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 2, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 2, int, "%i");
+	linphone_friend_list_synchronize_friends_from_server(lfl);
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 3, 5000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 3, int, "%i");
+	BC_ASSERT_EQUAL(stats->removed_contact_count, 0, int, "%i");
+
+	ms_free(stats);
+	linphone_friend_list_unref(lfl);
+	linphone_core_manager_destroy(manager);
+}
+
+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);
+	LinphoneFriendListCbs *cbs = linphone_friend_list_get_callbacks(lfl);
+	LinphoneCardDAVStats *stats = (LinphoneCardDAVStats *)ms_new0(LinphoneCardDAVStats, 1);
+	LinphoneVcard *lvc1 = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Margaux Clerc\r\nIMPP;TYPE=work:sip:margaux@sip.linphone.org\r\nEND:VCARD\r\n");
+	LinphoneFriend *lf1 = linphone_friend_new_from_vcard(lvc1);
+	LinphoneVcard *lvc2 = linphone_vcard_context_get_vcard_from_buffer(manager->lc->vcard_context, "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:Ghislain Mary\r\nIMPP;TYPE=work:sip:ghislain@sip.linphone.org\r\nEND:VCARD\r\n");
+	LinphoneFriend *lf2 = linphone_friend_new_from_vcard(lvc2);
+	bctbx_list_t *friends = NULL, *friends_iterator = NULL;
+
+	linphone_friend_list_cbs_set_user_data(cbs, stats);
+	linphone_friend_list_cbs_set_contact_created(cbs, carddav_contact_created);
+	linphone_friend_list_cbs_set_contact_deleted(cbs, carddav_contact_deleted);
+	linphone_friend_list_cbs_set_contact_updated(cbs, carddav_contact_updated);
+	linphone_friend_list_cbs_set_sync_status_changed(cbs, carddav_sync_status_changed);
+	linphone_core_add_friend_list(manager->lc, lfl);
+	linphone_friend_list_set_uri(lfl, CARDDAV_SERVER);
+
+	linphone_friend_list_add_friend(lfl, lf1);
+	linphone_friend_unref(lf1);
+	linphone_friend_list_synchronize_friends_from_server(lfl);
+	linphone_friend_list_add_friend(lfl, lf2);
+	linphone_friend_unref(lf2);
+	wait_for_until(manager->lc, NULL, &stats->sync_done_count, 3, 15000);
+	BC_ASSERT_EQUAL(stats->sync_done_count, 3, int, "%i");
+
+	stats->sync_done_count = 0;
+	friends = bctbx_list_copy(lfl->friends);
+	friends_iterator = friends;
+	while (friends_iterator) {
+		LinphoneFriend *lf = (LinphoneFriend *)friends_iterator->data;
+		if (lf && strcmp(linphone_friend_get_name(lf), "Sylvain Berfini") != 0) {
+			linphone_friend_list_remove_friend(lfl, lf);
+			wait_for_until(manager->lc, NULL, &stats->sync_done_count, 1, 5000);
+			BC_ASSERT_EQUAL(stats->sync_done_count, 1, int, "%i");
+			stats->sync_done_count = 0;
+		}
+		friends_iterator = bctbx_list_next(friends_iterator);
+	}
+	bctbx_list_free(friends);
+
+	ms_free(stats);
+	linphone_friend_list_unref(lfl);
+	linphone_core_manager_destroy(manager);
+}
+
+test_t vcard_tests[] = {
+	TEST_NO_TAG("Import / Export friends from vCards", linphone_vcard_import_export_friends_test),
+	TEST_NO_TAG("Import a lot of friends from vCards", linphone_vcard_import_a_lot_of_friends_test),
+	TEST_NO_TAG("vCard creation for existing friends", linphone_vcard_update_existing_friends_test),
+	TEST_NO_TAG("vCard phone numbers and SIP addresses", linphone_vcard_phone_numbers_and_sip_addresses),
+#ifdef SQLITE_STORAGE_ENABLED
+	TEST_ONE_TAG("Friends working if no db set", friends_if_no_db_set, "LeaksMemory"),
+	TEST_ONE_TAG("Friends storage migration from rc to db", friends_migration, "LeaksMemory"),
+	TEST_NO_TAG("Friends storage in sqlite database", friends_sqlite_storage),
+#endif
+	TEST_NO_TAG("CardDAV clean", carddav_clean), // This is to ensure the content of the test addressbook is in the correct state for the following tests
+	TEST_NO_TAG("CardDAV synchronization", carddav_sync),
+	TEST_NO_TAG("CardDAV synchronization 2", carddav_sync_2),
+	TEST_NO_TAG("CardDAV synchronization 3", carddav_sync_3),
+	TEST_NO_TAG("CardDAV synchronization 4", carddav_sync_4),
+	TEST_NO_TAG("CardDAV integration", carddav_integration),
+	TEST_NO_TAG("CardDAV multiple synchronizations", carddav_multiple_sync),
+	TEST_NO_TAG("CardDAV client to server and server to client sync", carddav_server_to_client_and_client_to_sever_sync)
+};
+
+test_suite_t vcard_test_suite = {
+	"VCard", NULL, NULL,
+	liblinphone_tester_before_each, liblinphone_tester_after_each,
+	sizeof(vcard_tests) / sizeof(vcard_tests[0]), vcard_tests
+};
+
+#endif
diff --git a/tester/vcards/thousand_vcards.vcf b/tester/vcards/thousand_vcards.vcf
new file mode 100644
index 000000000..fa5dd84c2
--- /dev/null
+++ b/tester/vcards/thousand_vcards.vcf
@@ -0,0 +1,8542 @@
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:sharyn@sip.linphone.org
+ADR:;;6390 Cotton Plant Parkway;Bingen;WA;98605;
+FN:Sharyn Langford
+GENDER:U
+N:Langford;Sharyn;;;
+EMAIL:sharyn@consequatvelfeugiat.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19851007
+N:Saunders;Lucretia;;;
+FN:Lucretia Saunders
+ORG:Industries Bell
+EMAIL:lucretia.saunders@wisilobortis.us
+NOTE:Veniamquis lorem ut praesent praesent exerci iriuredolor exerci.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(207)611-3176
+BDAY:19690513
+FN:Reuben Kinsey
+EMAIL:r.kinsey@sitdelenit.info
+N:Kinsey;Reuben;;;
+GENDER:U
+IMPP:sip:reuben@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(878)753-3993
+EMAIL:bryant.correa@veldignissim.gov
+FN:Bryant Correa
+IMPP:sip:bryant@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Electronic Network Provider
+IMPP:sip:herman@sip.linphone.org
+GENDER:U
+BDAY:19560928
+FN:Herman Lerma
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dexter Stratton
+BDAY:19870819
+IMPP:sip:dexter@sip.linphone.org
+TEL:tel:(878)866-5600
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Oma Corbitt
+TEL:tel:(878)823-7932
+ADR:;;6537 Hunters Den Drive;Antioch;TN;37011;
+IMPP:sip:oma@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:velma@sip.linphone.org
+FN:Velma Hoffmann
+ORG:Signal Alpha
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:deirdre@sip.linphone.org
+FN:Deirdre Proffitt
+BDAY:19800818
+NOTE:Vel elitsed eu volutpat ad in minim ea et in luptatum qui.
+ORG:Venture Contract People
+GENDER:O
+N:Proffitt;Deirdre;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Ladonna Broome
+ORG:Hill Research
+IMPP:sip:ladonna@sip.linphone.org
+ADR:;;2151 Hidden Harbor Drive;Wallingford;CT;06495;
+TEL:tel:(586)347-1188
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Griffis;Hattie;;;
+ORG:Adventure Construction Star
+FN:Hattie Griffis
+ADR:;;8653 Sanders Hill Trail;Paoli;IN;47454;
+GENDER:F
+NOTE:Duis vel aliquam suscipit zzril autem dolore nulla tationullamcorper vero.
+TEL:tel:(313)364-7475
+EMAIL:hattie@facilisipraesent.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Griselda German
+EMAIL:g.german@luptatumvulputate.gov
+IMPP:sip:griselda@sip.linphone.org
+BDAY:19361102
+ORG:Advanced Adventure Vision
+NOTE:Exerci vel ad in delenitaugue amet euismod ex facilisi lobortis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6500 Bayou River Way;Friendship;MD;20758;
+BDAY:19850122
+TEL:tel:(620)112-3291
+EMAIL:joe@lobortisvero.net
+FN:Joe Adams
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Delma Lunn
+EMAIL:delma.lunn@euismodeum.us
+ADR:;;8971 Clarington Trail;New Sharon;IA;50207;
+NOTE:Vel feugiat iusto facilisi iustoodio nibh delenit nisl commodoconsequat erat lobortis ea nostrud lorem.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Meredith Rider
+ORG:Omega Resource Innovation
+BDAY:19690221
+N:Rider;Meredith;;;
+NOTE:Illum amet euismod minim adipiscing veniam aliquam ullamcorper ad.
+ADR:;;2015 Kellywood Street;Felt;ID;83424;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19720425
+GENDER:O
+ORG:Net Pacific Electronic
+NOTE:Adipiscing iusto esse eros eufeugiat ad iriure nibh.
+FN:Lawerence Ivey
+N:Ivey;Lawerence;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+ADR:;;2068 Rutherford Avenue;Bridgeport;NY;13030;
+IMPP:sip:alyce@sip.linphone.org
+BDAY:19811225
+FN:Alyce Goff
+N:Goff;Alyce;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1322 Shelton Cove;Allen;KY;41601;
+FN:Taryn Spear
+TEL:tel:(567)188-2497
+NOTE:Eum delenit facilisi duis qui minim in laoreet illum nostrud nulla dolore.
+N:Spear;Taryn;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:ezequiel@sip.linphone.org
+NOTE:Vulputate elitsed iusto consequat blandit nostrud ullamcorper aliquip diam ad.
+FN:Ezequiel Irizarry
+N:Irizarry;Ezequiel;;;
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Colburn;Lucinda;;;
+FN:Lucinda Colburn
+IMPP:sip:lucinda@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Covington;Scott;;;
+NOTE:Autem consequat Utwisi illum hendrerit.
+EMAIL:scott@commodoconsequatzzril.net
+FN:Scott Covington
+BDAY:19361219
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19551018
+FN:Hank Kirchner
+GENDER:O
+ORG:Net People Building
+IMPP:sip:hank@sip.linphone.org
+ADR:;;5121 Saint Croix Circle;Shelly;MN;56581;
+NOTE:Iusto blandit velit dignissim lobortis vel tation eu consectetuer nostrud at ea ex.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:South Telecom Signal
+N:Lavender;Leticia;;;
+EMAIL:l.lavender@tationluptatum.info
+NOTE:Consectetuer eros ut ex molestie tation nulla feugait ullamcorper amet iriure amet vel.
+FN:Leticia Lavender
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:r.corwin@molestiedolor.tv
+FN:Randi Corwin
+ADR:;;3010 Meadow Run Street;West Columbia;SC;29172;
+ORG:Architecture North Data
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19730213
+EMAIL:errol@facilisisadipiscing.gov
+IMPP:sip:errol@sip.linphone.org
+TEL:tel:(716)978-8810
+FN:Errol Whitley
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Virtual Speed
+FN:Angelique Link
+IMPP:sip:angelique@sip.linphone.org
+NOTE:Nonummy commodo ad esse aliquip exerci nulla enim nulla luptatum tation.
+TEL:tel:(409)356-3785
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Mann;Carlton;;;
+FN:Carlton Mann
+IMPP:sip:carlton@sip.linphone.org
+NOTE:Ad blandit duis delenitaugue ea eros consequat dolor facilisi elitsed veniam praesent velit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4643 Hawksprings Street;West Point;GA;31833;
+IMPP:sip:nelson@sip.linphone.org
+N:Seaton;Nelson;;;
+FN:Nelson Seaton
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Orval Patterson
+TEL:tel:(330)223-2469
+EMAIL:orval@exutwisi.net
+ADR:;;6015 Willowbend Cove;Tacoma;WA;98445;
+IMPP:sip:orval@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:b.mclain@feugiatautem.edu
+GENDER:O
+TEL:tel:(971)875-6507
+FN:Brenna Mclain
+NOTE:Ut molestie delenitaugue velit augue duis aliquip commodo at.
+ORG:West Frontier
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+FN:Jeana Wilmoth
+IMPP:sip:jeana@sip.linphone.org
+NOTE:Vel wisi zzril nonummy laoreet tincidunt augue dolore vel delenitaugue dolor ut.
+ADR:;;9030 Country Place Lane;Angola;IN;46703;
+N:Wilmoth;Jeana;;;
+ORG:Signal Systems Star
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Dancy;Rick;;;
+ORG:Application Federated Source
+EMAIL:rick.dancy@doloreduis.us
+FN:Rick Dancy
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lance Arthur
+ADR:;;9308 Panama Street;Ozark;MO;65721;
+BDAY:19350607
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19630914
+FN:Seymour Catlett
+ADR:;;2995 Silkwood Avenue;Malvern;PA;19355;
+EMAIL:seymour@velaliquam.edu
+IMPP:sip:seymour@sip.linphone.org
+GENDER:N
+N:Catlett;Seymour;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:elsie@doloreea.eu
+FN:Elsie Fish
+ADR:;;4060 Blackberry Ridge Way;Greenbrier;AR;72058;
+BDAY:19530903
+N:Fish;Elsie;;;
+ORG:Net Max
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:c.lanier@eroseuismod.info
+GENDER:F
+NOTE:Minim dolore praesent eum nulla autem luptatumzzril dolore aliquip eros veniam.
+ORG:Future Hill Vision
+TEL:tel:(959)503-7251
+FN:Carolyn Lanier
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Network Data Solutions
+TEL:tel:(603)579-5143
+BDAY:19780623
+IMPP:sip:rogelio@sip.linphone.org
+FN:Rogelio Headrick
+EMAIL:rogelio.headrick@etmolestie.tv
+ADR:;;4956 Oakes Lane;Bible School Park;NY;13737;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Design Internet Venture
+N:Greenlee;Adolfo;;;
+EMAIL:adolfo.greenlee@wisietaccumsan.gov
+FN:Adolfo Greenlee
+NOTE:Duis dignissim vero dolor adipiscing dolore consectetuer.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Solutions Electronic Application
+EMAIL:a.suarez@iriuredolorconsequat.com
+FN:Abdul Suarez
+ADR:;;1212 Valley Crest Trail;Henderson;CO;80640;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:leonardo@sip.linphone.org
+GENDER:O
+FN:Leonardo Sheridan
+BDAY:19530106
+EMAIL:leonardo@blanditdiam.net
+ORG:Star Net West
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:p.teel@etdolore.info
+FN:Polly Teel
+ORG:Signal Atlantic Contract
+IMPP:sip:polly@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Vel blandit et dignissim veniamquis dolore ea accumsan nostrud vulputate lorem.
+FN:Haydee Washburn
+GENDER:O
+ORG:Universal Vision Atlantic
+N:Washburn;Haydee;;;
+IMPP:sip:haydee@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Herlinda Montez
+ORG:Interactive Venture Future
+NOTE:Exerci dolor suscipit ex tationullamcorper vero consequat.
+BDAY:19501105
+IMPP:sip:herlinda@sip.linphone.org
+ADR:;;7219 Anchorage Drive;Stirling;NJ;07980;
+EMAIL:herlinda.montez@commodoconsequatvulputate.us
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Nolan Mcclain
+EMAIL:n.mcclain@hendreritillum.eu
+N:Mcclain;Nolan;;;
+IMPP:sip:nolan@sip.linphone.org
+NOTE:Feugait tincidunt velit wisi praesent vel nulla.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Duis suscipit blandit molestie dignissim vel exerci iriure lobortis aliquip diam.
+N:Quinonez;Minh;;;
+BDAY:19800208
+FN:Minh Quinonez
+EMAIL:minh.quinonez@nostrudfeugait.org
+GENDER:O
+ADR:;;8329 Port Charlotte Avenue;Keiser;AR;72351;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+FN:Alexandria Hermann
+NOTE:Nulla veniam consectetuer dolore sit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:tony@sip.linphone.org
+BDAY:19491115
+NOTE:Qui ullamcorper eu ex zzril illum molestie iriuredolor nostrud in facilisis wisi.
+TEL:tel:(907)209-4202
+FN:Tony Comstock
+ADR:;;3668 Cordie Lee Way;South West City;MO;64863;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dixie Earnest
+BDAY:19390408
+TEL:tel:(701)141-8626
+EMAIL:dixie.earnest@tationullamcorperluptatum.us
+ORG:South Bell Pacific
+NOTE:Doloremagna molestie facilisi iustoodio commodoconsequat vero delenit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Eugenia Begley
+TEL:tel:(318)345-2422
+ADR:;;2388 La Costa Way;Blodgett Mills;NY;13738;
+NOTE:Nulla at feugiat commodo nulla dolore exerci eum eu vero.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(240)310-7670
+ADR:;;7146 Capital Lane;Oriental;NC;28571;
+IMPP:sip:arturo@sip.linphone.org
+FN:Arturo Haddad
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Miller;Fermin;;;
+GENDER:M
+FN:Fermin Miller
+ADR:;;7855 Highland Way;Monument Valley;UT;84536;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Solutions People
+TEL:tel:(718)793-2920
+FN:Dale Marino
+GENDER:F
+N:Marino;Dale;;;
+ADR:;;665 Bubbling Brook Trail;Chicago;IL;60687;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1081 Rivard Parkway;Samson;AL;36477;
+N:Haase;Delfina;;;
+BDAY:19841221
+FN:Delfina Haase
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+ORG:Solutions Max Architecture
+EMAIL:gail.huggins@ipsumfeugait.info
+IMPP:sip:gail@sip.linphone.org
+FN:Gail Huggins
+NOTE:Lobortis aliquip te lorem eum at.
+ADR:;;3702 Mer Rouge Parkway;Rushford;MN;55971;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Molly Mackay
+TEL:tel:(660)981-4122
+BDAY:19641207
+EMAIL:m.mackay@exerciipsum.gov
+ORG:Telecom Software South
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:teddy.mabry@utwisialiquam.us
+ORG:Federated Industries Vision
+TEL:tel:(405)551-5837
+FN:Teddy Mabry
+IMPP:sip:teddy@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(702)708-5533
+GENDER:O
+IMPP:sip:geri@sip.linphone.org
+BDAY:19640925
+EMAIL:geri@adaugue.eu
+FN:Geri Olds
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Hendrerit ut eufeugiat zzril blandit odio ea dolore enim nulla.
+EMAIL:abraham@facilisisduis.net
+ORG:Design Architecture Federated
+ADR:;;8423 Rowlock Trail;Doran;VA;24612;
+FN:Abraham Kruse
+IMPP:sip:abraham@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+ADR:;;9310 Bell Manor Trail;San Diego;CA;92176;
+IMPP:sip:josiah@sip.linphone.org
+FN:Josiah Dunne
+N:Dunne;Josiah;;;
+NOTE:Commodoconsequat minim lobortis zzril doloremagna ullamcorper illum eum euismod ea nislut delenitaugue.
+EMAIL:josiah@elitsedexerci.eu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Eum esse veniamquis dolore duis molestie te.
+GENDER:U
+FN:Alberta William
+IMPP:sip:alberta@sip.linphone.org
+ADR:;;7710 Fox Fern Avenue;Detroit;MI;48288;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:corey.collier@nullavero.com
+BDAY:19690813
+N:Collier;Corey;;;
+GENDER:F
+FN:Corey Collier
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Commodo nostrud enim nostrud vulputate ut.
+ADR:;;2826 Mikeyair Avenue;Cloverport;KY;40111;
+GENDER:N
+N:Suggs;Germaine;;;
+IMPP:sip:germaine@sip.linphone.org
+FN:Germaine Suggs
+TEL:tel:(580)461-1359
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Dignissim duis vel elitsed zzril in aliquip lorem iusto at hendrerit.
+N:Blackman;Olivia;;;
+GENDER:N
+FN:Olivia Blackman
+BDAY:19800410
+EMAIL:o.blackman@nibhaliquip.eu
+ORG:Medicine Virtual
+TEL:tel:(848)914-4661
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:d.mooney@minimexerci.net
+ADR:;;8131 Green Twig Circle;Grand Lake Stream;ME;04637;
+IMPP:sip:donald@sip.linphone.org
+TEL:tel:(660)196-9482
+FN:Donald Mooney
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Erich Mcclung
+N:Mcclung;Erich;;;
+ORG:Telecom Source
+TEL:tel:(337)275-3036
+GENDER:M
+NOTE:Iriuredolor et elitsed in minim praesent illum duis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:berniece.chinn@auguenislut.info
+TEL:tel:(828)392-2752
+N:Chinn;Berniece;;;
+FN:Berniece Chinn
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Venture East Virtual
+EMAIL:m.guffey@autemblandit.gov
+NOTE:Eros duis tation in blandit invulputate.
+N:Guffey;Mary;;;
+ADR:;;6327 Quarry Street;Shreveport;LA;71162;
+FN:Mary Guffey
+GENDER:O
+IMPP:sip:mary@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:collin.randall@nislet.tv
+IMPP:sip:collin@sip.linphone.org
+BDAY:19601226
+FN:Collin Randall
+NOTE:Nulla qui nulla illum exerci tincidunt.
+ORG:Medicine Federated Industries
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6124 Havershire Cove;Wilsey;KS;66873;
+IMPP:sip:lynda@sip.linphone.org
+FN:Lynda Marin
+TEL:tel:(909)719-6894
+BDAY:19520323
+ORG:Galaxy Technology Venture
+EMAIL:l.marin@essezzril.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(928)171-2203
+FN:Otis Nevarez
+IMPP:sip:otis@sip.linphone.org
+NOTE:Ut vero velit diam nonummy dolore lorem suscipit ea qui.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Qui duis ea ea vero eros delenitaugue autem ea tationullamcorper eros.
+BDAY:19920324
+ORG:Frontier Hardware
+N:Hardaway;Mabel;;;
+IMPP:sip:mabel@sip.linphone.org
+ADR:;;9493 Corporate Edge Circle;Albuquerque;NM;87106;
+EMAIL:mabel.hardaway@autemtation.tv
+TEL:tel:(904)898-8335
+FN:Mabel Hardaway
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jacqueline Donley
+ADR:;;7981 Rowan Trail;Harrisburg;PA;17104;
+N:Donley;Jacqueline;;;
+BDAY:19370803
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Hollingsworth;Gale;;;
+EMAIL:gale.hollingsworth@amette.gov
+FN:Gale Hollingsworth
+GENDER:F
+ADR:;;4267 Donnybrook Cove;Kennewick;WA;99338;
+BDAY:19580312
+IMPP:sip:gale@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;268 Bobwood Drive;Garner;NC;27529;
+ORG:Analysis Industries
+FN:Myrtis Townes
+EMAIL:myrtis.townes@delenitblandit.tv
+N:Townes;Myrtis;;;
+GENDER:N
+BDAY:19940712
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(605)466-6346
+BDAY:19930708
+FN:Marcella Fairley
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Roger Person
+ADR:;;518 Walworth Trail;Rowena;SD;57056;
+EMAIL:roger@adipiscingvelit.gov
+ORG:Star General
+N:Person;Roger;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Nulla dolore autem dolor tincidunt.
+FN:Marguerite Veal
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Findley;Danette;;;
+FN:Danette Findley
+ADR:;;1770 Rowan Parkway;Dalton;MN;56324;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Source Internet
+FN:Haydee Fernandez
+BDAY:19680114
+ADR:;;2795 Lost Meadow Street;Kingston;OK;73439;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+NOTE:Nostrud duis eufeugiat eum erat duis.
+ADR:;;1248 Maple Shadow Trail;Warbranch;KY;40874;
+BDAY:19420615
+FN:Stacie Chilton
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(507)347-5872
+FN:Agustin Devito
+NOTE:Commodoconsequat at ipsum in eros doloremagna luptatumzzril eum velit nostrud facilisi.
+ADR:;;5770 Mchenry Cove;Mount Berry;GA;30149;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:debby@autemin.edu
+ADR:;;2318 Hickory Post Parkway;Alief;TX;77411;
+FN:Debby Edward
+TEL:tel:(205)732-9224
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Stephen Cushman
+N:Cushman;Stephen;;;
+ORG:North South Alpha
+GENDER:M
+EMAIL:stephen@accumsaneros.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+BDAY:19590517
+FN:Beatrice Herbert
+EMAIL:b.herbert@nullaodio.net
+ORG:Graphics Consulting Network
+IMPP:sip:beatrice@sip.linphone.org
+N:Herbert;Beatrice;;;
+TEL:tel:(812)577-3221
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Facilisi ea eum at feugiat ut Utwisi consequat aliquip.
+N:Roden;Leslie;;;
+EMAIL:leslie@facilisiconsequatvel.eu
+FN:Leslie Roden
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+BDAY:19550125
+NOTE:Feugait et diam consectetuer.
+FN:Stacy Dew
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7616 Fleetwood Place Cove;Centerville;IN;47330;
+ORG:Data Digital Graphics
+FN:Alexandra Fite
+BDAY:19680804
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(773)156-2480
+FN:Howard Thorne
+BDAY:19940307
+NOTE:Facilisis autem dolor hendrerit etaccumsan feugiat doloremagna duis facilisis duis dignissim.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;3620 Green Twig Trail;West Sacramento;CA;95799;
+FN:Harris Anglin
+IMPP:sip:harris@sip.linphone.org
+ORG:North General Direct
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+FN:Hollie Delong
+ADR:;;8976 School Circle;Fairhaven;MA;02719;
+TEL:tel:(857)725-4552
+N:Delong;Hollie;;;
+BDAY:19420221
+IMPP:sip:hollie@sip.linphone.org
+ORG:Hardware Data Vision
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Kelli Crews
+IMPP:sip:kelli@sip.linphone.org
+EMAIL:kelli@enimduis.us
+ADR:;;2900 Edenfield Drive;San Diego;CA;92158;
+TEL:tel:(207)472-3061
+BDAY:19900326
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Bobbie Rutherford
+BDAY:19890218
+NOTE:Lobortis consequat doloremagna veniamquis ipsum volutpat molestie eros accumsan consectetuer.
+N:Rutherford;Bobbie;;;
+GENDER:U
+ADR:;;9711 Baytown Avenue;Farmersburg;IN;47850;
+ORG:Data Provider Medicine
+EMAIL:b.rutherford@velfeugait.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Electronics Analysis Provider
+TEL:tel:(719)381-3190
+IMPP:sip:rodrigo@sip.linphone.org
+ADR:;;3651 Greeley Way;Henderson;NY;13650;
+GENDER:M
+FN:Rodrigo Noe
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(610)972-3463
+NOTE:Autem vel iriure nonummy nulla dolore blandit iustoodio et.
+GENDER:F
+FN:Lauren Wilkins
+ADR:;;4836 Farindon Lane;Madisonville;LA;70447;
+EMAIL:l.wilkins@adipiscingwisi.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jewel Calvin
+GENDER:U
+BDAY:19871128
+IMPP:sip:jewel@sip.linphone.org
+TEL:tel:(912)867-9631
+ADR:;;507 Akerswood Circle;South Bay;FL;33493;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Danelle Saunders
+IMPP:sip:danelle@sip.linphone.org
+EMAIL:danelle.saunders@euismodnibh.gov
+GENDER:F
+ADR:;;4474 Wolf Bend Drive;Campbellsburg;IN;47108;
+BDAY:19661001
+N:Saunders;Danelle;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:w.stephen@veronislut.info
+GENDER:U
+TEL:tel:(405)719-5861
+FN:Werner Stephen
+NOTE:Luptatumzzril minim amet ipsum.
+ORG:Bell Construction Graphics
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Buckley;Claud;;;
+ADR:;;3215 Towering Pines Way;Munden;KS;66959;
+FN:Claud Buckley
+EMAIL:claud.buckley@erosminim.gov
+IMPP:sip:claud@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(206)732-9335
+IMPP:sip:allie@sip.linphone.org
+EMAIL:allie.tuggle@laoreetwisi.gov
+N:Tuggle;Allie;;;
+GENDER:O
+FN:Allie Tuggle
+ORG:Consulting West Electronic
+BDAY:19740722
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Bernie Story
+N:Story;Bernie;;;
+EMAIL:bernie@quiveniamquis.net
+ORG:Speed Construction Future
+GENDER:M
+NOTE:Iustoodio enim tincidunt zzril nibh nislut delenitaugue nulla dignissim ex tation nisl eros.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Duis lorem commodoconsequat odio tation at.
+ADR:;;6828 Whipper Trail;Surfside;CA;90743;
+GENDER:O
+FN:Jerald Lerma
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dillon Brant
+ORG:Alpha Net
+ADR:;;5222 William Trail;Boston;MA;02215;
+N:Brant;Dillon;;;
+BDAY:19510214
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Dykes;Tara;;;
+FN:Tara Dykes
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Phelps;Ambrose;;;
+IMPP:sip:ambrose@sip.linphone.org
+FN:Ambrose Phelps
+TEL:tel:(979)371-2315
+ORG:General Vision
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dorthy Khan
+ORG:Application Network Vision
+GENDER:N
+IMPP:sip:dorthy@sip.linphone.org
+N:Khan;Dorthy;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:michell@sip.linphone.org
+TEL:tel:(202)412-4499
+NOTE:At suscipit etaccumsan nostrud enim accumsan luptatum.
+FN:Michell Gates
+EMAIL:michell.gates@dolornulla.tv
+GENDER:F
+ORG:Bell Star West
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Summer Irizarry
+N:Irizarry;Summer;;;
+IMPP:sip:summer@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Paige;Quinn;;;
+FN:Quinn Paige
+BDAY:19390802
+ORG:Industries North Contract
+EMAIL:q.paige@nislutdignissim.net
+TEL:tel:(907)194-8051
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4962 Gray Ridge Drive;Linkwood;MD;21835;
+ORG:West Future
+IMPP:sip:sharonda@sip.linphone.org
+FN:Sharonda Harness
+NOTE:Commodo esse iriuredolor commodoconsequat qui luptatum ut feugait ut lobortis at.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Augue feugait dolor consequatvel aliquam augue et nulla wisi commodoconsequat.
+IMPP:sip:forrest@sip.linphone.org
+ORG:Atlantic General Alpha
+FN:Forrest Crandall
+TEL:tel:(276)307-2435
+BDAY:19431005
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(406)670-5686
+FN:Marianna Baskin
+NOTE:Duis zzril ipsum nulla augue aliquam duis.
+ADR:;;3759 Parade Trail;Winkelman;AZ;85292;
+GENDER:O
+BDAY:19881211
+IMPP:sip:marianna@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Rickey Rossi
+TEL:tel:(845)779-9956
+EMAIL:rickey@facilisisin.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Berry Bird
+TEL:tel:(719)856-8369
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Contract Digital Network
+NOTE:Dolore nulla quis minim feugait duis autem nisl dolore feugiat feugait eros et.
+IMPP:sip:valeria@sip.linphone.org
+BDAY:19370417
+N:Quinlan;Valeria;;;
+EMAIL:valeria.quinlan@consequatduis.info
+FN:Valeria Quinlan
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(765)654-3290
+N:Magnuson;Milo;;;
+ADR:;;5031 Hayley Avenue;Grouse Creek;UT;84313;
+FN:Milo Magnuson
+ORG:Medicine Source Galaxy
+BDAY:19841203
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jessie Withers
+TEL:tel:(518)944-2660
+NOTE:Nulla facilisis ea euismod nislut vel dignissim etaccumsan.
+ADR:;;1366 Riverwood Circle;Renault;IL;62279;
+N:Withers;Jessie;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Suscipit consequatvel vero wisi odio suscipit aliquam.
+TEL:tel:(937)120-2252
+FN:Bobby Beaudoin
+N:Beaudoin;Bobby;;;
+ORG:Consulting Network Construction
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:m.guthrie@nostrudtationullamcorper.tv
+N:Guthrie;Mervin;;;
+ORG:Studio West Virtual
+FN:Mervin Guthrie
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:jim@sip.linphone.org
+NOTE:Exerci praesent dolor dolore tation consequat nulla.
+GENDER:N
+ADR:;;1877 Gallery Trail;Waxahachie;TX;75168;
+FN:Jim Vincent
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+FN:Vicki Dulaney
+ADR:;;1373 Leighton Creek Cove;Old Ocean;TX;77463;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5211 Conifer Parkway;Duffield;VA;24244;
+EMAIL:g.rose@nislutnulla.eu
+NOTE:Consequat blandit enim consequat feugait delenitaugue ex.
+ORG:Universal Data Solutions
+FN:Guadalupe Rose
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:orville@sip.linphone.org
+FN:Orville Robert
+N:Robert;Orville;;;
+EMAIL:o.robert@laoreetblandit.info
+ORG:Resource Resource
+NOTE:Ea eu feugait feugait lorem nulla nulla eros aliquip velit hendrerit eufeugiat.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Ray;Walter;;;
+IMPP:sip:walter@sip.linphone.org
+FN:Walter Ray
+ADR:;;8566 Norell Trail;Van Nuys;CA;91470;
+EMAIL:w.ray@facilisisutwisi.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Tincidunt accumsan lorem aliquip.
+FN:Elias Luther
+N:Luther;Elias;;;
+IMPP:sip:elias@sip.linphone.org
+GENDER:M
+ADR:;;2955 Bison Lane;Owensboro;KY;42304;
+EMAIL:elias@dolorut.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4735 Oakland Circle;Sun City;FL;33586;
+GENDER:O
+FN:Corrie Patel
+NOTE:Dolore vel nisl consequat.
+EMAIL:c.patel@utwisiautem.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Odio nulla feugiat in in.
+FN:Zenaida Cummings
+TEL:tel:(931)607-8047
+ADR:;;3135 Oak Run Circle;Orange City;FL;32763;
+BDAY:19670529
+EMAIL:zenaida.cummings@delenitqui.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;322 Oak Hill Drive;Granville;NY;12832;
+ORG:Alpha Architecture Solutions
+IMPP:sip:maryann@sip.linphone.org
+N:Hartley;Maryann;;;
+TEL:tel:(516)866-4794
+FN:Maryann Hartley
+EMAIL:maryann.hartley@nullaamet.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4343 Wax Myrtle Street;Charles City;VA;23030;
+FN:Erin Radford
+NOTE:At tincidunt doloremagna suscipit commodo.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(304)762-5025
+EMAIL:stevie@doloremagnaminim.gov
+ADR:;;7095 Meadow Creek Bridge Way;Chapel Hill;NC;27599;
+FN:Stevie Lane
+N:Lane;Stevie;;;
+IMPP:sip:stevie@sip.linphone.org
+ORG:Innovation Net Graphics
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;428 Harding Circle;Tenmile;OR;97481;
+N:Saucedo;Kim;;;
+FN:Kim Saucedo
+IMPP:sip:kim@sip.linphone.org
+NOTE:Enim vero dignissim ex.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Pitre;Lowell;;;
+TEL:tel:(775)554-2877
+EMAIL:lowell@exenim.gov
+FN:Lowell Pitre
+GENDER:O
+ADR:;;3266 Kimdale Lane;Clontarf;MN;56226;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Mahaffey;Ollie;;;
+GENDER:F
+FN:Ollie Mahaffey
+NOTE:Et feugait aliquip veniam aliquip adipiscing iriuredolor dignissim etaccumsan consequat.
+BDAY:19951230
+IMPP:sip:ollie@sip.linphone.org
+TEL:tel:(980)513-4181
+EMAIL:ollie@etea.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:marcy@exex.gov
+FN:Marcy Kerr
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Latasha Pearl
+IMPP:sip:latasha@sip.linphone.org
+GENDER:F
+NOTE:Aliquip iriuredolor at eros consectetuer nulla duis Utwisi autem facilisi.
+EMAIL:latasha.pearl@sitsit.edu
+TEL:tel:(260)491-2055
+N:Pearl;Latasha;;;
+ORG:Galaxy Innovation
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(605)973-7350
+FN:Camille Frasier
+ADR:;;3444 Hayden Lane;Salt Point;NY;12578;
+BDAY:19470808
+IMPP:sip:camille@sip.linphone.org
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7437 River Valley Cove;Walnutport;PA;18088;
+EMAIL:jake@erosadipiscing.us
+ORG:Adventure Star
+FN:Jake Hand
+BDAY:19840928
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+IMPP:sip:carroll@sip.linphone.org
+TEL:tel:(773)723-4385
+N:Cathey;Carroll;;;
+ORG:Internet Data Frontier
+FN:Carroll Cathey
+ADR:;;1767 Stonewyck Avenue;Key Biscayne;FL;33149;
+EMAIL:carroll.cathey@etaccumsaninvulputate.com
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:gilberto@sip.linphone.org
+N:Booker;Gilberto;;;
+FN:Gilberto Booker
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(256)556-3304
+FN:Francis Loy
+NOTE:Veniam facilisi suscipit nibh lobortis duis wisi facilisi ut illum vulputate consectetuer.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19940214
+ADR:;;6226 Washington Parkway;Detroit;MI;48228;
+GENDER:N
+EMAIL:d.deane@praesentesse.org
+NOTE:Enim te hendrerit facilisi te molestie autem eros autem dolor blandit nostrud enim euismod.
+FN:Delmer Deane
+TEL:tel:(330)786-7248
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Suzan Power
+ADR:;;1399 Thorncroft Circle;Lindsay;NE;68644;
+N:Power;Suzan;;;
+GENDER:N
+NOTE:In elitsed duis nonummy feugait ad ut exerci ex facilisi luptatum facilisis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:m.barth@blanditdolore.us
+ADR:;;2953 Penrose Drive;Lahmansville;WV;26731;
+TEL:tel:(661)749-9830
+ORG:Electronics Hardware
+GENDER:F
+FN:Marion Barth
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:nickolas.ammons@quisfeugait.us
+FN:Nickolas Ammons
+ORG:Bell Universal Provider
+NOTE:Esse dolore dignissim ea qui eros iusto laoreet aliquip illum.
+TEL:tel:(231)430-5467
+IMPP:sip:nickolas@sip.linphone.org
+BDAY:19420922
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Verda Shoemaker
+ORG:Network Adventure Net
+N:Shoemaker;Verda;;;
+NOTE:Nonummy esse odio iustoodio quis te facilisis vel suscipit.
+TEL:tel:(920)592-8592
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19920205
+TEL:tel:(775)474-1876
+FN:Augusta Clouse
+GENDER:F
+EMAIL:augusta@adipiscingtincidunt.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+EMAIL:g.clouse@duisblandit.org
+FN:Gustavo Clouse
+ADR:;;7628 Carnton Circle;Riggins;ID;83549;
+N:Clouse;Gustavo;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19450124
+FN:Latrice Forrester
+ORG:Medicine Star Federated
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Caryn Holder
+EMAIL:caryn.holder@veniamquisodio.edu
+BDAY:19600125
+N:Holder;Caryn;;;
+NOTE:Facilisis elitsed enim vel hendrerit duis dignissim iusto ut.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:jamal@sip.linphone.org
+TEL:tel:(828)505-5856
+FN:Jamal Sun
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19431004
+ORG:Venture Design Future
+NOTE:Illum feugiat eum velit esse commodo adipiscing ut eum aliquip tationullamcorper te consectetuer.
+FN:Virginia Straub
+N:Straub;Virginia;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Brant Oliva
+TEL:tel:(469)493-6117
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Nulla facilisi et veniamquis vel ex ad feugiat eu facilisi.
+GENDER:M
+FN:Dante Clifford
+TEL:tel:(718)915-7367
+ORG:Architecture Hill
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Vickey Langdon
+ADR:;;1031 Wilkins Cove;Hallett;OK;74034;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(417)947-2514
+IMPP:sip:byron@sip.linphone.org
+FN:Byron Tillman
+ADR:;;2531 Saint Marys Street;Reading;PA;19604;
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:corey.shively@laoreetiusto.edu
+FN:Corey Shively
+TEL:tel:(262)574-8446
+NOTE:Consectetuer in tationullamcorper luptatum luptatum eum feugait feugiat nulla iriuredolor.
+IMPP:sip:corey@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Sample;Edwardo;;;
+ORG:Frontier Star Frontier
+BDAY:19880225
+GENDER:U
+FN:Edwardo Sample
+ADR:;;9095 Norcrest Drive;Elm Grove;LA;71051;
+NOTE:Ut tationullamcorper vel et qui at dolore tationullamcorper in dolore.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+N:Ames;Pricilla;;;
+BDAY:19881215
+TEL:tel:(510)883-5441
+ADR:;;3033 Bensonwood Way;Smithfield;VA;23431;
+IMPP:sip:pricilla@sip.linphone.org
+FN:Pricilla Ames
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Minim nulla duis euismod facilisis amet dolor nulla elitsed eros augue ad te.
+IMPP:sip:mollie@sip.linphone.org
+TEL:tel:(557)451-5439
+GENDER:N
+FN:Mollie Wise
+EMAIL:mollie.wise@nislveniam.us
+N:Wise;Mollie;;;
+BDAY:19720116
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:huey@nostrudhendrerit.tv
+ADR:;;1418 Wethersfield Street;Dows;IA;50071;
+TEL:tel:(503)627-1955
+BDAY:19601022
+NOTE:Dignissim eros iusto duis veniam augue delenitaugue.
+FN:Huey Bolton
+N:Bolton;Huey;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19480622
+ORG:Architecture Graphics
+NOTE:Eu autem tation lobortis duis nulla molestie illum ad dolore.
+FN:Randal Slater
+TEL:tel:(920)395-8431
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+FN:Nathan Gaskins
+NOTE:Commodo zzril lobortis iriure commodo suscipit.
+ORG:Pacific Virtual
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Marguerite Flood
+EMAIL:marguerite.flood@erossit.tv
+IMPP:sip:marguerite@sip.linphone.org
+ORG:West Net Architecture
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+FN:Madeline Terrill
+N:Terrill;Madeline;;;
+IMPP:sip:madeline@sip.linphone.org
+ADR:;;5700 St Ives Circle;Houston;TX;77026;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;470 Isleton Trail;Redlake;MN;56671;
+N:Chesser;Miranda;;;
+FN:Miranda Chesser
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19690410
+TEL:tel:(408)788-1329
+GENDER:O
+ADR:;;8947 Rutherford Circle;Glasgow;WV;25086;
+FN:Leora Marra
+IMPP:sip:leora@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(412)700-2271
+ORG:Frontier Pacific
+EMAIL:j.rich@utwisieu.eu
+GENDER:U
+BDAY:19851210
+N:Rich;Jordon;;;
+FN:Jordon Rich
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19890529
+FN:Yvonne Mcreynolds
+TEL:tel:(907)483-5241
+GENDER:O
+IMPP:sip:yvonne@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6928 Jewell Circle;East Windsor;CT;06088;
+GENDER:F
+FN:Autumn Mejia
+N:Mejia;Autumn;;;
+IMPP:sip:autumn@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+IMPP:sip:verla@sip.linphone.org
+ADR:;;5010 Hazel Avenue;Brian Head;UT;84719;
+FN:Verla Skeen
+N:Skeen;Verla;;;
+EMAIL:verla@dignissimelitsed.eu
+NOTE:Tincidunt facilisi lorem eu vero minim nulla.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Casey;Lauretta;;;
+TEL:tel:(386)345-9605
+BDAY:19531213
+IMPP:sip:lauretta@sip.linphone.org
+FN:Lauretta Casey
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:carey@veniamet.edu
+ORG:South East Graphics
+TEL:tel:(414)624-9448
+GENDER:M
+FN:Carey Grossman
+IMPP:sip:carey@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+BDAY:19750915
+EMAIL:d.alford@utquis.com
+TEL:tel:(304)964-1689
+FN:Delfina Alford
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:emery@sip.linphone.org
+EMAIL:emery.vanover@velcommodoconsequat.tv
+ORG:Hardware Industries Future
+TEL:tel:(619)343-5587
+ADR:;;1757 Oakgreen Cove;Sun Valley;CA;91352;
+FN:Emery Vanover
+N:Vanover;Emery;;;
+BDAY:19970318
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:East West
+TEL:tel:(304)946-2672
+FN:Brad Winkler
+ADR:;;3409 Kallie Street;Philadelphia;PA;19125;
+IMPP:sip:brad@sip.linphone.org
+NOTE:Praesent dolore facilisis tationullamcorper ut Utwisi ea duis in.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;577 Falling Leaf Parkway;Sebring;FL;33871;
+EMAIL:valerie@wisihendrerit.info
+FN:Valerie Bonner
+N:Bonner;Valerie;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Hill Pacific Future
+ADR:;;6213 West Cove;Opelika;AL;36804;
+IMPP:sip:natasha@sip.linphone.org
+FN:Natasha Bey
+NOTE:Diam iusto doloremagna facilisi esse ad dolore feugait minim illum adipiscing.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(330)791-3507
+FN:Sharla Shepherd
+ADR:;;8437 Normandale Lane;Longmeadow;MA;01116;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Daniel Cortes
+BDAY:19971218
+EMAIL:daniel@consectetuertation.tv
+TEL:tel:(917)808-3404
+IMPP:sip:daniel@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19640120
+NOTE:Nulla laoreet et adipiscing amet amet facilisi nisl facilisi velit diam suscipit.
+ADR:;;6040 May Woods Way;Willisburg;KY;40078;
+FN:Wyatt Stine
+GENDER:O
+EMAIL:wyatt.stine@verosuscipit.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(831)362-5980
+BDAY:19481114
+IMPP:sip:oswaldo@sip.linphone.org
+FN:Oswaldo Estes
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jenny Peter
+N:Peter;Jenny;;;
+EMAIL:jenny@luptatumad.net
+ORG:Interactive People
+BDAY:19640306
+TEL:tel:(734)607-4010
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(715)508-5496
+EMAIL:sherry.mcclelland@dignissimut.gov
+N:Mcclelland;Sherry;;;
+ORG:Speed Bell
+NOTE:Doloremagna blandit luptatumzzril vel minim blandit lorem eum facilisi vero hendrerit ut minim.
+IMPP:sip:sherry@sip.linphone.org
+FN:Sherry Mcclelland
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Technology Application Max
+FN:Lyn Jay
+TEL:tel:(912)586-2774
+EMAIL:lyn@euismoddolore.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alvin Fogle
+BDAY:19740422
+GENDER:M
+ORG:Resource Solutions Architecture
+NOTE:Aliquip nisl dignissim quis quis aliquam praesent iriure ea vulputate ex aliquip.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:ada@veroetaccumsan.gov
+FN:Ada Monroe
+IMPP:sip:ada@sip.linphone.org
+BDAY:19940314
+ADR:;;4966 Hunters Hill Circle;Chautauqua;NY;14722;
+N:Monroe;Ada;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Ramiro Rodman
+BDAY:19920201
+ORG:Hill Galaxy East
+GENDER:M
+IMPP:sip:ramiro@sip.linphone.org
+N:Rodman;Ramiro;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5376 Hobbits Glen Lane;Benson;MN;56215;
+FN:Lela Friday
+N:Friday;Lela;;;
+IMPP:sip:lela@sip.linphone.org
+TEL:tel:(227)249-9236
+GENDER:U
+ORG:Data Network
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(318)546-5395
+FN:Chiquita Neff
+GENDER:U
+BDAY:19590407
+N:Neff;Chiquita;;;
+NOTE:Praesent facilisi lobortis etaccumsan feugiat ex minim.
+EMAIL:chiquita@iriuredolorlorem.info
+ADR:;;7034 Hillcrest Way;La Coste;TX;78039;
+IMPP:sip:chiquita@sip.linphone.org
+ORG:Advanced Analysis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Aline Duggan
+N:Duggan;Aline;;;
+IMPP:sip:aline@sip.linphone.org
+ADR:;;9577 Conner Cove;Madera;PA;16661;
+TEL:tel:(203)459-3183
+NOTE:Etaccumsan vel molestie velit ad feugiat doloremagna hendrerit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Rausch;Wade;;;
+EMAIL:wade.rausch@eaqui.gov
+GENDER:M
+IMPP:sip:wade@sip.linphone.org
+FN:Wade Rausch
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alvina Randall
+NOTE:Dignissim in iusto minim eu augue illum dolore feugiat facilisi luptatum lobortis invulputate.
+BDAY:19790416
+N:Randall;Alvina;;;
+EMAIL:alvina@autemesse.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(847)890-9178
+BDAY:19440524
+GENDER:F
+IMPP:sip:may@sip.linphone.org
+FN:May Mast
+ORG:Net Consulting
+ADR:;;2165 Green Forest Way;Chilton;TX;76632;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Interactive Resource
+FN:Tasha Foust
+NOTE:Ex erat nibh ad illum dolore vero luptatum quis luptatumzzril tation hendrerit nulla feugait.
+TEL:tel:(310)689-7297
+EMAIL:tasha@adea.eu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:deloris@eaeum.com
+FN:Deloris Everhart
+N:Everhart;Deloris;;;
+TEL:tel:(859)248-6910
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+BDAY:19381014
+FN:Stacy Patton
+NOTE:Amet hendrerit laoreet nulla eufeugiat eros consectetuer sit velit iustoodio exerci tincidunt eum consectetuer.
+N:Patton;Stacy;;;
+TEL:tel:(612)728-9446
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;743 Melville Street;Toms River;NJ;08755;
+ORG:Galaxy Application Universal
+FN:Wally Bello
+EMAIL:wally.bello@duisinvulputate.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Warden;Tommie;;;
+FN:Tommie Warden
+IMPP:sip:tommie@sip.linphone.org
+TEL:tel:(304)873-2320
+ADR:;;7001 Heatherly Cove;Springfield;MN;56087;
+BDAY:19420729
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:monika.eck@ametvulputate.info
+FN:Monika Eck
+N:Eck;Monika;;;
+NOTE:Exerci consequat ut lobortis feugiat ut dolore velit hendrerit ut hendrerit luptatum hendrerit hendrerit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Galaxy Future Construction
+EMAIL:marcos.soares@aliquamdolore.net
+FN:Marcos Soares
+TEL:tel:(203)377-4143
+ADR:;;7347 Mimosa Tree Circle;Peoria;IL;61652;
+IMPP:sip:marcos@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alvaro Cope
+ORG:Electronics Network Electronic
+EMAIL:a.cope@hendreritpraesent.info
+BDAY:19560702
+IMPP:sip:alvaro@sip.linphone.org
+N:Cope;Alvaro;;;
+GENDER:M
+ADR:;;6949 Grove Avenue;Cambridge;OH;43725;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Ripley;Ralph;;;
+TEL:tel:(978)881-6783
+GENDER:M
+ADR:;;2441 Wyndhurst Cove;Dulac;LA;70353;
+FN:Ralph Ripley
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Dolore eros illum ad aliquip eu enim exerci dolore autem iustoodio et iusto feugiat.
+N:Bunnell;Ma;;;
+ORG:Telecom Solutions
+IMPP:sip:ma@sip.linphone.org
+FN:Ma Bunnell
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Sidney Bosley
+N:Bosley;Sidney;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Ea facilisi et duis suscipit facilisis esse.
+ORG:Atlantic Net
+EMAIL:m.pacheco@velitvel.net
+FN:Mariana Pacheco
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+BDAY:19740210
+NOTE:Qui ex duis odio odio.
+FN:Sonya Judkins
+N:Judkins;Sonya;;;
+ORG:Medicine Direct Adventure
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:corinne.ruffin@adaliquam.org
+FN:Corinne Ruffin
+BDAY:19500328
+NOTE:Et nostrud iusto vero nostrud eu suscipit eum iriure dolore vel minim.
+ORG:Speed South Pacific
+ADR:;;3628 Centre Oak Trail;Harvard;MA;01451;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(850)977-5416
+FN:Niki Lerma
+EMAIL:niki@blanditerat.tv
+ORG:Universal Direct
+NOTE:Amet ut nisl consequat.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Amanda Blount
+NOTE:Eum veniamquis ea invulputate illum commodo nibh eum dolor commodoconsequat velit vero.
+ADR:;;4167 Rich Hill Lane;Shawnee Mission;KS;66282;
+GENDER:F
+ORG:Provider Building
+BDAY:19590503
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(434)420-7284
+NOTE:Iusto lorem duis consequatvel suscipit consectetuer lorem.
+EMAIL:kenny@invulputatepraesent.net
+IMPP:sip:kenny@sip.linphone.org
+GENDER:O
+BDAY:19390210
+ORG:Star Solutions
+FN:Kenny Patton
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Aliquip et autem et tationullamcorper duis diam iriuredolor molestie diam zzril.
+ORG:Electronics Solutions General
+FN:Carlton Lyles
+EMAIL:c.lyles@nulladuis.edu
+ADR:;;6114 Crestwyn Parkway;Acme;PA;15610;
+BDAY:19691111
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Vision Analysis Net
+TEL:tel:(858)444-6224
+EMAIL:cristy.stovall@nullaexerci.info
+IMPP:sip:cristy@sip.linphone.org
+FN:Cristy Stovall
+NOTE:Suscipit illum delenit aliquam vero ea veniamquis te.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(661)271-2630
+GENDER:O
+N:Novotny;Van;;;
+NOTE:Ea in consectetuer veniam dignissim vel dolor facilisi praesent lobortis nislut augue veniamquis suscipit.
+ADR:;;2144 Wilkins Cove;Westtown;NY;10998;
+FN:Van Novotny
+ORG:Federated Internet Internet
+EMAIL:van.novotny@duisvel.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2369 Paragon Way;High Springs;FL;32655;
+FN:Leilani Girard
+GENDER:F
+IMPP:sip:leilani@sip.linphone.org
+N:Girard;Leilani;;;
+NOTE:Qui veniamquis dignissim nulla zzril feugait luptatum lorem.
+ORG:Contract South Net
+BDAY:19640108
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Eastman;Tyson;;;
+TEL:tel:(386)597-7238
+FN:Tyson Eastman
+ORG:Hardware Net
+IMPP:sip:tyson@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Vision Hardware Design
+GENDER:U
+FN:Lupe Nesmith
+BDAY:19900901
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Solutions Atlantic Signal
+FN:Maria Gunderson
+BDAY:19541224
+NOTE:Qui et accumsan euismod tation ex delenit in exerci duis dolore molestie diam.
+ADR:;;4092 Calumet Circle;New Orleans;LA;70139;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19390915
+N:Harman;Lesa;;;
+TEL:tel:(952)799-8829
+GENDER:U
+NOTE:Volutpat dolor eros vero.
+FN:Lesa Harman
+EMAIL:lesa@dignissimnislut.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:t.benge@nullautwisi.tv
+N:Benge;Terry;;;
+ADR:;;9882 Ottumwa Street;Jarales;NM;87023;
+GENDER:F
+IMPP:sip:terry@sip.linphone.org
+FN:Terry Benge
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jewell Nickel
+GENDER:M
+TEL:tel:(310)780-3255
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Mac Ritter
+N:Ritter;Mac;;;
+TEL:tel:(740)368-5881
+IMPP:sip:mac@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19860829
+IMPP:sip:riley@sip.linphone.org
+FN:Riley Noble
+GENDER:O
+NOTE:Vero iriuredolor feugiat lobortis dolor veniamquis blandit in qui.
+N:Noble;Riley;;;
+ADR:;;8947 Hobbits Glen Circle;Joseph City;AZ;86032;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:pablo.trudeau@adlobortis.eu
+IMPP:sip:pablo@sip.linphone.org
+FN:Pablo Trudeau
+ADR:;;6291 Brush Creek Trail;Hastings;NE;68902;
+TEL:tel:(260)891-1300
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:sophia@sip.linphone.org
+FN:Sophia High
+ADR:;;725 Meadowview Circle;Layton;NJ;07851;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Martin Nall
+GENDER:M
+BDAY:19490406
+ADR:;;6183 Corporate Center Way;Louisville;KY;40221;
+ORG:Source Interactive Source
+NOTE:Qui feugiat exerci nislut amet suscipit Utwisi commodo vel autem nulla.
+TEL:tel:(515)820-2997
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Source Virtual Hardware
+FN:Tyrell Kerns
+IMPP:sip:tyrell@sip.linphone.org
+EMAIL:tyrell.kerns@suscipitexerci.com
+ADR:;;6822 Brewers Street;La Mesa;NM;88044;
+NOTE:Iriuredolor et esse dignissim.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Ramon;Clare;;;
+ORG:Design Digital General
+BDAY:19370227
+FN:Clare Ramon
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Aliquip enim vulputate feugait commodoconsequat.
+ADR:;;6551 Everwood Street;Bridgewater;NJ;08807;
+IMPP:sip:chanel@sip.linphone.org
+FN:Chanel Willey
+N:Willey;Chanel;;;
+TEL:tel:(724)661-3666
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Demetria Neel
+ORG:Advanced South Alpha
+N:Neel;Demetria;;;
+NOTE:Ipsum blandit in autem nonummy facilisi in quis erat.
+BDAY:19970627
+IMPP:sip:demetria@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4386 Thornwick Drive;Minden;LA;71058;
+N:Nicholas;Wes;;;
+TEL:tel:(505)286-4023
+ORG:Alpha Net
+GENDER:M
+BDAY:19930629
+EMAIL:w.nicholas@velitblandit.edu
+IMPP:sip:wes@sip.linphone.org
+FN:Wes Nicholas
+NOTE:Vel dignissim te accumsan aliquip commodoconsequat Utwisi.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Dolore facilisi nulla blandit volutpat facilisi feugait nulla duis.
+FN:Domenic Winters
+EMAIL:domenic.winters@duisat.tv
+GENDER:O
+TEL:tel:(207)676-5318
+BDAY:19930607
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(248)453-6728
+EMAIL:s.schneider@inaliquip.us
+FN:Silas Schneider
+N:Schneider;Silas;;;
+GENDER:O
+IMPP:sip:silas@sip.linphone.org
+NOTE:Duis autem ipsum qui amet nostrud nibh iusto qui erat velit commodo doloremagna.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+FN:Louisa Grace
+ADR:;;2220 Jocelyn Way;Black;AL;36314;
+TEL:tel:(651)381-1704
+IMPP:sip:louisa@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19670128
+GENDER:F
+ORG:Adventure Technology
+FN:Shiela Ricks
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;3071 Heatherbrook Circle;Austin;TX;78748;
+IMPP:sip:toney@sip.linphone.org
+FN:Toney Krauss
+BDAY:19551107
+TEL:tel:(864)675-5041
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(660)772-3012
+GENDER:M
+FN:Walton Slaton
+BDAY:19351207
+IMPP:sip:walton@sip.linphone.org
+NOTE:Aliquip consectetuer facilisi eum feugait nibh ut ipsum iusto nonummy invulputate ut.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Hebert;Rudolph;;;
+IMPP:sip:rudolph@sip.linphone.org
+FN:Rudolph Hebert
+NOTE:Laoreet feugait in veniam elitsed iusto duis adipiscing te suscipit velit molestie at tation.
+EMAIL:rudolph@utlaoreet.info
+ORG:Venture Galaxy
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5133 Morning Dove Trail;Lineboro;MD;21088;
+GENDER:N
+BDAY:19940730
+EMAIL:b.bostick@facilisisconsequat.us
+FN:Bruno Bostick
+IMPP:sip:bruno@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Sammy Mahon
+IMPP:sip:sammy@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+ORG:West Galaxy Interactive
+IMPP:sip:christi@sip.linphone.org
+BDAY:19371219
+EMAIL:c.gill@adipiscingeufeugiat.net
+FN:Christi Gill
+N:Gill;Christi;;;
+ADR:;;2104 Stonewyck Lane;Potomac;MD;20854;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Rubye Muhammad
+N:Muhammad;Rubye;;;
+ORG:Federated Telecom
+NOTE:In commodo invulputate iusto veniam eros vel dolore elitsed suscipit.
+EMAIL:r.muhammad@velblandit.edu
+GENDER:O
+TEL:tel:(424)783-2218
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Daniel Bruns
+TEL:tel:(239)613-7508
+GENDER:U
+IMPP:sip:daniel@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:peter.gonsalves@exad.tv
+FN:Peter Gonsalves
+TEL:tel:(571)773-3394
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Carrol Shuler
+IMPP:sip:carrol@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Rey Appleton
+EMAIL:rey.appleton@autemnulla.gov
+ADR:;;1621 Oxboro Cove;Sturgis;MI;49091;
+IMPP:sip:rey@sip.linphone.org
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Michal Nunez
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:collin@indignissim.info
+FN:Collin Busch
+N:Busch;Collin;;;
+NOTE:Etaccumsan eum tationullamcorper te exerci luptatum.
+IMPP:sip:collin@sip.linphone.org
+BDAY:19750618
+ORG:Max Interactive General
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(918)656-4581
+IMPP:sip:jim@sip.linphone.org
+BDAY:19800313
+NOTE:Lobortis feugait ex delenitaugue veniam delenitaugue facilisi facilisis duis ut dolore hendrerit dignissim vero.
+FN:Jim Beaver
+GENDER:O
+N:Beaver;Jim;;;
+ORG:Systems Hardware Software
+EMAIL:jim@dolorediam.com
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:g.ostrander@facilisisfacilisis.gov
+TEL:tel:(210)868-5445
+ORG:Innovation Provider Internet
+GENDER:M
+ADR:;;3274 Wilkins Drive;Ellabell;GA;31308;
+FN:Glen Ostrander
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19660131
+GENDER:U
+EMAIL:a.galbraith@aliquipaliquip.eu
+FN:Arlen Galbraith
+ORG:Systems Analysis Net
+IMPP:sip:arlen@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Darcy Houck
+ORG:Solutions Design
+ADR:;;4209 Elk Run Street;Morristown;NJ;07963;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:jillian.lam@utetaccumsan.edu
+NOTE:Quis molestie duis tationullamcorper suscipit.
+FN:Jillian Lam
+N:Lam;Jillian;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19480708
+FN:Bettye Sorrell
+TEL:tel:(870)422-3359
+N:Sorrell;Bettye;;;
+GENDER:N
+NOTE:Aliquip eros velit vero.
+IMPP:sip:bettye@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Cheney;Wally;;;
+ADR:;;6166 Haseley Drive;Ingleside;TX;78362;
+FN:Wally Cheney
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Research Industries
+FN:Jospeh Beyer
+NOTE:Dolor delenit commodoconsequat velit sit adipiscing et odio.
+IMPP:sip:jospeh@sip.linphone.org
+N:Beyer;Jospeh;;;
+BDAY:19660131
+ADR:;;9777 Valley Crest Street;Mapleton;ME;04757;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+BDAY:19670226
+IMPP:sip:heriberto@sip.linphone.org
+ADR:;;8916 Danforth Street;French Village;MO;63036;
+N:Roden;Heriberto;;;
+FN:Heriberto Roden
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(225)603-8216
+FN:Maynard Eden
+EMAIL:m.eden@praesentiriuredolor.us
+GENDER:U
+ADR:;;4059 Orchard Hill Trail;Ogden;UT;84415;
+ORG:Vision Interactive
+NOTE:Eum blandit facilisis luptatum nibh nulla praesent lobortis velit feugiat lobortis duis vel.
+BDAY:19510723
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Keyes;Bryon;;;
+EMAIL:bryon.keyes@feugaitdelenit.org
+FN:Bryon Keyes
+ADR:;;5727 Hapano Street;Little Rock;AR;72295;
+ORG:Frontier Atlantic
+NOTE:Aliquip at duis nulla lobortis vel consequat.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19790318
+FN:Michele Burkett
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+NOTE:Etaccumsan vel delenitaugue esse volutpat aliquip nonummy praesent exerci nibh qui Utwisi te.
+IMPP:sip:tristan@sip.linphone.org
+FN:Tristan Amador
+ADR:;;4568 Walkwood Lane;Fleetwood;PA;19522;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:titus@enimut.us
+BDAY:19380925
+NOTE:Wisi iustoodio nulla sit.
+IMPP:sip:titus@sip.linphone.org
+GENDER:M
+FN:Titus Andrus
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Rosita Nettles
+IMPP:sip:rosita@sip.linphone.org
+ORG:Hill Star
+ADR:;;2347 Chestnut Avenue;Bessemer City;NC;28016;
+N:Nettles;Rosita;;;
+TEL:tel:(808)226-3984
+BDAY:19850308
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:santos@sip.linphone.org
+FN:Santos Hedrick
+EMAIL:santos@dolorepraesent.gov
+TEL:tel:(501)502-5766
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6333 Sandy Lane;Spring Valley;IL;61362;
+FN:Easter Erickson
+N:Erickson;Easter;;;
+GENDER:F
+TEL:tel:(626)706-3992
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Nona Stinson
+N:Stinson;Nona;;;
+GENDER:O
+TEL:tel:(470)249-8522
+ORG:Vision General
+ADR:;;8049 Commercial Street;Sargent;NE;68874;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:c.ingraham@iustout.com
+ADR:;;2114 Woodleaf Cove;Porterville;CA;93258;
+FN:Chong Ingraham
+ORG:Power West
+TEL:tel:(859)364-7708
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Hooker;Amparo;;;
+BDAY:19780308
+NOTE:Minim dignissim eum Utwisi praesent iusto.
+FN:Amparo Hooker
+EMAIL:a.hooker@aliquipvel.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+FN:Anton Olivarez
+ORG:Federated Internet Design
+ADR:;;3638 Beaux Bridge Circle;Sharpsville;PA;16150;
+TEL:tel:(469)444-8222
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:nicolas@sip.linphone.org
+EMAIL:nicolas.worley@dolorconsequat.org
+ADR:;;8398 Long Oak Trail;Stevenson;CT;06491;
+FN:Nicolas Worley
+GENDER:M
+ORG:Construction Alpha Vision
+NOTE:Feugiat exerci te minim.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+ADR:;;8811 Poplar Way;Conway;NH;03818;
+TEL:tel:(773)568-5105
+FN:Scotty Vogt
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Speed Data
+FN:Avery Prater
+GENDER:N
+BDAY:19470416
+N:Prater;Avery;;;
+TEL:tel:(630)907-7067
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Industries Advanced Building
+FN:Gwendolyn Abreu
+BDAY:19390308
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(717)793-7719
+FN:Jeremiah Barton
+GENDER:O
+ADR:;;4299 Green Forest Circle;Macon;GA;31208;
+BDAY:19680103
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(916)693-9508
+ORG:Pacific Telecom Alpha
+FN:Jeromy Myrick
+IMPP:sip:jeromy@sip.linphone.org
+NOTE:Facilisi esse zzril invulputate wisi qui laoreet ullamcorper delenit commodo dolore euismod in.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Signal Hill Federated
+ADR:;;3129 Hawksprings Trail;Waldport;OR;97394;
+EMAIL:noe.weis@teautem.gov
+FN:Noe Weis
+IMPP:sip:noe@sip.linphone.org
+BDAY:19450614
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:West Galaxy Adventure
+BDAY:19580408
+ADR:;;5679 Somerset Cove;Brookston;TX;75421;
+TEL:tel:(401)122-4169
+FN:Orville Whitehead
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2460 Matisse Way;Ingold;NC;28446;
+FN:Delfina Alvarez
+GENDER:N
+ORG:Net Advanced Building
+TEL:tel:(574)622-6569
+EMAIL:delfina.alvarez@molestieeros.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Drummond;Jana;;;
+NOTE:Ipsum luptatum consequat aliquam invulputate nulla diam dolore iusto quis dolore amet.
+BDAY:19371108
+IMPP:sip:jana@sip.linphone.org
+ORG:Federated Architecture Alpha
+FN:Jana Drummond
+GENDER:U
+EMAIL:jana.drummond@accumsanaliquam.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19460901
+FN:Doyle Delgado
+ADR:;;9711 Mchenry Way;Micro;NC;27555;
+GENDER:M
+TEL:tel:(702)231-4317
+ORG:Application Signal Medicine
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Odessa Shipman
+ORG:People Contract
+GENDER:O
+TEL:tel:(573)929-2084
+ADR:;;7255 Durley Drive;Blue Point;NY;11715;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Marie Brand
+EMAIL:marie@facilisimolestie.com
+ADR:;;4112 Val Verde Drive;Minturn;SC;29573;
+GENDER:F
+TEL:tel:(703)584-6907
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Aileen Tovar
+ADR:;;7079 Park Ridge Lane;Locust Fork;AL;35097;
+BDAY:19500527
+EMAIL:aileen@praesentautem.info
+GENDER:U
+TEL:tel:(563)897-6866
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Analysis Max Graphics
+ADR:;;5421 Grenville Street;Pleasanton;CA;94588;
+BDAY:19470627
+IMPP:sip:gillian@sip.linphone.org
+FN:Gillian Mcginnis
+NOTE:Praesent illum aliquip et autem iustoodio hendrerit consequat nibh consequatvel facilisi.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:cara@veroerat.net
+FN:Cara Mcneil
+ORG:Net Data Industries
+NOTE:Iustoodio consequat ullamcorper esse feugiat aliquip tincidunt illum feugait ea adipiscing.
+IMPP:sip:cara@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Fredric Grayson
+NOTE:Delenitaugue vel duis dolore illum veniamquis augue exerci quis eu vel delenitaugue.
+ADR:;;991 Oak Manor Trail;Vernon;IL;62892;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Ivy Langdon
+BDAY:19750322
+TEL:tel:(803)210-8297
+GENDER:F
+ADR:;;4160 Meadow Wood Trail;New Vienna;IA;52065;
+NOTE:In at nonummy facilisi nulla nostrud feugiat.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+TEL:tel:(630)529-3506
+ORG:Power Net
+BDAY:19951029
+FN:Lemuel Mcgriff
+EMAIL:lemuel.mcgriff@molestieet.net
+N:Mcgriff;Lemuel;;;
+NOTE:Odio aliquip ut esse ex in dignissim etaccumsan diam.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:s.chamberlain@elitsedin.gov
+ADR:;;7010 Saint Marys Lane;Rock Springs;WI;53961;
+NOTE:Sit accumsan velit augue dolore ea et nulla et et velit et praesent commodo.
+FN:Sharla Chamberlain
+BDAY:19510711
+ORG:Bell General
+IMPP:sip:sharla@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Net Adventure North
+EMAIL:donny.townsend@atwisi.eu
+GENDER:M
+ADR:;;7276 Foster Dale Drive;Rivervale;AR;72377;
+IMPP:sip:donny@sip.linphone.org
+FN:Donny Townsend
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Delenitaugue euismod dolore delenit nostrud iriure sit ut.
+ORG:Construction Source Vision
+IMPP:sip:leta@sip.linphone.org
+GENDER:N
+BDAY:19670524
+FN:Leta Kirk
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6679 Havenhill Drive;Young America;MN;55557;
+TEL:tel:(352)569-5498
+EMAIL:j.cameron@feugaitnibh.com
+FN:Johnie Cameron
+IMPP:sip:johnie@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:garrett@sip.linphone.org
+ADR:;;9628 Bridge Forest Trail;Atlanta;GA;30392;
+NOTE:Dolore facilisis praesent ut ipsum nibh delenitaugue facilisi lobortis ut nostrud nisl et diam.
+TEL:tel:(323)557-2825
+FN:Garrett Peachey
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:edythe@sip.linphone.org
+FN:Edythe Dougherty
+BDAY:19730501
+N:Dougherty;Edythe;;;
+ADR:;;3485 Tully Trail;Ocala;FL;34479;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;3495 Orchard Grove Avenue;Morgan Hill;CA;95038;
+IMPP:sip:lacey@sip.linphone.org
+FN:Lacey Hargett
+GENDER:O
+EMAIL:l.hargett@loremconsequat.us
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Fawn Albright
+GENDER:O
+EMAIL:fawn.albright@hendreritdolor.info
+ORG:Federated Medicine Application
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19740811
+ORG:Pacific Industries
+FN:Justine Alfaro
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19530304
+EMAIL:issac.coburn@utfacilisis.com
+NOTE:Suscipit feugait enim suscipit.
+ADR:;;2231 Regents Avenue;Soper;OK;74759;
+FN:Issac Coburn
+ORG:Consulting Application People
+IMPP:sip:issac@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Desmond Kraft
+NOTE:Nulla elitsed et volutpat autem consectetuer dolor feugait luptatumzzril odio minim zzril laoreet aliquip.
+BDAY:19670606
+ORG:Atlantic East West
+EMAIL:d.kraft@elitsedvel.tv
+TEL:tel:(315)771-8545
+IMPP:sip:desmond@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Brittany Helms
+N:Helms;Brittany;;;
+NOTE:Nulla autem suscipit ullamcorper illum minim vel tincidunt consequat hendrerit minim.
+GENDER:U
+IMPP:sip:brittany@sip.linphone.org
+EMAIL:brittany@utwisiqui.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Bo Bickford
+BDAY:19370318
+NOTE:Dolor nibh in blandit et feugait aliquam velit iusto.
+ADR:;;9662 Western Parkway;Banks;ID;83602;
+ORG:Bell Venture
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:tanya@sip.linphone.org
+ORG:North Resource Virtual
+ADR:;;8305 Robin Parkway;Matoaka;WV;24736;
+TEL:tel:(703)268-5308
+N:Montenegro;Tanya;;;
+EMAIL:t.montenegro@dolorenulla.net
+FN:Tanya Montenegro
+NOTE:Consequat sit ullamcorper suscipit nulla feugiat nulla.
+BDAY:19960623
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Leila Mcclanahan
+ADR:;;5183 Everett Cove;Atlanta;GA;30334;
+ORG:Systems Electronic Building
+N:Mcclanahan;Leila;;;
+EMAIL:leila.mcclanahan@veroaliquip.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+ADR:;;7083 Innsbruck Trail;Saint Petersburg;FL;33709;
+TEL:tel:(530)822-4399
+NOTE:Consequatvel erat ut dignissim augue delenit nulla feugiat wisi lorem.
+FN:Marlene Rosenberg
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Network Research
+NOTE:Dolore exerci nibh iriuredolor commodoconsequat esse lorem ut autem sit praesent.
+FN:Andres Houston
+GENDER:M
+ADR:;;413 Malcolm Cove;Pompano Beach;FL;33077;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+NOTE:Ad blandit adipiscing in hendrerit enim esse hendrerit.
+ORG:Digital Universal
+TEL:tel:(419)814-9532
+EMAIL:s.dallas@dolorillum.info
+FN:Stacy Dallas
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Feugait accumsan luptatumzzril et.
+ADR:;;3284 Toro Circle;Eek;AK;99578;
+FN:Rafaela Sledge
+GENDER:O
+TEL:tel:(412)993-6896
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+FN:Jackson Mckay
+NOTE:Eum ad tationullamcorper praesent duis suscipit zzril invulputate facilisi esse.
+N:Mckay;Jackson;;;
+EMAIL:j.mckay@odioautem.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Canady;Moses;;;
+IMPP:sip:moses@sip.linphone.org
+GENDER:N
+FN:Moses Canady
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Eros te blandit ut.
+IMPP:sip:isaias@sip.linphone.org
+FN:Isaias Dowdell
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(515)290-7997
+FN:Esperanza Carlson
+NOTE:Hendrerit ut facilisi in nulla at iustoodio ad luptatumzzril nisl wisi.
+IMPP:sip:esperanza@sip.linphone.org
+ORG:Max East
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(408)227-8737
+N:Oneill;Jospeh;;;
+FN:Jospeh Oneill
+EMAIL:j.oneill@tationhendrerit.tv
+ORG:Studio Solutions
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:stephenie@sip.linphone.org
+FN:Stephenie Redmon
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Williams;Adelaide;;;
+EMAIL:a.williams@hendreritexerci.info
+NOTE:Dolore ex iusto enim hendrerit eum ut veniam minim facilisi tationullamcorper eros.
+IMPP:sip:adelaide@sip.linphone.org
+BDAY:19431012
+FN:Adelaide Williams
+ADR:;;8665 Laurinburg Street;Chambersburg;PA;17201;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Kate Stitt
+NOTE:Dolor dolore veniamquis autem ut consequat nulla ex.
+TEL:tel:(541)659-6119
+ADR:;;4988 Huntcliff Avenue;Plainfield;NJ;07062;
+EMAIL:kate@molestiedolore.edu
+N:Stitt;Kate;;;
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(559)830-3541
+FN:Zoe Tang
+IMPP:sip:zoe@sip.linphone.org
+NOTE:Te delenit lobortis dolore esse etaccumsan nislut etaccumsan wisi nulla delenitaugue veniamquis te.
+ORG:Resource East Future
+ADR:;;3096 River Bend Cove;Garfield;NJ;07026;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lindsey Reardon
+N:Reardon;Lindsey;;;
+EMAIL:l.reardon@minimexerci.com
+BDAY:19690805
+IMPP:sip:lindsey@sip.linphone.org
+ADR:;;2343 Rainbow Street;Tacoma;WA;98447;
+NOTE:Invulputate hendrerit duis consequat.
+TEL:tel:(480)482-1632
+ORG:Virtual Innovation
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Tremblay;Eusebio;;;
+NOTE:In autem consectetuer lobortis.
+EMAIL:eusebio@nostruddignissim.info
+BDAY:19850207
+FN:Eusebio Tremblay
+TEL:tel:(304)195-4577
+IMPP:sip:eusebio@sip.linphone.org
+ORG:People General Network
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Adventure Architecture
+GENDER:N
+BDAY:19380309
+FN:Andra Gary
+ADR:;;3697 Liberty Circle;Sunset;ME;04683;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Solutions Source Hill
+ADR:;;1312 Oakes Way;Success;AR;72470;
+GENDER:O
+IMPP:sip:oswaldo@sip.linphone.org
+EMAIL:oswaldo.hopson@eumnulla.eu
+N:Hopson;Oswaldo;;;
+TEL:tel:(317)700-4847
+NOTE:Feugiat hendrerit vero dolor vel ut vero duis molestie diam vero iriuredolor enim.
+FN:Oswaldo Hopson
+BDAY:19970517
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Conyers;Maudie;;;
+GENDER:O
+IMPP:sip:maudie@sip.linphone.org
+FN:Maudie Conyers
+TEL:tel:(864)681-5903
+ADR:;;6590 Winchester Trail;Docena;AL;35060;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Tation nulla nulla veniamquis ut volutpat feugiat consectetuer facilisis at delenitaugue hendrerit.
+FN:Shauna Chaney
+IMPP:sip:shauna@sip.linphone.org
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19900924
+ORG:Frontier Interactive Network
+FN:Marissa Vergara
+N:Vergara;Marissa;;;
+EMAIL:marissa.vergara@duisvel.eu
+ADR:;;2249 Barons Drive;Manchester;MN;56064;
+GENDER:U
+NOTE:Dignissim illum hendrerit molestie in esse consectetuer doloremagna delenitaugue iriuredolor et nostrud ex.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:faustino@enimluptatumzzril.tv
+FN:Faustino Dover
+ADR:;;849 River Heights Drive;Widnoon;PA;16261;
+ORG:Star General South
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:williams@sip.linphone.org
+NOTE:Iustoodio nisl nislut amet velit nulla velit suscipit commodo lobortis.
+N:Holley;Williams;;;
+TEL:tel:(202)628-6388
+FN:Williams Holley
+EMAIL:williams@doloreautem.eu
+ADR:;;3448 Victoria Lane;Pleasant Lake;MI;49272;
+ORG:Application Electronic Contract
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Consulting Atlantic
+FN:Lillie Redmon
+NOTE:Iusto diam iustoodio commodo commodoconsequat esse exerci consequatvel nulla nisl doloremagna ut dolore in.
+GENDER:F
+TEL:tel:(518)394-1947
+EMAIL:lillie.redmon@tinciduntinvulputate.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19370730
+FN:Mohammed Paulson
+TEL:tel:(619)979-9169
+NOTE:Luptatum facilisi laoreet delenit esse delenitaugue amet eum Utwisi nulla euismod ea.
+EMAIL:mohammed.paulson@nullacommodoconsequat.eu
+ORG:Frontier Solutions West
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Taylor Sullivan
+BDAY:19640911
+ORG:Provider Consulting Research
+EMAIL:taylor@iriureet.us
+NOTE:Consequat te ut enim ad ut duis nislut nulla doloremagna.
+N:Sullivan;Taylor;;;
+TEL:tel:(304)407-4653
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:George Herrington
+ORG:Building Application Omega
+BDAY:19881001
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+N:Erwin;Christina;;;
+ADR:;;9992 Brownleaf Parkway;Pecks Mill;WV;25547;
+FN:Christina Erwin
+BDAY:19360113
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Neil Gilliam
+TEL:tel:(682)676-1647
+EMAIL:neil@dolordolore.edu
+ADR:;;2007 Paddock Way;West Hills;CA;91307;
+NOTE:Iriure nulla commodoconsequat in iusto ullamcorper esse nulla dolore velit qui ea.
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;3886 Greeley Way;Morrowville;KS;66958;
+FN:Hugo Sandlin
+BDAY:19661120
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Gerald Saenz
+ORG:Omega People West
+BDAY:19661006
+TEL:tel:(412)607-9819
+NOTE:Iustoodio nibh laoreet eu in elitsed qui quis delenitaugue esse.
+GENDER:N
+EMAIL:g.saenz@eatincidunt.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Eufeugiat suscipit feugait autem iriure qui vel minim veniam diam blandit.
+FN:Carlton Rector
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Shirley;Evan;;;
+GENDER:N
+BDAY:19371024
+FN:Evan Shirley
+IMPP:sip:evan@sip.linphone.org
+ORG:Galaxy Advanced Network
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Steve Ferry
+NOTE:At etaccumsan ipsum praesent illum wisi.
+TEL:tel:(213)364-2534
+GENDER:U
+ORG:Innovation Studio Technology
+EMAIL:s.ferry@etaccumsanmolestie.tv
+IMPP:sip:steve@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Joe Delacruz
+ORG:Architecture Resource Electronic
+NOTE:Facilisis etaccumsan ut aliquam.
+EMAIL:joe.delacruz@suscipitminim.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:alecia@sip.linphone.org
+BDAY:19880105
+FN:Alecia Gillis
+N:Gillis;Alecia;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Graig Hawk
+NOTE:Dignissim volutpat eufeugiat velit vero.
+IMPP:sip:graig@sip.linphone.org
+TEL:tel:(443)472-6334
+ORG:Net Vision Frontier
+N:Hawk;Graig;;;
+BDAY:19910708
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:guillermo@sip.linphone.org
+GENDER:N
+NOTE:Vel facilisi velit vel vulputate vel feugiat in elitsed dignissim velit nonummy vel commodoconsequat.
+FN:Guillermo Hines
+N:Hines;Guillermo;;;
+BDAY:19360628
+ADR:;;7003 Osman Way;Alachua;FL;32615;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1643 Peacan Circle;Branford;FL;32008;
+N:Wise;Darin;;;
+BDAY:19910416
+FN:Darin Wise
+NOTE:Nostrud at quis adipiscing vel adipiscing adipiscing nulla dolore te hendrerit.
+TEL:tel:(563)617-3028
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:d.kaminski@consectetueririure.tv
+FN:Dewey Kaminski
+GENDER:M
+BDAY:19420102
+N:Kaminski;Dewey;;;
+IMPP:sip:dewey@sip.linphone.org
+ADR:;;4782 Kingsride Cove;Tibbie;AL;36583;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Interactive Telecom Architecture
+TEL:tel:(706)348-7118
+GENDER:O
+FN:Kevin Hutson
+ADR:;;5470 Hazel Circle;Cincinnati;OH;45237;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:gale@sip.linphone.org
+N:Folse;Gale;;;
+ORG:Resource Internet
+FN:Gale Folse
+EMAIL:g.folse@nullain.org
+BDAY:19930804
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+N:Lockwood;Rafaela;;;
+FN:Rafaela Lockwood
+TEL:tel:(980)368-1453
+ORG:Internet Star
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:alaina.ochoa@euismodaugue.tv
+GENDER:N
+FN:Alaina Ochoa
+ORG:Electronic Hill Hardware
+IMPP:sip:alaina@sip.linphone.org
+BDAY:19350907
+NOTE:Nisl luptatum ullamcorper aliquip laoreet wisi aliquip ad velit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Ut eum lorem hendrerit consequat molestie.
+GENDER:U
+FN:Stanford Zink
+ADR:;;2798 Corporate Gardens Trail;Rago;KS;67128;
+EMAIL:stanford@quifacilisi.com
+IMPP:sip:stanford@sip.linphone.org
+ORG:Alpha Source Solutions
+BDAY:19370514
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jarrett Eubanks
+ORG:Virtual Digital People
+EMAIL:jarrett@etvel.org
+TEL:tel:(312)748-5625
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Black;Mason;;;
+FN:Mason Black
+BDAY:19820920
+GENDER:N
+TEL:tel:(608)922-3041
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6405 Sawyer Way;Lankin;ND;58250;
+FN:Michell Cummins
+N:Cummins;Michell;;;
+GENDER:F
+ORG:Adventure Atlantic
+IMPP:sip:michell@sip.linphone.org
+TEL:tel:(956)773-1500
+NOTE:Aliquip molestie duis amet nibh doloremagna suscipit eros.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Orlando;Emil;;;
+ADR:;;4499 Poplar Estates Lane;Junction City;CA;96048;
+FN:Emil Orlando
+ORG:Building Software East
+BDAY:19970401
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Farrow;Burt;;;
+ADR:;;3932 Quant Circle;Charleston;WV;25314;
+FN:Burt Farrow
+EMAIL:b.farrow@eate.eu
+TEL:tel:(973)156-5614
+IMPP:sip:burt@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Building Architecture
+BDAY:19820616
+EMAIL:l.dougherty@iriuredoloraliquip.edu
+FN:Louis Dougherty
+NOTE:Nulla illum erat facilisi quis hendrerit illum nulla aliquip velit suscipit luptatumzzril amet velit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;9568 Riverview Street;Rogersville;MO;65742;
+BDAY:19721126
+ORG:Frontier Alpha
+TEL:tel:(580)352-6590
+N:Saavedra;Teresita;;;
+FN:Teresita Saavedra
+NOTE:Autem nislut ex invulputate duis consequatvel.
+EMAIL:t.saavedra@doloreipsum.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:z.numbers@dignissimea.com
+GENDER:F
+FN:Zoe Numbers
+BDAY:19530127
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Denny;Keneth;;;
+TEL:tel:(660)402-4120
+FN:Keneth Denny
+GENDER:M
+ADR:;;2746 Gershwin Drive;Quincy;OH;43343;
+BDAY:19481031
+ORG:Atlantic Pacific Architecture
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5133 Riverwind Drive;West Columbia;WV;25287;
+FN:Addie Harden
+EMAIL:a.harden@nullaqui.org
+IMPP:sip:addie@sip.linphone.org
+GENDER:O
+ORG:Electronic East Advanced
+NOTE:Eros luptatum sit tationullamcorper ad erat dignissim.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19890313
+FN:Isidro Ashton
+ORG:Electronics Provider
+TEL:tel:(917)331-7907
+GENDER:U
+NOTE:Esse eum vel invulputate sit eros.
+EMAIL:isidro@veldolore.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:rob.sheehan@tationconsequatvel.gov
+FN:Rob Sheehan
+GENDER:U
+TEL:tel:(435)962-9596
+ORG:General Digital
+IMPP:sip:rob@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:shanda.barraza@praesentesse.gov
+FN:Shanda Barraza
+TEL:tel:(215)283-5508
+GENDER:F
+ORG:Star South Atlantic
+ADR:;;3957 Willowbend Trail;Denver;CO;80237;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:douglas@sip.linphone.org
+NOTE:Dolore duis exerci vero nostrud enim consectetuer.
+FN:Douglas Neuman
+BDAY:19500410
+ORG:Power Net Telecom
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Solutions Star
+EMAIL:f.harman@eumconsequat.us
+FN:Felipe Harman
+N:Harman;Felipe;;;
+IMPP:sip:felipe@sip.linphone.org
+ADR:;;6861 Poplar Drive;Whitehall;MI;49461;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Quis facilisis elitsed autem tationullamcorper lobortis ullamcorper.
+FN:Loyd Zielinski
+EMAIL:l.zielinski@consequatvelzzril.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19720506
+FN:Perry Abraham
+ORG:Adventure Construction Contract
+ADR:;;75 Main Cove;Gulfport;MS;39506;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Sonja Boss
+N:Boss;Sonja;;;
+TEL:tel:(878)517-6710
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:gregory.pritchett@esseexerci.us
+FN:Gregory Pritchett
+ORG:Electronics Architecture
+TEL:tel:(408)965-9886
+N:Pritchett;Gregory;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Valerie Kelleher
+NOTE:Commodoconsequat consectetuer Utwisi dolore dolore ipsum qui feugait delenitaugue vel molestie exerci hendrerit.
+TEL:tel:(989)492-9404
+ADR:;;5632 Woodbend Cove;Monterey;CA;93944;
+GENDER:U
+N:Kelleher;Valerie;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Christin Burnette
+BDAY:19761120
+NOTE:Commodoconsequat in duis exerci delenit exerci esse aliquip hendrerit velit ut ut.
+N:Burnette;Christin;;;
+GENDER:F
+ORG:Telecom Network Research
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(269)883-1327
+FN:Roman Tamayo
+N:Tamayo;Roman;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(469)141-8991
+GENDER:U
+BDAY:19771021
+FN:Willis Naylor
+N:Naylor;Willis;;;
+EMAIL:willis@consequatvelenim.net
+ADR:;;224 Saint George Circle;Folsom;LA;70437;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(253)593-1510
+N:Dwyer;Genevieve;;;
+FN:Genevieve Dwyer
+EMAIL:g.dwyer@dignissimdolore.net
+ADR:;;5176 Circleshade Lane;Emmaus;PA;18098;
+GENDER:N
+IMPP:sip:genevieve@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(620)612-3494
+EMAIL:annamarie.dugan@atdolore.info
+GENDER:N
+FN:Annamarie Dugan
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:johnson@aliquipduis.net
+ORG:Construction Electronics Universal
+BDAY:19921212
+FN:Johnson Brunson
+IMPP:sip:johnson@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(612)181-7773
+IMPP:sip:vaughn@sip.linphone.org
+N:Smiley;Vaughn;;;
+BDAY:19811220
+EMAIL:v.smiley@etvel.net
+FN:Vaughn Smiley
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Max Star Power
+FN:Louisa Majors
+IMPP:sip:louisa@sip.linphone.org
+NOTE:Et vel aliquam et duis minim autem iusto.
+N:Majors;Louisa;;;
+ADR:;;8280 Otter Circle;Port Clinton;OH;43452;
+GENDER:F
+TEL:tel:(225)488-6239
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lulu Lacey
+EMAIL:l.lacey@consequatduis.org
+GENDER:F
+TEL:tel:(559)671-8385
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Ingram;Lee;;;
+EMAIL:lee.ingram@molestienulla.org
+NOTE:Ea consequatvel blandit ex consequat doloremagna ullamcorper dignissim delenit feugait esse nostrud.
+GENDER:N
+TEL:tel:(727)871-2405
+FN:Lee Ingram
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Mcmurray;Taylor;;;
+EMAIL:taylor@addolor.gov
+FN:Taylor Mcmurray
+TEL:tel:(660)326-1555
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+IMPP:sip:lydia@sip.linphone.org
+TEL:tel:(207)255-6135
+ORG:Omega Systems
+ADR:;;8672 Heatherbrook Avenue;Hillview;KY;40129;
+BDAY:19681221
+FN:Lydia Jeffrey
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:r.adler@quienim.com
+NOTE:Facilisi duis vero adipiscing at accumsan enim.
+BDAY:19890307
+GENDER:N
+N:Adler;Rafaela;;;
+FN:Rafaela Adler
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Hardy;Janis;;;
+ADR:;;5182 Sycamore Avenue;Edroy;TX;78352;
+FN:Janis Hardy
+ORG:Building Electronic Data
+EMAIL:j.hardy@tationet.info
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(215)513-3270
+GENDER:O
+IMPP:sip:jake@sip.linphone.org
+FN:Jake Krause
+EMAIL:jake.krause@doloreduis.org
+NOTE:Facilisi et eros dignissim duis at lorem dolore aliquam illum iriure.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Eufeugiat ut hendrerit vel luptatum iriuredolor nulla veniamquis dignissim luptatum iusto ad aliquip.
+FN:Grady Killian
+GENDER:O
+BDAY:19641011
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:cletus.forrest@molestieodio.us
+TEL:tel:(975)230-3679
+NOTE:Suscipit nulla dignissim iriuredolor delenitaugue dolore augue minim nulla nulla at blandit nulla.
+ADR:;;1998 Oldridge Parkway;New Johnsonville;TN;37134;
+FN:Cletus Forrest
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Reyna;Allan;;;
+NOTE:In tincidunt aliquip aliquam.
+TEL:tel:(518)585-3228
+FN:Allan Reyna
+IMPP:sip:allan@sip.linphone.org
+ORG:Medicine South Resource
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Liz Horner
+NOTE:Diam et illum zzril veniamquis consequat blandit aliquam facilisis et exerci at.
+IMPP:sip:liz@sip.linphone.org
+N:Horner;Liz;;;
+TEL:tel:(424)458-3347
+ADR:;;996 Lofton Parkway;Walker;MO;64790;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19410903
+FN:Valentin Pitt
+NOTE:Ut augue iustoodio facilisi nostrud adipiscing.
+EMAIL:valentin@exblandit.com
+IMPP:sip:valentin@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(434)114-7200
+NOTE:Feugait autem eum velit autem praesent vero duis illum at vero ad diam.
+FN:Morgan Wayne
+N:Wayne;Morgan;;;
+EMAIL:m.wayne@feugaitea.org
+BDAY:19580930
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19570726
+FN:Racheal Farias
+ADR:;;2566 Falling Leaf Parkway;Wade;NC;28395;
+N:Farias;Racheal;;;
+EMAIL:racheal@eaquis.com
+ORG:Construction Pacific
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Hal Hubbard
+GENDER:N
+ADR:;;7168 Jocelyn Trail;Burneyville;OK;73430;
+N:Hubbard;Hal;;;
+EMAIL:h.hubbard@diamquis.com
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:dusty@dolorfeugiat.net
+FN:Dusty Helton
+GENDER:M
+NOTE:Aliquip eros molestie at eum ullamcorper duis eros ut veniam luptatum nulla.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Esteban Dew
+EMAIL:e.dew@duislobortis.org
+TEL:tel:(320)258-8117
+N:Dew;Esteban;;;
+NOTE:Volutpat ut lobortis duis tincidunt.
+ADR:;;7405 Oak Manor Circle;New Haven;CT;06504;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Design Resource
+IMPP:sip:adell@sip.linphone.org
+EMAIL:adell@wisite.eu
+TEL:tel:(734)952-4085
+N:Godfrey;Adell;;;
+NOTE:Nostrud exerci tincidunt nostrud zzril dolore velit esse nulla dolor aliquip duis tation minim.
+FN:Adell Godfrey
+ADR:;;979 Newberry Way;Cascadia;OR;97329;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Esse vel zzril tincidunt vero autem.
+TEL:tel:(201)379-7518
+ORG:Data Data
+FN:Burt Falk
+IMPP:sip:burt@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Rees;Guy;;;
+FN:Guy Rees
+EMAIL:g.rees@facilisiste.tv
+NOTE:Suscipit feugiat ut hendrerit lobortis.
+ORG:Contract Vision
+IMPP:sip:guy@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;129 Redwood Place Lane;Castanea;PA;17726;
+N:Kee;Kaitlyn;;;
+FN:Kaitlyn Kee
+BDAY:19860613
+ORG:Virtual Federated
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(229)783-8723
+BDAY:19730818
+N:Golden;Sonia;;;
+EMAIL:s.golden@loremhendrerit.net
+FN:Sonia Golden
+ADR:;;521 Rivercrest Parkway;Springfield;VA;22150;
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Munn;Lyman;;;
+TEL:tel:(978)839-1511
+FN:Lyman Munn
+EMAIL:lyman@velitsuscipit.gov
+BDAY:19650201
+NOTE:Duis nisl dolor illum autem nulla facilisis dolor velit invulputate nonummy in.
+ADR:;;7326 Island Grove Avenue;Durant;FL;33530;
+IMPP:sip:lyman@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Illum ipsum odio dolore Utwisi minim qui exerci in.
+FN:Stacie Garvey
+N:Garvey;Stacie;;;
+IMPP:sip:stacie@sip.linphone.org
+BDAY:19780819
+EMAIL:stacie.garvey@wisisit.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Greenlee;Rena;;;
+BDAY:19641011
+ORG:Graphics South
+GENDER:O
+TEL:tel:(352)887-6426
+FN:Rena Greenlee
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Praesent praesent lorem minim aliquam ad suscipit feugait vulputate duis nislut.
+N:Lanham;Chung;;;
+FN:Chung Lanham
+TEL:tel:(401)768-2075
+EMAIL:c.lanham@duiseufeugiat.com
+ADR:;;5871 Meadowview Way;Stuyvesant Falls;NY;12174;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;3008 Osgood Lane;Milton;MA;02186;
+ORG:Virtual East People
+EMAIL:yong.gooding@feugaitodio.gov
+NOTE:Qui feugait blandit illum veniam tationullamcorper vero.
+FN:Yong Gooding
+TEL:tel:(440)873-7428
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lee Miner
+NOTE:Ipsum vel aliquam lorem.
+ADR:;;5131 Saddle Ridge Drive;Fitzgerald;GA;31750;
+BDAY:19690222
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(573)251-9606
+BDAY:19620529
+FN:Cleveland Prentice
+ORG:South East Frontier
+NOTE:Iustoodio in aliquam hendrerit exerci nulla quis invulputate ipsum nonummy eros eum enim ex.
+EMAIL:cleveland.prentice@facilisisin.tv
+ADR:;;668 Brittmoore Circle;Marietta;GA;30006;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jude Melton
+ADR:;;7572 Webster Circle;Hammond;IN;46320;
+EMAIL:jude.melton@erosexerci.edu
+BDAY:19971106
+GENDER:M
+NOTE:Illum et iusto illum consequat.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1756 Park Street;Castaic;CA;91384;
+EMAIL:shirley.mulligan@exeum.net
+FN:Shirley Mulligan
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2362 Brookside Drive;Severn;MD;21144;
+IMPP:sip:shawna@sip.linphone.org
+N:Abney;Shawna;;;
+BDAY:19770217
+GENDER:U
+FN:Shawna Abney
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Damon Kern
+IMPP:sip:damon@sip.linphone.org
+NOTE:Erat adipiscing ut commodo.
+N:Kern;Damon;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Eros accumsan veniamquis in lobortis hendrerit nulla et molestie facilisi duis etaccumsan eros enim.
+ADR:;;8852 Moss Tree Cove;Pompano Beach;FL;33076;
+N:Blake;Gay;;;
+FN:Gay Blake
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Annabelle Conley
+GENDER:F
+NOTE:Autem lobortis iriure sit iriuredolor exerci molestie iustoodio.
+ADR:;;7284 Three Chimneys Lane;Faith;SD;57626;
+ORG:East Future Provider
+N:Conley;Annabelle;;;
+TEL:tel:(214)948-9155
+BDAY:19930418
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Vision Speed Medicine
+N:Viera;Guadalupe;;;
+TEL:tel:(434)158-2604
+ADR:;;8271 Towne Street;Merrifield;MN;56465;
+EMAIL:guadalupe@duisdolore.eu
+FN:Guadalupe Viera
+IMPP:sip:guadalupe@sip.linphone.org
+NOTE:Hendrerit ea consequatvel eufeugiat esse enim enim velit sit eufeugiat esse.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(907)324-4930
+ORG:Consulting Building
+FN:Burton Root
+NOTE:Dolor esse nibh in dignissim velit augue feugait dolore lobortis veniam eum.
+GENDER:M
+ADR:;;2254 Driving Park Circle;Eagar;AZ;85925;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:North Alpha Galaxy
+EMAIL:k.sellars@duiscommodo.edu
+TEL:tel:(208)122-8564
+FN:Kathrine Sellars
+N:Sellars;Kathrine;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:m.scribner@feugaitfacilisis.tv
+NOTE:Delenitaugue enim aliquam feugait hendrerit consequatvel molestie enim eum quis illum.
+FN:Misty Scribner
+TEL:tel:(901)150-8913
+N:Scribner;Misty;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(623)969-4134
+FN:Amelia Slaughter
+ORG:Industries Graphics
+GENDER:O
+EMAIL:amelia@dolorconsequat.info
+N:Slaughter;Amelia;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19970808
+FN:Celia Briggs
+N:Briggs;Celia;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Modesto Redd
+NOTE:Nibh invulputate facilisis nulla nonummy et lorem tationullamcorper.
+ORG:Max Vision Atlantic
+EMAIL:m.redd@etaccumsanminim.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:luciano@sip.linphone.org
+GENDER:O
+TEL:tel:(310)752-9001
+ORG:Provider Architecture Consulting
+FN:Luciano Tijerina
+NOTE:Vel blandit dolore in ut ex nonummy nulla erat nulla velit iriuredolor.
+EMAIL:luciano.tijerina@veleum.eu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Keys;Mel;;;
+NOTE:Qui minim nonummy suscipit amet in nislut ea consequat.
+BDAY:19511010
+FN:Mel Keys
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1468 Holcombe Parkway;Golden;TX;75444;
+IMPP:sip:thelma@sip.linphone.org
+ORG:Virtual Venture
+N:Stegall;Thelma;;;
+BDAY:19871216
+FN:Thelma Stegall
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7303 Chadbourne Drive;Chester;IA;52134;
+IMPP:sip:beryl@sip.linphone.org
+ORG:Signal Speed Resource
+FN:Beryl Conyers
+BDAY:19861026
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(901)857-4470
+IMPP:sip:benita@sip.linphone.org
+BDAY:19620319
+NOTE:Nislut vel exerci ex.
+ADR:;;2525 Appaloosa Drive;Lindenhurst;NY;11757;
+GENDER:O
+FN:Benita Perry
+N:Perry;Benita;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Mcnulty;Melvin;;;
+BDAY:19830502
+ADR:;;4760 Abercrombie Avenue;Atlanta;GA;30333;
+FN:Melvin Mcnulty
+TEL:tel:(608)596-9204
+NOTE:Commodo autem enim ad.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4409 Lakespur Avenue;Minter;AL;36761;
+N:Talbot;Marilyn;;;
+NOTE:Erat esse tationullamcorper minim dolore ullamcorper vero delenit feugait eum quis.
+FN:Marilyn Talbot
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Karol Chester
+N:Chester;Karol;;;
+NOTE:Tationullamcorper diam lobortis ut feugait hendrerit lobortis vero et autem augue illum et.
+GENDER:O
+BDAY:19560518
+ORG:Internet Federated Bell
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(557)790-9739
+EMAIL:m.church@nullaluptatum.edu
+GENDER:F
+N:Church;Meghan;;;
+FN:Meghan Church
+ORG:Hill Solutions Industries
+NOTE:Et eum duis illum tincidunt eros consequatvel nibh veniam iriure suscipit dolore et te.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Verla Mccurry
+ORG:Application Virtual Industries
+ADR:;;3437 Corporate Gardens Drive;Tok;AK;99780;
+N:Mccurry;Verla;;;
+EMAIL:verla.mccurry@lobortisdolore.gov
+BDAY:19840705
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:marylou@sip.linphone.org
+GENDER:F
+ORG:Virtual Electronic
+BDAY:19630616
+FN:Marylou Dykes
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Iusto accumsan vero ipsum nostrud.
+ADR:;;1256 Last Arrow Circle;Collinsville;OK;74021;
+FN:Opal Lennon
+EMAIL:opal@etaccumsanvel.info
+N:Lennon;Opal;;;
+TEL:tel:(406)576-4445
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Warner;Sandy;;;
+ORG:Research Design
+FN:Sandy Warner
+TEL:tel:(520)844-7609
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Arlen Paradis
+N:Paradis;Arlen;;;
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Van Grimm
+GENDER:U
+IMPP:sip:van@sip.linphone.org
+TEL:tel:(515)747-1192
+EMAIL:v.grimm@veroveniamquis.tv
+NOTE:Lobortis delenitaugue accumsan delenitaugue suscipit commodo nonummy vel dolor veniam.
+BDAY:19741119
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Max Graphics Design
+TEL:tel:(707)112-4401
+N:Preston;Velda;;;
+ADR:;;5461 Thornbranch Cove;Artois;CA;95913;
+IMPP:sip:velda@sip.linphone.org
+FN:Velda Preston
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Ashley Wynne
+N:Wynne;Ashley;;;
+GENDER:U
+NOTE:Dolor elitsed odio iusto hendrerit te.
+BDAY:19540629
+TEL:tel:(276)236-9593
+EMAIL:a.wynne@tationmolestie.info
+IMPP:sip:ashley@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Eu ad adipiscing duis consequat enim ut dolor commodo nostrud aliquip luptatumzzril luptatumzzril erat.
+EMAIL:rodrigo.rutherford@eufeugiatminim.eu
+TEL:tel:(952)245-5127
+ADR:;;245 Honey Hill Lane;Oyster Bay;NY;11771;
+GENDER:U
+FN:Rodrigo Rutherford
+BDAY:19860109
+N:Rutherford;Rodrigo;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(870)322-9123
+EMAIL:neil@velblandit.edu
+GENDER:N
+N:Fuentes;Neil;;;
+ADR:;;4743 Trowbridge Cove;Houston;TX;77047;
+FN:Neil Fuentes
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:;Emery;;;
+GENDER:M
+EMAIL:emery@dolorein.org
+FN:Emery 
+TEL:tel:(870)853-3824
+ADR:;;6635 Plantation Trail;Alpha;KY;42603;
+BDAY:19940502
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Et illum ex duis adipiscing ut exerci dignissim.
+FN:Cordell Somers
+IMPP:sip:cordell@sip.linphone.org
+TEL:tel:(310)942-8444
+BDAY:19390227
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19630617
+FN:Mac Clay
+N:Clay;Mac;;;
+ORG:Application Source South
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6969 Hillcrest Cove;Carrie;KY;41725;
+IMPP:sip:randall@sip.linphone.org
+N:Rainey;Randall;;;
+FN:Randall Rainey
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5587 Twisted Oak Street;Tallevast;FL;34270;
+BDAY:19421102
+NOTE:Dolore facilisis exerci dolor Utwisi at dignissim ipsum zzril qui.
+EMAIL:mable@sitvulputate.net
+FN:Mable Pardo
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Wilburn;Amos;;;
+ORG:Alpha Direct Consulting
+FN:Amos Wilburn
+ADR:;;2315 Oasis Parkway;Tuscaloosa;AL;35486;
+TEL:tel:(260)269-8276
+EMAIL:amos@aliquipiustoodio.com
+BDAY:19890505
+IMPP:sip:amos@sip.linphone.org
+NOTE:Dolor nislut vero vel suscipit hendrerit blandit vel.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Boris Scherer
+TEL:tel:(207)986-9506
+N:Scherer;Boris;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:angelia@sip.linphone.org
+FN:Angelia Bower
+BDAY:19470416
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4765 Lookout Avenue;Albany;NY;12207;
+ORG:Max Future
+NOTE:Duis ex elitsed autem nostrud enim sit hendrerit qui.
+IMPP:sip:terrell@sip.linphone.org
+GENDER:M
+EMAIL:t.rhodes@tincidunttincidunt.org
+FN:Terrell Rhodes
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Michel Cave
+ORG:Max Adventure Telecom
+EMAIL:michel@diamipsum.com
+IMPP:sip:michel@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Shanna Hollis
+IMPP:sip:shanna@sip.linphone.org
+GENDER:F
+ADR:;;3646 Old Post Drive;Virginia;MN;55777;
+N:Hollis;Shanna;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Mayme Amato
+GENDER:N
+ORG:Internet Future Pacific
+EMAIL:mayme.amato@aliquipin.com
+TEL:tel:(913)186-4444
+NOTE:Velit lorem sit blandit consectetuer qui blandit consectetuer facilisis ipsum qui commodoconsequat exerci.
+IMPP:sip:mayme@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Esse in aliquip consequat illum vero amet hendrerit iriuredolor blandit.
+BDAY:19560225
+FN:Marva Bruns
+TEL:tel:(585)661-3714
+IMPP:sip:marva@sip.linphone.org
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Source Building Frontier
+ADR:;;4216 Kahlden Circle;Alexander City;AL;35011;
+FN:Jeana Morton
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19670526
+GENDER:O
+NOTE:Exerci iusto veniamquis aliquip odio praesent hendrerit diam nonummy vero veniam nisl nulla vero.
+FN:Ernie Her
+TEL:tel:(603)849-1657
+IMPP:sip:ernie@sip.linphone.org
+N:Her;Ernie;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;8582 Winter Oaks Lane;Greenwich;NY;12834;
+TEL:tel:(256)341-8666
+FN:Pattie Barbee
+IMPP:sip:pattie@sip.linphone.org
+EMAIL:pattie.barbee@commodofacilisi.com
+N:Barbee;Pattie;;;
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Becky Ralph
+TEL:tel:(865)776-8961
+N:Ralph;Becky;;;
+GENDER:F
+ORG:Building Architecture
+ADR:;;9359 Winners Parkway;Utica;PA;16362;
+NOTE:Invulputate lorem nulla etaccumsan delenitaugue tationullamcorper.
+EMAIL:becky@eaminim.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:chanel.billups@facilisifeugait.gov
+TEL:tel:(737)995-6995
+ADR:;;9976 Newberry Parkway;Fairburn;SD;57738;
+IMPP:sip:chanel@sip.linphone.org
+FN:Chanel Billups
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Timothy Odonnell
+IMPP:sip:timothy@sip.linphone.org
+TEL:tel:(812)695-7169
+NOTE:Vel molestie commodo blandit augue iustoodio in lorem feugait praesent eu dolore.
+ADR:;;9822 Fairy Falls Way;Cayuga;ND;58013;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Burchett;Emmett;;;
+GENDER:U
+FN:Emmett Burchett
+TEL:tel:(201)763-2408
+ADR:;;7139 Oakes Way;Raiford;FL;32083;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Industries Design
+TEL:tel:(205)865-4863
+IMPP:sip:donna@sip.linphone.org
+FN:Donna Mcneal
+ADR:;;9802 Sea Smoke Lane;Edgard;LA;70049;
+BDAY:19620716
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Georgina Burton
+ORG:Universal Speed North
+BDAY:19741211
+GENDER:F
+IMPP:sip:georgina@sip.linphone.org
+EMAIL:georgina.burton@commodofacilisis.us
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(817)768-6456
+ORG:Interactive Resource
+BDAY:19570123
+FN:Aimee Cano
+GENDER:O
+IMPP:sip:aimee@sip.linphone.org
+ADR:;;9419 Eagle Ridge Avenue;Bergman;AR;72615;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+BDAY:19601114
+NOTE:Dignissim amet blandit luptatumzzril consequat invulputate facilisi consectetuer vero velit.
+FN:Donny Cannon
+EMAIL:d.cannon@doloremagnaautem.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:margret.howell@velvero.edu
+TEL:tel:(479)632-9962
+BDAY:19430401
+FN:Margret Howell
+N:Howell;Margret;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:candace.jean@velet.net
+FN:Candace Jean
+TEL:tel:(406)387-1185
+N:Jean;Candace;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;8046 Sandy Creek Drive;Hamilton;MT;59840;
+FN:Hassan Houck
+NOTE:Eu delenit dolor duis nibh dolore nulla delenitaugue eu eufeugiat odio consectetuer volutpat eros.
+ORG:Hardware Construction Pacific
+BDAY:19541018
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Chas Foltz
+GENDER:U
+N:Foltz;Chas;;;
+ADR:;;7644 Patchester Drive;Arbela;MO;63432;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:fern@exdolore.edu
+ADR:;;6339 Grove Lane;Meeteetse;WY;82433;
+GENDER:N
+FN:Fern Scribner
+TEL:tel:(912)877-9311
+NOTE:Ex iusto illum dignissim duis delenit ipsum molestie autem veniamquis aliquam at suscipit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:orville@sip.linphone.org
+ADR:;;9785 Jermyn Parkway;Cressey;CA;95312;
+N:Hackney;Orville;;;
+ORG:Construction Future
+FN:Orville Hackney
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Patricia Conaway
+EMAIL:p.conaway@veldiam.edu
+ORG:East North Internet
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+IMPP:sip:amy@sip.linphone.org
+EMAIL:amy@velitin.us
+ADR:;;5006 Gumleaf Trail;Cherokee;OK;73728;
+N:Blakely;Amy;;;
+FN:Amy Blakely
+ORG:Atlantic East Resource
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19771103
+FN:Elias Irish
+IMPP:sip:elias@sip.linphone.org
+N:Irish;Elias;;;
+EMAIL:elias.irish@inerat.com
+TEL:tel:(317)269-2062
+ORG:Hill Source Hardware
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:w.vaughan@doloreodio.eu
+ORG:Software Architecture
+TEL:tel:(928)416-6136
+FN:Willa Vaughan
+NOTE:Volutpat etaccumsan duis Utwisi ut exerci exerci.
+N:Vaughan;Willa;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2052 Northwestern Parkway;Kathleen;GA;31047;
+TEL:tel:(561)726-8397
+BDAY:19680324
+FN:Jerald Speight
+N:Speight;Jerald;;;
+IMPP:sip:jerald@sip.linphone.org
+EMAIL:jerald.speight@facilisisillum.tv
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Nita Jeffery
+N:Jeffery;Nita;;;
+NOTE:Ad ea facilisis vero lobortis te in ut dolore nostrud duis iusto.
+IMPP:sip:nita@sip.linphone.org
+BDAY:19570504
+ORG:General Source Hill
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:justin@adipiscingdolore.org
+BDAY:19640119
+FN:Justin Marquis
+ORG:Construction Adventure Software
+TEL:tel:(564)289-9380
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Bowers;Ivan;;;
+TEL:tel:(260)400-7716
+BDAY:19390821
+ORG:Interactive Vision Electronic
+EMAIL:ivan@etlorem.com
+GENDER:N
+FN:Ivan Bowers
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6851 Thorene Circle;Fence;WI;54120;
+FN:Mickey Alves
+EMAIL:m.alves@exdolor.org
+NOTE:Eu esse molestie in duis facilisis nonummy duis.
+TEL:tel:(803)557-5328
+ORG:Solutions Solutions
+GENDER:F
+N:Alves;Mickey;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(865)907-4687
+N:Tibbs;Alphonso;;;
+ORG:Galaxy Advanced
+FN:Alphonso Tibbs
+IMPP:sip:alphonso@sip.linphone.org
+NOTE:Lorem augue ut in in autem ut.
+EMAIL:a.tibbs@facilisisaliquip.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+EMAIL:desmond@facilisiesse.info
+N:Ortiz;Desmond;;;
+FN:Desmond Ortiz
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:lucas@sip.linphone.org
+N:Clarkson;Lucas;;;
+BDAY:19380112
+FN:Lucas Clarkson
+EMAIL:lucas@aliquammolestie.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19670822
+FN:Amanda Mcgill
+NOTE:Exerci veniamquis vero at velit consequatvel blandit veniamquis at feugiat hendrerit blandit euismod.
+GENDER:N
+EMAIL:a.mcgill@commodotation.com
+N:Mcgill;Amanda;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Laoreet facilisis ut ut nostrud molestie in doloremagna esse invulputate nulla.
+FN:Rachel Newman
+BDAY:19840321
+ORG:Industries Graphics
+ADR:;;1004 Cross Pike Trail;Satsuma;FL;32189;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(205)540-6396
+GENDER:N
+N:Ulrich;Angelia;;;
+FN:Angelia Ulrich
+IMPP:sip:angelia@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Oshea;Wilson;;;
+BDAY:19740228
+ADR:;;4893 Staples Circle;Packwood;IA;52580;
+FN:Wilson Oshea
+TEL:tel:(701)747-6762
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+EMAIL:kraig@dolorelitsed.info
+FN:Kraig Valentin
+IMPP:sip:kraig@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Nostrud delenitaugue tation vel praesent in dolore eros etaccumsan nostrud iustoodio odio ut.
+N:Dykes;Vonda;;;
+TEL:tel:(304)499-2940
+GENDER:F
+ORG:East Solutions
+FN:Vonda Dykes
+BDAY:19810729
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(212)455-7126
+N:Forbes;Alisha;;;
+GENDER:F
+ORG:Alpha Galaxy
+IMPP:sip:alisha@sip.linphone.org
+EMAIL:a.forbes@feugaitvulputate.edu
+ADR:;;2356 Londonderry Lane;Kansas City;MO;64130;
+FN:Alisha Forbes
+NOTE:Dolore invulputate enim invulputate in dolore lobortis lorem zzril nostrud autem euismod duis amet.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19600110
+ORG:Research Vision
+FN:Wilbur Vieira
+TEL:tel:(612)178-4929
+GENDER:M
+N:Vieira;Wilbur;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:ahmed@sip.linphone.org
+FN:Ahmed Mcnally
+NOTE:Nostrud vel eufeugiat nulla dignissim eum erat molestie enim iriuredolor blandit tationullamcorper dolore vero.
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Whitlow;Brandy;;;
+IMPP:sip:brandy@sip.linphone.org
+NOTE:Tation vel consequat eufeugiat nisl.
+ORG:Atlantic Graphics Max
+FN:Brandy Whitlow
+ADR:;;7952 Olene Lane;Calico Rock;AR;72519;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Covington;Margery;;;
+FN:Margery Covington
+NOTE:Velit eros praesent eros erat blandit te duis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Velez;Pat;;;
+FN:Pat Velez
+GENDER:N
+BDAY:19690527
+EMAIL:pat@utduis.info
+NOTE:Facilisi molestie eufeugiat etaccumsan duis wisi dolore commodoconsequat nulla consequat at nisl ut dolore.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:g.melendez@luptatumzzrilconsequatvel.us
+NOTE:Facilisi vel ea lobortis enim tincidunt nulla qui diam elitsed feugait vulputate augue accumsan.
+FN:Glenda Melendez
+TEL:tel:(949)202-9819
+ORG:Analysis Construction
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:brigitte@sip.linphone.org
+N:Griffin;Brigitte;;;
+ORG:Design Net
+FN:Brigitte Griffin
+EMAIL:b.griffin@veroet.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Facilisi hendrerit exerci illum quis eu iusto blandit laoreet in dolore luptatum qui.
+FN:Archie Gaston
+BDAY:19920804
+IMPP:sip:archie@sip.linphone.org
+N:Gaston;Archie;;;
+EMAIL:a.gaston@erosnibh.net
+TEL:tel:(540)688-8072
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lakesha Zuniga
+N:Zuniga;Lakesha;;;
+NOTE:Molestie duis iriuredolor aliquip vel accumsan ea tationullamcorper commodoconsequat qui minim iusto esse et.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Odio aliquip delenitaugue amet nonummy dignissim.
+EMAIL:callie.thornton@doloresse.com
+N:Thornton;Callie;;;
+GENDER:N
+FN:Callie Thornton
+IMPP:sip:callie@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:luis@sip.linphone.org
+NOTE:Feugiat dolor exerci nulla.
+EMAIL:l.cato@adutwisi.info
+GENDER:M
+TEL:tel:(715)183-7862
+FN:Luis Cato
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Alpha Internet Universal
+ADR:;;7007 Newgate Cove;Wheatland;WY;82201;
+FN:Randi Reinhart
+EMAIL:r.reinhart@dolorefeugait.tv
+IMPP:sip:randi@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lorena Gant
+NOTE:Et in commodo te blandit ullamcorper.
+TEL:tel:(806)228-8784
+ORG:Star Vision
+IMPP:sip:lorena@sip.linphone.org
+ADR:;;2770 Donnington Circle;Bradenton;FL;34212;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Max Studio Electronic
+EMAIL:colleen@nostruddolore.net
+IMPP:sip:colleen@sip.linphone.org
+ADR:;;2325 Barryknoll Way;Glenwood;MD;21738;
+FN:Colleen Fajardo
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jason Moniz
+ORG:Hardware Architecture Atlantic
+N:Moniz;Jason;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:guy@sip.linphone.org
+BDAY:19901224
+GENDER:U
+ORG:Vision Building Technology
+EMAIL:guy.aponte@diammolestie.org
+FN:Guy Aponte
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4421 Old Bridge Cove;Ludlow;PA;16333;
+GENDER:N
+NOTE:Ut dolor praesent eros at.
+EMAIL:israel.darling@elitsedautem.eu
+BDAY:19870624
+FN:Israel Darling
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(832)548-1347
+FN:Elaine Zeller
+IMPP:sip:elaine@sip.linphone.org
+N:Zeller;Elaine;;;
+BDAY:19960312
+GENDER:O
+NOTE:Vero exerci ut et eufeugiat enim illum facilisis iriure.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Provider Application Direct
+IMPP:sip:tracie@sip.linphone.org
+EMAIL:t.verdin@doloreut.org
+FN:Tracie Verdin
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Cooks;Jesse;;;
+FN:Jesse Cooks
+GENDER:F
+TEL:tel:(920)508-9584
+NOTE:Illum exerci molestie velit eum delenit enim te.
+ADR:;;8998 Deerfield Way;Elizaville;NY;12523;
+EMAIL:jesse.cooks@nullaodio.edu
+ORG:Data Electronics Consulting
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Sebastian Freed
+TEL:tel:(479)830-5833
+NOTE:Ipsum vel duis tation te nostrud.
+ORG:Architecture Design
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:kayla@sip.linphone.org
+TEL:tel:(818)306-5034
+BDAY:19680730
+GENDER:U
+FN:Kayla Carnes
+ADR:;;7300 Muir Avenue;Gregory;SD;57533;
+N:Carnes;Kayla;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:hortencia@nislautem.info
+IMPP:sip:hortencia@sip.linphone.org
+NOTE:Accumsan ad at wisi wisi at vero illum vero laoreet.
+ORG:Signal East West
+GENDER:U
+FN:Hortencia Reitz
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Quentin Steward
+TEL:tel:(408)999-1140
+N:Steward;Quentin;;;
+BDAY:19400209
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Euismod esse eufeugiat iustoodio.
+BDAY:19960705
+GENDER:O
+N:Moreau;Annmarie;;;
+EMAIL:annmarie@eufacilisis.us
+FN:Annmarie Moreau
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Francisco Beattie
+ORG:Industries Bell Universal
+NOTE:Accumsan te molestie feugiat nulla praesent esse amet diam minim te veniam odio.
+N:Beattie;Francisco;;;
+ADR:;;261 Aspen Pine Drive;Parsons;KS;67357;
+BDAY:19591019
+TEL:tel:(478)745-3799
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:norberto@euillum.us
+GENDER:O
+ORG:Advanced Software
+FN:Norberto Boggs
+BDAY:19580213
+IMPP:sip:norberto@sip.linphone.org
+N:Boggs;Norberto;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2864 Millstone Lane;North Grosvenordale;CT;06255;
+FN:Nellie Chavarria
+NOTE:Dolore enim esse autem vero suscipit nulla luptatumzzril minim odio dolor nulla.
+N:Chavarria;Nellie;;;
+GENDER:F
+TEL:tel:(785)350-8066
+BDAY:19480413
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(845)492-3976
+IMPP:sip:rosalyn@sip.linphone.org
+NOTE:Dolore aliquam etaccumsan ut nisl illum veniam nulla sit facilisi lobortis.
+FN:Rosalyn Rome
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+FN:Stanford Stpierre
+ORG:Electronics Max Application
+NOTE:Luptatumzzril ex molestie lobortis.
+BDAY:19600526
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dominic Carmichael
+NOTE:Nostrud adipiscing nulla euismod tation ipsum autem dolore dolore vero nulla autem laoreet.
+GENDER:O
+BDAY:19550919
+TEL:tel:(281)322-1438
+ADR:;;3706 Heritage Street;Chataignier;LA;70524;
+ORG:East Data Direct
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Dolore ipsum aliquam esse commodo feugait Utwisi ut aliquam wisi.
+EMAIL:l.snell@veltation.us
+FN:Lynette Snell
+ORG:Digital Direct Architecture
+N:Snell;Lynette;;;
+GENDER:U
+TEL:tel:(859)444-7118
+IMPP:sip:lynette@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Joann Bruce
+IMPP:sip:joann@sip.linphone.org
+NOTE:Tincidunt esse duis vero enim.
+EMAIL:joann.bruce@tationut.net
+ORG:Vision Source
+N:Bruce;Joann;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Ut nislut duis aliquip ex consequatvel.
+ORG:Telecom Industries North
+GENDER:M
+FN:Jermaine Cummins
+N:Cummins;Jermaine;;;
+IMPP:sip:jermaine@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Aliquip illum duis eros consequat.
+N:Callaghan;Serena;;;
+IMPP:sip:serena@sip.linphone.org
+GENDER:U
+ADR:;;1185 Osgood Circle;Roxana;KY;41848;
+FN:Serena Callaghan
+BDAY:19520419
+EMAIL:serena@nibhtincidunt.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:lillie@sip.linphone.org
+N:Coyle;Lillie;;;
+EMAIL:lillie.coyle@nislutdolore.edu
+FN:Lillie Coyle
+TEL:tel:(719)287-2284
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:benedict@sip.linphone.org
+ADR:;;331 Lakemere Street;Orlando;FL;32898;
+ORG:Research Industries
+NOTE:Suscipit nisl molestie lobortis praesent enim odio.
+FN:Benedict Warren
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Laoreet in nostrud dolore ad laoreet quis etaccumsan dolore nostrud.
+N:Geer;Janet;;;
+EMAIL:janet.geer@exnonummy.eu
+ADR:;;871 Stagecoach Lane;Caneyville;KY;42721;
+IMPP:sip:janet@sip.linphone.org
+FN:Janet Geer
+BDAY:19880907
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Qui molestie nislut veniamquis et nulla commodoconsequat dignissim consequat ea velit vel et.
+FN:Jonathon Heflin
+N:Heflin;Jonathon;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Aliquip duis quis adipiscing eros luptatum praesent.
+EMAIL:c.fabian@eaqui.gov
+FN:Courtney Fabian
+ADR:;;7972 Boom Trail;Baton Rouge;LA;70835;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+NOTE:Ullamcorper dolore dolore facilisi te aliquam nulla dolore wisi nulla nislut.
+EMAIL:oleta.stanfield@consequateuismod.tv
+TEL:tel:(561)919-6933
+FN:Oleta Stanfield
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:catina@sip.linphone.org
+FN:Catina Whalen
+ADR:;;2606 Winding Creek Trail;Goldbond;VA;24094;
+N:Whalen;Catina;;;
+EMAIL:catina.whalen@aliquipaliquam.org
+NOTE:Euismod amet consequat dolor erat molestie nibh suscipit diam feugiat.
+TEL:tel:(228)896-4249
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Sit Utwisi aliquam facilisi blandit at nulla augue nostrud et nostrud consequatvel.
+TEL:tel:(610)250-3736
+FN:Horacio Cheatham
+ADR:;;8173 Bobwood Street;Le Roy;KS;66857;
+GENDER:M
+ORG:Medicine Hardware
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Nonummy iusto velit eufeugiat sit odio dolore.
+EMAIL:a.legg@hendreritvel.us
+ADR:;;5845 Parker Cove;Engelhard;NC;27824;
+TEL:tel:(975)762-3484
+FN:Ashleigh Legg
+BDAY:19680224
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19650102
+FN:Julius Spears
+ORG:Bell Network Galaxy
+N:Spears;Julius;;;
+ADR:;;559 Cornuta Circle;North Haven;ME;04853;
+EMAIL:julius@nullaminim.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Contract Vision
+EMAIL:sid.linn@laoreetiustoodio.net
+FN:Sid Linn
+NOTE:Ea feugait ad enim.
+IMPP:sip:sid@sip.linphone.org
+GENDER:O
+ADR:;;1609 Lake Avenue;West Des Moines;IA;50266;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Curtis Winslow
+NOTE:Nulla nostrud ut consectetuer at qui invulputate odio in etaccumsan duis ad velit eros.
+TEL:tel:(256)426-8196
+N:Winslow;Curtis;;;
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2006 Fox Creek Circle;Vicksburg;MS;39182;
+GENDER:N
+TEL:tel:(283)293-6758
+FN:Amie Hinton
+EMAIL:amie@dolorehendrerit.gov
+BDAY:19820722
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2296 Riverview Drive;Murchison;TX;75778;
+EMAIL:paulette@augueea.tv
+GENDER:U
+FN:Paulette Lemons
+ORG:Signal Solutions Design
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19661007
+ADR:;;6591 Oakville Circle;Old Hickory;TN;37138;
+N:Galarza;Daron;;;
+NOTE:Autem blandit doloremagna ex Utwisi ex ut nulla Utwisi lobortis eu.
+FN:Daron Galarza
+ORG:Star Frontier
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+EMAIL:charlie@commodoconsequatautem.org
+ADR:;;2645 Southmoore Avenue;Kansas City;KS;66106;
+NOTE:Autem esse praesent illum at duis ut zzril eufeugiat odio vero molestie erat.
+FN:Charlie Easley
+TEL:tel:(270)848-9739
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:aurelio@tationullamcorperpraesent.us
+NOTE:Et ullamcorper commodo dolor dolor nisl iriure et amet.
+FN:Aurelio Bruns
+IMPP:sip:aurelio@sip.linphone.org
+N:Bruns;Aurelio;;;
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19530817
+ADR:;;1813 Hill Creek Cove;Wesco;MO;65586;
+NOTE:Vulputate nulla feugait nonummy suscipit illum vel dolor diam enim hendrerit blandit.
+FN:Deana Good
+EMAIL:deana.good@tationiriuredolor.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:drew@sip.linphone.org
+TEL:tel:(775)506-6318
+BDAY:19810625
+EMAIL:d.gonsalves@elitsedat.tv
+ADR:;;8682 Chestnut Way;Shiloh;GA;31826;
+FN:Drew Gonsalves
+N:Gonsalves;Drew;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19700822
+FN:Belva Doolittle
+IMPP:sip:belva@sip.linphone.org
+ORG:Venture Galaxy Medicine
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Workman;Bryon;;;
+FN:Bryon Workman
+EMAIL:bryon.workman@dignissimullamcorper.info
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19710419
+ADR:;;979 Staples Circle;Olympia;KY;40358;
+FN:Orval Harrison
+GENDER:M
+ORG:Electronic Consulting Power
+NOTE:Consectetuer duis vel delenit.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Booker Mouton
+TEL:tel:(304)907-3686
+N:Mouton;Booker;;;
+IMPP:sip:booker@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:gerald@sip.linphone.org
+FN:Gerald Lafleur
+ADR:;;9063 Bradford Parkway;Newberry;SC;29108;
+TEL:tel:(315)532-7328
+ORG:Construction Architecture North
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Tia Hoyle
+GENDER:F
+EMAIL:tia.hoyle@enimdiam.gov
+IMPP:sip:tia@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;9499 Heathstone Avenue;Lebanon;PA;17042;
+FN:Bobbie Cardenas
+GENDER:U
+NOTE:Ut minim hendrerit iriure.
+EMAIL:b.cardenas@molestieesse.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2087 Pineridge Street;Miami;FL;33130;
+IMPP:sip:janette@sip.linphone.org
+EMAIL:janette.cromer@intation.eu
+ORG:Virtual Star
+BDAY:19570518
+FN:Janette Cromer
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19801207
+ADR:;;250 Jewell Cove;Altona;IL;61414;
+FN:Anita Weatherford
+N:Weatherford;Anita;;;
+IMPP:sip:anita@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Pasquale Rodriquez
+EMAIL:pasquale@dignissimat.us
+ORG:Architecture Application Internet
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:roscoe.wray@essepraesent.tv
+TEL:tel:(315)643-3592
+BDAY:19461224
+FN:Roscoe Wray
+N:Wray;Roscoe;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Abraham;Paul;;;
+FN:Paul Abraham
+GENDER:U
+EMAIL:p.abraham@indelenit.com
+ADR:;;3891 Anchorage Cove;Casselberry;FL;32707;
+BDAY:19600621
+TEL:tel:(508)192-7791
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(283)551-8207
+FN:Alvaro Robbins
+BDAY:19930701
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19500925
+FN:Rosie Fawcett
+ADR:;;4383 Cane Creek Street;Treichlers;PA;18086;
+IMPP:sip:rosie@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19940203
+FN:Catalina Haynes
+TEL:tel:(207)315-9888
+GENDER:N
+IMPP:sip:catalina@sip.linphone.org
+NOTE:Suscipit doloremagna exerci illum illum molestie vero.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Amie Steward
+NOTE:Facilisi tincidunt ullamcorper in dolore blandit duis molestie dolor praesent diam.
+N:Steward;Amie;;;
+IMPP:sip:amie@sip.linphone.org
+ORG:Speed Electronics Network
+BDAY:19791116
+ADR:;;528 Myrtle Lane;Los Indios;TX;78567;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:patty@sip.linphone.org
+TEL:tel:(907)764-8263
+GENDER:F
+BDAY:19520727
+FN:Patty Vanhorn
+ADR:;;7814 Driftwood Street;Kent;AL;36045;
+ORG:Electronics East Data
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:brooke@doloremagnavelit.tv
+GENDER:N
+ADR:;;2088 Danbury Parkway;Nada;TX;77460;
+IMPP:sip:brooke@sip.linphone.org
+NOTE:Consectetuer praesent exerci euismod at facilisi exerci.
+FN:Brooke Alba
+ORG:Systems Hardware
+TEL:tel:(574)751-8739
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Luptatum odio suscipit ut zzril nulla dignissim erat qui eum praesent.
+ORG:Vision Technology Digital
+BDAY:19360420
+FN:Russ Chadwick
+N:Chadwick;Russ;;;
+IMPP:sip:russ@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Atlantic Signal Electronic
+BDAY:19900112
+FN:Orval Rowley
+ADR:;;7545 Jewell Way;Vernon;AL;35592;
+NOTE:Velit zzril aliquam vulputate in nisl ut.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:christy.moulton@hendreritdignissim.eu
+IMPP:sip:christy@sip.linphone.org
+FN:Christy Moulton
+NOTE:Nulla lobortis esse facilisis sit hendrerit vulputate autem nulla autem molestie sit.
+BDAY:19841010
+ORG:Telecom Net Analysis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Future Adventure
+N:Jarman;Damien;;;
+NOTE:Esse autem nulla ad nislut iriuredolor et aliquam aliquam.
+FN:Damien Jarman
+TEL:tel:(512)290-1765
+BDAY:19440108
+ADR:;;2760 Bent Creek Street;Tifton;GA;31793;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(914)996-3452
+ORG:Electronic Bell Vision
+BDAY:19770703
+N:Hand;Jarrett;;;
+IMPP:sip:jarrett@sip.linphone.org
+EMAIL:j.hand@nislqui.org
+NOTE:Iriure vero suscipit dolor ex vel invulputate etaccumsan enim praesent Utwisi.
+FN:Jarrett Hand
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:jeff.wyatt@duisat.tv
+ORG:Construction Frontier Advanced
+ADR:;;8196 Centre Oak Parkway;Barnegat Light;NJ;08006;
+FN:Jeff Wyatt
+GENDER:M
+NOTE:Feugait ad euismod vel sit.
+N:Wyatt;Jeff;;;
+IMPP:sip:jeff@sip.linphone.org
+TEL:tel:(786)863-5178
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;4739 Kinderhill Drive;San Francisco;CA;94141;
+FN:Gayla Lemus
+TEL:tel:(562)801-3000
+EMAIL:g.lemus@euismodwisi.us
+GENDER:F
+ORG:Software Net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Mel Whittaker
+EMAIL:m.whittaker@consequatsuscipit.gov
+IMPP:sip:mel@sip.linphone.org
+ORG:Atlantic Interactive
+ADR:;;8631 Heatherbrook Parkway;Springvale;ME;04083;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Industries Internet Building
+IMPP:sip:hong@sip.linphone.org
+ADR:;;1887 Stonewyck Trail;Altoona;AL;35952;
+BDAY:19680110
+FN:Hong Mclendon
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Caleb Salgado
+N:Salgado;Caleb;;;
+GENDER:M
+ADR:;;5691 Kickerillo Circle;Burlington;NJ;08016;
+EMAIL:caleb.salgado@adduis.eu
+ORG:East Frontier Network
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(918)824-6403
+IMPP:sip:jack@sip.linphone.org
+FN:Jack Valdes
+GENDER:M
+ORG:Architecture Software
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:merry.woodson@eumconsequat.eu
+BDAY:19870819
+FN:Merry Woodson
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Ea vulputate iusto te ex hendrerit iustoodio praesent.
+EMAIL:jessie@lobortissuscipit.eu
+GENDER:M
+FN:Jessie Seaton
+BDAY:19740423
+IMPP:sip:jessie@sip.linphone.org
+N:Seaton;Jessie;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alfredo Champagne
+ADR:;;5956 Germantown Village Street;Warsaw;IL;62379;
+EMAIL:alfredo@duisvelit.com
+IMPP:sip:alfredo@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:julianne@sip.linphone.org
+FN:Julianne Jordon
+TEL:tel:(843)979-2054
+N:Jordon;Julianne;;;
+EMAIL:j.jordon@inin.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Merry Poole
+IMPP:sip:merry@sip.linphone.org
+NOTE:Duis hendrerit velit et vel at feugait invulputate eu duis consequat.
+EMAIL:merry@autemiusto.tv
+ADR:;;9336 Mcclellan Lane;Austin;CO;81410;
+N:Poole;Merry;;;
+TEL:tel:(626)749-5600
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Yvonne Warfield
+ORG:Data Solutions
+BDAY:19781125
+GENDER:N
+IMPP:sip:yvonne@sip.linphone.org
+EMAIL:yvonne@autemetaccumsan.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Gruber;Elia;;;
+FN:Elia Gruber
+ADR:;;836 Hobbits Glen Street;Tuskahoma;OK;74574;
+EMAIL:e.gruber@commodoat.com
+ORG:Max Source General
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:cristina.nealy@laoreetnostrud.com
+ORG:Power West Application
+TEL:tel:(319)940-6805
+IMPP:sip:cristina@sip.linphone.org
+FN:Cristina Nealy
+NOTE:Dolore enim lobortis laoreet.
+ADR:;;840 Island Grove Street;Packwaukee;WI;53953;
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(713)785-9554
+GENDER:O
+ADR:;;4410 Quirt Way;Wenham;MA;01984;
+N:Becker;Marlon;;;
+IMPP:sip:marlon@sip.linphone.org
+FN:Marlon Becker
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Rhett Lemay
+BDAY:19940731
+EMAIL:rhett.lemay@iustoenim.edu
+IMPP:sip:rhett@sip.linphone.org
+ORG:Speed Solutions South
+GENDER:M
+TEL:tel:(901)447-7008
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Dolore diam molestie vel dignissim zzril qui veniamquis duis feugait vel in.
+TEL:tel:(660)919-1575
+IMPP:sip:carol@sip.linphone.org
+FN:Carol Eubanks
+ADR:;;6789 Leaning Ash Parkway;Cedar Lake;MI;48812;
+N:Eubanks;Carol;;;
+EMAIL:carol@suscipitinvulputate.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19790211
+N:Dupont;Ione;;;
+EMAIL:i.dupont@nislvero.eu
+GENDER:N
+FN:Ione Dupont
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+IMPP:sip:mallory@sip.linphone.org
+NOTE:Esse dignissim illum duis.
+N:Pemberton;Mallory;;;
+BDAY:19520526
+FN:Mallory Pemberton
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19940709
+FN:Bianca Chambers
+ORG:Signal Pacific
+N:Chambers;Bianca;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:carol.moriarty@autemdolore.eu
+TEL:tel:(316)208-4060
+GENDER:N
+IMPP:sip:carol@sip.linphone.org
+ORG:Venture Contract
+FN:Carol Moriarty
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(301)112-2744
+IMPP:sip:fritz@sip.linphone.org
+GENDER:U
+NOTE:Facilisis blandit laoreet ut te.
+FN:Fritz Loper
+EMAIL:fritz.loper@dignissimsit.org
+N:Loper;Fritz;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jorge Brito
+BDAY:19630710
+ORG:Studio Software Analysis
+N:Brito;Jorge;;;
+EMAIL:jorge.brito@iriuredolorvulputate.info
+ADR:;;1965 Legend Way;Smithfield;WV;26437;
+TEL:tel:(564)240-6751
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Dolore autem luptatumzzril ea ex luptatum ut velit at lorem adipiscing commodo dolore.
+FN:Bryan Pena
+GENDER:O
+N:Pena;Bryan;;;
+ADR:;;3319 Soboda Cove;Houston;TX;77042;
+EMAIL:bryan.pena@miniminvulputate.com
+ORG:Graphics Federated North
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+FN:Tonja Pepper
+NOTE:Te et blandit nonummy dolore dolor.
+ADR:;;6395 Cordie Lee Parkway;East Sparta;OH;44626;
+ORG:Hardware Innovation
+BDAY:19900214
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:carmen@sip.linphone.org
+FN:Carmen Mccorkle
+NOTE:Invulputate facilisis Utwisi illum enim facilisis eufeugiat dolore.
+GENDER:F
+N:Mccorkle;Carmen;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:jeannine@sip.linphone.org
+GENDER:O
+FN:Jeannine Cintron
+N:Cintron;Jeannine;;;
+TEL:tel:(641)947-2136
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:jill@sip.linphone.org
+EMAIL:jill@esseconsectetuer.tv
+ORG:Industries Net
+N:Rinehart;Jill;;;
+BDAY:19650817
+FN:Jill Rinehart
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7520 Corporate Center Drive;East Derry;NH;03041;
+FN:Guadalupe Cuellar
+NOTE:Vulputate delenitaugue lobortis accumsan aliquam dolore odio ullamcorper luptatumzzril delenit.
+IMPP:sip:guadalupe@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:j.vest@feugiatdignissim.tv
+ORG:Medicine Max Adventure
+BDAY:19750923
+FN:Janice Vest
+ADR:;;9645 Landfair Trail;Spencer;OK;73084;
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(631)935-6965
+NOTE:Eros feugiat nostrud ea eum ea.
+ORG:Advanced Signal South
+BDAY:19631102
+N:Meeker;Maudie;;;
+FN:Maudie Meeker
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Vero in veniamquis et commodoconsequat te dignissim elitsed diam in nulla suscipit blandit et.
+GENDER:U
+FN:Joseph Brand
+TEL:tel:(703)691-2199
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19451202
+EMAIL:v.whitten@dolornulla.edu
+FN:Vance Whitten
+N:Whitten;Vance;;;
+GENDER:U
+ADR:;;3921 Mayfield Lane;Cincinnati;OH;45230;
+ORG:Internet Digital Construction
+TEL:tel:(605)972-6400
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Bettis;Wm;;;
+GENDER:U
+FN:Wm Bettis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Mia Cameron
+ORG:Bell Venture Power
+TEL:tel:(425)586-9243
+NOTE:Te hendrerit aliquip facilisis.
+BDAY:19871021
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19381119
+FN:Shon Jay
+IMPP:sip:shon@sip.linphone.org
+N:Jay;Shon;;;
+TEL:tel:(207)755-1935
+ADR:;;9051 West Trail;Outing;MN;56662;
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Cartwright;Hannah;;;
+ORG:Data Advanced Source
+EMAIL:h.cartwright@eumvero.net
+FN:Hannah Cartwright
+NOTE:Wisi veniamquis nostrud facilisis facilisi eum ut vero iustoodio volutpat ipsum at minim iriuredolor.
+TEL:tel:(240)315-9780
+ADR:;;6990 Kimberley Lane;Minooka;IL;60447;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Qui eum amet praesent qui minim nibh nisl aliquam luptatum eum.
+ADR:;;3104 Cottage Glen Cove;Lepanto;AR;72354;
+N:Halverson;Linnie;;;
+IMPP:sip:linnie@sip.linphone.org
+FN:Linnie Halverson
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19470102
+TEL:tel:(202)268-3906
+FN:Daphne Dow
+ORG:Provider Studio Direct
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19930717
+EMAIL:e.choi@commodoeros.edu
+FN:Earline Choi
+ADR:;;8771 Lakeside Drive;Roy;MT;59471;
+IMPP:sip:earline@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Mattie Bragg
+IMPP:sip:mattie@sip.linphone.org
+ADR:;;658 Merenerm Avenue;Topeka;KS;66629;
+GENDER:F
+BDAY:19580220
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Novotny;Galen;;;
+TEL:tel:(802)326-1682
+IMPP:sip:galen@sip.linphone.org
+ORG:Future Design
+FN:Galen Novotny
+ADR:;;3919 Sunny Slope Way;Sag Harbor;NY;11963;
+BDAY:19400918
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Raymon Blair
+EMAIL:raymon.blair@nibheu.gov
+IMPP:sip:raymon@sip.linphone.org
+TEL:tel:(775)879-1956
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(501)838-9703
+IMPP:sip:dorene@sip.linphone.org
+BDAY:19600124
+EMAIL:d.strong@iustoodioad.edu
+NOTE:Accumsan diam eu praesent.
+FN:Dorene Strong
+ADR:;;5810 Durley Parkway;Norwalk;CT;06860;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19371030
+NOTE:Et etaccumsan eu illum iusto invulputate luptatum ex vero facilisis.
+ADR:;;7566 Silverbark Avenue;Johnston;SC;29832;
+IMPP:sip:carlos@sip.linphone.org
+FN:Carlos Worley
+TEL:tel:(763)856-9354
+N:Worley;Carlos;;;
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lura Hernandez
+EMAIL:lura@nostrudnibh.net
+ADR:;;5678 Woodhall Trail;Trenton;IL;62293;
+IMPP:sip:lura@sip.linphone.org
+GENDER:F
+ORG:Max General Electronic
+BDAY:19750618
+N:Hernandez;Lura;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Zzril molestie ad duis iustoodio dolore ea vero wisi.
+BDAY:19631023
+ADR:;;9526 Riverain Lane;Wilder;ID;83676;
+EMAIL:gena@doloresuscipit.info
+ORG:Digital Provider
+N:Trapp;Gena;;;
+FN:Gena Trapp
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Nance;Ervin;;;
+FN:Ervin Nance
+IMPP:sip:ervin@sip.linphone.org
+NOTE:Eros molestie nulla in exerci luptatumzzril autem dignissim blandit ea.
+GENDER:O
+BDAY:19740909
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:haywood@sip.linphone.org
+NOTE:Et lobortis aliquam duis illum nibh exerci qui commodoconsequat luptatumzzril.
+EMAIL:haywood.chew@nislutiustoodio.tv
+GENDER:O
+FN:Haywood Chew
+ADR:;;7229 Melville Drive;El Paso;TX;88519;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jed Wooten
+BDAY:19670619
+N:Wooten;Jed;;;
+NOTE:Iustoodio dignissim esse delenit.
+ORG:Consulting West Data
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19400105
+TEL:tel:(631)679-9630
+ORG:Contract Federated Max
+NOTE:Blandit tation etaccumsan minim duis facilisis.
+GENDER:F
+FN:Martha Flanigan
+EMAIL:martha.flanigan@eratconsequat.us
+N:Flanigan;Martha;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19450122
+NOTE:Consectetuer aliquip nonummy facilisi dignissim.
+TEL:tel:(810)208-7665
+FN:Misti Nickerson
+EMAIL:misti@nonummyqui.tv
+ORG:Construction East Software
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19660809
+IMPP:sip:major@sip.linphone.org
+NOTE:Molestie enim esse etaccumsan diam at luptatumzzril.
+N:Carpenter;Major;;;
+GENDER:O
+FN:Major Carpenter
+EMAIL:major.carpenter@enimesse.com
+ADR:;;8978 Thicket Parkway;Caldwell;TX;77836;
+ORG:Speed Network Internet
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+IMPP:sip:young@sip.linphone.org
+NOTE:Lobortis wisi dolore ex duis ea.
+ADR:;;5433 Southchester Street;Petersburg;AK;99833;
+FN:Young Ng
+ORG:Venture People
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(715)350-5828
+IMPP:sip:matthew@sip.linphone.org
+ORG:Analysis South Consulting
+FN:Matthew Stahl
+GENDER:O
+ADR:;;3911 Oakleigh Drive;Evansville;IN;47712;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Darwin Timmons
+ADR:;;6584 Forest Hill Way;Washington;DC;20375;
+GENDER:O
+ORG:East East
+N:Timmons;Darwin;;;
+EMAIL:darwin.timmons@tedelenitaugue.eu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Velit iriuredolor blandit eros duis nislut adipiscing consequat delenit qui hendrerit accumsan eros elitsed.
+TEL:tel:(904)842-8241
+ORG:Network Source
+EMAIL:teri@elitsedodio.org
+GENDER:N
+ADR:;;9705 Tamerlane Way;Monroe;TN;38573;
+FN:Teri York
+IMPP:sip:teri@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Tovar;Laurie;;;
+FN:Laurie Tovar
+EMAIL:laurie@duisnostrud.info
+NOTE:Vero nulla ex odio exerci te adipiscing praesent consequat.
+BDAY:19880618
+ORG:Application Data Analysis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+ORG:East Software Network
+FN:Gaye Unger
+IMPP:sip:gaye@sip.linphone.org
+EMAIL:gaye.unger@minimquis.edu
+NOTE:Ex laoreet duis enim at molestie suscipit sit ut molestie at nisl facilisi.
+ADR:;;295 Chestnut Way;West Richland;WA;99353;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19571217
+ORG:Vision Systems Atlantic
+FN:Nancy Hussey
+EMAIL:nancy.hussey@facilisifacilisis.eu
+GENDER:O
+TEL:tel:(920)267-9308
+N:Hussey;Nancy;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19760320
+N:Dillard;Jimmie;;;
+FN:Jimmie Dillard
+IMPP:sip:jimmie@sip.linphone.org
+TEL:tel:(740)311-3818
+ADR:;;8620 Eldridge Trail;Metairie;LA;70003;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Max Industries Interactive
+N:Lujan;Una;;;
+GENDER:F
+IMPP:sip:una@sip.linphone.org
+ADR:;;2095 Hunters Grove Avenue;Marshfield;WI;54472;
+FN:Una Lujan
+EMAIL:una@duisnulla.us
+NOTE:Veniam iusto etaccumsan delenit dolore delenit aliquip ex dignissim et facilisis eum et et.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:una@sip.linphone.org
+ADR:;;9870 Saint Marys Way;Portland;TN;37148;
+ORG:Star Telecom
+EMAIL:una.moen@lobortisfacilisis.edu
+N:Moen;Una;;;
+FN:Una Moen
+GENDER:U
+TEL:tel:(207)845-2254
+BDAY:19630110
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19710413
+TEL:tel:(843)189-8299
+FN:Elizabeth Dozier
+IMPP:sip:elizabeth@sip.linphone.org
+ADR:;;5421 Ingberg Circle;Scotland;AR;72141;
+N:Dozier;Elizabeth;;;
+NOTE:Vel suscipit praesent adipiscing consequat feugiat blandit delenit tationullamcorper dignissim.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Luciano Tellez
+IMPP:sip:luciano@sip.linphone.org
+ORG:West Vision Consulting
+GENDER:O
+NOTE:Wisi qui feugait consequat eros etaccumsan.
+EMAIL:l.tellez@consequatdolore.info
+ADR:;;1280 Laurie Street;Roseboom;NY;13450;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;209 Farmington Drive;Vidalia;GA;30474;
+BDAY:19391221
+TEL:tel:(310)256-6583
+FN:Annamarie Jefferies
+GENDER:O
+IMPP:sip:annamarie@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+EMAIL:b.tirado@hendreritveniam.gov
+FN:Barry Tirado
+ORG:Medicine Telecom Solutions
+ADR:;;3293 Olinda Cove;Ewing;VA;24248;
+N:Tirado;Barry;;;
+NOTE:Lorem autem diam nonummy duis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Delenitaugue dignissim exerci consequatvel ut nulla ex.
+ADR:;;4089 Duckhorn Parkway;Farmville;NC;27828;
+FN:Elbert Hawes
+IMPP:sip:elbert@sip.linphone.org
+GENDER:U
+BDAY:19531016
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:c.janes@loremzzril.org
+N:Janes;Cary;;;
+NOTE:Dolore autem invulputate suscipit.
+BDAY:19791215
+ADR:;;4733 Holcombe Parkway;Saint Paul;MN;55111;
+FN:Cary Janes
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(409)764-1483
+FN:Charley Sewell
+ADR:;;7341 Cornwall Cove;Pelican Lake;WI;54463;
+ORG:Universal Vision Construction
+N:Sewell;Charley;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+NOTE:At consequat facilisi dignissim delenitaugue etaccumsan.
+EMAIL:m.rauch@blanditex.net
+FN:Monty Rauch
+IMPP:sip:monty@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Treadwell;Chelsey;;;
+FN:Chelsey Treadwell
+NOTE:Duis autem nulla laoreet lobortis iriure feugait nulla tation suscipit.
+BDAY:19900518
+EMAIL:chelsey.treadwell@aliquipfeugait.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Tillie Slattery
+ORG:Data Bell Digital
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(563)356-5376
+FN:Robby Lombardo
+BDAY:19410809
+GENDER:U
+NOTE:Duis eros ea aliquip hendrerit nulla ipsum nostrud ea.
+ORG:Advanced Analysis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Source Frontier
+GENDER:N
+BDAY:19900731
+EMAIL:fern@inblandit.net
+ADR:;;9620 Carters Grove Way;Montgomery;AL;36142;
+FN:Fern Alicea
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Hope;Andreas;;;
+FN:Andreas Hope
+GENDER:O
+ORG:Star Architecture
+IMPP:sip:andreas@sip.linphone.org
+TEL:tel:(260)790-2040
+EMAIL:a.hope@elitsednostrud.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Damian Hickman
+N:Hickman;Damian;;;
+IMPP:sip:damian@sip.linphone.org
+ORG:East Digital Innovation
+GENDER:O
+TEL:tel:(801)339-8356
+NOTE:Minim volutpat suscipit dolore enim nulla diam duis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Bell Medicine
+FN:Russell Lenz
+GENDER:U
+TEL:tel:(412)505-9598
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19441129
+NOTE:Velit feugait minim vero accumsan.
+ADR:;;7576 Old Village Circle;East Elmhurst;NY;11370;
+EMAIL:zenaida.penn@essedelenit.us
+FN:Zenaida Penn
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:kellie.alonzo@facilisiadipiscing.info
+FN:Kellie Alonzo
+IMPP:sip:kellie@sip.linphone.org
+NOTE:Vel molestie suscipit etaccumsan nulla feugait suscipit in in.
+ORG:Power Innovation
+TEL:tel:(757)588-5598
+N:Alonzo;Kellie;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19910523
+GENDER:M
+ORG:Research Technology North
+FN:Gerardo Babb
+TEL:tel:(321)199-3366
+EMAIL:g.babb@dolorete.gov
+N:Babb;Gerardo;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Carrier;Denise;;;
+FN:Denise Carrier
+GENDER:F
+EMAIL:denise@eumvelit.gov
+IMPP:sip:denise@sip.linphone.org
+NOTE:Vero nulla facilisi minim elitsed facilisis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:rosalina.chambliss@ullamcorperconsequatvel.net
+FN:Rosalina Chambliss
+ADR:;;2747 Misty Creek Avenue;Clewiston;FL;33440;
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19670319
+TEL:tel:(202)148-8351
+ADR:;;9393 Willard Cove;Mcgrew;NE;69353;
+FN:Rosemarie Morey
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19610728
+N:Simone;Mohamed;;;
+NOTE:Invulputate eum nostrud qui veniamquis vulputate feugiat velit facilisi iusto enim zzril accumsan vel.
+EMAIL:m.simone@quisconsectetuer.info
+FN:Mohamed Simone
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Sills;Berry;;;
+BDAY:19631225
+FN:Berry Sills
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Gavin Bain
+GENDER:M
+N:Bain;Gavin;;;
+TEL:tel:(785)763-4544
+NOTE:Enim duis delenit ea lorem hendrerit illum dignissim nislut dolore.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Ulysses Daley
+N:Daley;Ulysses;;;
+EMAIL:ulysses@lobortisdelenitaugue.gov
+ADR:;;8321 Knoll Cove;Houghton;SD;57449;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Data Consulting Studio
+IMPP:sip:miguel@sip.linphone.org
+EMAIL:miguel.aguiar@duisdignissim.edu
+N:Aguiar;Miguel;;;
+NOTE:Feugait hendrerit dolore ex iriure nulla dolore tation dolore autem illum.
+FN:Miguel Aguiar
+BDAY:19460609
+ADR:;;1563 Northwestern Cove;Boncarbo;CO;81024;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Benge;Joelle;;;
+ORG:Technology Internet Federated
+BDAY:19410104
+FN:Joelle Benge
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:leonard@sip.linphone.org
+GENDER:M
+FN:Leonard Chesser
+ADR:;;5180 Bryn Mawr Drive;Carlsbad;CA;92018;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19791012
+GENDER:F
+EMAIL:m.churchill@uthendrerit.com
+NOTE:Vel ipsum facilisis zzril ut nostrud vel ut ex eum Utwisi ad facilisi.
+ADR:;;1042 Gumleaf Circle;Oakford;IN;46965;
+FN:Millicent Churchill
+N:Churchill;Millicent;;;
+IMPP:sip:millicent@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Doloremagna ad et lobortis etaccumsan etaccumsan blandit luptatumzzril.
+FN:Caroline Norton
+TEL:tel:(949)837-4906
+IMPP:sip:caroline@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Erwin Moore
+GENDER:U
+N:Moore;Erwin;;;
+ORG:South Data Virtual
+NOTE:Lorem feugait vero minim tationullamcorper eu velit luptatumzzril dolore euismod luptatumzzril feugait illum.
+ADR:;;570 Kimbrough Grove Street;Des Moines;IA;50350;
+BDAY:19850717
+TEL:tel:(928)760-6761
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Nettles;Jarred;;;
+GENDER:O
+FN:Jarred Nettles
+TEL:tel:(283)163-6727
+IMPP:sip:jarred@sip.linphone.org
+ORG:Solutions Power
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(509)199-3473
+ORG:Contract Galaxy
+BDAY:19431202
+FN:Brigitte Kidd
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Sheffield;Hai;;;
+IMPP:sip:hai@sip.linphone.org
+ORG:Building Digital
+BDAY:19731029
+NOTE:Dolor lobortis duis et.
+FN:Hai Sheffield
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:rafaela@sip.linphone.org
+FN:Rafaela Casteel
+BDAY:19620118
+TEL:tel:(228)966-4053
+NOTE:Velit eu te minim et ad illum eu velit accumsan minim vulputate erat consequat.
+N:Casteel;Rafaela;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Vision Virtual
+FN:Laverne Bottoms
+EMAIL:laverne@autemautem.net
+N:Bottoms;Laverne;;;
+GENDER:M
+BDAY:19790628
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5234 Centre Oak Parkway;Westernport;MD;21562;
+FN:Consuelo Ezell
+ORG:Pacific Analysis Solutions
+EMAIL:consuelo@doloredolor.com
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(606)741-6168
+ADR:;;5426 Fairlawn Parkway;Genoa;OH;43430;
+BDAY:19810228
+EMAIL:a.flanigan@exexerci.tv
+GENDER:M
+NOTE:Consequat delenitaugue consectetuer commodoconsequat in dolore.
+IMPP:sip:amado@sip.linphone.org
+FN:Amado Flanigan
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Mindy Hamm
+EMAIL:mindy.hamm@delenitsit.gov
+IMPP:sip:mindy@sip.linphone.org
+BDAY:19960708
+ADR:;;6232 Last Arrow Way;Clear;AK;99704;
+NOTE:Tationullamcorper consequatvel ut nulla.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:joey.lowry@exercidolore.com
+TEL:tel:(281)603-8741
+N:Lowry;Joey;;;
+ADR:;;9491 Port Charlotte Way;Panama City;FL;32403;
+FN:Joey Lowry
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Gladys Horvath
+BDAY:19600701
+GENDER:N
+ORG:Source Max Industries
+EMAIL:g.horvath@ettincidunt.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alden Burns
+N:Burns;Alden;;;
+TEL:tel:(702)624-2531
+ADR:;;9605 Blackhaw Trail;Jacksonville;FL;32236;
+EMAIL:alden.burns@suscipitvulputate.org
+ORG:Star Max
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:d.mayhew@suscipithendrerit.info
+GENDER:F
+ADR:;;3147 Sibelius Street;Ewing;IL;62836;
+ORG:Venture Digital Electronic
+FN:Deborah Mayhew
+BDAY:19401115
+IMPP:sip:deborah@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Humes;Susie;;;
+EMAIL:s.humes@doloreinvulputate.eu
+ADR:;;5019 Lakemere Trail;Cabot;VT;05647;
+ORG:Solutions Studio Direct
+FN:Susie Humes
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Speed Signal North
+NOTE:Zzril vero ex nulla lobortis elitsed autem lobortis esse ea accumsan facilisis.
+FN:Major Dean
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+ORG:People Consulting East
+TEL:tel:(802)912-7813
+FN:Hilda Driggers
+N:Driggers;Hilda;;;
+EMAIL:h.driggers@iriuredolorenim.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Magdalene Mata
+IMPP:sip:magdalene@sip.linphone.org
+GENDER:N
+TEL:tel:(718)143-9852
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Franklyn Pilcher
+ORG:Power Analysis Technology
+IMPP:sip:franklyn@sip.linphone.org
+N:Pilcher;Franklyn;;;
+EMAIL:f.pilcher@nostrudqui.net
+ADR:;;6511 Kimbrough Park Way;Bremen;IN;46506;
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Vel molestie veniam iriuredolor consequatvel nonummy luptatumzzril enim ipsum facilisis amet euismod hendrerit eufeugiat.
+EMAIL:s.casteel@molestieexerci.com
+FN:Shirley Casteel
+TEL:tel:(360)694-1968
+ORG:Frontier Telecom
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Consequatvel lorem nostrud facilisis amet minim tationullamcorper consectetuer autem lorem hendrerit.
+FN:Lyle Langford
+EMAIL:lyle@consequatamet.org
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19771202
+TEL:tel:(775)166-6772
+NOTE:Zzril accumsan Utwisi ad vulputate.
+EMAIL:f.lunn@nonummyutwisi.tv
+ADR:;;1808 Norwich Lane;Bay Saint Louis;MS;39520;
+FN:Fawn Lunn
+GENDER:O
+N:Lunn;Fawn;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+ORG:Adventure Consulting
+BDAY:19631108
+ADR:;;5153 Londonderry Drive;Windham;ME;04062;
+EMAIL:shanta@consequatad.gov
+NOTE:Feugiat odio te sit ea etaccumsan.
+FN:Shanta Phifer
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7730 Overhill Circle;Beaverton;OR;97007;
+EMAIL:gerald.stanfield@dignissimullamcorper.edu
+FN:Gerald Stanfield
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:tosha.rincon@atutwisi.tv
+TEL:tel:(878)720-1453
+BDAY:19801015
+ORG:Architecture Alpha Frontier
+FN:Tosha Rincon
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19831012
+TEL:tel:(208)582-6145
+IMPP:sip:mara@sip.linphone.org
+FN:Mara Parish
+ORG:Power Federated
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(337)952-3263
+GENDER:F
+N:Cameron;Enid;;;
+IMPP:sip:enid@sip.linphone.org
+FN:Enid Cameron
+EMAIL:enid@essequis.info
+ADR:;;1523 Gainesway Parkway;Schooleys Mountain;NJ;07870;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Dignissim veniamquis odio feugait iriure qui molestie esse consectetuer iusto vero luptatum ut dolore.
+FN:Drew Keys
+ORG:Medicine Provider Data
+TEL:tel:(228)736-9321
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+TEL:tel:(715)156-1312
+N:Goad;Jack;;;
+FN:Jack Goad
+IMPP:sip:jack@sip.linphone.org
+NOTE:Elitsed lobortis at erat tationullamcorper.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+EMAIL:juliana.bailey@veliriure.tv
+N:Bailey;Juliana;;;
+IMPP:sip:juliana@sip.linphone.org
+FN:Juliana Bailey
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:jake.curtin@lobortisminim.org
+IMPP:sip:jake@sip.linphone.org
+ORG:Solutions Electronic
+TEL:tel:(914)636-8182
+GENDER:N
+ADR:;;9949 Stone Mill Parkway;Spanish Fort;AL;36527;
+N:Curtin;Jake;;;
+FN:Jake Curtin
+BDAY:19920304
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Chung Somerville
+EMAIL:chung@commodoet.eu
+IMPP:sip:chung@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Coleen Seymour
+ADR:;;9675 Norwich Circle;Dayton;OH;45432;
+NOTE:Illum ex veniamquis vel ad in consectetuer.
+TEL:tel:(541)730-1206
+IMPP:sip:coleen@sip.linphone.org
+ORG:Alpha Frontier
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19890103
+IMPP:sip:rico@sip.linphone.org
+N:Pagan;Rico;;;
+FN:Rico Pagan
+NOTE:Iusto amet suscipit suscipit eros facilisi euismod.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(562)414-9123
+GENDER:U
+IMPP:sip:claire@sip.linphone.org
+FN:Claire Gustafson
+NOTE:Etaccumsan etaccumsan lobortis eu amet iusto.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Universal Federated
+BDAY:19631102
+FN:Boyce Loyd
+NOTE:Enim duis nostrud qui ad autem.
+TEL:tel:(319)554-8033
+ADR:;;6053 Deerfield Street;Feeding Hills;MA;01030;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:n.ballinger@minimminim.org
+GENDER:U
+FN:Nellie Ballinger
+ORG:Speed General
+TEL:tel:(541)650-8193
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19960509
+N:Jean;Rosie;;;
+FN:Rosie Jean
+ORG:Architecture Medicine Star
+EMAIL:rosie.jean@wisiad.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Madeline Terrill
+NOTE:Consequat dolor nulla vel.
+BDAY:19780219
+N:Terrill;Madeline;;;
+EMAIL:madeline.terrill@exvel.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Etaccumsan eum odio nulla iustoodio delenitaugue illum praesent.
+FN:Marcellus Ziegler
+TEL:tel:(540)916-3710
+BDAY:19920902
+ADR:;;1309 Itasca Cove;Huggins;MO;65484;
+GENDER:O
+ORG:Consulting Omega Consulting
+N:Ziegler;Marcellus;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Jeffrey;Mamie;;;
+FN:Mamie Jeffrey
+NOTE:Hendrerit minim esse esse.
+IMPP:sip:mamie@sip.linphone.org
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(227)441-3118
+ORG:Speed People Net
+ADR:;;7357 Crooked Oak Avenue;Indio;CA;92203;
+FN:Frances Keefe
+BDAY:19380115
+IMPP:sip:frances@sip.linphone.org
+GENDER:M
+EMAIL:frances.keefe@atesse.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7208 Donnington Drive;Sutherland Springs;TX;78161;
+N:Wingate;Tom;;;
+TEL:tel:(207)776-3150
+NOTE:Eros at blandit tationullamcorper consequatvel dolor nislut facilisis.
+EMAIL:tom@nibhblandit.tv
+GENDER:U
+FN:Tom Wingate
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+N:Boynton;Earline;;;
+EMAIL:e.boynton@utillum.tv
+FN:Earline Boynton
+NOTE:Invulputate qui dolore luptatumzzril vulputate commodo odio exerci te dolore lobortis lorem te.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(706)735-1344
+BDAY:19790618
+IMPP:sip:felicita@sip.linphone.org
+FN:Felicita Covey
+NOTE:Feugiat augue blandit nibh euismod adipiscing dolor wisi.
+ORG:South Provider Technology
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Avery;Gil;;;
+FN:Gil Avery
+NOTE:Te tation ex Utwisi.
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jake Mitchel
+GENDER:U
+IMPP:sip:jake@sip.linphone.org
+BDAY:19790922
+ADR:;;4382 Wolf River Avenue;Decatur;IL;62521;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+IMPP:sip:grady@sip.linphone.org
+BDAY:19470916
+EMAIL:g.dockery@exerciiusto.net
+TEL:tel:(785)192-3133
+FN:Grady Dockery
+ORG:Hardware Electronics Research
+ADR:;;4429 Kelvin Cove;Helena;AL;35080;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Maynard Conley
+ORG:Bell Hill Venture
+EMAIL:maynard.conley@uteum.us
+TEL:tel:(702)924-6785
+N:Conley;Maynard;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19480529
+NOTE:Ad in nulla hendrerit iusto zzril facilisis.
+GENDER:M
+FN:Randall Pepper
+IMPP:sip:randall@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1896 Carlingford Drive;Manhattan;KS;66503;
+N:Denman;Elvira;;;
+NOTE:Utwisi qui nislut ex dolor nostrud dolore consequat praesent laoreet iriuredolor feugiat iusto.
+BDAY:19500416
+GENDER:U
+FN:Elvira Denman
+ORG:Atlantic Studio
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:raymond@nonummyminim.eu
+GENDER:O
+NOTE:Autem nislut facilisi nibh eros ea sit in veniamquis et veniam.
+FN:Raymond Metcalf
+ORG:Max Design
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Lackey;Wyatt;;;
+EMAIL:wyatt.lackey@veroiustoodio.tv
+FN:Wyatt Lackey
+ADR:;;7409 Misty Meadow Lane;Panama City;FL;32401;
+IMPP:sip:wyatt@sip.linphone.org
+BDAY:19491022
+TEL:tel:(540)990-9914
+NOTE:Ut odio dolore ex diam vulputate aliquam delenit dolore molestie.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Irwin Salisbury
+BDAY:19550820
+N:Salisbury;Irwin;;;
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+FN:Winford Pollard
+EMAIL:winford.pollard@nislutex.gov
+BDAY:19660114
+TEL:tel:(718)148-5105
+ORG:Building Resource Advanced
+NOTE:Te lobortis ad enim feugait exerci zzril.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Sommers;Lavern;;;
+ORG:Architecture Solutions Digital
+GENDER:O
+BDAY:19360727
+FN:Lavern Sommers
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+IMPP:sip:corinne@sip.linphone.org
+BDAY:19780504
+TEL:tel:(918)338-6635
+ORG:Galaxy Source Hill
+FN:Corinne Holloman
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(352)712-6838
+NOTE:Et autem wisi duis dolore dolor ex eu eufeugiat eufeugiat eros.
+IMPP:sip:justina@sip.linphone.org
+N:Jacobsen;Justina;;;
+ADR:;;2139 Valley Crest Lane;Carthage;NY;13619;
+FN:Justina Jacobsen
+ORG:Research Studio Building
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Bell Analysis
+IMPP:sip:joel@sip.linphone.org
+N:Pedersen;Joel;;;
+TEL:tel:(757)276-1874
+BDAY:19520815
+FN:Joel Pedersen
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Industries Contract Power
+EMAIL:carlo@enimvel.edu
+N:Blanco;Carlo;;;
+TEL:tel:(708)322-7176
+FN:Carlo Blanco
+GENDER:N
+NOTE:Ut duis ad et doloremagna ea volutpat ut tation dolore praesent lobortis vero feugiat.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:gordon@utea.com
+ADR:;;7519 Nordic Cove;Pierson;IA;51048;
+FN:Gordon Major
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;57 Ilo Way;Riverdale;MI;48877;
+EMAIL:c.appleton@doloredignissim.us
+FN:Cyrus Appleton
+TEL:tel:(626)148-5783
+NOTE:In erat vulputate minim.
+ORG:Solutions Net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Anne Worth
+ORG:Frontier Research
+EMAIL:anne@dignissimdolore.gov
+TEL:tel:(605)854-8333
+NOTE:Veniamquis tincidunt et Utwisi ea praesent ex in vero eros in facilisi vero autem.
+BDAY:19810423
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(949)636-7406
+NOTE:Nislut vero ut et nulla augue te nibh dolor facilisis.
+IMPP:sip:rhoda@sip.linphone.org
+ADR:;;7953 Village Shops Drive;Cincinnati;OH;45217;
+FN:Rhoda Valle
+EMAIL:rhoda@vellobortis.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Flynn;Joni;;;
+FN:Joni Flynn
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Trudy Herr
+GENDER:O
+BDAY:19950410
+TEL:tel:(870)128-5632
+ORG:Source Innovation Pacific
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19520606
+ORG:Interactive Building West
+FN:Elisha Orton
+NOTE:Lorem vel exerci ad consequat dolor.
+ADR:;;625 Echo Lane;Grandin;MO;63943;
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:kelley@sip.linphone.org
+ADR:;;6916 Itasca Avenue;Leesburg;FL;34748;
+EMAIL:kelley@dolorenostrud.net
+FN:Kelley Westfall
+ORG:Direct Medicine
+TEL:tel:(802)758-1490
+GENDER:F
+N:Westfall;Kelley;;;
+BDAY:19460411
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19790128
+N:Bullock;Orval;;;
+FN:Orval Bullock
+NOTE:Luptatumzzril eros duis duis qui praesent etaccumsan suscipit wisi vero consequat volutpat.
+ORG:Hardware Speed
+TEL:tel:(219)215-8749
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+ADR:;;6768 Bow String Drive;Boons Camp;KY;41204;
+FN:Beverley Newman
+BDAY:19891027
+ORG:Hill Vision
+EMAIL:beverley.newman@doloreinvulputate.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Sterling Fitzpatrick
+GENDER:M
+ORG:Design Signal Hill
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Vision Net Omega
+EMAIL:nedra@eatationullamcorper.org
+N:Fortier;Nedra;;;
+TEL:tel:(772)483-8412
+FN:Nedra Fortier
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Hendrerit iustoodio tincidunt wisi elitsed vulputate nisl sit commodo nulla iustoodio.
+FN:Vincent Mallard
+ADR:;;9519 Rutherford Lane;Dickens;IA;51333;
+IMPP:sip:vincent@sip.linphone.org
+BDAY:19890414
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:clifford.spradlin@exin.edu
+N:Spradlin;Clifford;;;
+BDAY:19690222
+IMPP:sip:clifford@sip.linphone.org
+FN:Clifford Spradlin
+GENDER:O
+TEL:tel:(202)792-5978
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Steward;Cari;;;
+BDAY:19400827
+IMPP:sip:cari@sip.linphone.org
+EMAIL:cari@dignissimmolestie.net
+TEL:tel:(304)159-4819
+NOTE:Te dolor qui adipiscing qui minim minim ea ullamcorper vulputate esse minim qui facilisis.
+FN:Cari Steward
+ORG:Direct Frontier Provider
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Fletcher Mahan
+EMAIL:fletcher@teiustoodio.tv
+ORG:West Electronics South
+NOTE:Lorem nulla eufeugiat ex tation duis tation facilisi hendrerit ex adipiscing eufeugiat enim.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7257 Lydia Parkway;Tulsa;OK;74147;
+BDAY:19930315
+ORG:Internet Internet
+IMPP:sip:dane@sip.linphone.org
+FN:Dane Kirkpatrick
+NOTE:Nostrud vel qui doloremagna diam molestie dolore consequat commodo aliquip praesent.
+N:Kirkpatrick;Dane;;;
+TEL:tel:(907)178-2149
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7967 Tamarack Avenue;West Point;IL;62380;
+N:Casper;Dirk;;;
+BDAY:19591205
+GENDER:U
+FN:Dirk Casper
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Godinez;Mohamed;;;
+ADR:;;2877 Mulberry Circle;Elyria;OH;44036;
+FN:Mohamed Godinez
+GENDER:M
+BDAY:19690102
+NOTE:Ut minim ullamcorper amet nonummy eum illum qui in consequat wisi ullamcorper minim.
+TEL:tel:(864)488-8772
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:cari.pettway@utfeugiat.net
+TEL:tel:(513)693-9539
+ADR:;;4994 Thicket Trail;Spring Lake;MN;56680;
+FN:Cari Pettway
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(339)126-8466
+IMPP:sip:graham@sip.linphone.org
+NOTE:At molestie blandit dignissim dolore vero dolore vel.
+BDAY:19910118
+ADR:;;445 Brewers Trail;Spring Valley;OH;45370;
+FN:Graham Kinder
+N:Kinder;Graham;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Telecom Max
+TEL:tel:(952)417-9567
+ADR:;;9979 Waverly Avenue;Lake Charles;LA;70629;
+FN:Rachelle Marlow
+IMPP:sip:rachelle@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19580106
+FN:Angela Orr
+ORG:Solutions Analysis Source
+ADR:;;5139 Rico Way;Midwest;WY;82643;
+GENDER:F
+IMPP:sip:angela@sip.linphone.org
+TEL:tel:(701)521-8618
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Rex Condon
+EMAIL:r.condon@hendreritdolore.gov
+NOTE:Iriure delenit eu autem ea dolore et et facilisis doloremagna nulla nibh ex ex.
+IMPP:sip:rex@sip.linphone.org
+GENDER:N
+TEL:tel:(252)198-4158
+ORG:Federated Consulting People
+N:Condon;Rex;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Technology Systems Vision
+FN:Casandra Fry
+GENDER:F
+IMPP:sip:casandra@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(907)422-7367
+FN:Belva Jacoby
+ADR:;;8582 Kersh Avenue;Hawley;TX;79525;
+ORG:Star Graphics General
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(607)966-2450
+GENDER:M
+EMAIL:c.soileau@suscipitfeugiat.tv
+ORG:Data Resource Contract
+FN:Connie Soileau
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+ORG:Solutions Hardware
+FN:Josef Eastman
+IMPP:sip:josef@sip.linphone.org
+EMAIL:josef@etvelit.us
+NOTE:Veniam quis nostrud at adipiscing hendrerit vel praesent odio exerci diam vulputate.
+N:Eastman;Josef;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Hugh Zeller
+EMAIL:hugh@essenislut.com
+TEL:tel:(978)154-4609
+NOTE:Qui veniamquis aliquip enim.
+GENDER:M
+N:Zeller;Hugh;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Franklyn Fanning
+TEL:tel:(952)756-2132
+ORG:Galaxy Interactive Frontier
+N:Fanning;Franklyn;;;
+EMAIL:franklyn.fanning@molestieexerci.tv
+NOTE:Volutpat wisi lobortis volutpat quis in nulla exerci.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Bettina Polk
+ADR:;;4699 Mayfield Circle;Westphalia;MI;48894;
+NOTE:Vel molestie volutpat consequat dolore hendrerit tation eum dolor amet euismod facilisis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Juliana Mabe
+GENDER:N
+EMAIL:juliana.mabe@feugiatet.com
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Natalie Harbin
+ADR:;;4372 Myrtlea Parkway;Elgin;IL;60123;
+TEL:tel:(314)582-2722
+EMAIL:natalie.harbin@tinciduntdolore.net
+NOTE:Nonummy ullamcorper praesent feugait facilisi.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Network Source Bell
+FN:Lana Kent
+ADR:;;1714 Neal Lane;Applegate;CA;95703;
+NOTE:Eufeugiat consectetuer iusto exerci erat.
+N:Kent;Lana;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Kitchen;Carolyn;;;
+FN:Carolyn Kitchen
+NOTE:In in consequat exerci aliquam consequatvel duis facilisi molestie molestie.
+ORG:Venture West Universal
+BDAY:19420311
+EMAIL:carolyn.kitchen@erosluptatumzzril.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Johnathan Berrios
+N:Berrios;Johnathan;;;
+ORG:Pacific Research Contract
+NOTE:Utwisi lobortis dolore etaccumsan velit.
+IMPP:sip:johnathan@sip.linphone.org
+BDAY:19590807
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Ceja;Willard;;;
+FN:Willard Ceja
+EMAIL:w.ceja@molestiefeugait.tv
+BDAY:19710225
+ORG:Data Atlantic
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19820109
+NOTE:Hendrerit feugait illum duis.
+FN:Nadia Gamez
+N:Gamez;Nadia;;;
+TEL:tel:(609)572-1467
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Pam Frank
+BDAY:19940322
+ADR:;;8944 Trailwood Cove;New Hyde Park;NY;11044;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:ambrose@quinislut.net
+TEL:tel:(252)984-1145
+ADR:;;9229 Settlers Street;Kaw City;OK;74641;
+FN:Ambrose Osborne
+ORG:Omega Vision Speed
+IMPP:sip:ambrose@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Alpha Digital Adventure
+EMAIL:elinor.wahl@etduis.us
+N:Wahl;Elinor;;;
+BDAY:19951209
+FN:Elinor Wahl
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Weatherly;Reynaldo;;;
+BDAY:19730820
+GENDER:M
+ADR:;;9878 Leesburg Avenue;Anchorage;AK;99516;
+FN:Reynaldo Weatherly
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+NOTE:Et adipiscing elitsed vero duis nulla aliquip nulla vel.
+FN:Athena Fullerton
+IMPP:sip:athena@sip.linphone.org
+BDAY:19730831
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:lorena@utnonummy.info
+GENDER:U
+FN:Lorena Bruns
+ADR:;;5586 Oakgreen Avenue Avenue;Newalla;OK;74857;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:hallie@sip.linphone.org
+ORG:Research Speed
+ADR:;;1671 Stamford Street;Sycamore Valley;OH;43789;
+GENDER:O
+FN:Hallie Howland
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:dayna.boehm@feugiataliquam.edu
+IMPP:sip:dayna@sip.linphone.org
+ADR:;;3210 Honeye Drive;Hudson;OH;44237;
+GENDER:U
+BDAY:19380312
+FN:Dayna Boehm
+N:Boehm;Dayna;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Irvin Aldrich
+BDAY:19710329
+NOTE:Sit delenit ea duis accumsan qui iusto consequatvel consequat.
+TEL:tel:(727)365-1476
+GENDER:U
+ADR:;;1985 Ravenhill Street;Land O Lakes;WI;54540;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Universal Max Interactive
+IMPP:sip:clemente@sip.linphone.org
+EMAIL:clemente@tevolutpat.edu
+BDAY:19960313
+FN:Clemente Billings
+N:Billings;Clemente;;;
+ADR:;;5853 Barkers Landing Lane;Yelm;WA;98597;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Feugait dolor elitsed consequat vulputate commodoconsequat doloremagna dolore duis.
+N:Byrne;Elliot;;;
+GENDER:M
+FN:Elliot Byrne
+TEL:tel:(636)273-9153
+EMAIL:elliot@exerciluptatumzzril.eu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:rey@sip.linphone.org
+GENDER:O
+FN:Rey Joiner
+N:Joiner;Rey;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Tationullamcorper vel Utwisi commodoconsequat suscipit nostrud ea Utwisi feugait in enim molestie.
+FN:Luis Marx
+ORG:Building Net Hill
+N:Marx;Luis;;;
+ADR:;;2743 Paddock Parkway;Portsmouth;NH;03804;
+TEL:tel:(212)293-2197
+EMAIL:luis@nullatincidunt.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:cornell@sip.linphone.org
+FN:Cornell Jaynes
+GENDER:M
+BDAY:19760422
+EMAIL:cornell@tinciduntaliquam.edu
+TEL:tel:(256)596-7561
+N:Jaynes;Cornell;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:alma@sip.linphone.org
+FN:Alma Archer
+NOTE:Amet wisi ea tationullamcorper eu dolore quis ad nulla.
+GENDER:F
+EMAIL:alma.archer@eate.us
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Connor;Mellisa;;;
+NOTE:Veniam consectetuer luptatum duis velit ea luptatumzzril facilisi aliquam at.
+ORG:Virtual Source Pacific
+TEL:tel:(219)685-9239
+IMPP:sip:mellisa@sip.linphone.org
+FN:Mellisa Connor
+ADR:;;3256 Watkins Circle;Cucumber;WV;24826;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19421005
+FN:Yolanda Brumfield
+ORG:Pacific Advanced
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Amy Otoole
+TEL:tel:(903)944-2371
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jessie Freed
+ORG:Electronics Alpha Innovation
+TEL:tel:(859)166-9395
+EMAIL:jessie@dolorein.net
+N:Freed;Jessie;;;
+NOTE:At etaccumsan etaccumsan praesent adipiscing aliquam duis tationullamcorper quis iustoodio at odio dolor nibh.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:caroline@adquis.info
+ORG:Graphics Software
+BDAY:19510506
+FN:Caroline Pardo
+N:Pardo;Caroline;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Merle Marlowe
+EMAIL:merle@commodoconsequatesse.com
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Net Universal
+N:Cardona;Allen;;;
+FN:Allen Cardona
+ADR:;;1623 Amundson Circle;Republican Grove;VA;24585;
+TEL:tel:(212)220-6995
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Sammons;Kelly;;;
+NOTE:Velit dignissim zzril nostrud eum dolor duis velit illum.
+FN:Kelly Sammons
+ADR:;;6116 Washington Trail;Darrington;WA;98241;
+ORG:Omega North Solutions
+IMPP:sip:kelly@sip.linphone.org
+GENDER:O
+EMAIL:kelly.sammons@erosdolore.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2785 Hunters Creek Way;Carthage;NC;28327;
+BDAY:19750717
+IMPP:sip:louann@sip.linphone.org
+GENDER:U
+FN:Louann Hassell
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5602 Merenerm Lane;Epps;LA;71237;
+IMPP:sip:alphonse@sip.linphone.org
+FN:Alphonse Naquin
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+FN:Georgette Peoples
+TEL:tel:(252)277-1841
+N:Peoples;Georgette;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Breedlove;Hortencia;;;
+TEL:tel:(270)978-4760
+FN:Hortencia Breedlove
+IMPP:sip:hortencia@sip.linphone.org
+ORG:Vision Power Consulting
+EMAIL:hortencia.breedlove@dolorin.org
+ADR:;;247 Deerfield Street;Otis;CO;80743;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Advanced Industries
+ADR:;;8399 Savannah Cove;Owensville;MO;65066;
+FN:Bertram Woodbury
+N:Woodbury;Bertram;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(703)914-5006
+IMPP:sip:hilary@sip.linphone.org
+ORG:Application Speed
+N:Lowry;Hilary;;;
+ADR:;;6341 Shepherdwood Way;Sharpsburg;NC;27878;
+FN:Hilary Lowry
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alisa Cosby
+N:Cosby;Alisa;;;
+ADR:;;7700 Westminster Lane;Annapolis;MD;21403;
+NOTE:In luptatum et qui ex in eum aliquip in consequat.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19390425
+ORG:Federated East
+ADR:;;7864 Huntcliff Avenue;Garrett;IN;46738;
+TEL:tel:(267)701-1423
+FN:Haywood Greco
+N:Greco;Haywood;;;
+EMAIL:haywood.greco@volutpatamet.edu
+IMPP:sip:haywood@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:goldie@sip.linphone.org
+N:Brunner;Goldie;;;
+BDAY:19440411
+TEL:tel:(925)601-3999
+ADR:;;3741 Fawnlake Parkway;Holmesville;OH;44633;
+FN:Goldie Brunner
+ORG:Signal Venture Internet
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Clouse;Sydney;;;
+ADR:;;2915 Grove Mill Avenue;Saint Louis;MO;63146;
+TEL:tel:(814)469-3252
+FN:Sydney Clouse
+BDAY:19870314
+EMAIL:sydney.clouse@quislorem.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Federated Virtual
+BDAY:19690329
+FN:Vern Gault
+ADR:;;354 Oakgreen Avenue Lane;Roland;IA;50236;
+TEL:tel:(334)245-7649
+NOTE:Ut iriuredolor eum velit sit feugait facilisis molestie consequat sit suscipit consequat exerci qui.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Tanisha Gerard
+TEL:tel:(956)245-3241
+ADR:;;661 Peacan Street;Albany;NY;12255;
+ORG:Innovation Network Atlantic
+IMPP:sip:tanisha@sip.linphone.org
+N:Gerard;Tanisha;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Corine Barnhill
+N:Barnhill;Corine;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Sosa;Phillis;;;
+ORG:Speed Electronics Interactive
+BDAY:19830211
+FN:Phillis Sosa
+GENDER:F
+NOTE:Feugiat dolor consequat autem invulputate vero.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(408)413-1117
+N:Daily;Theresa;;;
+ADR:;;8043 Winding Oak Parkway;Owensboro;KY;42302;
+FN:Theresa Daily
+ORG:Vision Software West
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Facilisis nulla in qui nibh delenitaugue.
+ADR:;;9 Turkey Avenue;Eastman;GA;31023;
+N:Whyte;Adela;;;
+FN:Adela Whyte
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alene Culbertson
+TEL:tel:(615)136-5531
+ADR:;;348 Cranberry Hill Parkway;Orleans;IN;47452;
+BDAY:19820812
+NOTE:Duis consequat eros illum dolore consequatvel.
+ORG:Hardware Virtual Galaxy
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Laoreet vulputate veniamquis suscipit nisl.
+ORG:Federated Telecom Medicine
+FN:Minerva Antonio
+IMPP:sip:minerva@sip.linphone.org
+BDAY:19550530
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Chrystal Ceja
+TEL:tel:(315)774-5441
+EMAIL:c.ceja@velet.eu
+ORG:Future Internet
+IMPP:sip:chrystal@sip.linphone.org
+N:Ceja;Chrystal;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Santo Green
+N:Green;Santo;;;
+IMPP:sip:santo@sip.linphone.org
+EMAIL:s.green@velea.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lenard Tribble
+IMPP:sip:lenard@sip.linphone.org
+ADR:;;3726 Crooked Oak Lane;Dellslow;WV;26531;
+EMAIL:lenard.tribble@veroesse.eu
+N:Tribble;Lenard;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19870724
+ADR:;;3546 Redhaw Drive;Brant;NY;14027;
+EMAIL:darius.thibodeaux@euismoddolore.us
+FN:Darius Thibodeaux
+TEL:tel:(865)973-4720
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Qui nulla eros dolore ex.
+BDAY:19500220
+IMPP:sip:nelda@sip.linphone.org
+TEL:tel:(978)183-7665
+FN:Nelda Bumgarner
+EMAIL:nelda@molestieat.net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Chitwood;Gene;;;
+FN:Gene Chitwood
+ORG:Source Adventure
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(202)871-9815
+FN:Verna Justus
+IMPP:sip:verna@sip.linphone.org
+ADR:;;6083 Kimforest Lane;Milwaukee;WI;53202;
+EMAIL:v.justus@eufeugiatmolestie.us
+ORG:Galaxy Direct Solutions
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Myron Clarkson
+EMAIL:myron@etiriuredolor.gov
+ADR:;;9702 Pepper Avenue;Greeley;IA;52050;
+IMPP:sip:myron@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Hill Virtual Innovation
+TEL:tel:(878)123-3609
+ADR:;;4438 Haseley Avenue;Liberty;MO;64087;
+IMPP:sip:sophie@sip.linphone.org
+FN:Sophie Hutchens
+NOTE:Facilisis ad dolore augue vulputate enim tation et adipiscing eros delenitaugue veniamquis commodoconsequat.
+N:Hutchens;Sophie;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(724)605-5859
+N:Thibodeau;Jenna;;;
+EMAIL:jenna@erosinvulputate.gov
+FN:Jenna Thibodeau
+IMPP:sip:jenna@sip.linphone.org
+ORG:Medicine Analysis Research
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lily Kay
+ADR:;;3249 Manning Trail Cove;Nora Springs;IA;50458;
+N:Kay;Lily;;;
+TEL:tel:(607)839-8085
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:alene.chambers@adnonummy.info
+IMPP:sip:alene@sip.linphone.org
+ADR:;;881 Eastern Trail;Easley;SC;29640;
+FN:Alene Chambers
+ORG:Internet Innovation Analysis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Bernice Spurgeon
+ORG:Max Industries Interactive
+EMAIL:bernice@eumodio.us
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6042 Country Lane;Savannah;GA;31415;
+ORG:Building Network
+FN:Rochelle Perdue
+EMAIL:rochelle.perdue@atipsum.edu
+NOTE:Illum duis dolore aliquip delenitaugue illum.
+GENDER:F
+BDAY:19870203
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Abdul Earnest
+EMAIL:abdul.earnest@aliquipduis.com
+ORG:Virtual Net Network
+N:Earnest;Abdul;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Zzril facilisi praesent molestie duis dolore minim hendrerit ut Utwisi hendrerit.
+TEL:tel:(256)156-8043
+GENDER:M
+FN:Bertram Shea
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:gertie@sip.linphone.org
+FN:Gertie Okeefe
+GENDER:F
+EMAIL:g.okeefe@illumconsequat.net
+BDAY:19451030
+ORG:Solutions Provider Consulting
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Joesph Crouch
+ADR:;;840 Mistywood Street;Silverton;OR;97381;
+BDAY:19700423
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Willy Culbertson
+BDAY:19510105
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+ADR:;;9241 Lakespur Cove;Toledo;IA;52342;
+TEL:tel:(712)478-3301
+FN:Virginia Cain
+BDAY:19400901
+N:Cain;Virginia;;;
+IMPP:sip:virginia@sip.linphone.org
+ORG:South Net
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Escobedo;Gretchen;;;
+GENDER:F
+FN:Gretchen Escobedo
+BDAY:19631109
+IMPP:sip:gretchen@sip.linphone.org
+NOTE:Suscipit ipsum elitsed consequat facilisi luptatumzzril ad etaccumsan at dignissim hendrerit iusto aliquip.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(914)639-8527
+IMPP:sip:derick@sip.linphone.org
+FN:Derick Peeler
+NOTE:Duis duis feugait autem nulla invulputate elitsed nibh enim ad blandit hendrerit.
+ADR:;;2326 Omar Drive;Seaside Heights;NJ;08751;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Ophelia Harless
+EMAIL:ophelia@minimmolestie.info
+BDAY:19851007
+GENDER:U
+ADR:;;3632 Rice Circle;Oak Park;IL;60302;
+ORG:Max Frontier
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(360)967-2890
+EMAIL:j.bethea@infeugait.eu
+ADR:;;3931 Kallie Lane;New York;NY;10025;
+FN:Julianna Bethea
+IMPP:sip:julianna@sip.linphone.org
+BDAY:19500303
+ORG:Alpha Star Venture
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+NOTE:Hendrerit dignissim delenit adipiscing duis iriuredolor elitsed amet zzril augue dignissim.
+IMPP:sip:andres@sip.linphone.org
+FN:Andres Willis
+ORG:Research Building Contract
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:armando@sip.linphone.org
+EMAIL:armando@praesentenim.tv
+NOTE:Eu nulla autem velit qui tincidunt volutpat invulputate feugait te.
+N:Troutman;Armando;;;
+TEL:tel:(352)806-8019
+FN:Armando Troutman
+ORG:Speed Advanced Source
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5949 Rancho Bauer Street;Dowling;MI;49050;
+FN:Kendra Mccrory
+IMPP:sip:kendra@sip.linphone.org
+ORG:Solutions Industries North
+GENDER:F
+N:Mccrory;Kendra;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;3166 Germanwood Avenue;Grand Portage;MN;55605;
+EMAIL:valorie.rudolph@illumenim.edu
+ORG:Hardware Signal
+FN:Valorie Rudolph
+NOTE:Qui lobortis quis consequat vulputate velit.
+IMPP:sip:valorie@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Hilario Coffman
+NOTE:Hendrerit veniamquis duis feugiat vero erat tincidunt suscipit illum eu.
+TEL:tel:(215)744-1584
+ORG:Star North Electronics
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Margo Zink
+NOTE:Vel eros augue aliquip facilisi Utwisi iriuredolor.
+IMPP:sip:margo@sip.linphone.org
+TEL:tel:(718)662-1946
+N:Zink;Margo;;;
+ORG:Solutions General Systems
+EMAIL:margo@iriuredolornonummy.eu
+BDAY:19970928
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:marco@sip.linphone.org
+FN:Marco Towle
+NOTE:Feugait autem exerci te.
+ADR:;;4273 Leaning Ash Cove;Auburn;MI;48611;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Huey;Tiffany;;;
+NOTE:Ut velit lobortis qui.
+FN:Tiffany Huey
+ORG:People Graphics
+TEL:tel:(445)266-6359
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Sandy Bethea
+NOTE:Tincidunt et velit enim suscipit et et dolore nonummy volutpat molestie consequat doloremagna.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Lobortis diam blandit eum eros qui tationullamcorper nostrud molestie commodo ad.
+FN:Theresa Batiste
+TEL:tel:(304)827-7923
+EMAIL:theresa.batiste@autemin.info
+IMPP:sip:theresa@sip.linphone.org
+ORG:Vision South Direct
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:daphne@sip.linphone.org
+ORG:Star Analysis
+ADR:;;8904 Dogwood Street;Runnemede;NJ;08078;
+TEL:tel:(614)130-1297
+FN:Daphne Finn
+BDAY:19781222
+N:Finn;Daphne;;;
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Willis Wofford
+IMPP:sip:willis@sip.linphone.org
+EMAIL:willis@feugiataliquip.net
+NOTE:Et lobortis nulla autem aliquam dolor.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Vision Data Star
+EMAIL:o.zepeda@iriuredolornulla.net
+NOTE:Veniam ut etaccumsan vel.
+IMPP:sip:olen@sip.linphone.org
+BDAY:19620814
+FN:Olen Zepeda
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:delmar@sip.linphone.org
+EMAIL:delmar@euismodconsequat.net
+FN:Delmar Lashley
+NOTE:Velit nostrud autem dolor facilisi dolore velit erat dolor praesent eu volutpat esse.
+ORG:Bell Architecture
+BDAY:19480522
+ADR:;;8803 Omaha Way;Sherburn;MN;56171;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Adventure People Architecture
+TEL:tel:(563)757-5182
+GENDER:U
+NOTE:Invulputate at autem praesent autem feugait.
+IMPP:sip:vanessa@sip.linphone.org
+N:Redding;Vanessa;;;
+FN:Vanessa Redding
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+FN:Edward Pendleton
+ADR:;;9365 Marylane Drive;Washington;DC;20437;
+N:Pendleton;Edward;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+ADR:;;899 Rich Hill Drive;District Heights;MD;20753;
+TEL:tel:(347)455-4907
+ORG:Network Direct Solutions
+FN:Latoya Cardenas
+BDAY:19890730
+N:Cardenas;Latoya;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:emma@adeum.edu
+FN:Emma Keating
+TEL:tel:(740)447-3113
+N:Keating;Emma;;;
+IMPP:sip:emma@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1592 Holly Spring Way;Wilson;OK;73463;
+FN:Reggie Melton
+ORG:Hill Electronics
+BDAY:19360830
+EMAIL:reggie@blanditvero.com
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:cori@sip.linphone.org
+ORG:Consulting Max
+N:Sallee;Cori;;;
+GENDER:U
+EMAIL:cori@ateuismod.info
+FN:Cori Sallee
+BDAY:19450531
+NOTE:Lobortis ipsum duis amet facilisis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19700625
+EMAIL:bobby@veltincidunt.net
+NOTE:Ea autem consectetuer laoreet facilisi iriuredolor exerci veniam lorem feugait minim hendrerit.
+N:Wendt;Bobby;;;
+FN:Bobby Wendt
+ADR:;;2710 Surrey Circle;Saint Anthony;IA;50239;
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:merrill@sip.linphone.org
+FN:Merrill Queen
+ORG:Federated Interactive
+TEL:tel:(252)166-3312
+GENDER:M
+ADR:;;3206 Elmhurst Circle;Turner;MT;59542;
+N:Queen;Merrill;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Graphics Direct Electronics
+FN:Mia Lipscomb
+N:Lipscomb;Mia;;;
+ADR:;;6538 Grove Avenue;Poplarville;MS;39470;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:nelda.cowell@doloreiriuredolor.com
+N:Cowell;Nelda;;;
+FN:Nelda Cowell
+GENDER:U
+ORG:Electronics Application Future
+ADR:;;1982 Main Avenue;Church Rock;NM;87311;
+TEL:tel:(717)147-1510
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Internet East Innovation
+TEL:tel:(775)882-5617
+IMPP:sip:neal@sip.linphone.org
+FN:Neal Dejesus
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:boyd@exillum.eu
+TEL:tel:(701)597-8186
+N:Demarco;Boyd;;;
+ORG:Omega Federated Hardware
+FN:Boyd Demarco
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5041 Shelton Circle;Tariffville;CT;06081;
+FN:Rosario Schroeder
+NOTE:Suscipit qui aliquam luptatumzzril esse veniamquis eufeugiat delenitaugue praesent te blandit doloremagna.
+IMPP:sip:rosario@sip.linphone.org
+EMAIL:rosario.schroeder@iustoodioad.org
+GENDER:U
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19810909
+N:Edgar;Aletha;;;
+ADR:;;8195 Fawnlake Way;Pottersville;NY;12860;
+FN:Aletha Edgar
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19440606
+FN:Eugene Madrigal
+GENDER:M
+TEL:tel:(225)203-3413
+N:Madrigal;Eugene;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Rochelle Lamar
+IMPP:sip:rochelle@sip.linphone.org
+N:Lamar;Rochelle;;;
+ADR:;;718 Plantation Street;Cleveland;OH;44130;
+BDAY:19521202
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Illum dolore accumsan diam.
+FN:Pauline Rico
+BDAY:19570215
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(406)706-8518
+ADR:;;2003 Dewhurst Street;Dakota;IL;61018;
+ORG:Electronic Contract South
+FN:Ila Troy
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Shonda Durkin
+N:Durkin;Shonda;;;
+ADR:;;6547 Saddle Cove;Posey;CA;93260;
+NOTE:Esse in luptatum hendrerit te vel elitsed dignissim molestie hendrerit.
+ORG:Power Application Adventure
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Digital Graphics Power
+FN:Adolph Prescott
+IMPP:sip:adolph@sip.linphone.org
+BDAY:19720906
+N:Prescott;Adolph;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Marquis;Hollis;;;
+BDAY:19410702
+ADR:;;6748 Stone Mill Avenue;Gore;VA;22637;
+ORG:Consulting West
+GENDER:M
+FN:Hollis Marquis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;1363 Wheatley Parkway;Minden;TX;75680;
+N:Yarborough;Helene;;;
+FN:Helene Yarborough
+BDAY:19451006
+ORG:South Medicine
+TEL:tel:(864)176-7607
+GENDER:F
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:jacquelyn@sip.linphone.org
+EMAIL:jacquelyn.wesley@etutwisi.org
+ADR:;;2940 Riggs Trail;Shelby;IA;51570;
+BDAY:19880217
+FN:Jacquelyn Wesley
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Commodo delenit ad feugiat diam commodoconsequat tationullamcorper lobortis.
+TEL:tel:(910)662-1200
+FN:Elvira Haddad
+N:Haddad;Elvira;;;
+ADR:;;7656 Akerswood Drive;Honolulu;HI;96835;
+BDAY:19770218
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:liliana@sip.linphone.org
+GENDER:N
+BDAY:19900912
+EMAIL:l.obrien@delenitea.com
+NOTE:Velit amet praesent zzril.
+TEL:tel:(616)678-8924
+FN:Liliana Obrien
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Velit vel molestie diam feugait eum amet blandit ipsum delenitaugue iriure praesent nulla in.
+ORG:Software Galaxy
+BDAY:19860528
+FN:Chong Goff
+N:Goff;Chong;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Systems Signal Application
+ADR:;;2358 Waxlander Lane;Omaha;NE;68131;
+FN:Arlene Person
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(574)365-3098
+GENDER:O
+N:Schumacher;Margarito;;;
+EMAIL:margarito.schumacher@doloredoloremagna.us
+FN:Margarito Schumacher
+ADR:;;6743 Splinter Oak Circle;Louisville;KY;40205;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Source Omega
+FN:Gregory Hancock
+GENDER:M
+EMAIL:gregory@dignissimnostrud.eu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:bernie@sip.linphone.org
+NOTE:Consequatvel sit iustoodio lorem ex praesent aliquip nulla illum erat at.
+ORG:Source Systems Solutions
+GENDER:O
+FN:Bernie Hoy
+EMAIL:bernie@euillum.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19601227
+TEL:tel:(425)800-2550
+IMPP:sip:rosalee@sip.linphone.org
+ORG:General Power
+EMAIL:r.billingsley@hendreritlobortis.com
+FN:Rosalee Billingsley
+N:Billingsley;Rosalee;;;
+ADR:;;257 Olinda Circle;Butler;MD;21023;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+BDAY:19360408
+N:Lundberg;Annie;;;
+EMAIL:annie.lundberg@inblandit.us
+FN:Annie Lundberg
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+ADR:;;4625 Brenley Street;Scottsburg;OR;97473;
+TEL:tel:(251)666-7534
+BDAY:19370521
+FN:Leigh Rupert
+IMPP:sip:leigh@sip.linphone.org
+N:Rupert;Leigh;;;
+NOTE:Nisl at wisi eufeugiat nulla aliquip duis ullamcorper.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19880408
+N:Amos;Perla;;;
+GENDER:F
+FN:Perla Amos
+EMAIL:perla@sitillum.edu
+ORG:Power Provider
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Webster;Ron;;;
+FN:Ron Webster
+GENDER:M
+NOTE:Lorem Utwisi ex zzril ad wisi exerci consequat qui Utwisi doloremagna eros.
+BDAY:19800131
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Sammie Kolb
+N:Kolb;Sammie;;;
+ADR:;;2825 Garden Arbor Trail;Northport;AL;35476;
+ORG:Systems Net Graphics
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dora Cohn
+BDAY:19690403
+ADR:;;8155 Southchester Way;Palmyra;IN;47164;
+ORG:Atlantic Vision Solutions
+EMAIL:dora@doloreluptatumzzril.tv
+GENDER:N
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Elitsed illum autem lobortis autem.
+EMAIL:r.boss@addolore.gov
+ADR:;;9507 Monarda Circle;Sacramento;CA;94253;
+GENDER:F
+ORG:Vision Future
+FN:Roseann Boss
+BDAY:19721127
+N:Boss;Roseann;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(959)867-9387
+N:Ferrari;Terrence;;;
+BDAY:19950404
+GENDER:U
+FN:Terrence Ferrari
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+FN:Josue Cintron
+N:Cintron;Josue;;;
+NOTE:Suscipit et eros nostrud dolor esse veniamquis autem dignissim facilisis vel suscipit.
+EMAIL:josue@duisat.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Benny Eden
+ADR:;;1541 Muir Cove;Peoria;AZ;85380;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;9986 Oxen Lane;Guadalupita;NM;87722;
+TEL:tel:(502)431-6666
+FN:Caroline Burley
+IMPP:sip:caroline@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+N:Carver;Shameka;;;
+FN:Shameka Carver
+BDAY:19790913
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+TEL:tel:(202)687-8815
+FN:Selma Dugger
+NOTE:Blandit dolore enim hendrerit facilisi illum Utwisi duis vero ut dignissim blandit lobortis dolore.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:larissa@nostrudillum.net
+ADR:;;8207 Nottingham Oaks Trail;Daniels;WV;25832;
+FN:Larissa Parks
+N:Parks;Larissa;;;
+ORG:Direct North
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(501)607-4654
+EMAIL:twyla@essefacilisis.net
+NOTE:Nislut esse accumsan lorem doloremagna nisl vero laoreet dignissim volutpat eros iusto qui exerci.
+GENDER:F
+ORG:Industries Provider Star
+N:Brogan;Twyla;;;
+FN:Twyla Brogan
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19640322
+NOTE:Ut aliquip eum qui duis ut feugait accumsan illum dolor.
+IMPP:sip:valorie@sip.linphone.org
+FN:Valorie Mcknight
+GENDER:F
+ORG:Hill Source Virtual
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Gayle Alfred
+GENDER:N
+N:Alfred;Gayle;;;
+ORG:Software Virtual
+IMPP:sip:gayle@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:U
+BDAY:19600420
+N:Edwards;Carrol;;;
+EMAIL:carrol.edwards@veniamquisnulla.edu
+FN:Carrol Edwards
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Pacific Digital Graphics
+EMAIL:tanner.mccabe@essedolore.us
+TEL:tel:(714)728-5416
+FN:Tanner Mccabe
+IMPP:sip:tanner@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Net Net
+TEL:tel:(937)370-6620
+FN:Sylvia Nixon
+N:Nixon;Sylvia;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Raymon Betz
+NOTE:Iustoodio molestie nulla velit consectetuer.
+TEL:tel:(218)860-6854
+EMAIL:r.betz@exercimolestie.info
+ORG:Net Star Research
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Melba Pipkin
+IMPP:sip:melba@sip.linphone.org
+ADR:;;3539 Stamford Drive;North Charleston;SC;29415;
+N:Pipkin;Melba;;;
+NOTE:Velit duis dignissim vero.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Moshe Bowling
+BDAY:19761212
+ORG:Medicine Innovation Vision
+IMPP:sip:moshe@sip.linphone.org
+N:Bowling;Moshe;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;378 Butterfly Parkway;Pearce;AZ;85625;
+N:Faber;Martina;;;
+ORG:Future Bell Universal
+BDAY:19550719
+GENDER:N
+FN:Martina Faber
+NOTE:Ut consequat consectetuer et esse commodoconsequat iriure dolore quis.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(210)342-2848
+NOTE:Molestie esse minim feugiat aliquip ad facilisis velit invulputate autem consequat vel duis.
+FN:Nan Fonseca
+ADR:;;3252 Country Place Parkway;Greenfield;MO;65661;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Adan Olvera
+NOTE:At doloremagna tationullamcorper duis.
+TEL:tel:(774)295-5619
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Passmore;Sabina;;;
+ADR:;;4620 Heathstone Drive;Mc Kinnon;WY;82938;
+TEL:tel:(401)771-3988
+ORG:Building Medicine Industries
+EMAIL:sabina.passmore@euut.us
+GENDER:O
+FN:Sabina Passmore
+IMPP:sip:sabina@sip.linphone.org
+BDAY:19510430
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Maryellen Cave
+ORG:Star Source Star
+EMAIL:maryellen@dolorefeugait.gov
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+ORG:Application Universal Building
+FN:Luis Mcknight
+NOTE:Praesent suscipit suscipit ad vero autem aliquip velit tincidunt.
+TEL:tel:(641)712-3081
+N:Mcknight;Luis;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Janel York
+IMPP:sip:janel@sip.linphone.org
+NOTE:Duis at zzril aliquip molestie.
+ADR:;;1583 Oakes Parkway;Arcadia;PA;15712;
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Mullins;Bradly;;;
+ADR:;;8187 Waverly Circle;Warwick;RI;02889;
+FN:Bradly Mullins
+IMPP:sip:bradly@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Minter;Gaston;;;
+NOTE:Nulla luptatumzzril dignissim elitsed.
+TEL:tel:(415)304-7692
+FN:Gaston Minter
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Marie Sena
+N:Sena;Marie;;;
+BDAY:19510523
+TEL:tel:(845)670-5951
+ORG:Telecom Building
+GENDER:O
+EMAIL:marie@vulputateutwisi.info
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:refugio@sip.linphone.org
+N:Van;Refugio;;;
+GENDER:U
+BDAY:19501221
+TEL:tel:(317)120-5160
+EMAIL:refugio@illumex.eu
+FN:Refugio Van
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Carl Burge
+EMAIL:c.burge@minimutwisi.edu
+N:Burge;Carl;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Augue elitsed nulla veniamquis vulputate et duis facilisis dolor nisl in ex invulputate.
+ORG:Industries Direct Telecom
+TEL:tel:(817)178-1296
+BDAY:19690919
+FN:Estella Peterman
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Accumsan elitsed erat vulputate sit.
+TEL:tel:(865)523-8660
+ORG:Bell Star West
+EMAIL:rita.hadley@ullamcorperdolore.eu
+IMPP:sip:rita@sip.linphone.org
+FN:Rita Hadley
+BDAY:19850205
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Max Atlantic
+EMAIL:sal@molestiedoloremagna.info
+FN:Sal Downes
+ADR:;;6714 Misty Creek Trail;Rochelle;VA;22738;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:phillis@sip.linphone.org
+NOTE:Iusto ut augue et consectetuer molestie te et zzril etaccumsan consectetuer ullamcorper consectetuer.
+BDAY:19441020
+FN:Phillis Corrigan
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(702)725-2797
+BDAY:19750726
+GENDER:F
+EMAIL:b.thiel@eratte.net
+ADR:;;5846 Long Oak Street;Sheldon;WI;54766;
+FN:Brandy Thiel
+IMPP:sip:brandy@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Chance Mccants
+TEL:tel:(775)234-5923
+BDAY:19850112
+NOTE:Minim facilisi sit eros augue.
+ORG:Internet Internet
+IMPP:sip:chance@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+ADR:;;1880 Capital Cove;Rushville;IN;46173;
+FN:Rodrick Carrion
+IMPP:sip:rodrick@sip.linphone.org
+EMAIL:r.carrion@velut.info
+ORG:Virtual People Federated
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:wilhelmina@sip.linphone.org
+FN:Wilhelmina Chapa
+GENDER:N
+BDAY:19950621
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2640 Maple Shadow Circle;Jonestown;PA;17038;
+FN:Christine Crump
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+N:Partin;Brad;;;
+NOTE:Consequatvel eu euismod aliquip dignissim feugait consequat.
+TEL:tel:(985)818-4990
+ADR:;;1449 Nova Scotia Lane;Clear Lake;SD;57226;
+FN:Brad Partin
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;501 Pond View Circle;New Market;TN;37820;
+EMAIL:nicholas.estrada@consequatdelenit.org
+N:Estrada;Nicholas;;;
+BDAY:19501026
+NOTE:Praesent volutpat feugiat nulla consequatvel blandit.
+GENDER:O
+FN:Nicholas Estrada
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(202)249-3991
+IMPP:sip:adam@sip.linphone.org
+N:Loper;Adam;;;
+FN:Adam Loper
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:domingo@minimeufeugiat.org
+N:Herman;Domingo;;;
+IMPP:sip:domingo@sip.linphone.org
+FN:Domingo Herman
+ORG:Contract Power
+BDAY:19350114
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:dan@iriuredolortincidunt.gov
+TEL:tel:(262)839-5720
+NOTE:Zzril consequatvel vel luptatum.
+ADR:;;3324 Silkwood Trail;Haymarket;VA;20168;
+FN:Dan Picard
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:a.jansen@diamnulla.net
+NOTE:In facilisis facilisi nulla.
+FN:Alberta Jansen
+TEL:tel:(817)811-3555
+BDAY:19721227
+GENDER:O
+ORG:Software Research
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;6276 Grisby Circle;West Glover;VT;05875;
+NOTE:Esse hendrerit dolore suscipit.
+IMPP:sip:omer@sip.linphone.org
+FN:Omer Callaghan
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+ORG:Solutions Software Systems
+IMPP:sip:peter@sip.linphone.org
+ADR:;;1756 Panorama Cove;East Earl;PA;17519;
+FN:Peter Beebe
+TEL:tel:(831)357-5575
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(701)372-5913
+FN:Roselyn Sutherland
+ADR:;;1922 Trotter Drive;Montmorenci;IN;47962;
+IMPP:sip:roselyn@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Direct Provider Technology
+EMAIL:m.stroup@veroad.tv
+GENDER:N
+BDAY:19500408
+FN:Mandy Stroup
+N:Stroup;Mandy;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:malcolm@accumsanautem.org
+TEL:tel:(814)753-1865
+IMPP:sip:malcolm@sip.linphone.org
+NOTE:Te in praesent quis aliquip feugait praesent esse feugiat duis.
+N:Ayers;Malcolm;;;
+FN:Malcolm Ayers
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+EMAIL:d.baumgardner@loremillum.com
+N:Baumgardner;Dion;;;
+ADR:;;2975 Cobblestone Cove;Noxon;MT;59853;
+TEL:tel:(419)414-3163
+FN:Dion Baumgardner
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Sandoval;Tina;;;
+ORG:Net Star Solutions
+FN:Tina Sandoval
+GENDER:F
+ADR:;;4898 Belfort Trail;Mingo;OH;43047;
+IMPP:sip:tina@sip.linphone.org
+NOTE:Autem duis nislut duis nostrud molestie et eros nulla blandit consequat diam.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Bannister;Valarie;;;
+FN:Valarie Bannister
+GENDER:F
+ADR:;;6156 Hazelton Avenue;Malabar;FL;32950;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5385 Oakridge Lane;Glendale;CA;91206;
+FN:Melvin Quinlan
+N:Quinlan;Melvin;;;
+NOTE:Velit illum dignissim facilisi esse dolore exerci augue ea dolore facilisi.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19481011
+FN:Lorna Singh
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(574)677-1641
+N:Ricks;Merrill;;;
+GENDER:N
+IMPP:sip:merrill@sip.linphone.org
+FN:Merrill Ricks
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Christoper Niles
+ORG:Alpha Star Hardware
+EMAIL:christoper@eaquis.gov
+IMPP:sip:christoper@sip.linphone.org
+ADR:;;6344 Saint Marys Parkway;Los Alamitos;CA;90721;
+NOTE:Autem at qui facilisis dolore Utwisi dolore exerci dolore duis autem at veniam.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Systems Star Speed
+BDAY:19530720
+TEL:tel:(270)835-6822
+FN:Odis Currier
+IMPP:sip:odis@sip.linphone.org
+N:Currier;Odis;;;
+EMAIL:odis@nulladignissim.tv
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Judith Lightfoot
+ORG:Net Bell
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Alfredo Mata
+EMAIL:alfredo.mata@duisamet.net
+TEL:tel:(573)163-1426
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+FN:Long Grigsby
+ORG:People Provider Frontier
+TEL:tel:(907)143-6709
+IMPP:sip:long@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dara Minnick
+EMAIL:d.minnick@veniamerat.net
+ORG:Star Construction
+NOTE:Et veniamquis eufeugiat aliquip lorem vel esse Utwisi delenit nulla nostrud nonummy velit.
+IMPP:sip:dara@sip.linphone.org
+N:Minnick;Dara;;;
+GENDER:N
+ADR:;;2585 Woffington Street;Grand Junction;CO;81505;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Carroll Giordano
+ADR:;;8151 Goswell Circle;Peoria;IL;61603;
+IMPP:sip:carroll@sip.linphone.org
+EMAIL:carroll@esseiusto.net
+BDAY:19640315
+GENDER:N
+N:Giordano;Carroll;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Ammons;Tisha;;;
+GENDER:O
+FN:Tisha Ammons
+ORG:Construction Electronic
+ADR:;;7971 Oak Trail;Park Ridge;NJ;07656;
+TEL:tel:(470)631-3203
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;8829 Rock Avenue;Farmersville;CA;93223;
+FN:Jeromy Ervin
+GENDER:U
+N:Ervin;Jeromy;;;
+BDAY:19550614
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;8296 Kelman Circle;Carlstadt;NJ;07072;
+N:Manns;Homer;;;
+FN:Homer Manns
+EMAIL:homer.manns@loremconsequat.us
+NOTE:Diam exerci veniam doloremagna facilisis tation.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;2243 Rice Drive;Bedias;TX;77831;
+TEL:tel:(903)248-3314
+GENDER:O
+FN:Catalina Crabtree
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:julia.nowak@consequatea.tv
+TEL:tel:(717)275-6952
+FN:Julia Nowak
+GENDER:O
+ADR:;;803 Stout Street;Fort Lauderdale;FL;33323;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Delma Chester
+GENDER:F
+ORG:Advanced Future Alpha
+ADR:;;2794 Saint Francis Street;Banner;MS;38913;
+IMPP:sip:delma@sip.linphone.org
+TEL:tel:(505)315-5956
+N:Chester;Delma;;;
+EMAIL:delma@adipiscingdolor.us
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Velit blandit et in velit commodoconsequat vel tincidunt.
+N:Daniels;Tommie;;;
+ADR:;;1053 Hidden Valley Circle;Walnut Springs;TX;76690;
+BDAY:19670303
+GENDER:U
+FN:Tommie Daniels
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:blair@sip.linphone.org
+FN:Blair Leone
+BDAY:19660616
+ORG:Internet Interactive Network
+NOTE:Ex vero facilisi dignissim suscipit nulla esse odio.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lamar Horsley
+GENDER:N
+ORG:Net Solutions
+N:Horsley;Lamar;;;
+ADR:;;6941 Willard Lane;Mount Victory;OH;43340;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Sydney Beeson
+EMAIL:sydney.beeson@autemvel.info
+ADR:;;3404 Waverly Circle;Tolleson;AZ;85353;
+IMPP:sip:sydney@sip.linphone.org
+N:Beeson;Sydney;;;
+TEL:tel:(802)733-7172
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Federated Technology Data
+EMAIL:issac.snowden@autemad.info
+BDAY:19960608
+GENDER:M
+FN:Issac Snowden
+ADR:;;9018 Brick Trail;Carrollton;TX;75011;
+NOTE:Nostrud nostrud et lobortis feugait quis laoreet volutpat et esse eros odio augue ad.
+TEL:tel:(917)417-2068
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:myles.devore@invulputatedolore.gov
+IMPP:sip:myles@sip.linphone.org
+NOTE:At autem at nislut hendrerit exerci blandit iusto ad.
+ADR:;;3403 Deauville Trail;Lobeco;SC;29931;
+FN:Myles Devore
+ORG:West Telecom Power
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+NOTE:Facilisi iriuredolor ex illum duis esse duis hendrerit delenit suscipit elitsed odio duis vero.
+FN:Trinidad Heaton
+ORG:Application Atlantic North
+IMPP:sip:trinidad@sip.linphone.org
+TEL:tel:(859)538-2730
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19350803
+EMAIL:t.bergeron@duiset.org
+GENDER:M
+ADR:;;7998 Egerton Circle;Wellsville;OH;43968;
+IMPP:sip:taylor@sip.linphone.org
+N:Bergeron;Taylor;;;
+ORG:Contract Vision Galaxy
+NOTE:Praesent feugiat facilisis adipiscing dignissim facilisi blandit suscipit.
+TEL:tel:(424)394-4266
+FN:Taylor Bergeron
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Data Future
+IMPP:sip:melvin@sip.linphone.org
+FN:Melvin Henson
+EMAIL:melvin@nullaeum.gov
+TEL:tel:(616)862-2501
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+N:Galvin;August;;;
+IMPP:sip:august@sip.linphone.org
+ADR:;;3716 Justen Way;Lambsburg;VA;24351;
+BDAY:19651007
+NOTE:Wisi nostrud autem esse ex minim.
+ORG:East Source Star
+TEL:tel:(484)291-9887
+FN:August Galvin
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Valentina Ayers
+IMPP:sip:valentina@sip.linphone.org
+BDAY:19370507
+ADR:;;41 Rosehaven Cove;Leesburg;FL;34748;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Emilie Scott
+IMPP:sip:emilie@sip.linphone.org
+NOTE:Dolore ut in nonummy vulputate consequat velit illum nislut exerci velit esse ut.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5005 Soboda Cove;Vacaville;CA;95688;
+TEL:tel:(479)292-1138
+EMAIL:lupe.wells@feugaitex.gov
+FN:Lupe Wells
+ORG:Atlantic Systems Application
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Lindsey Tierney
+BDAY:19700528
+N:Tierney;Lindsey;;;
+IMPP:sip:lindsey@sip.linphone.org
+ADR:;;255 Ravensdale Trail;Shiloh;NC;27974;
+EMAIL:lindsey.tierney@dignissimnulla.info
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:d.naquin@consequatvel.net
+TEL:tel:(404)455-8239
+FN:Dylan Naquin
+NOTE:Facilisis nisl dignissim nulla at velit facilisi blandit elitsed te nostrud feugait doloremagna.
+N:Naquin;Dylan;;;
+GENDER:O
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:h.kohl@lobortistationullamcorper.gov
+ADR:;;8148 Nightingale Drive;Pleasanton;TX;78064;
+FN:Holli Kohl
+N:Kohl;Holli;;;
+IMPP:sip:holli@sip.linphone.org
+ORG:Innovation Provider Software
+TEL:tel:(757)347-2890
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(505)356-8068
+FN:Lilly Ouellette
+NOTE:Delenit qui velit dolore illum exerci nostrud nonummy iustoodio lobortis.
+GENDER:O
+ADR:;;3985 Abbott Way;Cottonwood;AZ;86326;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Analysis Hill
+TEL:tel:(606)118-9656
+IMPP:sip:erin@sip.linphone.org
+GENDER:U
+FN:Erin Harding
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:N
+ADR:;;9508 Stone Mill Circle;Peoria;IL;61634;
+FN:Natalia Drury
+N:Drury;Natalia;;;
+EMAIL:natalia.drury@doloremagnaeuismod.com
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:East Architecture Adventure
+NOTE:Duis dignissim augue suscipit hendrerit.
+N:Massie;Allen;;;
+FN:Allen Massie
+GENDER:M
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Elliott;Nan;;;
+ADR:;;1252 Burlington Parkway;Washington;DC;20404;
+IMPP:sip:nan@sip.linphone.org
+TEL:tel:(614)501-2359
+FN:Nan Elliott
+EMAIL:n.elliott@aliquamveniam.edu
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Dowdy;Leo;;;
+GENDER:M
+IMPP:sip:leo@sip.linphone.org
+FN:Leo Dowdy
+EMAIL:leo.dowdy@nostruddiam.org
+NOTE:Facilisi iriuredolor iusto diam tation duis enim at duis dolore facilisis minim.
+ORG:Hardware Hill
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;7608 Great Oaks Way;Toledo;OH;43609;
+GENDER:U
+FN:Kimberly Langlois
+BDAY:19741127
+NOTE:Hendrerit aliquam suscipit feugait duis qui iustoodio dolore.
+N:Langlois;Kimberly;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Autem augue blandit ut quis enim iriure.
+IMPP:sip:cody@sip.linphone.org
+FN:Cody Callahan
+ADR:;;4132 Isleton Way;Charlotte;NC;28281;
+N:Callahan;Cody;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:O
+EMAIL:tillie.horowitz@commodoat.info
+IMPP:sip:tillie@sip.linphone.org
+TEL:tel:(641)311-8633
+N:Horowitz;Tillie;;;
+FN:Tillie Horowitz
+NOTE:Lorem nulla vel enim consequatvel et.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Pilar Franz
+N:Franz;Pilar;;;
+ORG:Digital Solutions Signal
+TEL:tel:(804)818-5486
+ADR:;;2948 Judd Trail;Rociada;NM;87742;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;8412 Hollyhock Cove;Ocala;FL;34470;
+EMAIL:cleo.osgood@laoreetaugue.net
+FN:Cleo Osgood
+GENDER:O
+ORG:Net Vision North
+IMPP:sip:cleo@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(445)903-1629
+N:Fink;Marylou;;;
+BDAY:19880311
+NOTE:Illum nulla volutpat feugait te quis feugiat iriuredolor duis eum.
+ADR:;;1937 Peabody Circle;Gaithersburg;MD;20884;
+FN:Marylou Fink
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;814 Water Lane;Wentworth;SD;57075;
+FN:Adrianne Coffey
+EMAIL:a.coffey@lobortissuscipit.edu
+N:Coffey;Adrianne;;;
+BDAY:19771025
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:leila.timmerman@tinciduntiriure.eu
+NOTE:Facilisi at aliquip at at Utwisi blandit blandit accumsan duis nulla elitsed quis consectetuer.
+ORG:Max North General
+ADR:;;3545 Germantown Circle;Nevada;IA;50201;
+N:Timmerman;Leila;;;
+FN:Leila Timmerman
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:cari@sip.linphone.org
+FN:Cari Shumaker
+ORG:Building Software Net
+BDAY:19730326
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:dixie@sip.linphone.org
+N:Spalding;Dixie;;;
+FN:Dixie Spalding
+ORG:Design Universal Systems
+NOTE:Veniam autem iriuredolor dolore velit.
+ADR:;;6361 Kimbrough Grove Trail;Brooklyn;NY;11239;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(623)204-1369
+N:Harness;Pierre;;;
+FN:Pierre Harness
+ADR:;;8289 Cherrybark Trail;Glencoe;IL;60022;
+ORG:Interactive Architecture Atlantic
+NOTE:Suscipit et et et duis eufeugiat duis lobortis dolore vel.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Phillip Mock
+GENDER:M
+ADR:;;7944 Lakeside Circle;Monroeville;PA;15146;
+NOTE:Nostrud etaccumsan praesent suscipit vel eu molestie velit ut hendrerit tincidunt.
+TEL:tel:(251)981-4291
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Mercer;Columbus;;;
+GENDER:M
+NOTE:Feugait vero aliquip facilisis luptatum illum hendrerit suscipit.
+FN:Columbus Mercer
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+NOTE:Facilisi eros autem velit volutpat at at zzril et.
+FN:Alicia Rosario
+TEL:tel:(812)170-6637
+BDAY:19741228
+N:Rosario;Alicia;;;
+EMAIL:alicia.rosario@quisvolutpat.gov
+IMPP:sip:alicia@sip.linphone.org
+ORG:Data East
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;8041 Wyndhurst Trail;Houston;TX;77043;
+IMPP:sip:darryl@sip.linphone.org
+ORG:Future Solutions
+FN:Darryl Adler
+NOTE:Augue invulputate in minim eum vel tation at iriure.
+N:Adler;Darryl;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:F
+NOTE:Feugait te adipiscing wisi facilisi eros.
+ORG:Galaxy Speed Solutions
+IMPP:sip:lula@sip.linphone.org
+ADR:;;8420 Jamaca Circle;Vancouver;WA;98684;
+FN:Lula Harness
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;5937 Overlook Circle;Paul Smiths;NY;12970;
+FN:Diane Joseph
+NOTE:Duis vero ex facilisi qui hendrerit facilisis autem.
+N:Joseph;Diane;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Dominic Jordan
+TEL:tel:(336)346-2767
+N:Jordan;Dominic;;;
+BDAY:19600127
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Tony Back
+ADR:;;8733 Foxgate Cove;Oak Bluffs;MA;02557;
+BDAY:19960426
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jolene Black
+NOTE:Eros autem in vel esse tincidunt ad laoreet qui minim ipsum.
+EMAIL:j.black@feugaitvero.gov
+BDAY:19911030
+IMPP:sip:jolene@sip.linphone.org
+TEL:tel:(337)144-3107
+ADR:;;8758 Lydia Street;Forsyth;MT;59327;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Charleen Begay
+GENDER:U
+NOTE:Aliquip eu vulputate nulla facilisis illum blandit blandit dolore hendrerit.
+N:Begay;Charleen;;;
+ADR:;;6130 Hobbits Glen Avenue;Tallman;NY;10982;
+EMAIL:charleen@inconsequat.info
+BDAY:19710222
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(907)209-2611
+FN:Xavier Vanhoose
+ORG:Max Pacific
+EMAIL:x.vanhoose@nibhvel.com
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Samuel Marshall
+N:Marshall;Samuel;;;
+GENDER:N
+BDAY:19640301
+NOTE:Ad nulla minim nulla suscipit vel tincidunt augue.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;9995 Station Hill Circle;Mount Gilead;OH;43338;
+BDAY:19871228
+NOTE:Tation veniamquis luptatumzzril nibh facilisis duis ullamcorper nisl consequat suscipit accumsan suscipit.
+ORG:Data Design
+EMAIL:j.ralston@autemsuscipit.edu
+FN:Janis Ralston
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(270)820-9211
+FN:Migdalia Rash
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ORG:Vision Future Solutions
+NOTE:Qui autem in iriuredolor vel amet dolor invulputate.
+ADR:;;5604 Queensbury Way;Canton;OH;44720;
+TEL:tel:(610)121-8396
+IMPP:sip:eugenia@sip.linphone.org
+FN:Eugenia Pantoja
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+GENDER:M
+BDAY:19700608
+IMPP:sip:alfonzo@sip.linphone.org
+FN:Alfonzo Tompkins
+TEL:tel:(475)485-9104
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(763)202-1504
+EMAIL:chong@eumeros.us
+GENDER:N
+NOTE:Eum etaccumsan exerci et dignissim aliquip ipsum lorem.
+ORG:Star Universal Consulting
+BDAY:19580709
+FN:Chong Mabry
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:silas@autemeros.edu
+FN:Silas Leal
+TEL:tel:(412)257-8210
+ADR:;;3212 Grove Lake Trail;Kirkland;AZ;86332;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Latasha Crowe
+IMPP:sip:latasha@sip.linphone.org
+ORG:Design Technology Analysis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+TEL:tel:(219)537-6700
+EMAIL:leta@blanditsit.info
+ORG:Adventure Advanced Telecom
+FN:Leta Mccloskey
+N:Mccloskey;Leta;;;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Allison;Alejandro;;;
+ORG:Innovation Source Net
+EMAIL:alejandro@minimodio.eu
+GENDER:O
+FN:Alejandro Allison
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Asher;Freddy;;;
+GENDER:M
+FN:Freddy Asher
+NOTE:Vel eufeugiat in eum.
+EMAIL:freddy@esseiustoodio.gov
+ADR:;;4137 Carlingford Way;Sheldon Springs;VT;05485;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;8996 Fairmeadows Trail;Maybell;CO;81640;
+GENDER:M
+ORG:Universal Advanced Consulting
+IMPP:sip:mack@sip.linphone.org
+FN:Mack Lombard
+TEL:tel:(775)827-4643
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+N:Spearman;Melinda;;;
+ADR:;;3906 Rich Hill Way;Green Spring;WV;26722;
+FN:Melinda Spearman
+ORG:Medicine Vision Universal
+GENDER:O
+IMPP:sip:melinda@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19840316
+EMAIL:kesha.tuggle@essefeugait.org
+N:Tuggle;Kesha;;;
+ORG:South Studio Vision
+FN:Kesha Tuggle
+TEL:tel:(865)414-7674
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+IMPP:sip:eugenia@sip.linphone.org
+FN:Eugenia Lucas
+BDAY:19521229
+EMAIL:eugenia@veroesse.eu
+ORG:Future Studio Direct
+TEL:tel:(330)135-6449
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+ADR:;;550 Palomino Trail;Letcher;SD;57359;
+NOTE:Velit ea vel eufeugiat nulla.
+BDAY:19470117
+FN:Cecile Laws
+ORG:Telecom Net Analysis
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19730822
+EMAIL:a.gaylord@consequatduis.org
+FN:Arturo Gaylord
+NOTE:Duis dolore enim te feugait.
+IMPP:sip:arturo@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+EMAIL:r.orellana@odiotation.org
+ADR:;;2672 Fiddlers Elbow Circle;Mcgregor;MN;55760;
+FN:Rosalina Orellana
+TEL:tel:(817)292-2224
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jeffrey Broome
+ORG:Internet Vision Adventure
+N:Broome;Jeffrey;;;
+EMAIL:j.broome@nullaautem.org
+ADR:;;322 Oakland Trail;Laceys Spring;AL;35754;
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Ricardo Zarate
+ADR:;;7882 Somerset Lane;Rose;NE;68772;
+EMAIL:r.zarate@eufeugiatesse.org
+NOTE:Dolore in euismod esse vero.
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+FN:Jae Wilber
+ORG:Contract Alpha Speed
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+BDAY:19640214
+N:Kimbrough;Deidra;;;
+FN:Deidra Kimbrough
+ORG:Pacific Bell
+TEL:tel:(413)543-7430
+IMPP:sip:kimbrough@sip.linphone.org
+END:VCARD
diff --git a/tester/vcards/vcards.vcf b/tester/vcards/vcards.vcf
new file mode 100644
index 000000000..7ffd718c6
--- /dev/null
+++ b/tester/vcards/vcards.vcf
@@ -0,0 +1,22 @@
+BEGIN:VCARD
+VERSION:4.0
+KIND:individual
+FN:Sylvain Berfini
+N:Berfini;Sylvain;Pascal;;
+GENDER:M
+IMPP;PREF=1;TYPE=work:sip:sylvain@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+KIND:individual
+FN:François Grisez
+N:Grisez;François;;;
+IMPP;TYPE=work:sip:francois@sip.linphone.org
+END:VCARD
+BEGIN:VCARD
+VERSION:4.0
+KIND:individual
+FN:Margaux Clerc
+GENDER:F
+IMPP:sip:margaux@sip.linphone.org
+END:VCARD
diff --git a/tester/video_tester.c b/tester/video_tester.c
index abffb59ab..6d2e4cce9 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -24,6 +24,13 @@
 #include "liblinphone_tester.h"
 #include "lpconfig.h"
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic push
+#endif
+#ifndef _MSC_VER
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#endif
+
 #if HAVE_GTK
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
@@ -37,6 +44,10 @@ extern void *gdk_quartz_window_get_nsview(GdkWindow      *window);
 
 #include <gdk/gdkkeysyms.h>
 
+#if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#pragma GCC diagnostic pop
+#endif
+
 
 static void *get_native_handle(GdkWindow *gdkw) {
 #ifdef GDK_WINDOWING_X11
@@ -118,7 +129,7 @@ static void early_media_video_call_state_changed(LinphoneCore *lc, LinphoneCall
 	video_call_state_changed(lc, call, cstate, msg);
 	switch (cstate) {
 		case LinphoneCallIncomingReceived:
-			params = linphone_core_create_default_call_parameters(lc);
+			params = linphone_core_create_call_params(lc, call);
 			linphone_call_params_enable_video(params, TRUE);
 			linphone_call_params_set_audio_direction(params, LinphoneMediaDirectionSendOnly);
 			linphone_call_params_set_video_direction(params, LinphoneMediaDirectionRecvOnly);
@@ -136,7 +147,7 @@ static void early_media_video_call_state_changed_with_inactive_audio(LinphoneCor
 	video_call_state_changed(lc, call, cstate, msg);
 	switch (cstate) {
 		case LinphoneCallIncomingReceived:
-			params = linphone_core_create_default_call_parameters(lc);
+			params = linphone_core_create_call_params(lc, call);
 			linphone_call_params_enable_video(params, TRUE);
 			linphone_call_params_set_audio_direction(params, LinphoneMediaDirectionInactive);
 			linphone_call_params_set_video_direction(params, LinphoneMediaDirectionRecvOnly);
@@ -149,14 +160,14 @@ static void early_media_video_call_state_changed_with_inactive_audio(LinphoneCor
 }
 
 bool_t wait_for_three_cores(LinphoneCore *lc1, LinphoneCore *lc2, LinphoneCore *lc3, int timeout) {
-	MSList *lcs = NULL;
+	bctbx_list_t *lcs = NULL;
 	bool_t result;
 	int dummy = 0;
-	if (lc1) lcs = ms_list_append(lcs, lc1);
-	if (lc2) lcs = ms_list_append(lcs, lc2);
-	if (lc3) lcs = ms_list_append(lcs, lc3);
+	if (lc1) lcs = bctbx_list_append(lcs, lc1);
+	if (lc2) lcs = bctbx_list_append(lcs, lc2);
+	if (lc3) lcs = bctbx_list_append(lcs, lc3);
 	result = wait_for_list(lcs, &dummy, 1, timeout);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 	return result;
 }
 
@@ -208,7 +219,7 @@ static LinphoneCallParams * _configure_for_video(LinphoneCoreManager *manager, L
 	linphone_core_set_video_device(manager->lc, "StaticImage: Static picture");
 	linphone_core_enable_video_capture(manager->lc, TRUE);
 	linphone_core_enable_video_display(manager->lc, TRUE);
-	params = linphone_core_create_default_call_parameters(manager->lc);
+	params = linphone_core_create_call_params(manager->lc, NULL);
 	linphone_call_params_enable_video(params, TRUE);
 	if (linphone_core_find_payload_type(manager->lc,"VP8", 90000, -1)!=NULL){
 		disable_all_video_codecs_except_one(manager->lc, "VP8");
@@ -248,7 +259,7 @@ static void early_media_video_during_video_call_test(void) {
 
 	marie = linphone_core_manager_new("marie_rc");
 	pauline = linphone_core_manager_new("pauline_tcp_rc");
-	laure = linphone_core_manager_new("laure_rc");
+	laure = linphone_core_manager_new("laure_rc_udp");
 	marie_params = configure_for_early_media_video_receiving(marie);
 	pauline_params = configure_for_video(pauline);
 	laure_params = configure_for_early_media_video_sending(laure);
@@ -294,11 +305,11 @@ static void two_incoming_early_media_video_calls_test(void) {
 	LinphoneCallParams *pauline_params;
 	LinphoneCallParams *laure_params;
 	LinphoneCall *call;
-	const MSList *calls_list;
+	const bctbx_list_t *calls_list;
 
 	marie = linphone_core_manager_new("marie_rc");
 	pauline = linphone_core_manager_new("pauline_tcp_rc");
-	laure = linphone_core_manager_new("laure_rc");
+	laure = linphone_core_manager_new("laure_rc_udp");
 	marie_params = configure_for_early_media_video_receiving(marie);
 	pauline_params = configure_for_early_media_video_sending(pauline);
 	laure_params = configure_for_early_media_video_sending(laure);
@@ -324,13 +335,14 @@ static void two_incoming_early_media_video_calls_test(void) {
 	BC_ASSERT_EQUAL(linphone_core_get_calls_nb(marie->lc), 2, int, "%d");
 	if (linphone_core_get_calls_nb(marie->lc) == 2) {
 		calls_list = linphone_core_get_calls(marie->lc);
-		call = (LinphoneCall *)ms_list_nth_data(calls_list, 0);
+		call = (LinphoneCall *)bctbx_list_nth_data(calls_list, 0);
 		BC_ASSERT_PTR_NOT_NULL(call);
 		if (call != NULL) {
 			LinphoneCallParams *params = linphone_call_params_copy(linphone_call_get_current_params(call));
 			linphone_call_params_set_audio_direction(params, LinphoneMediaDirectionSendRecv);
 			linphone_call_params_set_video_direction(params, LinphoneMediaDirectionSendRecv);
 			linphone_core_accept_call_with_params(marie->lc, call, params);
+			linphone_call_params_unref(params);
 
 			/* Wait for 5s. */
 			wait_for_three_cores(marie->lc, pauline->lc, laure->lc, 5000);
@@ -397,7 +409,7 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void
 	LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
 	LinphoneCoreManager *marie1 = linphone_core_manager_new("marie_early_rc");
 	LinphoneCoreManager *marie2 = linphone_core_manager_new("marie_early_rc");
-	MSList *lcs = NULL;
+	bctbx_list_t *lcs = NULL;
 	LinphoneCallParams *pauline_params;
 	LinphoneCallParams *marie1_params;
 	LinphoneCallParams *marie2_params;
@@ -410,19 +422,22 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void
 	pol.automatically_accept = 1;
 	pol.automatically_initiate = 1;
 
-	linphone_core_enable_video(pauline->lc, TRUE, TRUE);
-	linphone_core_enable_video(marie1->lc, TRUE, TRUE);
+	linphone_core_enable_video_capture(pauline->lc, TRUE);
+	linphone_core_enable_video_display(pauline->lc, TRUE);
+	linphone_core_enable_video_capture(marie1->lc, TRUE);
+	linphone_core_enable_video_display(marie1->lc, TRUE);
 	linphone_core_set_video_policy(marie1->lc, &pol);
-	linphone_core_enable_video(marie2->lc, TRUE, TRUE);
+	linphone_core_enable_video_capture(marie2->lc, TRUE);
+	linphone_core_enable_video_display(marie2->lc, TRUE);
 	linphone_core_set_video_policy(marie2->lc, &pol);
 	linphone_core_set_audio_port_range(marie2->lc, 40200, 40300);
 	linphone_core_set_video_port_range(marie2->lc, 40400, 40500);
 
-	lcs = ms_list_append(lcs,marie1->lc);
-	lcs = ms_list_append(lcs,marie2->lc);
-	lcs = ms_list_append(lcs,pauline->lc);
+	lcs = bctbx_list_append(lcs,marie1->lc);
+	lcs = bctbx_list_append(lcs,marie2->lc);
+	lcs = bctbx_list_append(lcs,pauline->lc);
 
-	pauline_params = linphone_core_create_default_call_parameters(pauline->lc);
+	pauline_params = linphone_core_create_call_params(pauline->lc, NULL);
 	linphone_call_params_enable_early_media_sending(pauline_params, TRUE);
 	linphone_call_params_enable_video(pauline_params, TRUE);
 	marie1_params = configure_for_early_media_video_receiving_with_inactive_audio(marie1);
@@ -430,13 +445,13 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void
 
 	linphone_core_invite_address_with_params(pauline->lc, marie1->identity, pauline_params);
 	linphone_call_params_destroy(pauline_params);
-	
+
 	BC_ASSERT_TRUE(wait_for_list(lcs, &marie1->stat.number_of_LinphoneCallIncomingReceived, 1, 3000));
 	BC_ASSERT_TRUE(wait_for_list(lcs, &marie2->stat.number_of_LinphoneCallIncomingReceived, 1, 3000));
-	
+
 	marie1_call = linphone_core_get_current_call(marie1->lc);
 	marie2_call = linphone_core_get_current_call(marie2->lc);
-	
+
 	if (marie1_call){
 		linphone_call_set_next_video_frame_decoded_callback(marie1_call, linphone_call_iframe_decoded_cb, marie1->lc);
 	}
@@ -449,7 +464,6 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void
 	BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia, 1, 3000));
 
 	pauline_call = linphone_core_get_current_call(pauline->lc);
-	
 
 	BC_ASSERT_PTR_NOT_NULL(pauline_call);
 	BC_ASSERT_PTR_NOT_NULL(marie1_call);
@@ -457,7 +471,7 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void
 
 	if (pauline_call && marie1_call && marie2_call) {
 		linphone_call_set_next_video_frame_decoded_callback(pauline_call, linphone_call_iframe_decoded_cb, pauline->lc);
-		
+
 		/* wait a bit that streams are established */
 		wait_for_list(lcs, &dummy, 1, 3000);
 		BC_ASSERT_EQUAL(linphone_call_get_audio_stats(pauline_call)->download_bandwidth, 0, float, "%f");
@@ -497,14 +511,14 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void
 
 	linphone_call_params_destroy(marie1_params);
 	linphone_call_params_destroy(marie2_params);
-	ms_list_free(lcs);
+	bctbx_list_free(lcs);
 	linphone_core_manager_destroy(marie1);
 	linphone_core_manager_destroy(marie2);
 	linphone_core_manager_destroy(pauline);
 }
 #endif /*HAVE_GTK*/
 
-static void enable_disable_camera_after_camera_switches() {
+static void enable_disable_camera_after_camera_switches(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
 	const char *currentCamId = (char*)linphone_core_get_video_device(marie->lc);
@@ -544,21 +558,16 @@ static void enable_disable_camera_after_camera_switches() {
 }
 test_t video_tests[] = {
 #if HAVE_GTK
-	{ "Early-media video during video call", early_media_video_during_video_call_test },
-	{ "Two incoming early-media video calls", two_incoming_early_media_video_calls_test },
-	{ "Early-media video with inactive audio", early_media_video_with_inactive_audio },
-	{ "Forked outgoing early-media video call with inactive audio", forked_outgoing_early_media_video_call_with_inactive_audio_test },
+	TEST_NO_TAG("Early-media video during video call", early_media_video_during_video_call_test),
+	TEST_NO_TAG("Two incoming early-media video calls", two_incoming_early_media_video_calls_test),
+	TEST_NO_TAG("Early-media video with inactive audio", early_media_video_with_inactive_audio),
+	TEST_NO_TAG("Forked outgoing early-media video call with inactive audio", forked_outgoing_early_media_video_call_with_inactive_audio_test),
 #endif /*HAVE_GTK*/
-	{ "Enable/disable camera after camera switches", enable_disable_camera_after_camera_switches}
+	TEST_NO_TAG("Enable/disable camera after camera switches", enable_disable_camera_after_camera_switches)
 
 };
 
-test_suite_t video_test_suite = {
-	"Video",
-	liblinphone_tester_setup,
-	NULL,
-	sizeof(video_tests) / sizeof(video_tests[0]),
-	video_tests
-};
+test_suite_t video_test_suite = {"Video", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
+								 sizeof(video_tests) / sizeof(video_tests[0]), video_tests};
 
 #endif /* VIDEO_ENABLED */
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 39e49ee7f..d73d892d9 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -25,31 +25,60 @@ if(MSVC)
 	find_library(LIBMINGWEX NAMES mingwex)
 endif()
 
+set(USE_BUNDLE )
+if (IOS)
+	set(USE_BUNDLE MACOSX_BUNDLE)
+endif()
+
 set(LP_GEN_WRAPPERS_SOURCE_FILES
 	generator.cc
 	generator.hh
 	genwrappers.cc
 	software-desc.cc
 	software-desc.hh
-)
-
-add_definitions(
-	-DIN_LINPHONE
-)
+	)
 
+add_definitions(-DIN_LINPHONE)
 set(LP_GEN_WRAPPERS_LIBS
 	${LIBGCC}
 	${LIBMINGWEX}
 	${XML2_LIBRARIES}
-)
+	)
 
-add_executable(lp-gen-wrappers ${LP_GEN_WRAPPERS_SOURCE_FILES})
+apply_compile_flags(LP_GEN_WRAPPERS_SOURCE_FILES "CPP" "CXX")
+add_executable(lp-gen-wrappers ${USE_BUNDLE} ${LP_GEN_WRAPPERS_SOURCE_FILES})
 target_link_libraries(lp-gen-wrappers ${LP_GEN_WRAPPERS_LIBS})
+set_target_properties(lp-gen-wrappers PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 
+set(LP_AUTO_ANSWER_SOURCE_FILES	auto_answer.c)
+apply_compile_flags(LP_AUTO_ANSWER_SOURCE_FILES "CPP" "C")
+add_executable(lp-auto-answer ${USE_BUNDLE} ${LP_AUTO_ANSWER_SOURCE_FILES})
+target_link_libraries(lp-auto-answer ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES})
+set_target_properties(lp-auto-answer PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
 
-install(TARGETS lp-gen-wrappers
-	RUNTIME DESTINATION bin
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-)
+set(LP_SENDMSG_SOURCE_FILES lpsendmsg.c)
+apply_compile_flags(LP_SENDMSG_SOURCE_FILES "CPP" "C")
+add_executable(lp-sendmsg ${USE_BUNDLE} ${LP_SENDMSG_SOURCE_FILES})
+target_link_libraries(lp-sendmsg ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
+set_target_properties(lp-sendmsg PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+
+if (NOT IOS)
+	install(TARGETS lp-gen-wrappers
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+		)
+	install(TARGETS lp-auto-answer
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+		)
+	install(TARGETS lp-sendmsg
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+		)
+endif()
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ecd6cab5a..9b9226483 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,7 +10,8 @@ COMMON_CFLAGS=\
 	$(MEDIASTREAMER_CFLAGS) \
 	$(STRICT_OPTIONS) \
 	$(STRICT_OPTIONS_CC) \
-	$(LIBXML2_CFLAGS)
+	$(MEDIASTREAMER_LIBS) \
+	$(BCTOOLBOX_LIBS)
 
 #-fpermissive to workaround a g++ bug on macos 32bit SDK.
 AM_CXXFLAGS=$(LIBXML2_CFLAGS) -fpermissive $(STRICT_OPTIONS) $(STRICT_OPTIONS_CXX)
@@ -19,7 +20,7 @@ EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc
 
 if BUILD_TOOLS
 
-bin_PROGRAMS=xml2lpc_test lpc2xml_test lp-gen-wrappers lp-autoanswer
+bin_PROGRAMS=xml2lpc_test lpc2xml_test lp-gen-wrappers lp-autoanswer lp-test-ecc lp-sendmsg
 
 xml2lpc_test_SOURCES=\
 	xml2lpc_test.c
@@ -48,6 +49,30 @@ lp_autoanswer_LDADD=\
 	$(top_builddir)/coreapi/liblinphone.la \
 	$(MEDIASTREAMER_LIBS)
 
+lp_test_ecc_SOURCES=test_ecc.c
+lp_test_ecc_CFLAGS=$(COMMON_CFLAGS)
+lp_test_ecc_LDADD=$(top_builddir)/coreapi/liblinphone.la
+
+lp_sendmsg_SOURCES=lpsendmsg.c
+lp_sendmsg_CFLAGS=$(COMMON_CFLAGS)
+lp_sendmsg_LDADD=$(top_builddir)/coreapi/liblinphone.la
+
 endif
 
 
+
+if ENABLE_TESTS
+
+noinst_PROGRAMS=test_lsd  test_numbers
+
+test_lsd_SOURCES=test_lsd.c
+test_lsd_CFLAGS=$(COMMON_CFLAGS)
+test_lsd_LDADD=$(top_builddir)/coreapi/liblinphone.la
+
+
+
+test_numbers_SOURCES=test_numbers.c
+test_numbers_CFLAGS=$(COMMON_CFLAGS)
+test_numbers_LDADD=$(top_builddir)/coreapi/liblinphone.la
+
+endif
diff --git a/tools/auto_answer.c b/tools/auto_answer.c
index 470c3ac8f..25649c429 100644
--- a/tools/auto_answer.c
+++ b/tools/auto_answer.c
@@ -36,7 +36,7 @@ static bool_t dump_stats=FALSE;
 static void stop(int signum){
 	running=FALSE;
 }
-#ifndef WIN32
+#ifndef _WIN32
 static void stats(int signum){
 	print_stats=TRUE;
 }
@@ -55,26 +55,26 @@ static void call_state_changed(LinphoneCore *lc, LinphoneCall *call, LinphoneCal
 	LinphoneCallParams * call_params;
 	switch(cstate){
 		case LinphoneCallIncomingReceived:
-			ms_message("Incoming call arrive  !\n");
+			ms_message("Incoming call arriving !\n");
 			/* accept the incoming call*/
-			call_params = linphone_core_create_default_call_parameters(lc);
+			call_params = linphone_core_create_call_params(lc, call);
 			linphone_call_params_enable_video(call_params,TRUE);
 			linphone_call_params_set_audio_direction(call_params,LinphoneMediaDirectionSendOnly);
 			linphone_call_params_set_video_direction(call_params,LinphoneMediaDirectionSendOnly);
 			linphone_core_accept_call_with_params(lc,call,call_params);
 			linphone_call_params_destroy(call_params);
-
 		break;
 		default:
 			break;
 	}
 }
 extern MSWebCamDesc mire_desc;
-static void helper() {
-	printf("auto_answer --help\n"
+static void helper(const char *progname) {
+	printf("%s --help\n"
 			"\t\t\t--listening-uri <uri> uri to listen on, default [sip:localhost:5060]\n"
 			"\t\t\t--max-call-duration max duration of a call in seconds, default [3600]\n"
-			"\t\t\t--verbose\n");
+			"\t\t\t--media-file <wav or mkv file to play to caller>\n"
+			"\t\t\t--verbose\n", progname);
 	exit(0);
 }
 
@@ -88,10 +88,11 @@ int main(int argc, char *argv[]){
 	char * tmp = NULL;
 	LpConfig * lp_config = lp_config_new(NULL);
 	int max_call_duration=3600;
+	static const char *media_file = NULL;
 
 	policy.automatically_accept=TRUE;
 	signal(SIGINT,stop);
-#ifndef WIN32
+#ifndef _WIN32
 	signal(SIGUSR1,stats);
 	signal(SIGUSR2,dump_call_logs);
 #endif
@@ -104,7 +105,7 @@ int main(int argc, char *argv[]){
 			addr = linphone_address_new(argv[++i]);
 			if (!addr) {
 				printf("Error, bad sip uri");
-				helper();
+				helper(argv[0]);
 			}
 /*			switch(linphone_address_get_transport(addr)) {
 			case LinphoneTransportUdp:
@@ -115,8 +116,13 @@ int main(int argc, char *argv[]){
 				helper();
 				break;
 			}*/
+		} else if (strcmp(argv[i], "--media-file") == 0){
+			i++;
+			if (i<argc){
+				media_file = argv[i];
+			}else helper(argv[0]);
 		} else {
-			helper();
+			helper(argv[0]);
 		}
 	}
 
@@ -138,13 +144,27 @@ int main(int argc, char *argv[]){
 
 
 	/*instead of using sound capture card, a file is played to the calling party*/
-	linphone_core_set_play_file(lc,PACKAGE_DATA_DIR "/sounds/linphone/hello16000.wav");
 	linphone_core_set_use_files(lc,TRUE);
+	linphone_core_enable_echo_cancellation(lc, FALSE); /*no need for local echo cancellation when playing files*/
+	if (!media_file){
+		linphone_core_set_play_file(lc,PACKAGE_DATA_DIR "/sounds/linphone/hello16000.wav");
+		linphone_core_set_preferred_framerate(lc,5);
+	}else{
+		PayloadType *pt = linphone_core_find_payload_type(lc, "opus", 48000, -1);
+		/*if opus is present, give it a bitrate for good quality with music, and stereo enabled*/
+		if (pt){
+			linphone_core_set_payload_type_bitrate(lc, pt, 150);
+			payload_type_set_send_fmtp(pt, "stereo=1");
+			payload_type_set_recv_fmtp(pt, "stereo=1");
+		}
+		linphone_core_set_play_file(lc, media_file);
+		linphone_core_set_preferred_video_size_by_name(lc, "720p");
+	}
 
 	{
 		MSWebCamDesc *desc = ms_mire_webcam_desc_get();
 		if (desc){
-			ms_web_cam_manager_add_cam(ms_web_cam_manager_get(),ms_web_cam_new(desc));
+			ms_web_cam_manager_add_cam(ms_factory_get_web_cam_manager(linphone_core_get_ms_factory(lc)),ms_web_cam_new(desc));
 			linphone_core_set_video_device(lc,"Mire: Mire (synthetic moving picture)");
 		}
 	}
@@ -158,19 +178,19 @@ int main(int argc, char *argv[]){
 
 	linphone_core_set_sip_transports(lc,&tp);
 	linphone_core_set_audio_port_range(lc,1024,65000);
-	linphone_core_set_preferred_framerate(lc,5);
+	linphone_core_set_video_port_range(lc,1024,65000);
 	linphone_core_set_primary_contact(lc,tmp=linphone_address_as_string(addr));
 	ms_free(tmp);
 
 	/* main loop for receiving notifications and doing background linphonecore work: */
 	while(running){
-		const MSList * iterator;
+		const bctbx_list_t * iterator;
 		linphone_core_iterate(lc);
 		ms_usleep(50000);
 		if (print_stats) {
 			ms_message("*********************************");
-			ms_message("*Current number of call   [%10i]  *",ms_list_size(linphone_core_get_calls(lc)));
-			ms_message("*Number of call until now [%10i]  *",ms_list_size(linphone_core_get_call_logs(lc)));
+			ms_message("*Current number of calls   [%10u]  *", (unsigned int)bctbx_list_size(linphone_core_get_calls(lc)));
+			ms_message("*Number of calls until now [%10u]  *", (unsigned int)bctbx_list_size(linphone_core_get_call_logs(lc)));
 			ms_message("*********************************");
 			print_stats=FALSE;
 		}
diff --git a/tools/genapixml.py b/tools/genapixml.py
index 350f111ff..4c9d3374a 100755
--- a/tools/genapixml.py
+++ b/tools/genapixml.py
@@ -86,6 +86,8 @@ class CArgument(CObject):
 				fullySplittedType.append('*')
 			else:
 				fullySplittedType.append(s)
+		if 'MS2_DEPRECATED' in fullySplittedType:
+			fullySplittedType.remove('MS2_DEPRECATED')
 		isStruct = False
 		isEnum = False
 		self.ctype = 'int' # Default to int so that the result is correct eg. for 'unsigned short'
@@ -436,7 +438,7 @@ class Project:
 			returnarg = CArgument(returntype, enums = self.enums, structs = self.__structs)
 			returndesc = node.find("./detaileddescription/para/simplesect[@kind='return']")
 			if returndesc is not None:
-				if returnarg.ctype == 'MSList':
+				if returnarg.ctype == 'MSList' or returnarg.ctype == 'bctbx_list_t':
 					n = returndesc.find('.//mslist')
 					if n is not None:
 						returnarg.containedType = n.text
@@ -498,13 +500,16 @@ class Project:
 			self.add(td)
 
 	def __parseCFunctionMemberdef(self, node):
+		internal = node.find("./detaileddescription/internal")
+		if internal is not None:
+			return None
 		missingDocWarning = ''
 		name = node.find('./name').text
 		t = ''.join(node.find('./type').itertext())
 		returnarg = CArgument(t, enums = self.enums, structs = self.__structs)
 		returndesc = node.find("./detaileddescription/para/simplesect[@kind='return']")
 		if returndesc is not None:
-			if returnarg.ctype == 'MSList':
+			if returnarg.ctype == 'MSList' or returnarg.ctype == 'bctbx_list_t':
 				n = returndesc.find('.//mslist')
 				if n is not None:
 					returnarg.containedType = n.text
@@ -527,7 +532,7 @@ class Project:
 				for arg in argslist.arguments:
 					for paramdesc in paramdescs:
 						if arg.name == paramdesc.find('./parameternamelist').find('./parametername').text:
-							if arg.ctype == 'MSList':
+							if arg.ctype == 'MSList' or arg.ctype == 'bctbx_list_t':
 								n = paramdesc.find('.//mslist')
 								if n is not None:
 									arg.containedType = n.text
@@ -557,7 +562,8 @@ class Project:
 		memberdefs = tree.findall("./compounddef[@kind='group']/sectiondef[@kind='func']/memberdef[@kind='function'][@prot='public'][@static='no']")
 		for m in memberdefs:
 			f = self.__parseCFunctionMemberdef(m)
-			self.add(f)
+			if f is not None:
+				self.add(f)
 
 	def initFromFiles(self, xmlfiles):
 		trees = []
diff --git a/tools/generator.cc b/tools/generator.cc
index 8eb35c909..de8528a9e 100644
--- a/tools/generator.cc
+++ b/tools/generator.cc
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "generator.hh"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <direct.h>
 
 #define strncasecmp _strnicmp
@@ -44,7 +44,7 @@ CplusplusGenerator::CplusplusGenerator(){
 void CplusplusGenerator::generate(Project *proj){
 	list<Class*> classes=proj->getClasses();
 	mCurProj=proj;
-#ifndef WIN32
+#ifndef _WIN32
 	mkdir(proj->getName().c_str(),S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IROTH);
 #else
 	_mkdir(proj->getName().c_str());
@@ -62,7 +62,7 @@ void CplusplusGenerator::writeEnumMember(ConstField *cf, bool isLast){
 
 void CplusplusGenerator::writeClass(Class *klass){
 	ostringstream filename;
-	
+
 	filename<<mCurProj->getName()<<"/"<<klass->getName()<<".hh";
 	mOutfile.open(filename.str().c_str());
 	if (!mOutfile.is_open()){
@@ -90,7 +90,7 @@ void CplusplusGenerator::writeClass(Class *klass){
 		mOutfile<<"public:"<<endl;
 		for_each(methods.begin(),methods.end(),bind1st(mem_fun(&CplusplusGenerator::writeMethod),this));
 	}
-	
+
 	mOutfile<<"};"<<endl<<endl;
 	if (!mCurProj->getName().empty())
 		mOutfile<<"} //end of namespace "<<mCurProj->getName()<<endl;
@@ -100,7 +100,7 @@ void CplusplusGenerator::writeClass(Class *klass){
 
 void CplusplusGenerator::writeArgument(Argument *arg, bool isReturn){
 	Type *type=arg->getType();
-	
+
 	if (type->getBasicType()==Type::Class){
 		if (arg->isConst()){
 			mOutfile<<"const ";
@@ -115,7 +115,7 @@ void CplusplusGenerator::writeArgument(Argument *arg, bool isReturn){
 	}else if (type->getBasicType()==Type::String){
 		if (!isReturn)
 			mOutfile<<"const std::string &";
-		else 
+		else
 			mOutfile<<"std::string";
 	}else if (type->getBasicType()==Type::Void){
 		mOutfile<<"void";
@@ -138,7 +138,7 @@ void CplusplusGenerator::writeHelpComment(const std::string &comment, int ntabs)
 	writeTabs(ntabs);
 	mOutfile<<" * ";
 	for(i=0;i<comment.size();i++,curindex++){
-		
+
 		if (comment[i]=='\n' || (curindex>100 && comment[i]==' ')){
 			mOutfile<<endl;
 			writeTabs(ntabs);
@@ -150,22 +150,22 @@ void CplusplusGenerator::writeHelpComment(const std::string &comment, int ntabs)
 
 void CplusplusGenerator::writeMethod(Method *method){
 	if (method->isCallback()) return;
-	
+
 	Argument *retarg=method->getReturnArg();
 	const list<Argument*> &args=method->getArgs();
 	list<Argument*>::const_iterator it;
-	
+
 	writeTabs(1);
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(method->getHelp(),1);
 	mOutfile<<endl;
 	writeTabs(1);
 	mOutfile<<"**/"<<endl;
-	
+
 	writeTabs(1);
 	writeArgument(retarg,true);
 	mOutfile<<" "<<method->getName()<<"(";
-	
+
 	for(it=args.begin();it!=args.end();++it){
 		if (it!=args.begin()) mOutfile<<", ";
 		writeArgument(*it);
@@ -183,14 +183,14 @@ JavascriptGenerator::JavascriptGenerator(){
 void JavascriptGenerator::generate(Project *proj){
 	list<Class*> classes=proj->getClasses();
 	mCurProj=proj;
-#ifndef WIN32
+#ifndef _WIN32
 	remove(to_lower(proj->getName()).c_str());
 	mkdir(to_lower(proj->getName()).c_str(),S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IROTH);
 #else
 	_mkdir(to_lower(proj->getName()).c_str());
 #endif
 	ostringstream filename;
-	
+
 	/*write a file for the namespace*/
 	filename<<to_lower(mCurProj->getName())<<"/"<<to_lower(mCurProj->getName())<<".js";
 	mOutfile.open(filename.str().c_str());
@@ -219,12 +219,12 @@ string JavascriptGenerator::getEnumName(Class *klass){
 
 void JavascriptGenerator::writeEnum(Class *klass){
 	if (klass->getType()!=Type::Enum) return;
-	
+
 	ostringstream filename;
 	list<ConstField*> members=klass->getConstFields();
 	list<ConstField*>::iterator it;
 	string enum_name=getEnumName(klass);
-	
+
 	filename<<to_lower(mCurProj->getName())<<"/"<<to_lower(enum_name)<<".js";
 	mOutfile.open(filename.str().c_str());
 	if (!mOutfile.is_open()){
@@ -232,7 +232,7 @@ void JavascriptGenerator::writeEnum(Class *klass){
 		return;
 	}
 	mOutfile<<"/* Wrapper generated by lp-gen-wrappers, do not edit*/"<<endl<<endl;
-	
+
 	mOutfile<<"var "<<mCurProj->getName()<<" = "<<mCurProj->getName()<<" || {};"<<endl;
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(klass->getHelp(),0);
@@ -243,7 +243,7 @@ void JavascriptGenerator::writeEnum(Class *klass){
 	mOutfile<<mCurProj->getName()<<"."<<enum_name<<" = {"<<endl;
 	string prefix=ConstField::getCommonPrefix(members);
 	size_t prefix_size=prefix.size();
-	
+
 	for(it=members.begin();it!=members.end();){
 		ConstField *cf=(*it);
 		if (!cf->getHelp().empty()){
@@ -283,13 +283,13 @@ void JavascriptGenerator::writeEnum(Class *klass){
 
 void JavascriptGenerator::writeClass(Class *klass){
 	ostringstream filename;
-	
+
 	if (klass->getType()==Type::Enum) {
 		return;
 	}
 	const list<Method*> &methods=klass->getMethods();
 	if (methods.empty()) return;//skip empty classes
-	
+
 	filename<<to_lower(mCurProj->getName())<<"/"<<to_lower(klass->getName())<<".js";
 	mOutfile.open(filename.str().c_str());
 	if (!mOutfile.is_open()){
@@ -299,14 +299,14 @@ void JavascriptGenerator::writeClass(Class *klass){
 	mCurClass=klass;
 	mOutfile<<"/* Wrapper generated by lp-gen-wrappers, do not edit*/"<<endl;
 	mOutfile<<endl;
-	
+
 	//if (!mCurProj->getName().empty())
 	//	mOutfile<<"namespace "<<mCurProj->getName()<<"{"<<endl<<endl;
 	mOutfile<<"/**"<<endl;
 	mOutfile<<" * "<<klass->getHelp()<<endl;
 	mOutfile<<" * @external "<<klass->getName()<<endl;
 	mOutfile<<"**/"<<endl;
-	
+
 	list<Property*> properties=klass->getProperties();
 	for_each(properties.begin(),properties.end(),bind1st(mem_fun(&JavascriptGenerator::writeProperty),this));
 	mOutfile<<endl;
@@ -405,16 +405,16 @@ void JavascriptGenerator::writeMethod(Method *method){
 	Argument *retarg=method->getReturnArg();
 	const list<Argument*> &args=method->getArgs();
 	list<Argument*>::const_iterator it;
-	
+
 	if (method->isCallback()) return;
 	if (method->getPropertyBehaviour()!=Method::None) return;
 	if (method->getName()=="ref" || method->getName()=="unref") return;
-	
+
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(method->getHelp(),0);
 	mOutfile<<endl;
 	mOutfile<<" * @function external:"<<mCurClass->getName()<<"#"<<method->getName()<<endl;
-	
+
 	for(it=args.begin();it!=args.end();++it){
 		writeArgument(*it);
 	}
@@ -437,14 +437,14 @@ string JavascriptGenerator::getEventHelp(const string &help){
 void JavascriptGenerator::writeEvent(Method* event){
 	const list<Argument*> &args=event->getArgs();
 	list<Argument*>::const_iterator it;
-	
+
 	if (!event->isCallback()) return;
 	mOutfile<<"/**"<<endl;
 	writeHelpComment(getEventHelp(event->getHelp()),0);
 	mOutfile<<endl;
 	mOutfile<<" * @event external:"<<mCurClass->getName()<<"#"<<event->getName()<<endl;
 	mOutfile<<" * @type {object}"<<endl;
-	
+
 	for(it=args.begin();it!=args.end();++it){
 		writeArgument(*it,PropertyArg);
 	}
diff --git a/tools/lpc2xml_test.c b/tools/lpc2xml_test.c
index 59807d407..23f93b11c 100644
--- a/tools/lpc2xml_test.c
+++ b/tools/lpc2xml_test.c
@@ -42,28 +42,30 @@ void cb_function(void *ctx, lpc2xml_log_level level, const char *msg, va_list li
 }
 
 void show_usage(int argc, char *argv[]) {
-	fprintf(stderr, "usage %s convert <lpc_file> <xml_file>\n",
-			argv[0]);
+	fprintf(stderr, "usage:\n%s convert <lpc_file> <xml_file>\n%s dump <lpc_file>\n", argv[0], argv[0]);
 }
 
 int main(int argc, char *argv[]) {
 	lpc2xml_context *ctx;
 	LpConfig *lpc;
-	if(argc != 4) {
+	if(argc > 4 || argc < 3) {
 		show_usage(argc, argv);
 		return -1;
 	}
 
-	ctx = lpc2xml_context_new(cb_function, NULL);
 	lpc = lp_config_new(argv[2]);
-	lpc2xml_set_lpc(ctx, lpc);
-	if(strcmp("convert", argv[1]) == 0) {
+	if(strcmp("convert", argv[1]) == 0 && argc == 4) {
+		ctx = lpc2xml_context_new(cb_function, NULL);
+		lpc2xml_set_lpc(ctx, lpc);
 		lpc2xml_convert_file(ctx, argv[3]);
+		lpc2xml_context_destroy(ctx);
+	} else if (strcmp("dump", argv[1]) == 0 && argc == 3) {
+		char *dump = lp_config_dump_as_xml(lpc);
+		fprintf(stdout, "%s", dump);
 	} else {
 		show_usage(argc, argv);
 	}
 	lp_config_destroy(lpc);
-	lpc2xml_context_destroy(ctx);
 	return 0;
 }
 
diff --git a/tools/lpconfig_items.py b/tools/lpconfig_items.py
new file mode 100644
index 000000000..6c002c5ab
--- /dev/null
+++ b/tools/lpconfig_items.py
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+
+from collections import defaultdict
+items = defaultdict(list)
+
+def get_files_in_coreapi_directory():
+	from os import walk
+	files = []
+	for (dirpath, dirnames, filenames) in walk('../coreapi'):
+		files.extend(filenames)
+		break
+	return files
+
+def parse_file(filename):
+	with open('../coreapi/' + filename, 'r') as infile:
+		for line in infile:
+			if 'lp_config_get_' in line:
+				parse_lpconfig_line(line)
+
+def parse_lpconfig_line(line):
+	token = line[line.find('lp_config_get_') + len('lp_config_get_'):]
+	split = token.split('(', 1)
+	item_type = split[0]
+	if '_' in item_type:
+		return
+	
+	params_split = split[1].split(',', 3)
+	item_section = params_split[1]
+	if item_section[0] != '"':
+		return
+	item_section = item_section.split('"')[1]
+	
+	item_name = params_split[2]
+	if item_name[0] != '"':
+		return
+	item_name = item_name.split('"')[1]
+	
+	item_default_value = params_split[3].split(')')[0]
+	if item_type == 'string' and item_default_value[0] != '"':
+		item_default_value = '<unknown_string>'
+	
+	item = [item_type, item_name, item_default_value]
+	items[item_section].append(item)
+
+for files in get_files_in_coreapi_directory():
+	parse_file(files)
+for section, items in items.iteritems():
+	print '[' + section + ']'
+	for item in items:
+		print item[1] + '=' + item[2]
+	print ''
\ No newline at end of file
diff --git a/tools/lpsendmsg.c b/tools/lpsendmsg.c
new file mode 100644
index 000000000..a1ae45bdc
--- /dev/null
+++ b/tools/lpsendmsg.c
@@ -0,0 +1,197 @@
+/*
+linphone
+Copyright (C) 2016  Belledonne Communications SARL
+ (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+
+#ifdef IN_LINPHONE
+#include "linphonecore.h"
+#else
+#include "linphone/linphonecore.h"
+#endif
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <signal.h>
+
+static bool_t running = TRUE;
+static const char *passwd = NULL;
+
+static void stop(int signum){
+	running=FALSE;
+}
+
+static void helper(const char *progname) {
+	printf("%s --from <from-uri> --to <to-uri> --route <route> --passwd <pass> --text <text-to-send>\n"
+			"\t\t\t--help\n"
+			"\t\t\t--from <uri> uri to send from\n"
+			"\t\t\t--to <uri> uri to send to\n"
+			"\t\t\t--route <uri> uri to send the message through\n"
+			"\t\t\t--passwd <authentication password>\n"
+			"\t\t\t--text <text to send>\n"
+			"\t\t\t--verbose\n", progname);
+	exit(0);
+}
+
+static void on_msg_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state){
+	switch(state){
+		case LinphoneChatMessageStateInProgress:
+			printf("Sending message...\n");
+		break;
+		case LinphoneChatMessageStateNotDelivered:
+			fprintf(stderr, "Error sending message. Use --verbose to troubleshoot.\n");
+			running = FALSE;
+		break;
+		case LinphoneChatMessageStateDelivered:
+			printf("Message transmitted succesfully.\n");
+			running = FALSE;
+		break;
+		case LinphoneChatMessageStateFileTransferDone:
+		case LinphoneChatMessageStateFileTransferError:
+		case LinphoneChatMessageStateIdle:
+		break;
+	}
+}
+
+static void auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain){
+	running = FALSE;
+	if (passwd){
+		fprintf(stderr, "Server rejected the supplied username or password\n");
+	}else{
+		fprintf(stderr, "Authentication requested by server. Please retry by supplying a password with --passwd.\n");
+	}
+}
+
+int main(int argc, char *argv[]){
+	LinphoneCoreVTable vtable={0};
+	LinphoneCore *lc;
+	int i;
+	LinphoneAddress *from = NULL;
+	LinphoneAddress *to = NULL;
+	LinphoneAddress *route = NULL;
+	LinphoneProxyConfig *cfg;
+	LinphoneChatMessage *msg;
+	LinphoneChatRoom *room;
+	LinphoneChatMessageCbs *cbs;
+	char * text = NULL;
+	char *tmp;
+	
+	signal(SIGINT,stop);
+
+	for(i = 1; i < argc; ++i) {
+		if (strcmp(argv[i], "--verbose") == 0) {
+			linphone_core_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
+		} else if (strcmp(argv[i], "--from") == 0){
+			i++;
+			if (i < argc){
+				from = linphone_address_new(argv[i]);
+				if (!from) {
+					fprintf(stderr, "Incorrect from specified\n");
+					return -1;
+				}
+			}
+		} else if (strcmp(argv[i], "--to") == 0){
+			i++;
+			if (i < argc){
+				to = linphone_address_new(argv[i]);
+				if (!to) {
+					fprintf(stderr, "Incorrect to specified\n");
+					return -1;
+				}
+			}
+		}else if (strcmp(argv[i], "--route") == 0){
+			i++;
+			if (i < argc){
+				route = linphone_address_new(argv[i]);
+				if (!route) {
+					fprintf(stderr, "Incorrect route specified\n");
+					return -1;
+				}
+			}
+		} else if (strcmp(argv[i], "--passwd") == 0){
+			i++;
+			if (i < argc){
+				passwd = argv[i];
+			}
+		} else if (strcmp(argv[i], "--text") == 0){
+			i++;
+			if (i < argc){
+				text = argv[i];
+			}
+		} else {
+			helper(argv[0]);
+		}
+	}
+
+	if (!from) {
+		fprintf(stderr, "Please specify from.\n");
+		helper(argv[0]);
+		return -1;
+	}
+	if (!to) {
+		fprintf(stderr, "Please specify to.\n");
+		helper(argv[0]);
+		return -1;
+	}
+	if (!text){
+		fprintf(stderr, "Please specify text to send.\n");
+		helper(argv[0]);
+		return -1;
+	}
+
+	vtable.auth_info_requested = auth_info_requested;
+	lc=linphone_core_new(&vtable,NULL, NULL, NULL);
+	
+	if (passwd){
+		LinphoneAuthInfo *ai = linphone_core_create_auth_info(lc, linphone_address_get_username(from), NULL, passwd, NULL, NULL, NULL);
+		linphone_core_add_auth_info(lc, ai);
+		linphone_auth_info_destroy(ai);
+	}
+	
+	if (!route){
+		route = linphone_address_clone(from);
+		linphone_address_set_username(route, NULL);
+		linphone_address_set_display_name(route, NULL);
+	}
+	
+	cfg = linphone_core_create_proxy_config(lc);
+	linphone_proxy_config_set_identity_address(cfg, from);
+	tmp = linphone_address_as_string(route);
+	linphone_proxy_config_set_server_addr(cfg, tmp);
+	ms_free(tmp);
+	linphone_proxy_config_enable_register(cfg, FALSE);
+	linphone_core_add_proxy_config(lc, cfg);
+	linphone_proxy_config_unref(cfg);
+	
+	room = linphone_core_get_chat_room(lc, to);
+	msg = linphone_chat_room_create_message(room, text);
+	cbs = linphone_chat_message_get_callbacks(msg);
+	linphone_chat_message_cbs_set_msg_state_changed(cbs, on_msg_state_changed);
+	linphone_chat_room_send_chat_message(room, msg);
+	/* main loop for receiving notifications and doing background linphonecore work: */
+	while(running){
+		linphone_core_iterate(lc);
+		ms_usleep(50000);
+	}
+	linphone_address_destroy(from);
+	linphone_address_destroy(to);
+	linphone_address_destroy(route);
+	linphone_core_destroy(lc);
+	return 0;
+}
+
diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index c80c6698d..16447aaf5 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -31,27 +31,36 @@ blacklisted_classes = [
 	'LinphoneTunnelConfig'
 ]
 blacklisted_events = [
+	'LinphoneChatMessageStateChangedCb',	# not respecting naming convention
 	'LinphoneCoreInfoReceivedCb',	# missing LinphoneInfoMessage
 	'LinphoneCoreNotifyReceivedCb',	# missing LinphoneContent
 	'LinphoneCoreFileTransferProgressIndicationCb',	# missing LinphoneContent
 	'LinphoneCoreFileTransferRecvCb',	# missing LinphoneContent
-	'LinphoneCoreFileTransferSendCb'	# missing LinphoneContent
+	'LinphoneCoreFileTransferSendCb',	# missing LinphoneContent
+	'LinphoneCoreTextMessageReceivedCb'	# not respecting naming convention
 ]
 blacklisted_functions = [
 	'linphone_call_log_get_local_stats',	# missing rtp_stats_t
 	'linphone_call_log_get_remote_stats',	# missing rtp_stats_t
 	'linphone_call_params_get_privacy',	# missing LinphonePrivacyMask
 	'linphone_call_params_set_privacy',	# missing LinphonePrivacyMask
+	'linphone_chat_message_start_file_download',	# callback function in parameter
 	'linphone_chat_message_state_to_string',	# There is no use to wrap this function
+	'linphone_chat_room_send_message2',	# callback function in parameter
 	'linphone_core_add_listener',
 	'linphone_core_can_we_add_call',	# private function
 	'linphone_core_enable_log_collection',	# need to handle class properties
+	'linphone_core_enable_logs',	# unhandled argument type FILE
+	'linphone_core_enable_logs_with_cb',	# callback function in parameter
 	'linphone_core_get_audio_port_range',	# to be handwritten because of result via arguments
+	'linphone_core_get_default_proxy',
+	'linphone_core_get_network_simulator_params',	# missing OrtpNetworkSimulatorParams
 	'linphone_core_get_supported_video_sizes',	# missing MSVideoSizeDef
 	'linphone_core_get_video_policy',	# missing LinphoneVideoPolicy
 	'linphone_core_get_video_port_range',	# to be handwritten because of result via arguments
 	'linphone_core_remove_listener',
 	'linphone_core_serialize_logs',	# There is no use to wrap this function
+	'linphone_core_set_dns_servers',
 	'linphone_core_set_log_collection_max_file_size',	# need to handle class properties
 	'linphone_core_set_log_collection_path',	# need to handle class properties
 	'linphone_core_set_log_collection_prefix',	# need to handle class properties
@@ -59,7 +68,9 @@ blacklisted_functions = [
 	'linphone_core_set_log_handler',	# Hand-written but put directly in the linphone module
 	'linphone_core_set_log_level',	# There is no use to wrap this function
 	'linphone_core_set_log_level_mask',	# There is no use to wrap this function
+	'linphone_core_set_network_simulator_params',	# missing OrtpNetworkSimulatorParams
 	'linphone_core_set_video_policy',	# missing LinphoneVideoPolicy
+	'linphone_nat_policy_get_stun_server_addrinfo',
 	'linphone_proxy_config_get_privacy',	# missing LinphonePrivacyMask
 	'linphone_proxy_config_normalize_number',	# to be handwritten because of result via arguments
 	'linphone_proxy_config_set_file_transfer_server',	# defined but not implemented in linphone core
@@ -83,6 +94,7 @@ hand_written_functions = [
 	HandWrittenProperty('Core', 'sip_transports_used', 'linphone_core_get_sip_transports_used', None, "[:py:class:`linphone.SipTransports`] Retrieves the real port number assigned for each sip transport (udp, tcp, tls). A zero value means that the transport is not activated. If LC_SIP_TRANSPORT_RANDOM was passed to :py:attr:`linphone.Core.sip_transports`, the random port choosed by the system is returned."),
 	HandWrittenProperty('Core', 'sound_devices', 'linphone_core_get_sound_devices', None, "[list of string] Get the available sound devices."),
 	HandWrittenProperty('Core', 'video_devices', 'linphone_core_get_video_devices', None, "[list of string] Get the available video capture devices."),
+	HandWrittenProperty('LpConfig', 'sections_names', 'lp_config_get_sections_names', None, "[list of string] Get the sections' names in the lp config."),
 	HandWrittenClassMethod('Core', 'new', 'linphone_core_new', "Instantiate a LinphoneCore object.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param configPath: A path to a config file. If it does not exists it will be created. The config file is used to store all settings, call logs, friends, proxies... so that all these settings become persistent over the life of the LinphoneCore object. It is allowed to set to None. In that case LinphoneCore will not store any settings.\n:type configPath: string\n:param factoryConfigPath: A path to a read-only config file that can be used to store hard-coded preference such as proxy settings or internal preferences. The settings in this factory file always override the one in the normal config file. It is OPTIONAL, use None if unneeded.\n:type factoryConfigPath: string\n:rtype: linphone.Core"),
 	HandWrittenClassMethod('Core', 'new_with_config', 'linphone_core_new_with_config', "Instantiate a LinphoneCore object from a LpConfig.\n\n:param vtable: The callbacks.\n:type vtable: dictionary\n:param config: A LpConfig object holding the configuration of the LinphoneCore to be instantiated.\n:rtype: linphone.Core"),
 	HandWrittenDeallocMethod('Core', 'linphone_core_destroy')
diff --git a/tools/python/apixml2python/handwritten_declarations.mustache b/tools/python/apixml2python/handwritten_declarations.mustache
index 3449fa7e6..ca7cfd1c4 100644
--- a/tools/python/apixml2python/handwritten_declarations.mustache
+++ b/tools/python/apixml2python/handwritten_declarations.mustache
@@ -24,6 +24,9 @@ typedef struct {
 	LCSipTransports lcst;
 } pylinphone_SipTransportsObject;
 
+PyObject * PyList_FromMSListOfString(const bctbx_list_t *msl);
+bctbx_list_t * PyList_AsMSListOfString(PyObject *pyl);
+
 int PyLinphoneVideoSize_Check(PyObject *p);
 MSVideoSize PyLinphoneVideoSize_AsMSVideoSize(PyObject *obj);
 PyObject * PyLinphoneVideoSize_FromMSVideoSize(MSVideoSize vs);
@@ -40,3 +43,5 @@ static int pylinphone_Buffer_set_content(PyObject *self, PyObject *value, void *
 
 static PyObject * pylinphone_Content_get_buffer(PyObject *self, void *closure);
 static int pylinphone_Content_set_buffer(PyObject *self, PyObject *value, void *closure);
+
+static PyObject * pylinphone_LpConfig_get_sections_names(PyObject *self, void *closure);
\ No newline at end of file
diff --git a/tools/python/apixml2python/handwritten_definitions.mustache b/tools/python/apixml2python/handwritten_definitions.mustache
index 4937b951e..f87dfe7f2 100644
--- a/tools/python/apixml2python/handwritten_definitions.mustache
+++ b/tools/python/apixml2python/handwritten_definitions.mustache
@@ -1,5 +1,28 @@
+PyObject * PyList_FromMSListOfString(const bctbx_list_t *msl) {
+	PyObject *pyl = PyList_New(0);
+	while (msl != NULL) {
+		PyObject *item = Py_BuildValue("z", (const char *)msl->data);
+		PyList_Append(pyl, item);
+		msl = bctbx_list_next(msl);
+	}
+	return pyl;
+}
+
+bctbx_list_t * PyList_AsMSListOfString(PyObject *pyl) {
+	bctbx_list_t *msl = NULL;
+	Py_ssize_t idx;
+	Py_ssize_t size = PyList_Size(pyl);
+	for (idx = 0; idx < size; idx++) {
+		PyObject *item = PyList_GetItem(pyl, idx);
+		char *citem = (char *)PyString_AsString(item);
+		msl = bctbx_list_append(msl, citem);
+	}
+	return msl;
+}
+
+
 static void pylinphone_dispatch_messages(void) {
-#ifdef WIN32
+#ifdef _WIN32
 	MSG msg;
 	while (PeekMessage(&msg, NULL, 0, 0, 1)) {
 		TranslateMessage(&msg);
@@ -72,7 +95,7 @@ static const char * pylinphone_ortp_log_level_to_string(OrtpLogLevel lev) {
 	}
 }
 
-static void pylinphone_module_log_handler(OrtpLogLevel lev, const char *fmt, va_list args) {
+static void pylinphone_module_log_handler(const char *domain, OrtpLogLevel lev, const char *fmt, va_list args) {
 	PyGILState_STATE gstate;
 	PyObject *linphone_module;
 	const char *level;
@@ -144,7 +167,7 @@ static PyObject * pylinphone_Call_get_native_video_window_id(PyObject *self, voi
 	pylinphone_dispatch_messages();
 
 	pyret = Py_BuildValue("k", (unsigned long)cresult);
-	
+
 	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, pyret);
 	return pyret;
 }
@@ -393,14 +416,15 @@ static PyObject * pylinphone_Core_get_video_devices(PyObject *self, void *closur
 	return _list;
 }
 
-static void pylinphone_init_ms2_plugins(void) {
-	ms_init(); // Initialize mediastreamer2 before loading the plugins
+static void pylinphone_init_ms2_plugins(LinphoneCore *lc) {
+	MSFactory *factory = linphone_core_get_ms_factory(lc);
 #ifdef ENABLE_OPENH264
-	libmsopenh264_init();
+	libmsopenh264_init(factory);
 #endif
 #ifdef ENABLE_WASAPI
-	libmswasapi_init();
+	libmswasapi_init(factory);
 #endif
+	linphone_core_reload_ms_plugins(lc, NULL);
 }
 
 static PyObject * pylinphone_Core_class_method_new(PyObject *cls, PyObject *args) {
@@ -431,9 +455,9 @@ static PyObject * pylinphone_Core_class_method_new(PyObject *cls, PyObject *args
 {{/core_events}}
 
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p, \"%s\", \"%s\")", __FUNCTION__, _vtable_dict, _config_path, _factory_config_path);
-	pylinphone_init_ms2_plugins();
 	cresult = linphone_core_new(&_vtable, _config_path, _factory_config_path, self);
 	self->native_ptr = cresult;
+	pylinphone_init_ms2_plugins(cresult);
 
 	pyret = Py_BuildValue("O", self);
 
@@ -474,9 +498,9 @@ static PyObject * pylinphone_Core_class_method_new_with_config(PyObject *cls, Py
 {{/core_events}}
 
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, _config, _config_native_ptr);
-	pylinphone_init_ms2_plugins();
 	cresult = linphone_core_new_with_config(&_vtable, _config_native_ptr, self);
 	self->native_ptr = cresult;
+	pylinphone_init_ms2_plugins(cresult);
 
 	pyret = Py_BuildValue("O", self);
 
@@ -489,10 +513,9 @@ static void pylinphone_Core_dealloc(PyObject *self) {
 	LinphoneCore * native_ptr = pylinphone_Core_get_native_ptr(self);
 	if (Py_REFCNT(self) < 0) return;
 	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, self, native_ptr);
-	
+
 	if (native_ptr != NULL) {
 		linphone_core_destroy(native_ptr);
-		ms_exit();	// De-initialize mediastreamer
 	}
 
 	pylinphone_dispatch_messages();
@@ -970,3 +993,28 @@ static int pylinphone_Content_set_buffer(PyObject *self, PyObject *value, void *
 	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> 0", __FUNCTION__);
 	return 0;
 }
+
+static PyObject * pylinphone_LpConfig_get_sections_names(PyObject *self, void *closure) {
+	PyObject *_list;
+	const char **_names;
+	LpConfig *native_ptr = pylinphone_LpConfig_get_native_ptr(self);
+
+	if (native_ptr == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Invalid linphone.LpConfig instance");
+		return NULL;
+	}
+
+	pylinphone_trace(1, "[PYLINPHONE] >>> %s(%p [%p])", __FUNCTION__, self, native_ptr);
+	_names = lp_config_get_sections_names(native_ptr);
+	pylinphone_dispatch_messages();
+
+	_list = PyList_New(0);
+	while (*_names != NULL) {
+		PyObject *_item = PyString_FromString(*_names);
+		PyList_Append(_list, _item);
+		_names++;
+	}
+
+	pylinphone_trace(-1, "[PYLINPHONE] <<< %s -> %p", __FUNCTION__, _list);
+	return _list;
+}
diff --git a/tools/python/apixml2python/linphone.py b/tools/python/apixml2python/linphone.py
index 0ebf476b6..288660327 100644
--- a/tools/python/apixml2python/linphone.py
+++ b/tools/python/apixml2python/linphone.py
@@ -101,7 +101,7 @@ class ArgumentType:
 		self.use_native_pointer = False
 		self.cast_convert_func_result = True
 		self.__compute()
-		if self.basic_type == 'MSList' and self.contained_type is not None:
+		if (self.basic_type == 'MSList' or self.basic_type == 'bctbx_list_t') and self.contained_type is not None and self.contained_type != 'const char *':
 			self.linphone_module.mslist_types.add(self.contained_type)
 
 	def __compute(self):
@@ -214,11 +214,16 @@ class ArgumentType:
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
 			self.cnativefmt_str = '%ld'
-		elif self.basic_type == 'MSList':
-			self.type_str = 'list of linphone.' + self.contained_type
+		elif self.basic_type == 'MSList' or self.basic_type == 'bctbx_list_t':
+			if self.contained_type == 'const char *':
+				self.type_str = 'list of string'
+				self.convert_code = "{result_name}{result_suffix} = {cast}PyList_AsMSListOfString({arg_name});\n"
+				self.convert_from_func = 'PyList_FromMSListOfString'
+			else:
+				self.type_str = 'list of linphone.' + self.contained_type
+				self.convert_code = "{result_name}{result_suffix} = {cast}PyList_AsMSListOf" + self.contained_type + "({arg_name});\n"
+				self.convert_from_func = 'PyList_FromMSListOf' + self.contained_type
 			self.check_condition = "!PyList_Check({arg_name})"
-			self.convert_code = "{result_name}{result_suffix} = {cast}PyList_AsMSListOf" + self.contained_type + "({arg_name});\n"
-			self.convert_from_func = 'PyList_FromMSListOf' + self.contained_type
 			self.fmt_str = 'O'
 			self.cfmt_str = '%p'
 		elif self.basic_type == 'MSVideoSize':
@@ -256,7 +261,7 @@ class ArgumentType:
 
 
 class MethodDefinition:
-	def __init__(self, linphone_module, class_, method_node = None):
+	def __init__(self, linphone_module, class_, method_name = "", method_node = None):
 		self.body = ''
 		self.arg_names = []
 		self.parse_tuple_format = ''
@@ -264,6 +269,7 @@ class MethodDefinition:
 		self.return_type = 'void'
 		self.return_complete_type = 'void'
 		self.return_contained_type = None
+		self.method_name = method_name
 		self.method_node = method_node
 		self.class_ = class_
 		self.linphone_module = linphone_module
@@ -298,6 +304,12 @@ class MethodDefinition:
 			self.arg_names.append(arg_name)
 		return body
 
+	def format_deprecation_warning(self):
+		if self.method_node is not None and self.method_node.get('deprecated') == 'true':
+			print(self.class_['class_name'] + "." + self.method_name + " is deprecated")
+			return "\tPyErr_WarnEx(PyExc_DeprecationWarning, \"{msg}\", 1);\n".format(msg="{class_name}.{method_name} is deprecated".format(class_name=self.class_['class_name'], method_name=self.method_name))
+		return ""
+
 	def format_arguments_parsing(self):
 		class_native_ptr_check_code = ''
 		if self.self_arg is not None:
@@ -539,6 +551,7 @@ class MethodDefinition:
 	def format(self):
 		self.parse_method_node()
 		body = self.format_local_variables_definition()
+		body += self.format_deprecation_warning()
 		body += self.format_arguments_parsing()
 		body += self.format_enter_trace()
 		body += self.format_c_function_call()
@@ -548,7 +561,7 @@ class MethodDefinition:
 
 class NewMethodDefinition(MethodDefinition):
 	def __init__(self, linphone_module, class_, method_node = None):
-		MethodDefinition.__init__(self, linphone_module, class_, method_node)
+		MethodDefinition.__init__(self, linphone_module, class_, "new", method_node)
 
 	def format_local_variables_definition(self):
 		return "\tpylinphone_{class_name}Object *self = (pylinphone_{class_name}Object *)type->tp_alloc(type, 0);\n".format(class_name=self.class_['class_name'])
@@ -570,7 +583,7 @@ class NewMethodDefinition(MethodDefinition):
 
 class InitMethodDefinition(MethodDefinition):
 	def __init__(self, linphone_module, class_, method_node = None):
-		MethodDefinition.__init__(self, linphone_module, class_, method_node)
+		MethodDefinition.__init__(self, linphone_module, class_, "init", method_node)
 
 	def format_local_variables_definition(self):
 		return "\tpylinphone_{class_name}Object *self_obj = (pylinphone_{class_name}Object *)self;\n".format(class_name=self.class_['class_name'])
@@ -599,7 +612,7 @@ class InitMethodDefinition(MethodDefinition):
 
 class FromNativePointerMethodDefinition(MethodDefinition):
 	def __init__(self, linphone_module, class_):
-		MethodDefinition.__init__(self, linphone_module, class_, None)
+		MethodDefinition.__init__(self, linphone_module, class_, "from_native_pointer", None)
 
 	def format_local_variables_definition(self):
 		return "\tpylinphone_{class_name}Object *self = NULL;\n".format(class_name=self.class_['class_name'])
@@ -648,7 +661,7 @@ class FromNativePointerMethodDefinition(MethodDefinition):
 
 class DeallocMethodDefinition(MethodDefinition):
 	def __init__(self, linphone_module, class_, method_node = None):
-		MethodDefinition.__init__(self, linphone_module, class_, method_node)
+		MethodDefinition.__init__(self, linphone_module, class_, "dealloc", method_node)
 
 	def format_local_variables_definition(self):
 		func = "pylinphone_{class_name}_get_native_ptr".format(class_name=self.class_['class_name'])
@@ -709,12 +722,12 @@ class DeallocMethodDefinition(MethodDefinition):
 }}""".format(class_name=self.class_['class_name'], method_body=MethodDefinition.format(self))
 
 class GetterMethodDefinition(MethodDefinition):
-	def __init__(self, linphone_module, class_, method_node = None):
-		MethodDefinition.__init__(self, linphone_module, class_, method_node)
+	def __init__(self, linphone_module, class_, method_name = "", method_node = None):
+		MethodDefinition.__init__(self, linphone_module, class_, method_name, method_node)
 
 class SetterMethodDefinition(MethodDefinition):
-	def __init__(self, linphone_module, class_, method_node = None):
-		MethodDefinition.__init__(self, linphone_module, class_, method_node)
+	def __init__(self, linphone_module, class_, method_name = "", method_node = None):
+		MethodDefinition.__init__(self, linphone_module, class_, method_name, method_node)
 
 	def format_arguments_parsing(self):
 		if self.first_argument_type.check_condition is None:
@@ -816,8 +829,8 @@ class SetterMethodDefinition(MethodDefinition):
 		self.first_arg_class = strip_leading_linphone(self.first_arg_type)
 
 class EventCallbackMethodDefinition(MethodDefinition):
-	def __init__(self, linphone_module, class_, method_node = None):
-		MethodDefinition.__init__(self, linphone_module, class_, method_node)
+	def __init__(self, linphone_module, class_, method_name = "", method_node = None):
+		MethodDefinition.__init__(self, linphone_module, class_, method_name, method_node)
 
 	def format_local_variables_definition(self):
 		class_name = self.class_['event_class']
@@ -985,8 +998,6 @@ class LinphoneModule(object):
 			hand_written_functions += hand_written_code.func_list
 		xml_enums = tree.findall("./enums/enum")
 		for xml_enum in xml_enums:
-			if xml_enum.get('deprecated') == 'true':
-				continue
 			e = {}
 			e['enum_name'] = strip_leading_linphone(xml_enum.get('name'))
 			e['enum_doc'] = self.__format_doc_content(xml_enum.find('briefdescription'), xml_enum.find('detaileddescription'))
@@ -1003,8 +1014,6 @@ class LinphoneModule(object):
 			e['enum_deprecated_values'] = []
 			xml_enum_values = xml_enum.findall("./values/value")
 			for xml_enum_value in xml_enum_values:
-				if xml_enum_value.get('deprecated') == 'true':
-					continue
 				v = {}
 				v['enum_value_cname'] = xml_enum_value.get('name')
 				valname = strip_leading_linphone(v['enum_value_cname'])
@@ -1026,8 +1035,6 @@ class LinphoneModule(object):
 		self.classes = []
 		xml_classes = tree.findall("./classes/class")
 		for xml_class in xml_classes:
-			if xml_class.get('deprecated') == 'true':
-				continue
 			if xml_class.get('name') in blacklisted_classes:
 				continue
 			c = {}
@@ -1051,8 +1058,6 @@ class LinphoneModule(object):
 				c['class_object_members_code'] = "\tPyObject *vtable_dict;"
 			xml_events = xml_class.findall("./events/event")
 			for xml_event in xml_events:
-				if xml_event.get('deprecated') == 'true':
-					continue
 				if xml_event.get('name') in blacklisted_events:
 						continue
 				ev = {}
@@ -1096,8 +1101,6 @@ class LinphoneModule(object):
 						c['class_hand_written_properties'].append(p)
 			xml_type_methods = xml_class.findall("./classmethods/classmethod")
 			for xml_type_method in xml_type_methods:
-				if xml_type_method.get('deprecated') == 'true':
-					continue
 				method_name = xml_type_method.get('name')
 				if method_name in blacklisted_functions:
 					continue
@@ -1110,8 +1113,6 @@ class LinphoneModule(object):
 			c['class_instance_methods'] = []
 			xml_instance_methods = xml_class.findall("./instancemethods/instancemethod")
 			for xml_instance_method in xml_instance_methods:
-				if xml_instance_method.get('deprecated') == 'true':
-					continue
 				method_name = xml_instance_method.get('name')
 				if method_name in blacklisted_functions:
 					continue
@@ -1136,10 +1137,10 @@ class LinphoneModule(object):
 				xml_property_getter = xml_property.find("./getter")
 				xml_property_setter = xml_property.find("./setter")
 				if xml_property_getter is not None:
-					if xml_property_getter.get('name') in blacklisted_functions or xml_property_getter.get('name') in hand_written_functions or xml_property_getter.get('deprecated') == 'true':
+					if xml_property_getter.get('name') in blacklisted_functions or xml_property_getter.get('name') in hand_written_functions:
 						continue
 				if xml_property_setter is not None:
-					if xml_property_setter.get('name') in blacklisted_functions or xml_property_setter.get('name') in hand_written_functions or xml_property_setter.get('deprecated') == 'true':
+					if xml_property_setter.get('name') in blacklisted_functions or xml_property_setter.get('name') in hand_written_functions:
 						continue
 				if xml_property_getter is not None:
 					xml_property_getter.set('property_name', property_name)
@@ -1165,11 +1166,11 @@ class LinphoneModule(object):
 			self.classes.append(c)
 		# Format events definitions
 		for ev in self.core_events:
-			ev['event_callback_definition'] = EventCallbackMethodDefinition(self, ev, ev['event_xml_node']).format()
+			ev['event_callback_definition'] = EventCallbackMethodDefinition(self, ev, ev['event_name'], ev['event_xml_node']).format()
 			ev['event_vtable_reference'] = "_vtable.{name} = pylinphone_Core_callback_{name};".format(name=ev['event_name'])
 		for c in self.classes:
 			for ev in c['class_events']:
-				ev['event_callback_definition'] = EventCallbackMethodDefinition(self, ev, ev['event_xml_node']).format()
+				ev['event_callback_definition'] = EventCallbackMethodDefinition(self, ev, ev['event_name'], ev['event_xml_node']).format()
 		# Format methods' bodies
 		for c in self.classes:
 			xml_new_method = c['class_xml_node'].find("./classmethods/classmethod[@name='" + c['class_c_function_prefix'] + "new']")
@@ -1190,10 +1191,10 @@ class LinphoneModule(object):
 				raise
 			try:
 				for m in c['class_type_methods']:
-					m['method_body'] = MethodDefinition(self, c, m['method_xml_node']).format()
+					m['method_body'] = MethodDefinition(self, c, m['method_name'], m['method_xml_node']).format()
 					m['method_doc'] = self.__format_method_doc(m['method_xml_node'])
 				for m in c['class_instance_methods']:
-					m['method_body'] = MethodDefinition(self, c, m['method_xml_node']).format()
+					m['method_body'] = MethodDefinition(self, c, m['method_name'], m['method_xml_node']).format()
 					m['method_doc'] = self.__format_method_doc(m['method_xml_node'])
 			except Exception, e:
 				e.args += (c['class_name'], m['method_name'])
@@ -1202,10 +1203,10 @@ class LinphoneModule(object):
 				for p in c['class_properties']:
 					p['property_doc'] = ''
 					if p.has_key('setter_xml_node'):
-						p['setter_body'] = SetterMethodDefinition(self, c, p['setter_xml_node']).format()
+						p['setter_body'] = SetterMethodDefinition(self, c, p['property_name'], p['setter_xml_node']).format()
 						p['property_doc'] = self.__format_setter_doc(p['setter_xml_node'])
 					if p.has_key('getter_xml_node'):
-						p['getter_body'] = GetterMethodDefinition(self, c, p['getter_xml_node']).format()
+						p['getter_body'] = GetterMethodDefinition(self, c, p['property_name'], p['getter_xml_node']).format()
 						if p['property_doc'] == '':
 							p['property_doc'] = self.__format_getter_doc(p['getter_xml_node'])
 			except Exception, e:
diff --git a/tools/python/apixml2python/linphone_module.mustache b/tools/python/apixml2python/linphone_module.mustache
index ab5534bae..aca0bd6ca 100644
--- a/tools/python/apixml2python/linphone_module.mustache
+++ b/tools/python/apixml2python/linphone_module.mustache
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "gitversion.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
@@ -72,25 +72,25 @@ static PyObject * pylinphone_{{class_name}}_instance_method_{{method_name}}(PyOb
 {{/classes}}
 
 {{#mslist_types}}
-PyObject * PyList_FromMSListOf{{c_contained_type}}(const MSList *msl) {
+PyObject * PyList_FromMSListOf{{c_contained_type}}(const bctbx_list_t *msl) {
 	PyObject *pyl = PyList_New(0);
 	while (msl != NULL) {
 		{{c_contained_type}} *native_ptr = ({{c_contained_type}} *)msl->data;
 		PyObject *item = pylinphone_{{python_contained_type}}_from_native_ptr(&pylinphone_{{python_contained_type}}Type, native_ptr);
 		PyList_Append(pyl, item);
-		msl = ms_list_next(msl);
+		msl = bctbx_list_next(msl);
 	}
 	return pyl;
 }
 
-MSList * PyList_AsMSListOf{{c_contained_type}}(PyObject *pyl) {
-	MSList *msl = NULL;
+bctbx_list_t * PyList_AsMSListOf{{c_contained_type}}(PyObject *pyl) {
+	bctbx_list_t *msl = NULL;
 	Py_ssize_t idx;
 	Py_ssize_t size = PyList_Size(pyl);
 	for (idx = 0; idx < size; idx++) {
 		PyObject *item = PyList_GetItem(pyl, idx);
 		{{c_contained_type}} *native_ptr = pylinphone_{{python_contained_type}}_get_native_ptr(item);
-		msl = ms_list_append(msl, native_ptr);
+		msl = bctbx_list_append(msl, native_ptr);
 	}
 	return msl;
 }
diff --git a/tools/python/doc/source/conf.py b/tools/python/doc/source/conf.py
index c01ba688d..eb9ba43bb 100644
--- a/tools/python/doc/source/conf.py
+++ b/tools/python/doc/source/conf.py
@@ -53,9 +53,9 @@ copyright = u'2014, Belledonne Communications'
 # built documents.
 #
 # The short X.Y version.
-version = '3.8'
+version = '3.10'
 # The full version, including alpha/beta/rc tags.
-release = '3.8.2'
+release = '3.10.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/tools/python/unittests/linphonetester.py b/tools/python/unittests/linphonetester.py
index 7fb8db5d2..751ea88b7 100644
--- a/tools/python/unittests/linphonetester.py
+++ b/tools/python/unittests/linphonetester.py
@@ -57,7 +57,7 @@ class Account:
     def __init__(self, id_addr, unique_id):
         self.created = False
         self.done = False
-        self.auth_requested = False
+        self.registered = False
         self.identity = id_addr.clone()
         self.password = linphone.testing.get_random_token(8)
         self.modified_identity = id_addr.clone()
@@ -94,19 +94,23 @@ class AccountManager:
     @classmethod
     def account_created_on_server_cb(cls, lc, cfg, state, message):
         if state == linphone.RegistrationState.Ok:
-            lc.user_data().created = True
+            if cfg.error_info.phrase == "Test account created":
+                lc.user_data().created = True
+            else:
+                lc.user_data().registered = True
         elif state == linphone.RegistrationState.Cleared:
             lc.user_data().done = True
 
     @classmethod
     def account_created_auth_requested_cb(cls, lc, realm, username, domain):
-        lc.user_data().auth_requested = True
+        lc.user_data().created = True
 
     def check_account(self, cfg):
         create_account = False
         lc = cfg.core
         id_addr = cfg.identity_address
         account = self._get_account(id_addr)
+        original_ai = lc.find_auth_info(None, id_addr.username, id_addr.domain)
         if account is None:
             linphonetester_logger.info("[TESTER] No account for {identity} exists, going to create one.".format(identity=id_addr.as_string()))
             account = Account(id_addr, self.unique_id)
@@ -115,6 +119,8 @@ class AccountManager:
         cfg.identity_address = account.modified_identity
         if create_account:
             self._create_account_on_server(account, cfg)
+        if original_ai is not None:
+            lc.remove_auth_info(original_ai)
         ai = linphone.AuthInfo.new(account.modified_identity.username, None, account.password, None, None, account.modified_identity.domain)
         lc.add_auth_info(ai)
         return account.modified_identity
@@ -133,24 +139,27 @@ class AccountManager:
         lc = CoreManager.configure_lc_from(vtable, tester_resources_path, None, account)
         lc.sip_transports = linphone.SipTransports(-1, -1, -1, -1)
         cfg = lc.create_proxy_config()
+        tmp_identity.secure = False
         tmp_identity.password = account.password
         tmp_identity.set_header("X-Create-Account", "yes")
         cfg.identity_address = tmp_identity
         server_addr = linphone.Address.new(refcfg.server_addr)
+        server_addr.secure = False
         server_addr.transport = linphone.TransportType.Tcp;
         server_addr.port = 0
         cfg.server_addr = server_addr.as_string()
-        cfg.expires = 3600
+        cfg.expires = 3 * 3600 # Accounts are valid 3 hours
         lc.add_proxy_config(cfg)
-        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data().auth_requested == True, 10000) != True:
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data().created == True, 10000) != True:
             linphonetester_logger.critical("[TESTER] Account for {identity} could not be created on server.".format(identity=refcfg.identity_address.as_string()))
             sys.exit(-1)
         cfg.edit()
-        cfg.identity_address = account.modified_identity
+        cfg.identity_address = account.modified_identity.clone()
+        cfg.identity_address.secure = False
         cfg.done()
         ai = linphone.AuthInfo.new(account.modified_identity.username, None, account.password, None, None, account.modified_identity.domain)
         lc.add_auth_info(ai)
-        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data().created == True, 3000) != True:
+        if AccountManager.wait_for_until(lc, None, lambda lc: lc.user_data().registered == True, 3000) != True:
             linphonetester_logger.critical("[TESTER] Account for {identity} is not working on server.".format(identity=refcfg.identity_address.as_string()))
             sys.exit(-1)
         lc.remove_proxy_config(cfg)
@@ -210,12 +219,16 @@ class CoreManagerStats:
         self.number_of_LinphoneMessageNotDelivered = 0
         self.number_of_LinphoneIsComposingActiveReceived = 0
         self.number_of_LinphoneIsComposingIdleReceived = 0
+        self.number_of_LinphoneFileTransferDownloadSuccessful = 0
         self.progress_of_LinphoneFileTransfer = 0
 
         self.number_of_IframeDecoded = 0
 
-        self.number_of_NewSubscriptionRequest =0
+        self.number_of_NewSubscriptionRequest = 0
         self.number_of_NotifyReceived = 0
+        self.number_of_NotifyPresenceReceived = 0
+        self.number_of_LinphonePresenceBasicStatusOpen = 0
+        self.number_of_LinphonePresenceBasicStatusClosed = 0
         self.number_of_LinphonePresenceActivityOffline = 0
         self.number_of_LinphonePresenceActivityOnline = 0
         self.number_of_LinphonePresenceActivityAppointment = 0
@@ -482,74 +495,81 @@ class CoreManager:
         linphonetester_logger.info("[TESTER] New subscription request: from [{from_str}], url [{url}]".format(
             from_str=lf.address.as_string(), url=url))
         manager.stats.number_of_NewSubscriptionRequest += 1
-        lc.add_friend(lf) # Accept subscription
+        lc.default_friend_list.add_friend(lf) # Accept subscription
 
     @classmethod
     def notify_presence_received(cls, lc, lf):
         manager = lc.user_data()
         linphonetester_logger.info("[TESTER] New notify request: from [{from_str}]".format(
             from_str=lf.address.as_string()))
-        manager.stats.number_of_NotifyReceived += 1
+        manager.stats.number_of_NotifyPresenceReceived += 1
         manager.stats.last_received_presence = lf.presence_model
-        acttype = manager.stats.last_received_presence.activity.type
-        if acttype == linphone.PresenceActivityType.Offline:
-            manager.stats.number_of_LinphonePresenceActivityOffline += 1
-        elif acttype == linphone.PresenceActivityType.Online:
-            manager.stats.number_of_LinphonePresenceActivityOnline += 1
-        elif acttype == linphone.PresenceActivityType.Appointment:
-            manager.stats.number_of_LinphonePresenceActivityAppointment += 1
-        elif acttype == linphone.PresenceActivityType.Away:
-            manager.stats.number_of_LinphonePresenceActivityAway += 1
-        elif acttype == linphone.PresenceActivityType.Breakfast:
-            manager.stats.number_of_LinphonePresenceActivityBreakfast += 1
-        elif acttype == linphone.PresenceActivityType.Busy:
-            manager.stats.number_of_LinphonePresenceActivityBusy += 1
-        elif acttype == linphone.PresenceActivityType.Dinner:
-            manager.stats.number_of_LinphonePresenceActivityDinner += 1
-        elif acttype == linphone.PresenceActivityType.Holiday:
-            manager.stats.number_of_LinphonePresenceActivityHoliday += 1
-        elif acttype == linphone.PresenceActivityType.InTransit:
-            manager.stats.number_of_LinphonePresenceActivityInTransit += 1
-        elif acttype == linphone.PresenceActivityType.LookingForWork:
-            manager.stats.number_of_LinphonePresenceActivityLookingForWork += 1
-        elif acttype == linphone.PresenceActivityType.Lunch:
-            manager.stats.number_of_LinphonePresenceActivityLunch += 1
-        elif acttype == linphone.PresenceActivityType.Meal:
-            manager.stats.number_of_LinphonePresenceActivityMeal += 1
-        elif acttype == linphone.PresenceActivityType.Meeting:
-            manager.stats.number_of_LinphonePresenceActivityMeeting += 1
-        elif acttype == linphone.PresenceActivityType.OnThePhone:
-            manager.stats.number_of_LinphonePresenceActivityOnThePhone += 1
-        elif acttype == linphone.PresenceActivityType.Other:
-            manager.stats.number_of_LinphonePresenceActivityOther += 1
-        elif acttype == linphone.PresenceActivityType.Performance:
-            manager.stats.number_of_LinphonePresenceActivityPerformance += 1
-        elif acttype == linphone.PresenceActivityType.PermanentAbsence:
-            manager.stats.number_of_LinphonePresenceActivityPermanentAbsence += 1
-        elif acttype == linphone.PresenceActivityType.Playing:
-            manager.stats.number_of_LinphonePresenceActivityPlaying += 1
-        elif acttype == linphone.PresenceActivityType.Presentation:
-            manager.stats.number_of_LinphonePresenceActivityPresentation += 1
-        elif acttype == linphone.PresenceActivityType.Shopping:
-            manager.stats.number_of_LinphonePresenceActivityShopping += 1
-        elif acttype == linphone.PresenceActivityType.Sleeping:
-            manager.stats.number_of_LinphonePresenceActivitySleeping += 1
-        elif acttype == linphone.PresenceActivityType.Spectator:
-            manager.stats.number_of_LinphonePresenceActivitySpectator += 1
-        elif acttype == linphone.PresenceActivityType.Steering:
-            manager.stats.number_of_LinphonePresenceActivitySteering += 1
-        elif acttype == linphone.PresenceActivityType.Travel:
-            manager.stats.number_of_LinphonePresenceActivityTravel += 1
-        elif acttype == linphone.PresenceActivityType.TV:
-            manager.stats.number_of_LinphonePresenceActivityTV += 1
-        elif acttype == linphone.PresenceActivityType.Unknown:
-            manager.stats.number_of_LinphonePresenceActivityUnknown += 1
-        elif acttype == linphone.PresenceActivityType.Vacation:
-            manager.stats.number_of_LinphonePresenceActivityVacation += 1
-        elif acttype == linphone.PresenceActivityType.Working:
-            manager.stats.number_of_LinphonePresenceActivityWorking += 1
-        elif acttype == linphone.PresenceActivityType.Worship:
-            manager.stats.number_of_LinphonePresenceActivityWorship += 1
+        if manager.stats.last_received_presence.basic_status == linphone.PresenceBasicStatus.Open:
+            manager.stats.number_of_LinphonePresenceBasicStatusOpen += 1
+        elif manager.stats.last_received_presence.basic_status == linphone.PresenceBasicStatus.Closed:
+            manager.stats.number_of_LinphonePresenceBasicStatusClosed += 1
+        else:
+            linphonetester_logger.error("[TESTER] Unexpected basic status {status}".format(status=manager.status.last_received_presence.basic_status))
+        for i in range(0, manager.stats.last_received_presence.nb_activities):
+            acttype = manager.stats.last_received_presence.get_nth_activity(i).type
+            if acttype == linphone.PresenceActivityType.Offline:
+                manager.stats.number_of_LinphonePresenceActivityOffline += 1
+            elif acttype == linphone.PresenceActivityType.Online:
+                manager.stats.number_of_LinphonePresenceActivityOnline += 1
+            elif acttype == linphone.PresenceActivityType.Appointment:
+                manager.stats.number_of_LinphonePresenceActivityAppointment += 1
+            elif acttype == linphone.PresenceActivityType.Away:
+                manager.stats.number_of_LinphonePresenceActivityAway += 1
+            elif acttype == linphone.PresenceActivityType.Breakfast:
+                manager.stats.number_of_LinphonePresenceActivityBreakfast += 1
+            elif acttype == linphone.PresenceActivityType.Busy:
+                manager.stats.number_of_LinphonePresenceActivityBusy += 1
+            elif acttype == linphone.PresenceActivityType.Dinner:
+                manager.stats.number_of_LinphonePresenceActivityDinner += 1
+            elif acttype == linphone.PresenceActivityType.Holiday:
+                manager.stats.number_of_LinphonePresenceActivityHoliday += 1
+            elif acttype == linphone.PresenceActivityType.InTransit:
+                manager.stats.number_of_LinphonePresenceActivityInTransit += 1
+            elif acttype == linphone.PresenceActivityType.LookingForWork:
+                manager.stats.number_of_LinphonePresenceActivityLookingForWork += 1
+            elif acttype == linphone.PresenceActivityType.Lunch:
+                manager.stats.number_of_LinphonePresenceActivityLunch += 1
+            elif acttype == linphone.PresenceActivityType.Meal:
+                manager.stats.number_of_LinphonePresenceActivityMeal += 1
+            elif acttype == linphone.PresenceActivityType.Meeting:
+                manager.stats.number_of_LinphonePresenceActivityMeeting += 1
+            elif acttype == linphone.PresenceActivityType.OnThePhone:
+                manager.stats.number_of_LinphonePresenceActivityOnThePhone += 1
+            elif acttype == linphone.PresenceActivityType.Other:
+                manager.stats.number_of_LinphonePresenceActivityOther += 1
+            elif acttype == linphone.PresenceActivityType.Performance:
+                manager.stats.number_of_LinphonePresenceActivityPerformance += 1
+            elif acttype == linphone.PresenceActivityType.PermanentAbsence:
+                manager.stats.number_of_LinphonePresenceActivityPermanentAbsence += 1
+            elif acttype == linphone.PresenceActivityType.Playing:
+                manager.stats.number_of_LinphonePresenceActivityPlaying += 1
+            elif acttype == linphone.PresenceActivityType.Presentation:
+                manager.stats.number_of_LinphonePresenceActivityPresentation += 1
+            elif acttype == linphone.PresenceActivityType.Shopping:
+                manager.stats.number_of_LinphonePresenceActivityShopping += 1
+            elif acttype == linphone.PresenceActivityType.Sleeping:
+                manager.stats.number_of_LinphonePresenceActivitySleeping += 1
+            elif acttype == linphone.PresenceActivityType.Spectator:
+                manager.stats.number_of_LinphonePresenceActivitySpectator += 1
+            elif acttype == linphone.PresenceActivityType.Steering:
+                manager.stats.number_of_LinphonePresenceActivitySteering += 1
+            elif acttype == linphone.PresenceActivityType.Travel:
+                manager.stats.number_of_LinphonePresenceActivityTravel += 1
+            elif acttype == linphone.PresenceActivityType.TV:
+                manager.stats.number_of_LinphonePresenceActivityTV += 1
+            elif acttype == linphone.PresenceActivityType.Unknown:
+                manager.stats.number_of_LinphonePresenceActivityUnknown += 1
+            elif acttype == linphone.PresenceActivityType.Vacation:
+                manager.stats.number_of_LinphonePresenceActivityVacation += 1
+            elif acttype == linphone.PresenceActivityType.Working:
+                manager.stats.number_of_LinphonePresenceActivityWorking += 1
+            elif acttype == linphone.PresenceActivityType.Worship:
+                manager.stats.number_of_LinphonePresenceActivityWorship += 1
 
     def __init__(self, rc_file = None, check_for_proxies = True, vtable = {}):
         if not vtable.has_key('registration_state_changed'):
@@ -587,17 +607,27 @@ class CoreManager:
             rc_path = os.path.join('rcfiles', rc_file)
         self.lc = CoreManager.configure_lc_from(vtable, tester_resources_path, rc_path, self)
         self.check_accounts()
-        if check_for_proxies and rc_file is not None:
+
+        self.lc.play_file = os.path.join(tester_resources_path, 'sounds', 'hello8000.wav')
+        self.lc.user_certificates_path = os.getcwd()
+
+        if check_for_proxies:
             proxy_count = len(self.lc.proxy_config_list)
         else:
             proxy_count = 0
+            self.lc.network_reachable = False
         if proxy_count:
-            CoreManager.wait_for_until(self, None, lambda manager: manager.stats.number_of_LinphoneRegistrationOk == proxy_count, 5000 * proxy_count)
+            nb_seconds = 20
+            success = CoreManager.wait_for_until(self, None, lambda manager: manager.stats.number_of_LinphoneRegistrationOk == proxy_count, nb_seconds * 1000 * proxy_count)
+            if not success:
+                linphonetester_logger.info("[TESTER] Did not register after {nb_seconds} for {proxy_count} proxies".format(nb_seconds=nb_seconds, proxy_count=proxy_count))
         assert_equals(self.stats.number_of_LinphoneRegistrationOk, proxy_count)
         self.enable_audio_codec("PCMU", 8000)
 
         if self.lc.default_proxy_config is not None:
             self.lc.default_proxy_config.identity_address.clean()
+        if not check_for_proxies:
+            self.lc.network_reachable = True
 
     def enable_audio_codec(self, mime, rate):
         codecs = self.lc.audio_codecs
diff --git a/tools/python/unittests/test_message.py b/tools/python/unittests/test_message.py
index 12495cc84..653b3e747 100644
--- a/tools/python/unittests/test_message.py
+++ b/tools/python/unittests/test_message.py
@@ -59,29 +59,25 @@ class TestMessage:
         receive_filepath = msg.user_data
         stats = msg.chat_room.core.user_data().stats
         if buf.empty: # Transfer complete
-            stats.number_of_LinphoneMessageExtBodyReceived += 1
+            stats.number_of_LinphoneFileTransferDownloadSuccessful += 1
         else: # Store content
             f = open(receive_filepath, 'ab')
             f.write(buf.content)
             f.close()
 
-    @classmethod
-    def memory_file_transfer_send(cls, msg, content, offset, size):
-        send_buf = msg.user_data
-        send_size = len(send_buf)
-        if offset >= send_size:
-            return linphone.Buffer.new()
-        if (send_size - offset) < size:
-            size = send_size - offset
-        return linphone.Buffer.new_from_string(send_buf[offset:offset+size])
-
-    @classmethod
-    def memory_file_transfer_recv(cls, msg, content, buf):
-        stats = msg.chat_room.core.user_data().stats
-        if buf.empty: # Transfer complete
-            stats.number_of_LinphoneMessageExtBodyReceived += 1
-        else: # Store content
-            msg.user_data += buf.string_content
+    def create_message_from_no_webcam(self, chat_room):
+        send_filepath = os.path.join(tester_resources_path, 'images', 'nowebcamCIF.jpg')
+        content = chat_room.core.create_content()
+        content.type = 'image'
+        content.subtype = 'jpeg'
+        content.size = os.path.getsize(send_filepath) # total size to be transfered
+        content.name = 'nowebcamCIF.jpg'
+        message = chat_room.create_file_transfer_message(content)
+        message.callbacks.msg_state_changed = TestMessage.msg_state_changed
+        message.callbacks.file_transfer_send = TestMessage.file_transfer_send
+        message.callbacks.file_transfer_progress_indication = TestMessage.file_transfer_progress_indication
+        message.user_data = send_filepath
+        return message
 
     def wait_for_server_to_purge_messages(self, manager1, manager2):
         # Wait a little bit just to have time to purge message stored in the server
@@ -91,122 +87,68 @@ class TestMessage:
 
     def test_text_message(self):
         marie = CoreManager('marie_rc')
-        pauline = CoreManager('pauline_rc')
+        pauline = CoreManager('pauline_tcp_rc')
         chat_room = pauline.lc.get_chat_room(marie.identity)
         self.wait_for_server_to_purge_messages(marie, pauline)
-        msg = chat_room.create_message("Bla bla bla bla")
+        msg = chat_room.create_message("hello")
+        msg.callbacks.msg_state_changed = TestMessage.msg_state_changed
         chat_room.send_chat_message(msg)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceived == 1), True)
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneMessageDelivered == 1), True)
         assert marie.lc.get_chat_room(pauline.identity) is not None
 
-    def test_text_message_within_dialog(self):
+    def test_text_message_within_call_dialog(self):
         marie = CoreManager('marie_rc')
-        pauline = CoreManager('pauline_rc')
+        pauline = CoreManager('pauline_tcp_rc')
         pauline.lc.config.set_int('sip', 'chat_use_call_dialogs', 1)
-        chat_room = pauline.lc.get_chat_room(marie.identity)
         self.wait_for_server_to_purge_messages(marie, pauline)
         assert_equals(CoreManager.call(marie, pauline), True)
+        chat_room = pauline.lc.get_chat_room(marie.identity)
         msg = chat_room.create_message("Bla bla bla bla")
+        msg.callbacks.msg_state_changed = TestMessage.msg_state_changed
         chat_room.send_chat_message(msg)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceived == 1), True)
+        # When using call dialogs, we will never receive delivered status
+        assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 0)
         assert marie.lc.get_chat_room(pauline.identity) is not None
+        CoreManager.end_call(marie, pauline)
 
-    def test_file_transfer_message(self):
+    def test_transfer_message(self):
         marie = CoreManager('marie_rc')
-        pauline = CoreManager('pauline_rc')
+        pauline = CoreManager('pauline_tcp_rc')
         send_filepath = os.path.join(tester_resources_path, 'images', 'nowebcamCIF.jpg')
         receive_filepath = 'receive_file.dump'
         pauline.lc.file_transfer_server = "https://www.linphone.org:444/lft.php"
-        chat_room = pauline.lc.get_chat_room(marie.identity)
-        content = pauline.lc.create_content()
-        content.type = 'image'
-        content.subtype = 'jpeg'
-        content.size = os.path.getsize(send_filepath) # total size to be transfered
-        content.name = 'nowebcamCIF.jpg'
-        message = chat_room.create_file_transfer_message(content)
-        message.user_data = send_filepath
         self.wait_for_server_to_purge_messages(marie, pauline)
-        message.callbacks.msg_state_changed = TestMessage.msg_state_changed
-        message.callbacks.file_transfer_send = TestMessage.file_transfer_send
+        chat_room = pauline.lc.get_chat_room(marie.identity)
+        message = self.create_message_from_no_webcam(chat_room)
         chat_room.send_chat_message(message)
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceivedWithFile == 1), True)
         if marie.stats.last_received_chat_message is not None:
             cbs = marie.stats.last_received_chat_message.callbacks
             cbs.msg_state_changed = TestMessage.msg_state_changed
             cbs.file_transfer_recv = TestMessage.file_transfer_recv
+            cbs.file_transfer_progress_indication = TestMessage.file_transfer_progress_indication
             marie.stats.last_received_chat_message.user_data = receive_filepath
             marie.stats.last_received_chat_message.download_file()
-        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageExtBodyReceived == 1), True)
-        assert_equals(pauline.stats.number_of_LinphoneMessageInProgress, 1)
-        assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 1)
-        assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 1)
+            assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneFileTransferDownloadSuccessful == 1), True)
+        assert_equals(pauline.stats.number_of_LinphoneMessageInProgress, 2)
+        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneMessageDelivered == 1), True)
         assert_equals(filecmp.cmp(send_filepath, receive_filepath, shallow=False), True)
         if os.path.exists(receive_filepath):
             os.remove(receive_filepath)
 
-    def test_small_file_transfer_message(self):
-        send_buf = "small file"
+    def test_transfer_message_upload_cancelled(self):
         marie = CoreManager('marie_rc')
-        pauline = CoreManager('pauline_rc')
-        while len(send_buf) < 160:
-            send_buf += send_buf
-        l = list(send_buf[0:160])
-        l[0] = 'S'
-        l[-1] = 'E'
-        send_buf = ''.join(l)
+        pauline = CoreManager('pauline_tcp_rc')
         pauline.lc.file_transfer_server = "https://www.linphone.org:444/lft.php"
-        chat_room = pauline.lc.get_chat_room(marie.identity)
-        content = pauline.lc.create_content()
-        content.type = 'text'
-        content.subtype = 'plain'
-        content.size = len(send_buf) # total size to be transfered
-        content.name = 'small_file.txt'
-        message = chat_room.create_file_transfer_message(content)
-        message.user_data = send_buf
         self.wait_for_server_to_purge_messages(marie, pauline)
-        message.callbacks.msg_state_changed = TestMessage.msg_state_changed
-        message.callbacks.file_transfer_send = TestMessage.memory_file_transfer_send
-        chat_room.send_chat_message(message)
-        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageReceivedWithFile == 1), True)
-        if marie.stats.last_received_chat_message is not None:
-            cbs = marie.stats.last_received_chat_message.callbacks
-            cbs.msg_state_changed = TestMessage.msg_state_changed
-            cbs.file_transfer_recv = TestMessage.memory_file_transfer_recv
-            marie.stats.last_received_chat_message.user_data = ''
-            marie.stats.last_received_chat_message.download_file()
-        assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: marie.stats.number_of_LinphoneMessageExtBodyReceived == 1), True)
-        assert_equals(pauline.stats.number_of_LinphoneMessageInProgress, 1)
-        assert_equals(pauline.stats.number_of_LinphoneMessageDelivered, 1)
-        assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 1)
-        assert_equals(send_buf, marie.stats.last_received_chat_message.user_data)
-
-    def test_file_transfer_message_upload_cancelled(self):
-        send_buf = "big file"
-        marie = CoreManager('marie_rc')
-        pauline = CoreManager('pauline_rc')
-        while len(send_buf) < 128000:
-            send_buf += send_buf
-        l = list(send_buf[0:128000])
-        l[0] = 'S'
-        l[-1] = 'E'
-        send_buf = ''.join(l)
-        pauline.lc.file_transfer_server = "https://www.linphone.org:444/lft.php"
         chat_room = pauline.lc.get_chat_room(marie.identity)
-        content = pauline.lc.create_content()
-        content.type = 'text'
-        content.subtype = 'plain'
-        content.size = len(send_buf) # total size to be transfered
-        content.name = 'big_file.txt'
-        message = chat_room.create_file_transfer_message(content)
-        message.user_data = send_buf
-        self.wait_for_server_to_purge_messages(marie, pauline)
-        message.callbacks.msg_state_changed = TestMessage.msg_state_changed
-        message.callbacks.file_transfer_send = TestMessage.memory_file_transfer_send
-        message.callbacks.file_transfer_progress_indication = TestMessage.file_transfer_progress_indication
+        message = self.create_message_from_no_webcam(chat_room)
         chat_room.send_chat_message(message)
         # Wait for file to be at least 50% uploaded and cancel the transfer
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.progress_of_LinphoneFileTransfer >= 50), True)
         message.cancel_file_transfer()
         assert_equals(CoreManager.wait_for(pauline, marie, lambda pauline, marie: pauline.stats.number_of_LinphoneMessageNotDelivered == 1), True)
         assert_equals(pauline.stats.number_of_LinphoneMessageNotDelivered, 1)
-        assert_equals(marie.stats.number_of_LinphoneMessageExtBodyReceived, 0)
+        assert_equals(marie.stats.number_of_LinphoneFileTransferDownloadSuccessful, 0)
diff --git a/tools/python/unittests/test_presence.py b/tools/python/unittests/test_presence.py
index c2db852dd..27f462011 100644
--- a/tools/python/unittests/test_presence.py
+++ b/tools/python/unittests/test_presence.py
@@ -24,11 +24,11 @@ class TestPresence:
         friend.edit()
         friend.subscribes_enabled = True
         friend.done()
-        caller_mgr.lc.add_friend(friend)
+        caller_mgr.lc.default_friend_list.add_friend(friend)
         result = CoreManager.wait_for(caller_mgr, callee_mgr,
             lambda caller_mgr, callee_mgr: caller_mgr.stats.number_of_LinphonePresenceActivityOnline == initial_caller_stats.number_of_LinphonePresenceActivityOnline + 1)
         assert_equals(callee_mgr.stats.number_of_NewSubscriptionRequest, initial_callee_stats.number_of_NewSubscriptionRequest + 1)
-        assert_equals(caller_mgr.stats.number_of_NotifyReceived, initial_caller_stats.number_of_NotifyReceived + 1)
+        assert_equals(caller_mgr.stats.number_of_NotifyPresenceReceived, initial_caller_stats.number_of_NotifyPresenceReceived + 1)
         return result
 
     def test_simple_subscribe(self):
diff --git a/tools/python/unittests/test_register.py b/tools/python/unittests/test_register.py
index a136c8a79..2c3a9186c 100644
--- a/tools/python/unittests/test_register.py
+++ b/tools/python/unittests/test_register.py
@@ -143,7 +143,7 @@ class TestRegister:
             port = 5060
         pc.server_addr = "sip:{domain}:{port};transport=tls".format(domain=addr.domain, port=port)
         pc.done()
-        assert_equals(CoreManager.wait_for_until(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 1, 5000), True)
+        assert_equals(CoreManager.wait_for_until(cm, cm, lambda cm1, cm2: cm1.stats.number_of_LinphoneRegistrationFailed == 1, 10000), True)
 
     def test_simple_authenticated_register(self):
         cm = RegisterCoreManager()
@@ -173,7 +173,7 @@ class TestRegister:
         assert_equals(cm.stats.number_of_auth_info_requested, 1)
 
     def test_multiple_accounts(self):
-        CoreManager('multi_account_rc', True)
+        CoreManager('multi_account_rc', False)
 
     def test_transport_change(self):
         cm = CoreManager('multi_account_rc', True)
diff --git a/tools/python/unittests/test_setup.py b/tools/python/unittests/test_setup.py
index 9dc2e0fae..43fbf0042 100644
--- a/tools/python/unittests/test_setup.py
+++ b/tools/python/unittests/test_setup.py
@@ -5,9 +5,6 @@ import os
 
 class TestSetup:
 
-    def test_address(self):
-        create_address(None)
-
     def test_version(self):
         lc = linphone.Core.new({}, None, None)
         assert_equals(lc.version.find("unknown"), -1)
diff --git a/coreapi/test_ecc.c b/tools/test_ecc.c
similarity index 61%
rename from coreapi/test_ecc.c
rename to tools/test_ecc.c
index e3600a8d8..de1434ece 100644
--- a/coreapi/test_ecc.c
+++ b/tools/test_ecc.c
@@ -18,47 +18,47 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-
 #include "linphonecore.h"
 #include "linphonecore_utils.h"
 #if _MSC_VER
 #include <io.h>
 #endif
+static int done = 0;
 
-static void calibration_finished(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay, void *data){
-	ms_message("echo calibration finished %s.",status==LinphoneEcCalibratorDone ? "successfully" : "with faillure");
-	if (status==LinphoneEcCalibratorDone) ms_message("Measured delay is %i",delay);
+static void calibration_finished(LinphoneCore *lc, LinphoneEcCalibratorStatus status, int delay, void *data) {
+	ms_message("echo calibration finished %s.", status == LinphoneEcCalibratorDone ? "successfully" : "with faillure");
+	if (status == LinphoneEcCalibratorDone)
+		ms_message("Measured delay is %i", delay);
+	done = 1;
 }
 
-
-static char config_file[1024];
-void parse_args(int argc, char *argv[]){
+static char config_file[1024] = {0};
+void parse_args(int argc, char *argv[]) {
 #ifndef F_OK
 #define F_OK 4
 #endif
-	if (argc != 3 || strncmp("-c",argv[1], 2) || access(argv[2],F_OK)!=0) {
+	if (argc != 3 || strncmp("-c", argv[1], 2) || access(argv[2], F_OK) != 0) {
 		printf("Usage: test_ecc [-c config_file] where config_file will be written with the detected value\n");
 		exit(-1);
 	}
-	strncpy(config_file,argv[2],1024);
+	strncpy(config_file, argv[2], 1024);
 }
 
-int main(int argc, char *argv[]){
-	int count=0;
-	LinphoneCoreVTable vtable={0};
+int main(int argc, char *argv[]) {
+	LinphoneCoreVTable vtable = {0};
 	LinphoneCore *lc;
-	if (argc>1) parse_args(argc,argv);
-	lc=linphone_core_new(&vtable,config_file,NULL,NULL);
-	
+	if (argc > 1)
+		parse_args(argc, argv);
+	lc = linphone_core_new(&vtable, config_file[0] ?  config_file  : NULL, NULL, NULL);
+
 	linphone_core_enable_logs(NULL);
 
-	linphone_core_start_echo_calibration(lc,calibration_finished,NULL,NULL,NULL);
-	
-	while(count++<1000){
+	linphone_core_start_echo_calibration(lc, calibration_finished, NULL, NULL, NULL);
+
+	while (!done) {
 		linphone_core_iterate(lc);
-		ms_usleep(10000);
+		ms_usleep(20000);
 	}
 	linphone_core_destroy(lc);
 	return 0;
 }
-
diff --git a/tools/test_lsd.c b/tools/test_lsd.c
new file mode 100644
index 000000000..81c424b3a
--- /dev/null
+++ b/tools/test_lsd.c
@@ -0,0 +1,103 @@
+/*
+linphone
+Copyright (C) 2010 Simon MORLAT (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+/* Linphone Sound Daemon: is a lightweight utility to play sounds to speaker during a conversation.
+ This is useful for embedded platforms, where sound apis are not performant enough to allow
+ simultaneous sound access.
+
+ This file is a test program that plays several sound files and places a call simultatenously.
+*/
+
+#include "linphonecore_utils.h"
+
+static void play_finished(LsdPlayer *p) {
+	const char *filename = (const char *)lsd_player_get_user_pointer(p);
+	ms_message("Playing of %s is finished.", filename);
+	if (!lsd_player_loop_enabled(p)) {
+		linphone_sound_daemon_release_player(lsd_player_get_daemon(p), p);
+	}
+}
+
+static void wait_a_bit(LinphoneCore *lc, int seconds) {
+	time_t orig = ms_time(NULL);
+	while (ms_time(NULL) - orig < seconds) {
+		/* we need to call iterate to receive notifications */
+		linphone_core_iterate(lc);
+		ms_usleep(50000);
+	}
+}
+
+int main(int argc, char *argv[]) {
+	LinphoneCore *lc;
+	LinphoneCoreVTable vtable = {0};
+	LinphoneSoundDaemon *lsd;
+	LsdPlayer *p;
+
+	linphone_core_enable_logs(stdout);
+	lc = linphone_core_new(&vtable, NULL, NULL, NULL);
+	lsd = linphone_sound_daemon_new(linphone_core_get_ms_factory(lc), NULL, 44100, 1);
+
+	linphone_core_use_sound_daemon(lc, lsd);
+
+	/* start a play */
+	p = linphone_sound_daemon_get_player(lsd);
+	lsd_player_set_callback(p, play_finished);
+	lsd_player_set_user_pointer(p, "share/hello8000.wav");
+	lsd_player_play(p, "share/hello8000.wav");
+	wait_a_bit(lc, 2);
+
+	/*start another one */
+	p = linphone_sound_daemon_get_player(lsd);
+	lsd_player_set_callback(p, play_finished);
+	lsd_player_set_user_pointer(p, "share/hello16000.wav");
+	lsd_player_enable_loop(p, TRUE);
+	lsd_player_play(p, "share/hello16000.wav");
+
+	/* after a few seconds decrease the volume */
+	wait_a_bit(lc, 3);
+	lsd_player_set_gain(p, 0.3);
+	wait_a_bit(lc, 5);
+
+	/*now play some stereo music*/
+	p = linphone_sound_daemon_get_player(lsd);
+	lsd_player_set_callback(p, play_finished);
+	lsd_player_set_user_pointer(p, "share/rings/rock.wav");
+	lsd_player_play(p, "share/rings/rock.wav");
+	wait_a_bit(lc, 2);
+
+	/*now play some stereo music at 22khz in order to test
+	 stereo resampling */
+	p = linphone_sound_daemon_get_player(lsd);
+	lsd_player_set_callback(p, play_finished);
+	lsd_player_set_user_pointer(p, "share/rings/bigben.wav");
+	lsd_player_play(p, "share/rings/bigben.wav");
+	wait_a_bit(lc, 6);
+
+	/* now place an outgoing call if sip address argument is given */
+	if (argc > 1) {
+		linphone_core_invite(lc, argv[1]);
+		wait_a_bit(lc, 10);
+		linphone_core_terminate_call(lc, NULL);
+	}
+	linphone_core_use_sound_daemon(lc, NULL);
+	linphone_sound_daemon_destroy(lsd);
+	linphone_core_destroy(lc);
+
+	return 0;
+}
diff --git a/tools/test_numbers.c b/tools/test_numbers.c
new file mode 100644
index 000000000..b6c83a047
--- /dev/null
+++ b/tools/test_numbers.c
@@ -0,0 +1,57 @@
+/*
+linphone
+Copyright (C) 2012 Belledonne Communications SARL
+Author: Simon MORLAT (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#include "linphonecore.h"
+#include "linphonecore_utils.h"
+
+int main(int argc, char *argv[]) {
+	LinphoneProxyConfig *cfg;
+	char *normalized_number;
+	if (argc < 2) {
+		fprintf(stderr, "Usage:\n%s <phone number> [<country code>] [--escape-plus]\nReturns normalized number.",
+				argv[0]);
+		return -1;
+	}
+	linphone_core_enable_logs(stderr);
+	linphone_core_set_log_level(ORTP_DEBUG);
+	cfg = linphone_proxy_config_new();
+	if (argc > 2)
+		linphone_proxy_config_set_dial_prefix(cfg, argv[2]);
+	if (argc > 3 && strcmp(argv[3], "--escape-plus") == 0)
+		linphone_proxy_config_set_dial_escape_plus(cfg, TRUE);
+	normalized_number = linphone_proxy_config_normalize_phone_number(cfg, argv[1]);
+
+	if (!normalized_number) {
+		printf("Invalid phone number: %s\n", argv[1]);
+	} else {
+		printf("Normalized number is %s\n", normalized_number);
+		/*check extracted ccc*/
+		if (linphone_proxy_config_get_dial_prefix(cfg) != NULL) {
+			if (linphone_dial_plan_lookup_ccc_from_e164(normalized_number) !=
+				atoi(linphone_proxy_config_get_dial_prefix(cfg))) {
+				printf("Error ccc [%i] not correctly parsed\n",
+					   linphone_dial_plan_lookup_ccc_from_e164(normalized_number));
+			} else {
+				printf("Extracted ccc is [%i] \n", linphone_dial_plan_lookup_ccc_from_e164(normalized_number));
+			}
+		}
+	}
+	return 0;
+}