diff --git a/res/layout-sw533dp-land/assistant_linphone_login.xml b/res/layout-sw533dp-land/assistant_linphone_login.xml
index 1c9d8df64..28bc16612 100644
--- a/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -61,7 +61,7 @@
 				android:paddingLeft="30dp"
 				android:layout_width="0dp"
 				android:layout_weight="1"
-				android:layout_height="wrap_content">
+				android:layout_height="match_parent">
 
 				<TextView
 					android:text="@string/password"
diff --git a/res/layout/assistant_codec_downloader.xml b/res/layout/assistant_codec_downloader.xml
index 4f991e5b0..ad7eaf0fe 100644
--- a/res/layout/assistant_codec_downloader.xml
+++ b/res/layout/assistant_codec_downloader.xml
@@ -58,12 +58,9 @@
 		android:layout_height="wrap_content"
 		android:gravity="center"
 		android:id="@+id/answerNo"
-		android:layout_marginBottom="35dp"
 		android:layout_alignParentBottom="true"
 		android:layout_toLeftOf="@+id/imageView"
-		android:layout_toStartOf="@+id/imageView"
-		android:layout_marginRight="26dp"
-		android:layout_marginEnd="26dp"/>
+		android:layout_toStartOf="@+id/imageView" />
 
 	<Button
 		style="@style/font7"
@@ -85,8 +82,8 @@
 		android:layout_height="wrap_content"
 		android:gravity="center"
 		android:id="@+id/answerOk"
-		android:layout_alignTop="@+id/answerYes"
-		android:layout_centerHorizontal="true"/>
+		android:layout_centerHorizontal="true"
+		android:layout_alignTop="@+id/answerYes" />
 
 	<TextView
 		style="@style/font7"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8edc2148d..f9ab60831 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -179,6 +179,7 @@
 	<string name="warning_wrong_destination_address">Cannot build destination address from %s</string>
 	<string name="error_unknown">Unknown error</string>
 	<string name="error_call_declined">Call declined</string>
+	<string name="error_user_busy">User busy</string>
 	<string name="error_user_not_found">User not found</string>
 	<string name="error_incompatible_media">Incompatible media parameters</string>
 	<string name="error_low_bandwidth">Your correspondent has low bandwidth, video cannot be started</string>
diff --git a/src/org/linphone/CallOutgoingActivity.java b/src/org/linphone/CallOutgoingActivity.java
index 4e890e39e..b4051e008 100644
--- a/src/org/linphone/CallOutgoingActivity.java
+++ b/src/org/linphone/CallOutgoingActivity.java
@@ -111,6 +111,8 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 						displayCustomToast(getString(R.string.error_user_not_found), Toast.LENGTH_SHORT);
 					} else if (message != null && call.getErrorInfo().getReason() == Reason.Media) {
 						displayCustomToast(getString(R.string.error_incompatible_media), Toast.LENGTH_SHORT);
+					} else if (message != null && call.getErrorInfo().getReason() == Reason.Busy) {
+						displayCustomToast(getString(R.string.error_user_busy), Toast.LENGTH_SHORT);
 					} else if (message != null) {
 						displayCustomToast(getString(R.string.error_unknown) + " - " + message, Toast.LENGTH_SHORT);
 					}
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 698e153d4..0dd175859 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -215,11 +215,11 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			@Override
 			public void OnProgress(final int current, final int max) {
 				mHandler.post(new Runnable() {
-					@Override
-					public void run() {
+						@Override
+						public void run() {
 						OpenH264DownloadHelper ohcodec = LinphoneManager.getInstance().getOpenH264DownloadHelper();
 						if (progress == null) {
-							progress = new ProgressDialog((Context)ohcodec.getUserData(ctxt));
+							progress = new ProgressDialog((Context) ohcodec.getUserData(ctxt));
 							progress.setCanceledOnTouchOutside(false);
 							progress.setCancelable(false);
 							progress.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
@@ -238,22 +238,22 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 							}
 						}
 					}
-				});
+					});
 			}
 
 			@Override
-			public void OnError (final String error){
+			public void OnError(final String error) {
 				mHandler.post(new Runnable() {
-					@Override
-					public void run() {
+						@Override
+						public void run() {
 						if (progress != null) progress.dismiss();
-						AlertDialog.Builder builder = new AlertDialog.Builder((Context)LinphoneManager.getInstance().getOpenH264DownloadHelper().getUserData(ctxt));
+						AlertDialog.Builder builder = new AlertDialog.Builder((Context) LinphoneManager.getInstance().getOpenH264DownloadHelper().getUserData(ctxt));
 						builder.setMessage("Sorry an error has occurred.");
 						builder.setCancelable(false);
 						builder.setNeutralButton("Ok", null);
 						builder.show();
 					}
-				});
+					});
 			}
 		};
 		mCodecDownloader.setOpenH264HelperListener(mCodecListener);
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index b816eb314..4b91be9a0 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -685,7 +685,7 @@ public class SettingsFragment extends PreferencesListFragment {
 		PreferenceCategory codecs = (PreferenceCategory) findPreference(getString(R.string.pref_video_codecs_key));
 		codecs.removeAll();
 
-		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+		final LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 
 		final OpenH264DownloadHelper mCodecDownloader = LinphoneManager.getInstance().getOpenH264DownloadHelper();
 
@@ -705,9 +705,11 @@ public class SettingsFragment extends PreferencesListFragment {
 					}
 				}
 			}
-			if (pt.getMime().equals("H264") && mCodecDownloader.isCodecFound()) {
-				codec.setSummary(mCodecDownloader.getLicenseMessage());
-				codec.setTitle("OpenH264");
+			if (lc.openH264Enabled()) {
+				if (pt.getMime().equals("H264") && mCodecDownloader.isCodecFound()) {
+					codec.setSummary(mCodecDownloader.getLicenseMessage());
+					codec.setTitle("OpenH264");
+				}
 			}
 			codec.setChecked(lc.isPayloadTypeEnabled(pt));
 
@@ -716,29 +718,31 @@ public class SettingsFragment extends PreferencesListFragment {
 				public boolean onPreferenceChange(Preference preference, Object newValue) {
 					boolean enable = (Boolean) newValue;
 					try {
-						if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") 
-								&& pt.getMime().equals("H264") && !mCodecDownloader.isCodecFound()) {
-							mCodecDownloader.setOpenH264HelperListener(LinphoneManager.getInstance().getOpenH264HelperListener());
-							mCodecDownloader.setUserData(0,LinphoneManager.getInstance().getContext());
-							mCodecDownloader.setUserData(1,codec);
+						if (lc.openH264Enabled()) {
+							if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86")
+									&& pt.getMime().equals("H264") && !mCodecDownloader.isCodecFound()) {
+								mCodecDownloader.setOpenH264HelperListener(LinphoneManager.getInstance().getOpenH264HelperListener());
+								mCodecDownloader.setUserData(0, LinphoneManager.getInstance().getContext());
+								mCodecDownloader.setUserData(1, codec);
 
-							AlertDialog.Builder builder = new AlertDialog.Builder(LinphoneManager.getInstance().getContext());
-							builder.setCancelable(false);
-							builder.setMessage("Do you agree to download " + mCodecDownloader.getLicenseMessage()).setPositiveButton("Yes", new DialogInterface.OnClickListener() {
-								@Override
-								public void onClick(DialogInterface dialog, int which) {
-									if (which == DialogInterface.BUTTON_POSITIVE)
-										mCodecDownloader.downloadCodec();
-								}
-							});
-							builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
-								@Override
-								public void onClick(DialogInterface dialog, int which) {
-									if (which == DialogInterface.BUTTON_NEGATIVE) {
-										// Disable H264
+								AlertDialog.Builder builder = new AlertDialog.Builder(LinphoneManager.getInstance().getContext());
+								builder.setCancelable(false);
+								builder.setMessage("Do you agree to download " + mCodecDownloader.getLicenseMessage()).setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+									@Override
+									public void onClick(DialogInterface dialog, int which) {
+										if (which == DialogInterface.BUTTON_POSITIVE)
+											mCodecDownloader.downloadCodec();
 									}
-								}
-							}).show();
+								});
+								builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
+									@Override
+									public void onClick(DialogInterface dialog, int which) {
+										if (which == DialogInterface.BUTTON_NEGATIVE) {
+											// Disable H264
+										}
+									}
+								}).show();
+							}
 						}
 						LinphoneManager.getLcIfManagerNotDestroyedOrNull().enablePayloadType(pt, enable);
 					} catch (LinphoneCoreException e) {
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index cfc8ffa0a..3400873a1 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -479,8 +479,11 @@ public class StatusFragment extends Fragment {
 									PayloadType payloadVideo = params.getUsedVideoCodec();
 									if (payloadVideo != null && payloadAudio != null) {
 										String videoMime = payloadVideo.getMime();
-										if (payloadVideo.getMime().equals("H264") && LinphoneManager.getInstance().getOpenH264DownloadHelper().isCodecFound())
+										if (LinphoneManager.getLc().openH264Enabled() &&
+												payloadVideo.getMime().equals("H264") &&
+												LinphoneManager.getInstance().getOpenH264DownloadHelper().isCodecFound()) {
 											videoMime = "OpenH264";
+										}
 										codec.setText(videoMime + " / " + payloadAudio.getMime() + (payloadAudio.getRate() / 1000));
 									}
 									dl.setText(String.valueOf((int) videoStats.getDownloadBandwidth()) + " / " + (int) audioStats.getDownloadBandwidth() + " kbits/s");
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index d3e2faf12..3afbb36e0 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -377,15 +377,19 @@ private static AssistantActivity instance;
 	}
 
 	private void launchDownloadCodec() {
-		OpenH264DownloadHelper downloadHelper = LinphoneCoreFactory.instance().createOpenH264DownloadHelper();
-		if (Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") && !downloadHelper.isCodecFound()) {
-			CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();
-			changeFragment(codecFragment);
-			currentFragment = AssistantFragmentsEnum.DOWNLOAD_CODEC;
-			back.setVisibility(View.VISIBLE);
-			cancel.setEnabled(false);
-		} else
+		if (LinphoneManager.getLc().openH264Enabled()) {
+			OpenH264DownloadHelper downloadHelper = LinphoneCoreFactory.instance().createOpenH264DownloadHelper();
+			if (Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") && !downloadHelper.isCodecFound()) {
+				CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();
+				changeFragment(codecFragment);
+				currentFragment = AssistantFragmentsEnum.DOWNLOAD_CODEC;
+				back.setVisibility(View.VISIBLE);
+				cancel.setEnabled(false);
+			} else
+				goToLinphoneActivity();
+		} else {
 			goToLinphoneActivity();
+		}
 	}
 
 	public void endDownloadCodec() {