From ee283c0c77afbb970384578bdf94cf4a6af464b8 Mon Sep 17 00:00:00 2001
From: Sander Bogaert <Sander.Bogaert@tworoadssoftware.com>
Date: Thu, 2 Aug 2012 10:50:24 -0400
Subject: [PATCH] Give star a bit more room so there is no cut-off. Don't force
 the scrollbar on the outside so the listitems can take the whole width.

---
 res/layout-land/message_list_item.xml      | 4 ++--
 res/layout/message_list_item.xml           | 8 +++-----
 res/layout/message_list_item_touchable.xml | 4 +++-
 src/com/fsck/k9/activity/MessageList.java  | 1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/res/layout-land/message_list_item.xml b/res/layout-land/message_list_item.xml
index fd7d98763..ad9a85827 100644
--- a/res/layout-land/message_list_item.xml
+++ b/res/layout-land/message_list_item.xml
@@ -10,10 +10,10 @@
                  android:id="@+id/flagged"
                  android:focusable="false"
                  android:button="@drawable/star"
-
+		  android:layout_marginRight="5dip"
                  android:layout_gravity="center_vertical"
                  android:layout_height="20dip"
-                 android:layout_width="20dip"
+                 android:layout_width="23dip"
                 android:layout_alignParentRight="true"
                 />
     <RelativeLayout
diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 49c74a44b..e6c1705f7 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -89,11 +89,9 @@
     <CheckBox
         android:id="@+id/flagged"
         android:layout_height="20dip"
-        android:layout_width="20dip"
-        android:layout_marginLeft="2dip"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
+        android:layout_width="23dip"
+        android:layout_marginLeft="3dip"
+        android:layout_marginRight="7dip"
         android:layout_gravity="center_vertical"
         android:button="@drawable/star"
         android:focusable="false" />
diff --git a/res/layout/message_list_item_touchable.xml b/res/layout/message_list_item_touchable.xml
index 32d27ca07..daf2727d1 100644
--- a/res/layout/message_list_item_touchable.xml
+++ b/res/layout/message_list_item_touchable.xml
@@ -39,7 +39,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
+        android:layout_alignParentTop="true"   
+        android:layout_marginRight="3dip"
         android:paddingLeft="5dip"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
@@ -52,6 +53,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
         android:gravity="bottom"
+        android:layout_marginRight="3dip"
         android:layout_below="@+id/date"
         android:layout_marginTop="3dip"
         style="?android:attr/starStyle"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index a6c9d8b3d..944a3a8d3 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -898,7 +898,6 @@ public class MessageList
         setContentView(R.layout.message_list);
 
         mListView = (ListView) findViewById(R.id.message_list);
-        mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
         mListView.setLongClickable(true);
         mListView.setFastScrollEnabled(true);
         mListView.setScrollingCacheEnabled(false);