diff --git a/src/android/org/linphone/call/CallVideoFragment.java b/src/android/org/linphone/call/CallVideoFragment.java
index db05ec80f..d8ba53de4 100644
--- a/src/android/org/linphone/call/CallVideoFragment.java
+++ b/src/android/org/linphone/call/CallVideoFragment.java
@@ -163,6 +163,10 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
 			int maxHeight = screenHeight / 4; // Let's take at most 1/4 of the screen for the camera preview
 
 			VideoDefinition videoSize = call.getCurrentParams().getSentVideoDefinition(); // It already takes care of rotation
+			if (videoSize.getWidth() == 0 || videoSize.getHeight() == 0) {
+				Log.w("Couldn't get sent video definition, using default video definition");
+				videoSize = lc.getPreferredVideoDefinition();
+			}
 			int width = videoSize.getWidth();
 			int height = videoSize.getHeight();
 
@@ -170,6 +174,10 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
 			width = width * maxHeight / height;
 			height = maxHeight;
 
+			if (mCaptureView == null) {
+				Log.e("mCaptureView is null !");
+				return;
+			}
 			mCaptureView.getHolder().setFixedSize(width, height);
 			Log.d("Video preview size set to " + width + "x" + height);
 		}
@@ -196,8 +204,10 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
 			String newDevice;
 			if (index == 1)
 				newDevice = devices[0];
-			else
+			else if (devices.length > 1)
 				newDevice = devices[1];
+			else
+				newDevice = devices[index];
 			LinphoneManager.getLc().setVideoDevice(newDevice);
 
 			CallManager.getInstance().updateCall();
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 12211c116..1e2e1c7cd 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -183,6 +183,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 			    if (status == ChatMessage.State.Delivered) {
 				    holder.imdmLayout.setVisibility(View.VISIBLE);
 				    holder.imdmLabel.setText(R.string.sent);
+				    holder.imdmIcon.setImageResource(R.drawable.chat_delivered);
 				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));
 			    } else if (status == ChatMessage.State.DeliveredToUser) {
 				    holder.imdmLayout.setVisibility(View.VISIBLE);
diff --git a/submodules/linphone b/submodules/linphone
index 75cbb7694..63a16edca 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 75cbb769457a738ea2f676a37b6957a003ad84f5
+Subproject commit 63a16edcadc7b11cd2941ae476586a91b318cbb0