diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
index 95947af5e..fc826b2b5 100755
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 60d5abd4f..f114de63d 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3bd9504ce..57f6e9297 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,7 +56,7 @@
 <string name="no">No</string>
 <string name="never_remind">Never remind me</string>
 <string name="config_error">%s, do you want to go to the settings page ?</string>
-<string name="initial_config_error">No SIP account has been configured yet, do you want to go to the settings page ?\n  Need help ?\n http://www.linphone.org</string>
+<string name="initial_config_error">&lt;P ALIGN=CENTER&gt;No SIP account has been configured yet, do you want to go to the settings page ?&lt;br/&gt;&lt;br/&gt; Need help ?&lt;br/&gt; &quot;http://www.linphone.org/m/help&quot;&lt;/p&gt;</string>
 <string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string>
 <string name="tab_history">History</string>
 <string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string>
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index b3f11280e..99586d6d3 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -37,6 +37,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
+import android.text.Html;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
@@ -197,7 +198,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 			mInCallControlRow.setVisibility(View.GONE);
 			mInCallAddressLayout.setVisibility(View.GONE);
 			mDecline.setEnabled(false);
-			if (LinphoneService.isready() && getIntent().getData() != null) {
+			if (LinphoneService.isready() && getIntent().getData() != null && !LinphoneService.instance().getLinphoneCore().isIncall()) {
 		    	newOutgoingCall(getIntent().getData().toString().substring("tel://".length()));
 		    	getIntent().setData(null);
 		    }
@@ -374,11 +375,10 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 			} catch (LinphoneConfigException ec) {
 				Log.w(LinphoneService.TAG,"no valid settings found",ec);
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
-				//builder.setMessage(getString(R.string.initial_config_error))
 				TextView lDialogTextView = new TextView(this);
 				lDialogTextView.setAutoLinkMask(0x0f/*all*/);
 				lDialogTextView.setPadding(10, 10, 10, 10);
-				lDialogTextView.setText(getString(R.string.initial_config_error));
+				lDialogTextView.setText(Html.fromHtml(getString(R.string.initial_config_error) ));
 				builder.setCustomTitle(lDialogTextView)
 				.setCancelable(false)
 				.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
diff --git a/submodules/linphone b/submodules/linphone
index a0044d9a6..8210107a3 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a0044d9a6a3bfb25618ac5bd28e8687ae73e8fd3
+Subproject commit 8210107a35463f30894027ad271ee0f66d79cb00