diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 7146b22a1..d8866ed55 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -6,7 +6,7 @@
 	<string name="wizard_url">https://www.linphone.org/wizard.php</string>
 
 	<!-- Interface settings -->
-    <bool name="use_simple_history">true</bool>
+    <bool name="use_simple_history">false</bool>
     <bool name="hide_camera_settings">false</bool>
     <bool name="hide_wizard">false</bool>
     <bool name="hide_accounts">false</bool>
diff --git a/src/org/linphone/PreferencesActivity.java b/src/org/linphone/PreferencesActivity.java
index 450b12ffe..028bf44ea 100644
--- a/src/org/linphone/PreferencesActivity.java
+++ b/src/org/linphone/PreferencesActivity.java
@@ -60,6 +60,7 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.widget.ImageView;
 
 public class PreferencesActivity extends LinphonePreferencesActivity implements EcCalibrationListener {
 	private Handler mHandler = new Handler();
@@ -130,14 +131,14 @@ public class PreferencesActivity extends LinphonePreferencesActivity implements
 	}
 	
 	private void addExtraAccountPreferencesButton(PreferenceCategory parent, final int n, boolean isNewAccount) {
-		SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
+		final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
 		if (isNewAccount) {
 			SharedPreferences.Editor editor = prefs.edit();
 			editor.putInt(getString(R.string.pref_extra_accounts), n+1);
 			editor.commit();
 		}
 		
-		Preference me = new Preference(PreferencesActivity.this);
+		final Preference me = new Preference(PreferencesActivity.this);
 		String keyUsername = getString(R.string.pref_username_key);
 		String keyDomain = getString(R.string.pref_domain_key);
 		if (n > 0) {
@@ -161,19 +162,6 @@ public class PreferencesActivity extends LinphonePreferencesActivity implements
 			}
 		});
 		
-		for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
-			if (lpc.getIdentity().contains(prefs.getString(keyUsername, "")) && lpc.getIdentity().contains(prefs.getString(keyDomain, ""))) {
-				while ((lpc.getState() == RegistrationState.RegistrationProgress || lpc.getState() == RegistrationState.RegistrationNone) && (LinphoneManager.getLc().isNetworkReachable()))
-				{ };
-				
-				if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationOk) {
-					me.setWidgetLayoutResource(R.layout.preference_led_connected);
-				} else {
-					me.setWidgetLayoutResource(R.layout.preference_led_not_connected);
-				}
-			}
-		}
-		
 		parent.addPreference(me);
 	}