diff --git a/android/res/layout/download_item_country.xml b/android/res/layout/download_item_country.xml
index 019555d832..8272bcfb70 100644
--- a/android/res/layout/download_item_country.xml
+++ b/android/res/layout/download_item_country.xml
@@ -7,8 +7,8 @@
 
     <ImageView
         android:id="@+id/country_flag"
-        android:layout_width="?android:attr/listPreferredItemHeight"
-        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:padding="5dip"
         android:scaleType="center"
         android:layout_alignParentLeft="true"
@@ -17,7 +17,7 @@
     <ImageView
         android:id="@+id/show_country"
         android:layout_width="?android:attr/listPreferredItemHeight"
-        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:layout_height="wrap_content"
         android:scaleType="center"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
@@ -33,14 +33,14 @@
 
         <TextView
             android:id="@+id/title"
-            android:text="XXXX"
+            android:text="Xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"/>
 
         <TextView
             android:id="@+id/summary"
-            android:text="YYYY"
+            android:text="Yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"/>
diff --git a/android/res/layout/download_item_country_group.xml b/android/res/layout/download_item_country_group.xml
index c4b4c59ed6..baa73232db 100644
--- a/android/res/layout/download_item_country_group.xml
+++ b/android/res/layout/download_item_country_group.xml
@@ -7,8 +7,8 @@
 
     <ImageView
         android:id="@+id/country_flag"
-        android:layout_width="?android:attr/listPreferredItemHeight"
-        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:padding="5dip"
         android:scaleType="center"
         android:layout_alignParentLeft="true"
@@ -24,7 +24,7 @@
 
     <TextView
         android:id="@+id/title"
-        android:text="XXXX"
+        android:text="Xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/disclosure_image"
diff --git a/android/res/layout/search_item.xml b/android/res/layout/search_item.xml
index 6ef6c407f1..972850363d 100644
--- a/android/res/layout/search_item.xml
+++ b/android/res/layout/search_item.xml
@@ -7,15 +7,17 @@
     android:paddingRight="?android:attr/scrollbarSize">
 
     <LinearLayout
+        android:id="@+id/search_layout_1"
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toLeftOf="@+id/search_layout_2"
         android:layout_centerVertical="true"
         android:layout_alignParentLeft="true">
 
         <TextView
             android:id="@+id/name"
-            android:text="Name"
+            android:text="Long Feature Name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"/>
@@ -30,6 +32,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/search_layout_2"
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"