diff --git a/app/src/main/java/org/linphone/views/MarqueeTextView.java b/app/src/main/java/org/linphone/views/MarqueeTextView.java
new file mode 100644
index 000000000..a18fe85fb
--- /dev/null
+++ b/app/src/main/java/org/linphone/views/MarqueeTextView.java
@@ -0,0 +1,60 @@
+package org.linphone.views;
+
+/*
+MarqueeTextView.java
+Copyright (C) 2019 Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.TextView;
+import androidx.annotation.Nullable;
+
+/**
+ * The purpose of this class is to have a Textview automatically configured for marquee ellipsize
+ */
+@SuppressLint("AppCompatCustomView")
+public class MarqueeTextView extends TextView {
+    public MarqueeTextView(Context context) {
+        super(context);
+        init();
+    }
+
+    public MarqueeTextView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public MarqueeTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public MarqueeTextView(
+            Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init();
+    }
+
+    public void init() {
+        setEllipsize(TextUtils.TruncateAt.MARQUEE);
+        setMarqueeRepeatLimit(0xffffffff);
+        setSelected(true);
+    }
+}
diff --git a/app/src/main/res/layout-land/history_detail.xml b/app/src/main/res/layout-land/history_detail.xml
index f204c8e2b..ac5d70cce 100644
--- a/app/src/main/res/layout-land/history_detail.xml
+++ b/app/src/main/res/layout-land/history_detail.xml
@@ -78,11 +78,13 @@
                 style="@style/big_contact_name_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal" />
+                android:gravity="center_horizontal"
+                android:maxLines="2"/>
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/contact_address"
                 style="@style/sip_uri_font"
+                android:singleLine="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index 2eeaadd85..e8865a8bb 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -46,7 +46,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
                     android:gravity="center"
-                    android:maxLines="1"
+                    android:singleLine="true"
+                    android:ellipsize="end"
                     android:padding="15dp" />
 
                 <View
diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml
index f8f0cc7c9..b338f4c5f 100644
--- a/app/src/main/res/layout-sw533dp-land/main.xml
+++ b/app/src/main/res/layout-sw533dp-land/main.xml
@@ -46,7 +46,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
                     android:gravity="center"
-                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:singleLine="true"
                     android:padding="15dp" />
 
                 <View
diff --git a/app/src/main/res/layout-sw533dp/history_detail.xml b/app/src/main/res/layout-sw533dp/history_detail.xml
index fbc75bb01..1c78adfd0 100644
--- a/app/src/main/res/layout-sw533dp/history_detail.xml
+++ b/app/src/main/res/layout-sw533dp/history_detail.xml
@@ -77,9 +77,10 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal" />
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/contact_address"
                 style="@style/sip_uri_font"
+                android:singleLine="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml
index f8f442673..95bf4f6ba 100644
--- a/app/src/main/res/layout-sw533dp/main.xml
+++ b/app/src/main/res/layout-sw533dp/main.xml
@@ -46,7 +46,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
                     android:gravity="center"
-                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:singleLine="true"
                     android:padding="15dp" />
 
                 <View
diff --git a/app/src/main/res/layout/assistant_country_list.xml b/app/src/main/res/layout/assistant_country_list.xml
index 2cbd1c5a4..fce8c8e8f 100644
--- a/app/src/main/res/layout/assistant_country_list.xml
+++ b/app/src/main/res/layout/assistant_country_list.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_vertical|center"
-            android:maxLines="1"
+            android:singleLine="true"
             android:text="@string/assistant_choose_country" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/assistant_topbar.xml b/app/src/main/res/layout/assistant_topbar.xml
index 5f43c5608..bccce7681 100644
--- a/app/src/main/res/layout/assistant_topbar.xml
+++ b/app/src/main/res/layout/assistant_topbar.xml
@@ -23,7 +23,8 @@
         android:layout_height="match_parent"
         android:layout_weight="0.6"
         android:gravity="center"
-        android:maxLines="1"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:padding="15dp"
         android:text="@string/assistant"/>
 
diff --git a/app/src/main/res/layout/call_conference_cell.xml b/app/src/main/res/layout/call_conference_cell.xml
index eac7d8a1b..1646cfc73 100644
--- a/app/src/main/res/layout/call_conference_cell.xml
+++ b/app/src/main/res/layout/call_conference_cell.xml
@@ -31,13 +31,13 @@
             android:paddingRight="10dp"
             android:orientation="vertical">
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/contact_name"
                 style="@style/contact_name_list_cell_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical|left"
-                android:maxLines="1" />
+                android:singleLine="true"/>
 
 
             <Chronometer
diff --git a/app/src/main/res/layout/call_conference_paused_cell.xml b/app/src/main/res/layout/call_conference_paused_cell.xml
index e0abe6b26..ac540109e 100644
--- a/app/src/main/res/layout/call_conference_paused_cell.xml
+++ b/app/src/main/res/layout/call_conference_paused_cell.xml
@@ -19,7 +19,8 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical|left"
-        android:maxLines="1"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:paddingLeft="20dp"
         android:paddingRight="10dp"
         android:text="@string/conference" />
diff --git a/app/src/main/res/layout/call_inactive_row.xml b/app/src/main/res/layout/call_inactive_row.xml
index 2955ba396..0d3bf6cab 100644
--- a/app/src/main/res/layout/call_inactive_row.xml
+++ b/app/src/main/res/layout/call_inactive_row.xml
@@ -17,14 +17,14 @@
 
     </RelativeLayout>
 
-    <TextView
+    <org.linphone.views.MarqueeTextView
         android:id="@+id/contact_name"
         style="@style/call_contact_name_paused_font"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical|left"
-        android:maxLines="1"
+        android:singleLine="true"
         android:paddingLeft="20dp"
         android:paddingRight="10dp" />
 
diff --git a/app/src/main/res/layout/call_incoming.xml b/app/src/main/res/layout/call_incoming.xml
index 1d907cdd1..4d8f59187 100644
--- a/app/src/main/res/layout/call_incoming.xml
+++ b/app/src/main/res/layout/call_incoming.xml
@@ -46,7 +46,7 @@
             android:gravity="center_vertical|center_horizontal"
             android:paddingTop="5dp" />
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/contact_number"
             style="@style/sip_uri_font"
             android:layout_width="wrap_content"
@@ -54,8 +54,7 @@
             android:layout_below="@id/contact_name"
             android:layout_centerHorizontal="true"
             android:layout_gravity="center_vertical|center_horizontal"
-            android:ellipsize="end"
-            android:maxLines="1"
+            android:singleLine="true"
             android:paddingBottom="10dp" />
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/call_outgoing.xml b/app/src/main/res/layout/call_outgoing.xml
index 53f918e7c..03b1e6115 100644
--- a/app/src/main/res/layout/call_outgoing.xml
+++ b/app/src/main/res/layout/call_outgoing.xml
@@ -47,7 +47,7 @@
             android:gravity="center_vertical|center_horizontal"
             android:paddingTop="5dp" />
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/contact_number"
             style="@style/sip_uri_font"
             android:layout_width="wrap_content"
@@ -55,8 +55,7 @@
             android:layout_below="@id/contact_name"
             android:layout_centerHorizontal="true"
             android:layout_gravity="center_vertical|center_horizontal"
-            android:ellipsize="end"
-            android:maxLines="1"
+            android:singleLine="true"
             android:paddingBottom="10dp" />
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/chat.xml b/app/src/main/res/layout/chat.xml
index eab351439..68198a465 100644
--- a/app/src/main/res/layout/chat.xml
+++ b/app/src/main/res/layout/chat.xml
@@ -34,29 +34,26 @@
                 android:orientation="vertical"
                 android:paddingLeft="5dp">
 
-                <TextView
+                <org.linphone.views.MarqueeTextView
                     android:id="@+id/subject"
                     style="@style/toolbar_small_title_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="1" />
+                    android:singleLine="true" />
 
-                <TextView
+                <org.linphone.views.MarqueeTextView
                     android:id="@+id/participants"
                     style="@style/toolbar_small_title_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="1" />
+                    android:singleLine="true" />
 
-                <TextView
+                <org.linphone.views.MarqueeTextView
                     android:id="@+id/sipUri"
                     style="@style/sip_uri_small_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="1" />
+                    android:singleLine="true" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/chat_device_cell.xml b/app/src/main/res/layout/chat_device_cell.xml
index 6eded9512..1ea6e87af 100644
--- a/app/src/main/res/layout/chat_device_cell.xml
+++ b/app/src/main/res/layout/chat_device_cell.xml
@@ -6,7 +6,7 @@
     android:background="?attr/backgroundColor2"
     android:gravity="center_vertical">
 
-    <TextView
+    <org.linphone.views.MarqueeTextView
         android:id="@+id/name"
         style="@style/contact_name_list_cell_font"
         android:layout_width="wrap_content"
@@ -15,9 +15,7 @@
         android:layout_marginLeft="55dp"
         android:layout_marginRight="5dp"
         android:layout_toLeftOf="@id/security_level"
-        android:ellipsize="end"
-        android:lines="1"
-        android:maxLines="1" />
+        android:singleLine="true" />
 
     <ImageView
         android:id="@+id/security_level"
diff --git a/app/src/main/res/layout/chat_device_cell_as_group.xml b/app/src/main/res/layout/chat_device_cell_as_group.xml
index 638155e7c..a03cf3fed 100644
--- a/app/src/main/res/layout/chat_device_cell_as_group.xml
+++ b/app/src/main/res/layout/chat_device_cell_as_group.xml
@@ -5,7 +5,7 @@
     android:layout_margin="5dp"
     android:gravity="center_vertical">
 
-    <TextView
+    <org.linphone.views.MarqueeTextView
         android:id="@+id/name"
         style="@style/contact_name_list_cell_font"
         android:layout_width="wrap_content"
@@ -13,9 +13,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="5dp"
-        android:ellipsize="end"
-        android:lines="1"
-        android:maxLines="1" />
+        android:singleLine="true" />
 
     <ImageView
         android:id="@+id/security_level"
diff --git a/app/src/main/res/layout/chat_device_group.xml b/app/src/main/res/layout/chat_device_group.xml
index 1d52b3644..dd2650428 100644
--- a/app/src/main/res/layout/chat_device_group.xml
+++ b/app/src/main/res/layout/chat_device_group.xml
@@ -27,23 +27,19 @@
         android:layout_toRightOf="@id/avatar"
         android:orientation="vertical">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/name"
             style="@style/contact_name_list_cell_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:maxLines="1" />
+            android:singleLine="true" />
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/sipUri"
             style="@style/sip_uri_small_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:maxLines="1" />
+            android:singleLine="true"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/chat_devices.xml b/app/src/main/res/layout/chat_devices.xml
index 3df5ad201..a084428ed 100644
--- a/app/src/main/res/layout/chat_devices.xml
+++ b/app/src/main/res/layout/chat_devices.xml
@@ -26,9 +26,9 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.8"
-            android:ellipsize="marquee"
             android:gravity="center"
             android:padding="15dp"
+            android:ellipsize="end"
             android:singleLine="true"
             android:text="@string/group_chat_room_devices" />
 
diff --git a/app/src/main/res/layout/chat_imdn_cell.xml b/app/src/main/res/layout/chat_imdn_cell.xml
index 2a3e9adb9..c2d2ef22d 100644
--- a/app/src/main/res/layout/chat_imdn_cell.xml
+++ b/app/src/main/res/layout/chat_imdn_cell.xml
@@ -53,23 +53,19 @@
             android:layout_toRightOf="@id/avatar"
             android:orientation="vertical">
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/name"
                 style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1" />
+                android:singleLine="true" />
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/sipUri"
                 style="@style/sip_uri_small_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1" />
+                android:singleLine="true" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/chat_infos.xml b/app/src/main/res/layout/chat_infos.xml
index e851ee9d4..f1856ab03 100644
--- a/app/src/main/res/layout/chat_infos.xml
+++ b/app/src/main/res/layout/chat_infos.xml
@@ -33,7 +33,7 @@
                 android:layout_weight="0.4"
                 android:ellipsize="end"
                 android:gravity="center"
-                android:maxLines="1"
+                android:singleLine="true"
                 android:text="@string/chat_room_infos_title" />
 
             <ImageView
diff --git a/app/src/main/res/layout/chat_infos_cell.xml b/app/src/main/res/layout/chat_infos_cell.xml
index a32f88b57..a97e5fc55 100644
--- a/app/src/main/res/layout/chat_infos_cell.xml
+++ b/app/src/main/res/layout/chat_infos_cell.xml
@@ -93,23 +93,19 @@
         android:layout_toRightOf="@id/avatar"
         android:orientation="vertical">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/name"
             style="@style/contact_name_list_cell_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:maxLines="1" />
+            android:singleLine="true" />
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/sipUri"
             style="@style/sip_uri_small_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:maxLines="1" />
+            android:singleLine="true" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/chatlist_cell.xml b/app/src/main/res/layout/chatlist_cell.xml
index 6883b6d68..e0ba3d1b5 100644
--- a/app/src/main/res/layout/chatlist_cell.xml
+++ b/app/src/main/res/layout/chatlist_cell.xml
@@ -42,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/avatar_layout"
                 android:layout_marginTop="5dp"
-                android:maxLines="1" />
+                android:singleLine="true" />
 
         </RelativeLayout>
 
@@ -51,15 +51,13 @@
             android:layout_height="match_parent"
             android:paddingLeft="10dp">
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/sipUri"
                 style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="30dp"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1"
+                android:singleLine="true"
                 android:scrollHorizontally="true" />
 
             <TextView
@@ -73,7 +71,8 @@
                 android:background="@drawable/unread_message_count_bg"
                 android:contentDescription="@string/content_description_unread_chat_message"
                 android:gravity="center"
-                android:maxLines="1" />
+                android:singleLine="true"
+                android:ellipsize="end"/>
 
             <LinearLayout
                 android:id="@id/lastMessageLayout"
diff --git a/app/src/main/res/layout/contact.xml b/app/src/main/res/layout/contact.xml
index dfc09206d..cbe6e0f3d 100644
--- a/app/src/main/res/layout/contact.xml
+++ b/app/src/main/res/layout/contact.xml
@@ -76,16 +76,16 @@
                     style="@style/big_contact_name_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:maxLines="1" />
+                    android:gravity="center_horizontal"
+                    android:layout_gravity="center" />
 
-                <TextView
+                <org.linphone.views.MarqueeTextView
                     android:id="@+id/contactOrganization"
                     style="@style/contact_organization_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:maxLines="1" />
+                    android:singleLine="true" />
 
                 <TableLayout
                     android:id="@+id/controls"
diff --git a/app/src/main/res/layout/contact_avatar.xml b/app/src/main/res/layout/contact_avatar.xml
index 96eae8a8d..9680bbe3d 100644
--- a/app/src/main/res/layout/contact_avatar.xml
+++ b/app/src/main/res/layout/contact_avatar.xml
@@ -27,7 +27,8 @@
         android:layout_height="35dp"
         android:layout_alignParentLeft="true"
         android:gravity="center"
-        android:maxLines="1" />
+        android:singleLine="true"
+        android:maxEms="2"/>
 
     <ImageView
         android:id="@+id/border"
diff --git a/app/src/main/res/layout/contact_avatar_100.xml b/app/src/main/res/layout/contact_avatar_100.xml
index eda9e9a0c..c1a82bece 100644
--- a/app/src/main/res/layout/contact_avatar_100.xml
+++ b/app/src/main/res/layout/contact_avatar_100.xml
@@ -27,7 +27,8 @@
         android:layout_height="100dp"
         android:layout_alignParentLeft="true"
         android:gravity="center"
-        android:maxLines="1" />
+        android:singleLine="true"
+        android:maxEms="2" />
 
     <ImageView
         android:id="@+id/border"
diff --git a/app/src/main/res/layout/contact_avatar_200.xml b/app/src/main/res/layout/contact_avatar_200.xml
index b06860d4c..ba0ebd580 100644
--- a/app/src/main/res/layout/contact_avatar_200.xml
+++ b/app/src/main/res/layout/contact_avatar_200.xml
@@ -27,7 +27,8 @@
         android:layout_height="200dp"
         android:layout_alignParentLeft="true"
         android:gravity="center"
-        android:maxLines="1" />
+        android:singleLine="true"
+        android:maxEms="2" />
 
     <ImageView
         android:id="@+id/border"
diff --git a/app/src/main/res/layout/contact_avatar_call_paused.xml b/app/src/main/res/layout/contact_avatar_call_paused.xml
index 96eae8a8d..6bf2e97c8 100644
--- a/app/src/main/res/layout/contact_avatar_call_paused.xml
+++ b/app/src/main/res/layout/contact_avatar_call_paused.xml
@@ -27,7 +27,8 @@
         android:layout_height="35dp"
         android:layout_alignParentLeft="true"
         android:gravity="center"
-        android:maxLines="1" />
+        android:singleLine="true"
+        android:maxEms="2" />
 
     <ImageView
         android:id="@+id/border"
diff --git a/app/src/main/res/layout/contact_cell.xml b/app/src/main/res/layout/contact_cell.xml
index 1e2253605..7e719a908 100644
--- a/app/src/main/res/layout/contact_cell.xml
+++ b/app/src/main/res/layout/contact_cell.xml
@@ -87,23 +87,21 @@
             android:layout_toLeftOf="@id/friendLinphone"
             android:layout_toRightOf="@id/avatar">
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/name"
                 style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1" />
+                android:singleLine="true" />
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/contactOrganization"
                 style="@style/contact_organization_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:maxLines="1" />
+                android:singleLine="true" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/history_cell.xml b/app/src/main/res/layout/history_cell.xml
index 91302a2ad..6b67bb56b 100644
--- a/app/src/main/res/layout/history_cell.xml
+++ b/app/src/main/res/layout/history_cell.xml
@@ -84,17 +84,15 @@
                 android:padding="7dp"
                 android:src="@drawable/call_status_incoming" />
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/sip_uri"
                 style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="10dp"
                 android:layout_toRightOf="@id/icon"
-                android:ellipsize="end"
                 android:gravity="center_vertical"
-                android:lines="1"
-                android:maxLines="1" />
+                android:singleLine="true" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml
index d1b521a34..7dd5b2b61 100644
--- a/app/src/main/res/layout/history_detail.xml
+++ b/app/src/main/res/layout/history_detail.xml
@@ -77,9 +77,10 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal" />
 
-            <TextView
+            <org.linphone.views.MarqueeTextView
                 android:id="@+id/contact_address"
                 style="@style/sip_uri_font"
+                android:singleLine="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 61640b536..45f43943c 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -46,7 +46,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
                     android:gravity="center"
-                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:singleLine="true"
                     android:padding="15dp" />
 
                 <View
diff --git a/app/src/main/res/layout/recording_cell.xml b/app/src/main/res/layout/recording_cell.xml
index b67f25d15..83c7dbfa8 100644
--- a/app/src/main/res/layout/recording_cell.xml
+++ b/app/src/main/res/layout/recording_cell.xml
@@ -69,10 +69,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1">
+                android:layout_alignParentTop="true">
 
                 <TextView
                     android:id="@+id/record_name"
@@ -99,9 +96,6 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
-                android:ellipsize="end"
-                android:lines="1"
-                android:maxLines="1"
                 android:orientation="horizontal">
 
                 <TextView
diff --git a/app/src/main/res/layout/recordings_list.xml b/app/src/main/res/layout/recordings_list.xml
index 2a1926cd3..d9bbff5d0 100644
--- a/app/src/main/res/layout/recordings_list.xml
+++ b/app/src/main/res/layout/recordings_list.xml
@@ -29,7 +29,8 @@
             android:layout_height="match_parent"
             android:layout_weight="0.6"
             android:gravity="center"
-            android:maxLines="1"
+            android:singleLine="true"
+            android:ellipsize="end"
             android:padding="15dp"
             android:text="@string/menu_recordings"/>
 
diff --git a/app/src/main/res/layout/settings_widget_basic.xml b/app/src/main/res/layout/settings_widget_basic.xml
index fced78cb7..94fa9dc01 100644
--- a/app/src/main/res/layout/settings_widget_basic.xml
+++ b/app/src/main/res/layout/settings_widget_basic.xml
@@ -15,18 +15,16 @@
         android:paddingTop="15dp"
         android:paddingBottom="15dp">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_title"
             android:singleLine="true"
-            android:ellipsize="marquee"
             style="@style/settings_item_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_subtitle"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_below="@id/setting_title"
             style="@style/settings_item_subtitle_font"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/settings_widget_checkbox.xml b/app/src/main/res/layout/settings_widget_checkbox.xml
index 254223fdc..d7f0a41a7 100644
--- a/app/src/main/res/layout/settings_widget_checkbox.xml
+++ b/app/src/main/res/layout/settings_widget_checkbox.xml
@@ -15,20 +15,18 @@
         android:paddingTop="15dp"
         android:paddingBottom="15dp">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_title"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_toLeftOf="@id/setting_checkbox"
             android:paddingRight="5dp"
             style="@style/settings_item_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_subtitle"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_toLeftOf="@id/setting_checkbox"
             android:paddingRight="5dp"
             android:layout_below="@id/setting_title"
diff --git a/app/src/main/res/layout/settings_widget_led.xml b/app/src/main/res/layout/settings_widget_led.xml
index 4e4109a29..25e31aaa2 100644
--- a/app/src/main/res/layout/settings_widget_led.xml
+++ b/app/src/main/res/layout/settings_widget_led.xml
@@ -15,20 +15,18 @@
         android:paddingTop="15dp"
         android:paddingBottom="15dp">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_title"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_toLeftOf="@id/setting_led"
             android:paddingRight="5dp"
             style="@style/settings_item_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_subtitle"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_toLeftOf="@id/setting_led"
             android:paddingRight="5dp"
             android:layout_below="@id/setting_title"
diff --git a/app/src/main/res/layout/settings_widget_list.xml b/app/src/main/res/layout/settings_widget_list.xml
index 49f9eec8d..4418ff0c6 100644
--- a/app/src/main/res/layout/settings_widget_list.xml
+++ b/app/src/main/res/layout/settings_widget_list.xml
@@ -15,18 +15,16 @@
         android:paddingTop="15dp"
         android:paddingBottom="15dp">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_title"
             android:singleLine="true"
-            android:ellipsize="marquee"
             style="@style/settings_item_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_subtitle"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_below="@id/setting_title"
             style="@style/settings_item_subtitle_font"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/settings_widget_switch.xml b/app/src/main/res/layout/settings_widget_switch.xml
index 74e6936a6..3000ab83f 100644
--- a/app/src/main/res/layout/settings_widget_switch.xml
+++ b/app/src/main/res/layout/settings_widget_switch.xml
@@ -15,20 +15,18 @@
         android:paddingTop="15dp"
         android:paddingBottom="15dp">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_title"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_toLeftOf="@id/setting_switch"
             android:paddingRight="5dp"
             style="@style/settings_item_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_subtitle"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_toLeftOf="@id/setting_switch"
             android:paddingRight="5dp"
             android:layout_below="@id/setting_title"
diff --git a/app/src/main/res/layout/settings_widget_text.xml b/app/src/main/res/layout/settings_widget_text.xml
index 7eaec0ea1..5637cffa1 100644
--- a/app/src/main/res/layout/settings_widget_text.xml
+++ b/app/src/main/res/layout/settings_widget_text.xml
@@ -15,18 +15,16 @@
         android:paddingTop="15dp"
         android:paddingBottom="15dp">
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_title"
             android:singleLine="true"
-            android:ellipsize="marquee"
             style="@style/settings_item_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
-        <TextView
+        <org.linphone.views.MarqueeTextView
             android:id="@+id/setting_subtitle"
             android:singleLine="true"
-            android:ellipsize="marquee"
             android:layout_below="@id/setting_title"
             style="@style/settings_item_subtitle_font"
             android:layout_width="match_parent"