diff --git a/res/layout/actionbar_indeterminate_progress_actionview.xml b/res/layout/actionbar_indeterminate_progress_actionview.xml
new file mode 100644
index 000000000..46b6170a9
--- /dev/null
+++ b/res/layout/actionbar_indeterminate_progress_actionview.xml
@@ -0,0 +1,30 @@
+<!--
+  Copyright 2011 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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:paddingRight="12dp"
+    android:paddingLeft="12dp">
+	<!--  FrameLayout ignores margins on android 2.x so we use this padding
+    to make sure the total is the same width as the icon we
+    replace and no visual shifting occurs  -->
+    <ProgressBar android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        style="?android:attr/indeterminateProgressStyle" />
+</FrameLayout>
\ No newline at end of file
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index c30d70d17..4565d6cdb 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -278,7 +278,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mActionBarProgressView = getLayoutInflater().inflate(R.layout.actionbar_indeterminate_progress, null);
+        mActionBarProgressView = getLayoutInflater().inflate(R.layout.actionbar_indeterminate_progress_actionview, null);
         initializeActionBar();
         setContentView(R.layout.folder_list);
         mListView = getListView();