diff --git a/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml b/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml
index 8f7b60a23..6f4f88bac 100644
--- a/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml
+++ b/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml
@@ -61,7 +61,6 @@
             android:layout_above="@id/clear"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:maxLines="20"
             android:scrollbars="vertical"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/samples/browseable/MessagingService/res/layout/fragment_message_me.xml b/samples/browseable/MessagingService/res/layout/fragment_message_me.xml
index d01c5137a..29a8c441a 100644
--- a/samples/browseable/MessagingService/res/layout/fragment_message_me.xml
+++ b/samples/browseable/MessagingService/res/layout/fragment_message_me.xml
@@ -47,7 +47,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:maxLines="20"
         android:scrollbars="vertical"/>
     <Button
         android:layout_width="match_parent"
diff --git a/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java b/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java
index 210e061f0..7425df499 100644
--- a/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java
+++ b/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java
@@ -45,10 +45,10 @@ public class Conversations {
      * Senders of the said messages.
      */
     private static final String[] PARTICIPANTS = new String[]{
-            "John Rambo",
-            "Han Solo",
-            "Rocky Balboa",
-            "Lara Croft"
+            "John Smith",
+            "Robert Lawrence",
+            "James Smith",
+            "Jane Doe"
     };
 
     static class Conversation {