diff --git a/res/layout/call.xml b/res/layout/call.xml
index e855da5a2..5ab4b4d98 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -153,8 +153,8 @@
 						android:layout_width="match_parent"
 						android:layout_height="80dp"
 						android:layout_alignParentBottom="true"
-						android:layout_below="@+id/avatar_layout"
 						android:layout_marginTop="-5dp"
+						android:alpha="0.8"
 						android:background="@color/colorH"
 						android:orientation="vertical">
 
@@ -164,7 +164,6 @@
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:layout_gravity="center"
-							android:background="@color/colorH"
 							android:gravity="center"
 							android:paddingTop="5dp"/>
 
@@ -174,7 +173,7 @@
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:layout_gravity="center"
-							android:background="@color/colorH"/>
+							/>
 					</LinearLayout>
 				</RelativeLayout>
 
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index f76e0e173..0fd0ed9b8 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -148,8 +148,10 @@
 				android:id="@+id/send_picture"
 				android:layout_width="wrap_content"
 				android:layout_height="50dp"
+				android:layout_marginLeft="2dp"
+				android:layout_marginRight="-5dp"
 				android:contentDescription="@string/content_description_send_file"
-				android:paddingLeft="10dp"
+				android:padding="10dp"
 				android:src="@drawable/chat_send_file"/>
 
 			<EditText
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index c1525fc7c..85762cd6f 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 7b5d2cd34..17a2db033 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -76,24 +76,18 @@
 		android:layout_alignParentBottom="true"
 		>
 
-		<RelativeLayout
-			android:layout_width="match_parent"
+		<ImageView
+			android:id="@+id/add_contact"
+			android:layout_width="200dp"
 			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
 			android:layout_weight="1"
 			android:adjustViewBounds="true"
+			android:background="#595959"
+			android:contentDescription="@string/content_description_add_contact"
 			android:focusable="true"
-			android:visibility="gone">
-
-			<ImageView
-				android:id="@+id/add_contact"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_alignParentBottom="true"
-				android:contentDescription="@string/content_description_add_contact"
-				android:padding="15dp"
-				android:src="@drawable/contact_add_button"/>
-
-		</RelativeLayout>
+			android:src="@drawable/back_white"
+			android:visibility="gone"/>
 
 		<org.linphone.ui.CallButton
 			android:id="@+id/call"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f4a408303..600d19d25 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -197,6 +197,8 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="admin_set">%s est devenu(e) admin</string>
   <string name="admin_unset">%s n\'est plus admin</string>
   <string name="chat_room_you_are_now_admin">Vous êtes maintenant admin</string>
+  <string name="chat_room_you_are_no_longer_admin">Vous n\'êtes plus admin</string>
+  <string name="chat_room_creation_failed">La création de la conversation a échoué</string>
   <string name="chat_room_leave_dialog">Voulez vous vraiment quitter cette conversation ?</string>
   <string name="chat_room_leave_button">Quitter</string>
   <string name="chat_room_delete_dialog">Voulez vous vraiment quitter et supprimer les conversations selectionnées ?</string>
@@ -216,6 +218,7 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="incoming_call">appel entrant</string>
   <string name="outgoing_call">appel sortant</string>
   <string name="no_current_call">Aucun appel en cours</string>
+  <string name="add_video_dialog">Votre interlocuteur voudrait activer la vidéo</string>
   <string name="couldnt_accept_call">Une erreur est survenue pendant l\'acceptation de l\'appel</string>
   <string name="zrtp_dialog1">Indiquez le code SAS suivant à votre interlocuteur:\nDites: %s</string>
   <string name="zrtp_dialog2">\nVotre interlocuteur doit dire: %s</string>
diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index b90eb7fe9..ab6e6883d 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -20,10 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 package org.linphone.chat;
 
 import android.app.Fragment;
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ImageView;
diff --git a/src/android/org/linphone/fragments/DialerFragment.java b/src/android/org/linphone/fragments/DialerFragment.java
index b4cb5515a..640be7e67 100644
--- a/src/android/org/linphone/fragments/DialerFragment.java
+++ b/src/android/org/linphone/fragments/DialerFragment.java
@@ -208,8 +208,9 @@ public class DialerFragment extends Fragment {
 				//mCall.resetClickListener();
 			}
 			mAddContact.setEnabled(true);
-			mAddContact.setImageResource(R.drawable.call_alt_back);
+			//mAddContact.setImageResource(R.drawable.call_alt_back);
 			mAddContact.setOnClickListener(cancelListener);
+			mAddContact.setVisibility(View.VISIBLE);
 		} else {
 			/*if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) {
 				mCall.setImageResource(R.drawable.call_video_start);
@@ -217,14 +218,15 @@ public class DialerFragment extends Fragment {
 				mCall.setImageResource(R.drawable.call_alt_start_selected);
 			//}
 			mAddContact.setEnabled(false);
-			mAddContact.setImageResource(R.drawable.contact_add_button);
-			mAddContact.setOnClickListener(addContactListener);
-			enableDisableAddContact();
+			//mAddContact.setImageResource(R.drawable.contact_add_button);
+			//mAddContact.setOnClickListener(addContactListener);
+			//enableDisableAddContact();
+			mAddContact.setVisibility(View.GONE);
 		}
 	}
 
 	public void enableDisableAddContact() {
-		mAddContact.setEnabled(LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null && LinphoneManager.getLc().getCallsNb() > 0 || !mAddress.getText().toString().equals(""));
+		//mAddContact.setEnabled(LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null && LinphoneManager.getLc().getCallsNb() > 0 || !mAddress.getText().toString().equals(""));
 	}
 
 	public void displayTextInAddressBar(String numberOrSipAddress) {