Remove folders from the override xml in email.

Change-Id: I0bc8984d47a69a37a6c5f014cf9afed13868504c
diff --git a/email2/res/layout/conversation_item_view_normal.xml b/email2/res/layout/conversation_item_view_normal.xml
index 3debfc4..9de0356 100644
--- a/email2/res/layout/conversation_item_view_normal.xml
+++ b/email2/res/layout/conversation_item_view_normal.xml
@@ -52,15 +52,6 @@
             android:layout_height="wrap_content"
             android:layout_width="@dimen/total_conversationbar_width"
             android:layout_alignParentRight="true">
-            <TextView
-                android:id="@+id/folders"
-                android:layout_width="@dimen/max_total_folder_width"
-                android:layout_height="wrap_content"
-                android:text="@string/long_string"
-                android:textSize="@dimen/folders_font_size"
-                android:lines="1"
-                android:paddingTop="1dip"
-                android:layout_marginTop="10sp" />
             <ImageView
                 android:id="@+id/paperclip"
                 android:layout_width="wrap_content"
diff --git a/email2/res/layout/conversation_item_view_wide.xml b/email2/res/layout/conversation_item_view_wide.xml
index 1c72ef6..3cae7f6 100644
--- a/email2/res/layout/conversation_item_view_wide.xml
+++ b/email2/res/layout/conversation_item_view_wide.xml
@@ -68,15 +68,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="vertical">
-        <TextView
-            android:id="@+id/folders"
-            android:layout_width="@dimen/max_total_folder_width_wide"
-            android:layout_height="wrap_content"
-            android:paddingTop="2sp"
-            android:text="@string/long_string"
-            android:textSize="@dimen/folders_font_size"
-            android:lines="1"
-            android:layout_gravity="top" />
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"