diff --git a/res/drawable-hdpi/ic_btn_arrow_left_focus.png b/res/drawable-hdpi/ic_btn_arrow_left_focus.png
new file mode 100755
index 000000000..4e19229ad
Binary files /dev/null and b/res/drawable-hdpi/ic_btn_arrow_left_focus.png differ
diff --git a/res/drawable-hdpi/ic_btn_arrow_left_unselected.png b/res/drawable-hdpi/ic_btn_arrow_left_unselected.png
new file mode 100755
index 000000000..dc56cb465
Binary files /dev/null and b/res/drawable-hdpi/ic_btn_arrow_left_unselected.png differ
diff --git a/res/drawable-hdpi/ic_btn_arrow_right_focus.png b/res/drawable-hdpi/ic_btn_arrow_right_focus.png
new file mode 100755
index 000000000..08d1d845b
Binary files /dev/null and b/res/drawable-hdpi/ic_btn_arrow_right_focus.png differ
diff --git a/res/drawable-hdpi/ic_btn_arrow_right_unselected.png b/res/drawable-hdpi/ic_btn_arrow_right_unselected.png
new file mode 100755
index 000000000..9152c0808
Binary files /dev/null and b/res/drawable-hdpi/ic_btn_arrow_right_unselected.png differ
diff --git a/res/drawable-hdpi/ic_left_prev_arrow_default.png b/res/drawable-hdpi/ic_left_prev_arrow_default.png
deleted file mode 100644
index eced4e682..000000000
Binary files a/res/drawable-hdpi/ic_left_prev_arrow_default.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_right_next_arrow_default.png b/res/drawable-hdpi/ic_right_next_arrow_default.png
deleted file mode 100644
index 58b42370e..000000000
Binary files a/res/drawable-hdpi/ic_right_next_arrow_default.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_btn_arrow_left_focus.png b/res/drawable-mdpi/ic_btn_arrow_left_focus.png
new file mode 100755
index 000000000..a1889d4c3
Binary files /dev/null and b/res/drawable-mdpi/ic_btn_arrow_left_focus.png differ
diff --git a/res/drawable-mdpi/ic_btn_arrow_left_unselected.png b/res/drawable-mdpi/ic_btn_arrow_left_unselected.png
new file mode 100755
index 000000000..5ca1b9245
Binary files /dev/null and b/res/drawable-mdpi/ic_btn_arrow_left_unselected.png differ
diff --git a/res/drawable-mdpi/ic_btn_arrow_right_focus.png b/res/drawable-mdpi/ic_btn_arrow_right_focus.png
new file mode 100755
index 000000000..6796a4e64
Binary files /dev/null and b/res/drawable-mdpi/ic_btn_arrow_right_focus.png differ
diff --git a/res/drawable-mdpi/ic_btn_arrow_right_unselected.png b/res/drawable-mdpi/ic_btn_arrow_right_unselected.png
new file mode 100755
index 000000000..c8249a6df
Binary files /dev/null and b/res/drawable-mdpi/ic_btn_arrow_right_unselected.png differ
diff --git a/res/drawable-mdpi/ic_left_prev_arrow_default.png b/res/drawable-mdpi/ic_left_prev_arrow_default.png
deleted file mode 100755
index acc60b7be..000000000
Binary files a/res/drawable-mdpi/ic_left_prev_arrow_default.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_right_next_arrow_default.png b/res/drawable-mdpi/ic_right_next_arrow_default.png
deleted file mode 100755
index 62d3bbc32..000000000
Binary files a/res/drawable-mdpi/ic_right_next_arrow_default.png and /dev/null differ
diff --git a/res/drawable/btn_prev_next.xml b/res/drawable/btn_arrow_background.xml
similarity index 92%
rename from res/drawable/btn_prev_next.xml
rename to res/drawable/btn_arrow_background.xml
index 788fed0ed..b30941a91 100644
--- a/res/drawable/btn_prev_next.xml
+++ b/res/drawable/btn_arrow_background.xml
@@ -21,4 +21,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/btn_icon_bg_pressed" />
     <item android:state_focused="true" android:drawable="@drawable/btn_icon_bg_focused" />
+    <!-- <item android:drawable="@drawable/bg_arrow_unselected" /> -->
 </selector>
diff --git a/res/drawable/btn_arrow_left.xml b/res/drawable/btn_arrow_left.xml
new file mode 100644
index 000000000..339e56f9a
--- /dev/null
+++ b/res/drawable/btn_arrow_left.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/ic_btn_arrow_left_focus" />
+    <item android:drawable="@drawable/ic_btn_arrow_left_unselected" />
+</selector>
diff --git a/res/drawable/btn_arrow_right.xml b/res/drawable/btn_arrow_right.xml
new file mode 100644
index 000000000..077cba690
--- /dev/null
+++ b/res/drawable/btn_arrow_right.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/ic_btn_arrow_right_focus" />
+    <item android:drawable="@drawable/ic_btn_arrow_right_unselected" />
+</selector>
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 3c1a10414..1687f2a27 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -44,16 +44,16 @@
                     android:layout_width="40dip"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentTop="true"
-                    android:src="@drawable/ic_left_prev_arrow_default"
-                    android:background="@drawable/btn_prev_next" />
+                    android:src="@drawable/btn_arrow_left"
+                    android:background="@drawable/btn_arrow_background" />
                 <ImageButton
                     android:id="@+id/next"
                     android:layout_height="35dip"
                     android:layout_width="40dip"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentTop="true" 
-                    android:src="@drawable/ic_right_next_arrow_default"
-                    android:background="@drawable/btn_prev_next" />
+                    android:src="@drawable/btn_arrow_right"
+                    android:background="@drawable/btn_arrow_background" />
             </RelativeLayout>
 
             <include layout="@layout/message_view_header" />
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index c85e50b03..aefc109ce 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -315,7 +315,6 @@ public class MessageView extends Activity implements OnClickListener {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setContentView(R.layout.message_view);
 
         mSubjectView = (TextView) findViewById(R.id.subject);