diff --git a/res/layout-land/call_incoming.xml b/res/layout-land/call_incoming.xml
index 06e5e481b..6c118e888 100644
--- a/res/layout-land/call_incoming.xml
+++ b/res/layout-land/call_incoming.xml
@@ -86,6 +86,8 @@
 				<TextView
 					android:id="@+id/contact_number"
 					style="@style/font2"
+					android:ellipsize="end"
+					android:maxLines="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@id/contact_name"
diff --git a/res/layout-land/call_outgoing.xml b/res/layout-land/call_outgoing.xml
index 1227a7a94..356ce9478 100644
--- a/res/layout-land/call_outgoing.xml
+++ b/res/layout-land/call_outgoing.xml
@@ -87,6 +87,8 @@
 				<TextView
 					android:id="@+id/contact_number"
 					style="@style/font2"
+					android:ellipsize="end"
+					android:maxLines="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@id/contact_name"
diff --git a/res/layout-sw533dp-land/call_incoming.xml b/res/layout-sw533dp-land/call_incoming.xml
index f8811ca71..d682788af 100644
--- a/res/layout-sw533dp-land/call_incoming.xml
+++ b/res/layout-sw533dp-land/call_incoming.xml
@@ -86,6 +86,8 @@
 				<TextView
 					android:id="@+id/contact_number"
 					style="@style/font2"
+					android:ellipsize="end"
+					android:maxLines="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@id/contact_name"
diff --git a/res/layout-sw533dp-land/call_outgoing.xml b/res/layout-sw533dp-land/call_outgoing.xml
index 970ac27ec..b055d1b8e 100644
--- a/res/layout-sw533dp-land/call_outgoing.xml
+++ b/res/layout-sw533dp-land/call_outgoing.xml
@@ -87,6 +87,8 @@
 				<TextView
 					android:id="@+id/contact_number"
 					style="@style/font2"
+					android:ellipsize="end"
+					android:maxLines="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_below="@id/contact_name"
diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml
index 4fec8bc8e..1633cce28 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -50,6 +50,8 @@
 		<TextView
 			android:id="@+id/contact_number"
 			style="@style/font2"
+			android:ellipsize="end"
+			android:maxLines="1"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@id/contact_name"
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 81b3f5283..625c0da7f 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -51,6 +51,8 @@
 		<TextView
 			android:id="@+id/contact_number"
 			style="@style/font2"
+			android:ellipsize="end"
+			android:maxLines="1"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@id/contact_name"
diff --git a/src/android/org/linphone/chat/DeviceAdapter.java b/src/android/org/linphone/chat/DeviceAdapter.java
index 5bcffd9c6..c08547aa4 100644
--- a/src/android/org/linphone/chat/DeviceAdapter.java
+++ b/src/android/org/linphone/chat/DeviceAdapter.java
@@ -203,7 +203,7 @@ public class DeviceAdapter extends BaseExpandableListAdapter {
 
     @Override
     public boolean isChildSelectable(int groupPosition, int childPosition) {
-        return false;
+        return true;
     }
 
     @Override