diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 97a81c1d8..a99f278e4 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -60,7 +60,7 @@
 	<bool name="forbid_app_usage_until_remote_provisioning_completed">false</bool>
 	<bool name="display_confirmation_popup_after_first_configuration">false</bool>
 	<bool name="enable_log_collect">false</bool>
-	<bool name="disable_every_log">false</bool>
+	<bool name="disable_every_log">true</bool>
 	<bool name="disable_all_security_features_for_markets">false</bool> <!-- Disable TLS/SRTP/ZRTP -->
 	<bool name="disable_all_patented_codecs_for_markets">false</bool> <!-- Disable MPEG4/H264 -->
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index b0d4b316b..e906d90f3 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -355,7 +355,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
         LinphoneCore lc = getLcIfManagerNotDestroyedOrNull();
         if (lc != null ) {
             if ((lc.getGlobalState() == GlobalState.GlobalOn) && (LinphoneService.isReady())) {
-                Log.e("===>>> enableProxyPublish in the loop" );
                 LinphoneProxyConfig[] proxyList = lc.getProxyConfigList();
                 if (!enabled)
                     changeStatusToOffline();
@@ -615,16 +614,13 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			copyAssetsFromPackage();
 			//traces alway start with traces enable to not missed first initialization
 			boolean isDebugLogEnabled = !(mR.getBoolean(R.bool.disable_every_log));
-			LinphoneCoreFactory.instance().setDebugMode(isDebugLogEnabled, getString(R.string.app_name));
+            LinphonePreferences.instance().enableDebugLogs(isDebugLogEnabled);
+            LinphoneCoreFactory.instance().setDebugMode(isDebugLogEnabled, getString(R.string.app_name));
 			LinphoneCoreFactory.instance().enableLogCollection(isDebugLogEnabled);
 
 			mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, mLinphoneConfigFile, mLinphoneFactoryConfigFile, null, c);
 
-			//TODO: server test Presence
-			//PresenceModel model = LinphoneCoreFactory.instance().createPresenceModel(PresenceActivityType.TV, null);
-			//mLc.setPresenceModel(model);
-            //changeStatusToOnline();
-            instance.enableProxyPublish(true);
+			instance.enableProxyPublish(true);
 
 			TimerTask lTask = new TimerTask() {
 				@Override
@@ -651,7 +647,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 	private synchronized void initLiblinphone(LinphoneCore lc) throws LinphoneCoreException {
 		mLc = lc;
-		boolean isDebugLogEnabled = !(mR.getBoolean(R.bool.disable_every_log)) && mPrefs.isDebugEnabled();
+		boolean isDebugLogEnabled = !(mR.getBoolean(R.bool.disable_every_log)) ;//&& mPrefs.isDebugEnabled();
+        LinphonePreferences.instance().enableDebugLogs(isDebugLogEnabled);
 		LinphoneCoreFactory.instance().setDebugMode(isDebugLogEnabled, getString(R.string.app_name));
 		LinphoneCoreFactory.instance().enableLogCollection(isDebugLogEnabled);
 
@@ -843,7 +840,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		instance.doDestroy();
 	}
 
-	private String getString(int key) {
+	public String getString(int key) {
 		return mR.getString(key);
 	}
 
@@ -880,9 +877,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 	public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {
 		for(AvatarWithPresenceImage listener : listeners){
-            Log.e("===>> LinphoneManager : notifyPresenceReceived : "+listener.getFriendName()+" vs "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType());
+           // Log.e("===>> LinphoneManager : notifyPresenceReceived : "+listener.getFriendName()+" vs "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType());
 			if(listener.isThisFriend(lf)){
-				Log.e("===>> LinphoneManager : notifyPresenceReceived 2: "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType());
+			//	Log.e("===>> LinphoneManager : notifyPresenceReceived 2: "+lf.getName().toString()+" - "+lf.getPresenceModel().getActivity().getType());
 				listener.updatePresenceIcon(lc, lf);
 			}
 		}
diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java
index 8eb705cf3..c51022b30 100644
--- a/src/org/linphone/ui/Digit.java
+++ b/src/org/linphone/ui/Digit.java
@@ -30,6 +30,7 @@ import org.linphone.mediastream.Log;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -136,7 +137,9 @@ public class Digit extends Button implements AddressAware {
 				alertDialog.setItems(getContext().getResources().getStringArray(R.array.popup_send_log), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int which) {
 						if(which == 0){
+							Log.setEnableLog(false);
 							LinphonePreferences.instance().enableDebugLogs(false);
+							LinphoneCoreFactory.instance().setDebugMode(false, getResources().getString(R.string.app_name));
 							LinphoneCoreFactory.instance().enableLogCollection(false);
 						}
 						if(which == 1) {
@@ -152,7 +155,9 @@ public class Digit extends Button implements AddressAware {
 				alertDialog.setItems(getContext().getResources().getStringArray(R.array.popup_enable_log), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int which) {
 						if(which == 0) {
+							Log.setEnableLog(true);
 							LinphonePreferences.instance().enableDebugLogs(true);
+							LinphoneCoreFactory.instance().setDebugMode(true, getResources().getString(R.string.app_name));
 							LinphoneCoreFactory.instance().enableLogCollection(true);
 						}
 					}
diff --git a/submodules/linphone b/submodules/linphone
index 293c265e7..bc80229ec 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 293c265e7d7c66ff20fd9ba217ebe0a60f37720f
+Subproject commit bc80229ec26b5da6f318096a2f79bf9c4c281318