diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_dark.png b/res/drawable-hdpi/btn_check_off_normal_holo_dark.png
new file mode 100644
index 000000000..d30eec865
Binary files /dev/null and b/res/drawable-hdpi/btn_check_off_normal_holo_dark.png differ
diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-hdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 000000000..351a4f088
Binary files /dev/null and b/res/drawable-hdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_dark.png b/res/drawable-hdpi/btn_check_on_normal_holo_dark.png
new file mode 100644
index 000000000..b06f548dc
Binary files /dev/null and b/res/drawable-hdpi/btn_check_on_normal_holo_dark.png differ
diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-hdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 000000000..4b4364c92
Binary files /dev/null and b/res/drawable-hdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_dark.png b/res/drawable-mdpi/btn_check_off_normal_holo_dark.png
new file mode 100644
index 000000000..160649d1d
Binary files /dev/null and b/res/drawable-mdpi/btn_check_off_normal_holo_dark.png differ
diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-mdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 000000000..eda15916f
Binary files /dev/null and b/res/drawable-mdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_dark.png b/res/drawable-mdpi/btn_check_on_normal_holo_dark.png
new file mode 100644
index 000000000..30e2a1f40
Binary files /dev/null and b/res/drawable-mdpi/btn_check_on_normal_holo_dark.png differ
diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-mdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 000000000..ed6dca980
Binary files /dev/null and b/res/drawable-mdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png b/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png
new file mode 100644
index 000000000..84a0a44f8
Binary files /dev/null and b/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png differ
diff --git a/res/drawable-xhdpi/btn_check_off_normal_holo_light.png b/res/drawable-xhdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 000000000..d3809fa13
Binary files /dev/null and b/res/drawable-xhdpi/btn_check_off_normal_holo_light.png differ
diff --git a/res/drawable-xhdpi/btn_check_on_normal_holo_dark.png b/res/drawable-xhdpi/btn_check_on_normal_holo_dark.png
new file mode 100644
index 000000000..3d62162d5
Binary files /dev/null and b/res/drawable-xhdpi/btn_check_on_normal_holo_dark.png differ
diff --git a/res/drawable-xhdpi/btn_check_on_normal_holo_light.png b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 000000000..7e1bc8cba
Binary files /dev/null and b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png differ
diff --git a/res/drawable/btn_check_message_list_dark.xml b/res/drawable/btn_check_message_list_dark.xml
new file mode 100644
index 000000000..a55714bb6
--- /dev/null
+++ b/res/drawable/btn_check_message_list_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+          android:drawable="@drawable/btn_check_on_normal_holo_dark" />
+    <item android:state_checked="false"
+          android:drawable="@drawable/btn_check_off_normal_holo_dark" />
+</selector>
+
diff --git a/res/drawable/btn_check_message_list_light.xml b/res/drawable/btn_check_message_list_light.xml
new file mode 100644
index 000000000..6af202649
--- /dev/null
+++ b/res/drawable/btn_check_message_list_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+          android:drawable="@drawable/btn_check_on_normal_holo_light" />
+    <item android:state_checked="false"
+          android:drawable="@drawable/btn_check_off_normal_holo_light" />
+</selector>
+
diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 4da1faa21..d5f7e97a6 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -26,9 +26,11 @@
 
         <CheckBox
             android:id="@+id/selected_checkbox"
-            android:layout_width="36dip"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:button="?attr/messageListCheckbox"
             android:focusable="false"
+            android:clickable="false"
             android:visibility="gone" />
 
     </LinearLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 6d53f5c13..14b9d7b5c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -44,6 +44,7 @@
         <attr name="messageListThreadCountBackground" format="reference|color"/>
         <attr name="messageListActiveItemBackgroundColor" format="reference|color"/>
         <attr name="messageListDividerColor" format="reference|color"/>
+        <attr name="messageListCheckbox" format="reference"/>
         <attr name="messageViewHeaderBackgroundColor" format="reference|color"/>
         <attr name="messageViewAttachmentBackground" format="reference"/>
         <attr name="messageComposeAddContactImage" format="reference"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8baeb4a57..056adbecc 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -45,6 +45,7 @@
         <item name="messageListThreadCountBackground">@drawable/thread_count_box_light</item>
         <item name="messageListActiveItemBackgroundColor">#ff2ea7d1</item>
         <item name="messageListDividerColor">#ffcccccc</item>
+        <item name="messageListCheckbox">@drawable/btn_check_message_list_light</item>
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
         <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_light</item>
@@ -94,6 +95,7 @@
         <item name="messageListThreadCountBackground">@drawable/thread_count_box_dark</item>
         <item name="messageListActiveItemBackgroundColor">#ff33b5e5</item>
         <item name="messageListDividerColor">#ff333333</item>
+        <item name="messageListCheckbox">@drawable/btn_check_message_list_dark</item>
         <item name="messageViewHeaderBackgroundColor">#000000</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
         <item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_dark</item>