diff --git a/res/layout/assistant_remote_provisioning_login.xml b/res/layout/assistant_remote_provisioning_login.xml
index 976d3a0b7..2608982f8 100644
--- a/res/layout/assistant_remote_provisioning_login.xml
+++ b/res/layout/assistant_remote_provisioning_login.xml
@@ -4,11 +4,8 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-
-
-<TextView
+	<TextView
 		android:text="@string/assistant_remote_provisioning_title"
-		android:contentDescription="@string/content_description_welcome"
 		style="@style/font6"
 		android:textAllCaps="true"
 		android:paddingTop="20dp"
diff --git a/res/layout/remote_provisioning.xml b/res/layout/remote_provisioning.xml
index 0075b1083..b276243d9 100644
--- a/res/layout/remote_provisioning.xml
+++ b/res/layout/remote_provisioning.xml
@@ -5,8 +5,7 @@
 	android:background="@color/colorH"
 	android:orientation="vertical" >
 	
-  	<ImageView 
-        android:contentDescription="@string/content_description_welcome"
+  	<ImageView
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
 	    android:adjustViewBounds="true"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ca6bd65d5..0c4572bdd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -85,6 +85,7 @@
 	<string name="wizard_password_incorrect">Your password is invalid (6 characters min).</string>
 	<string name="wizard_passwords_unmatched">Passwords do not match.</string>
 	<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from your input to match requirements.\r\nDo you accept?</string>
+	<string name="first_launch_no_login_password">Please enter your login and password</string>
 
 	<!-- Dailer -->
 	<string name="address_bar_hint">Enter a number or an address</string>
diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java
index fb4995ad7..9048bccf6 100644
--- a/src/org/linphone/ChatListFragment.java
+++ b/src/org/linphone/ChatListFragment.java
@@ -204,41 +204,6 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 		} else {
 			backInCall.setVisibility(View.INVISIBLE);
 		}
-
-		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneActivity.instance());
-		boolean updateNeeded = prefs.getBoolean(getString(R.string.pref_first_time_linphone_chat_storage), true);
-		updateNeeded = updateNeeded && !isVersionUsingNewChatStorage();
-		if (updateNeeded) {
-			AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
-                private ProgressDialog pd;
-                @Override
-                protected void onPreExecute() {
-                         pd = new ProgressDialog(LinphoneActivity.instance());
-                         pd.setTitle(getString(R.string.wait));
-                         pd.setMessage(getString(R.string.importing_messages));
-                         pd.setCancelable(false);
-                         pd.setIndeterminate(true);
-                         pd.show();
-                }
-                @Override
-                protected Void doInBackground(Void... arg0) {
-                        try {
-                        	if (importAndroidStoredMessagedIntoLibLinphoneStorage()) {
-                				prefs.edit().putBoolean(getString(R.string.pref_first_time_linphone_chat_storage), false).commit();
-                				LinphoneActivity.instance().getChatStorage().restartChatStorage();
-                			}
-                        } catch (Exception e) {
-                               e.printStackTrace();
-                        }
-                        return null;
-                 }
-                 @Override
-                 protected void onPostExecute(Void result) {
-                         pd.dismiss();
-                 }
-			};
-        	task.execute((Void[])null);
-		}
 		
 		if (LinphoneActivity.isInstanciated()) {
 			LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT_LIST);
diff --git a/src/org/linphone/assistant/RemoteProvisioningActivity.java b/src/org/linphone/assistant/RemoteProvisioningActivity.java
index 08942cee5..186c945a9 100644
--- a/src/org/linphone/assistant/RemoteProvisioningActivity.java
+++ b/src/org/linphone/assistant/RemoteProvisioningActivity.java
@@ -163,12 +163,12 @@ public class RemoteProvisioningActivity extends Activity {
 		new AlertDialog.Builder(RemoteProvisioningActivity.this)
 				.setTitle(getString(R.string.remote_provisioning_again_title))
 				.setMessage(getString(R.string.remote_provisioning_again_message))
-				.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
+				.setPositiveButton(R.string.accept, new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int which) {
 						setRemoteProvisioningAddressAndRestart(configUriParam);
 					}
 				})
-				.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
+				.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int which) {
 						goToLinphoneActivity();
 					}