diff --git a/.classpath b/.classpath
index 67157cd28..1460c7812 100644
--- a/.classpath
+++ b/.classpath
@@ -3,12 +3,6 @@
 	<classpathentry excluding="**/.svn/**|.svn/**" kind="src" path="src"/>
 	<classpathentry excluding="**/.svn/**|.svn/**" kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
-	<classpathentry kind="lib" path="libs/jzlib-1.0.7.jar"/>
-	<classpathentry kind="lib" path="libs/jutf7-1.0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="libs/htmlcleaner-2.2.jar"/>
-	<classpathentry kind="lib" path="libs/apache-mime4j-core-0.7.2.jar"/>
-	<classpathentry kind="lib" path="libs/apache-mime4j-dom-0.7.2.jar"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..de1ccfffa
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "plugins/ActionBarSherlock"]
+	path = plugins/ActionBarSherlock
+	url = https://github.com/JakeWharton/ActionBarSherlock
diff --git a/ActionBarSherlock.iml b/ActionBarSherlock.iml
new file mode 100644
index 000000000..44a5bb04e
--- /dev/null
+++ b/ActionBarSherlock.iml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/plugins/ActionBarSherlock/library/target/generated-sources/r" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/plugins/ActionBarSherlock/library/target/generated-sources/aidl" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/libs" />
+        <option name="REGENERATE_R_JAVA" value="true" />
+        <option name="REGENERATE_JAVA_BY_AIDL" value="true" />
+        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
+        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/plugins/ActionBarSherlock/library/target/generated-sources/combined-resources/res" />
+        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
+        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
+        <option name="APK_PATH" value="/plugins/ActionBarSherlock/library/target/library.apk" />
+        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
+        <option name="GENERATE_UNSIGNED_APK" value="false" />
+        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+        <option name="PACK_TEST_CODE" value="false" />
+        <option name="RUN_PROGUARD" value="false" />
+        <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
+        <resOverlayFolders>
+          <path>/plugins/ActionBarSherlock/library/res-overlay</path>
+        </resOverlayFolders>
+        <includeSystemProguardFile>true</includeSystemProguardFile>
+        <additionalNativeLibs />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/classes" />
+    <output-test url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/test-classes" />
+    <content url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library">
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/r" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/gen" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/combined-assets" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/combined-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/extracted-dependencies" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/target/test-classes" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.0.1.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.pivotallabs:robolectric:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xerial:sqlite-jdbc:3.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.javassist:javassist:3.14.0-GA" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4a15a8f40..92884616c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
     >
     <uses-sdk
        android:minSdkVersion="7"
-       android:targetSdkVersion="7"
+       android:targetSdkVersion="15"
        />
     <supports-screens
         android:largeScreens="true"
@@ -59,6 +59,7 @@
         android:label="@string/app_name"
         android:name="K9"
         android:allowTaskReparenting="false"
+        android:theme="@style/Theme.Sherlock.Light.DarkActionBar"
         >
         <meta-data android:name="android.app.default_searchable"
                    android:value=".activity.Search" />
@@ -67,6 +68,7 @@
             android:name="com.fsck.k9.activity.Accounts"
             android:launchMode="singleTask"
             android:configChanges="locale"
+            android:uiOptions="splitActionBarWhenNarrow"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -90,6 +92,12 @@
             android:excludeFromRecents="true"
             >
         </activity>
+        <activity
+            android:name="com.fsck.k9.activity.setup.WelcomeMessage"
+            android:label="@string/welcome_message_title"
+            android:configChanges="locale"
+            >
+        </activity>
         <activity
             android:name="com.fsck.k9.activity.setup.FontSizeSettings"
             android:label="@string/font_size_settings_title"
@@ -197,6 +205,7 @@
             android:name="com.fsck.k9.activity.FolderList"
             android:launchMode="singleTask"
             android:configChanges="locale"
+            android:uiOptions="splitActionBarWhenNarrow"
             >
             <intent-filter>
                 <!-- This action is only to allow an entry point for launcher shortcuts -->
@@ -207,6 +216,7 @@
             android:name="com.fsck.k9.activity.MessageList"
             android:launchMode="singleTask"
             android:configChanges="locale"
+            android:uiOptions="splitActionBarWhenNarrow"
             >
             <intent-filter>
                 <!-- This action is only to allow an entry point for launcher shortcuts -->
@@ -215,8 +225,8 @@
         </activity>
         <activity
             android:name="com.fsck.k9.activity.MessageView"
-            android:theme="@android:style/Theme.Light"
             android:configChanges="locale"
+            android:uiOptions="splitActionBarWhenNarrow"
             >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -259,6 +269,7 @@
         <activity android:name="com.fsck.k9.activity.Search"
                   android:label="@string/search_action"
                   android:configChanges="locale"
+                  android:uiOptions="splitActionBarWhenNarrow"
                   >
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
diff --git a/k9mail.iml b/k9mail.iml
index 89b53c252..64b1b8bc5 100644
--- a/k9mail.iml
+++ b/k9mail.iml
@@ -40,6 +40,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="libs" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="compile-only-libs" level="project" />
+    <orderEntry type="module" module-name="ActionBarSherlock" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
diff --git a/k9mail.ipr b/k9mail.ipr
index f92a9e81f..36cd53d09 100644
--- a/k9mail.ipr
+++ b/k9mail.ipr
@@ -113,6 +113,7 @@
     <excludeFromCompile>
       <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/r" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -138,10 +139,15 @@
   <component name="DependencyValidationManager">
     <option name="SKIP_IMPORT_STATEMENTS" value="false" />
   </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library" charset="UTF-8" />
+  </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="android" url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library" />
+  </component>
   <component name="IdProvider" IDEtalkID="71055AFE08650FC251AC52E23DE3F795" />
   <component name="InspectionProjectProfileManager">
     <profiles>
@@ -169,6 +175,9 @@
   <component name="IvyProjectSettings">
     <dependencies />
   </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
+  </component>
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" />
     <option name="OPTION_SCOPE" value="protected" />
@@ -186,6 +195,18 @@
     <option name="LOCALE" />
     <option name="OPEN_IN_BROWSER" value="true" />
   </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/plugins/ActionBarSherlock/library/pom.xml" />
+      </list>
+    </option>
+    <option name="activeProfiles">
+      <list>
+        <option value="sonatype-oss-release" />
+      </list>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
     <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
@@ -367,6 +388,7 @@
   </component>
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/ActionBarSherlock.iml" filepath="$PROJECT_DIR$/ActionBarSherlock.iml" />
       <module fileurl="file://$PROJECT_DIR$/k9mail.iml" filepath="$PROJECT_DIR$/k9mail.iml" />
     </modules>
   </component>
@@ -389,6 +411,7 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/plugins/ActionBarSherlock" vcs="Git" />
   </component>
   <component name="VssConfiguration">
     <option name="CLIENT_PATH" value="" />
@@ -451,6 +474,181 @@
         <root url="jar://$PROJECT_DIR$/libs/htmlcleaner-2.2-all.zip!/HtmlCleaner/src/test/java" />
       </SOURCES>
     </library>
+    <library name="Maven: com.google.android:android:4.0.1.2">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.0.1.2/android-4.0.1.2.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.0.1.2/android-4.0.1.2-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.0.1.2/android-4.0.1.2-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: com.google.android:support-v4:r7">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/support-v4/r7/support-v4-r7-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: com.pivotallabs:robolectric:1.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/pivotallabs/robolectric/1.1/robolectric-1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/com/pivotallabs/robolectric/1.1/robolectric-1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/pivotallabs/robolectric/1.1/robolectric-1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: commons-codec:commons-codec:1.3">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: commons-logging:commons-logging:1.1.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: junit:junit:4.10">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.apache.httpcomponents:httpclient:4.0.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.apache.httpcomponents:httpcore:4.0.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.hamcrest:hamcrest-core:1.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.javassist:javassist:3.14.0-GA">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.14.0-GA/javassist-3.14.0-GA.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.14.0-GA/javassist-3.14.0-GA-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.14.0-GA/javassist-3.14.0-GA-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.json:json:20080701">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20080701/json-20080701.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20080701/json-20080701-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20080701/json-20080701-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.objenesis:objenesis:1.0">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.xerial:sqlite-jdbc:3.7.2">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.7.2/sqlite-jdbc-3.7.2-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: xerces:xmlParserAPIs:2.6.2">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: xpp3:xpp3:1.1.4c">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar!/" />
+      </SOURCES>
+    </library>
   </component>
 </project>
-
diff --git a/plugins/ActionBarSherlock b/plugins/ActionBarSherlock
new file mode 160000
index 000000000..9598f2bb2
--- /dev/null
+++ b/plugins/ActionBarSherlock
@@ -0,0 +1 @@
+Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc
diff --git a/project.properties b/project.properties
index 46fb34716..486e7deb2 100644
--- a/project.properties
+++ b/project.properties
@@ -13,3 +13,4 @@ java.encoding=utf8
 # Project target.
 target=android-15
 extensible.libs.classpath=compile-only-libs
+android.library.reference.1=plugins/ActionBarSherlock/library
diff --git a/res/anim/footer_appear.xml b/res/anim/footer_appear.xml
deleted file mode 100644
index 29beff9a4..000000000
--- a/res/anim/footer_appear.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/layout/list_content.xml
-**
-** Copyright 2009, Google Inc.
-**
-** 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
-    <translate
-        android:fromYDelta="+10%p"
-        android:toYDelta="0"
-        android:duration="300" />
-</set>
diff --git a/res/anim/footer_disappear.xml b/res/anim/footer_disappear.xml
deleted file mode 100644
index 35a28cb9c..000000000
--- a/res/anim/footer_disappear.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/layout/list_content.xml
-**
-** Copyright 2009, Google Inc.
-**
-** 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
-    <translate
-        android:fromYDelta="0"
-        android:toYDelta="+10%p"
-        android:duration="300" />
-</set>
diff --git a/res/drawable-hdpi/ic_action_add_attachment_dark.png b/res/drawable-hdpi/ic_action_add_attachment_dark.png
new file mode 100644
index 000000000..0107feef7
Binary files /dev/null and b/res/drawable-hdpi/ic_action_add_attachment_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_add_attachment_light.png b/res/drawable-hdpi/ic_action_add_attachment_light.png
new file mode 100644
index 000000000..26941f700
Binary files /dev/null and b/res/drawable-hdpi/ic_action_add_attachment_light.png differ
diff --git a/res/drawable-hdpi/ic_action_add_cc_bbc_light.png b/res/drawable-hdpi/ic_action_add_cc_bbc_light.png
new file mode 100644
index 000000000..b115bf1ac
Binary files /dev/null and b/res/drawable-hdpi/ic_action_add_cc_bbc_light.png differ
diff --git a/res/drawable-hdpi/ic_action_add_cc_bcc_dark.png b/res/drawable-hdpi/ic_action_add_cc_bcc_dark.png
new file mode 100644
index 000000000..27d721dac
Binary files /dev/null and b/res/drawable-hdpi/ic_action_add_cc_bcc_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_archive_dark.png b/res/drawable-hdpi/ic_action_archive_dark.png
new file mode 100644
index 000000000..f18e288d2
Binary files /dev/null and b/res/drawable-hdpi/ic_action_archive_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_archive_light.png b/res/drawable-hdpi/ic_action_archive_light.png
new file mode 100644
index 000000000..c38723212
Binary files /dev/null and b/res/drawable-hdpi/ic_action_archive_light.png differ
diff --git a/res/drawable-hdpi/ic_action_compose_dark.png b/res/drawable-hdpi/ic_action_compose_dark.png
new file mode 100644
index 000000000..9d5733a44
Binary files /dev/null and b/res/drawable-hdpi/ic_action_compose_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_compose_light.png b/res/drawable-hdpi/ic_action_compose_light.png
new file mode 100644
index 000000000..1a876e8ed
Binary files /dev/null and b/res/drawable-hdpi/ic_action_compose_light.png differ
diff --git a/res/drawable-hdpi/ic_action_delete_dark.png b/res/drawable-hdpi/ic_action_delete_dark.png
new file mode 100644
index 000000000..e770a298e
Binary files /dev/null and b/res/drawable-hdpi/ic_action_delete_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_delete_light.png b/res/drawable-hdpi/ic_action_delete_light.png
new file mode 100644
index 000000000..09abb199e
Binary files /dev/null and b/res/drawable-hdpi/ic_action_delete_light.png differ
diff --git a/res/drawable-hdpi/ic_action_move_or_copy_dark.png b/res/drawable-hdpi/ic_action_move_or_copy_dark.png
new file mode 100644
index 000000000..b293d11dc
Binary files /dev/null and b/res/drawable-hdpi/ic_action_move_or_copy_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_move_or_copy_light.png b/res/drawable-hdpi/ic_action_move_or_copy_light.png
new file mode 100644
index 000000000..a11c32645
Binary files /dev/null and b/res/drawable-hdpi/ic_action_move_or_copy_light.png differ
diff --git a/res/drawable-hdpi/ic_action_next_message_dark.png b/res/drawable-hdpi/ic_action_next_message_dark.png
new file mode 100644
index 000000000..657054d44
Binary files /dev/null and b/res/drawable-hdpi/ic_action_next_message_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_next_message_light.png b/res/drawable-hdpi/ic_action_next_message_light.png
new file mode 100644
index 000000000..49f871ec8
Binary files /dev/null and b/res/drawable-hdpi/ic_action_next_message_light.png differ
diff --git a/res/drawable-hdpi/ic_action_previous_message_dark.png b/res/drawable-hdpi/ic_action_previous_message_dark.png
new file mode 100644
index 000000000..1d6666192
Binary files /dev/null and b/res/drawable-hdpi/ic_action_previous_message_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_previous_message_light.png b/res/drawable-hdpi/ic_action_previous_message_light.png
new file mode 100644
index 000000000..b4a8f955f
Binary files /dev/null and b/res/drawable-hdpi/ic_action_previous_message_light.png differ
diff --git a/res/drawable-hdpi/ic_action_read_dark.png b/res/drawable-hdpi/ic_action_read_dark.png
new file mode 100644
index 000000000..058daeea7
Binary files /dev/null and b/res/drawable-hdpi/ic_action_read_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_read_light.png b/res/drawable-hdpi/ic_action_read_light.png
new file mode 100644
index 000000000..d0fa47b28
Binary files /dev/null and b/res/drawable-hdpi/ic_action_read_light.png differ
diff --git a/res/drawable-hdpi/ic_action_refresh_dark.png b/res/drawable-hdpi/ic_action_refresh_dark.png
new file mode 100644
index 000000000..d0ac1dfda
Binary files /dev/null and b/res/drawable-hdpi/ic_action_refresh_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_refresh_light.png b/res/drawable-hdpi/ic_action_refresh_light.png
new file mode 100644
index 000000000..2df79d81f
Binary files /dev/null and b/res/drawable-hdpi/ic_action_refresh_light.png differ
diff --git a/res/drawable-hdpi/ic_action_search_dark.png b/res/drawable-hdpi/ic_action_search_dark.png
new file mode 100644
index 000000000..caa960723
Binary files /dev/null and b/res/drawable-hdpi/ic_action_search_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_search_light.png b/res/drawable-hdpi/ic_action_search_light.png
new file mode 100644
index 000000000..32e8d7b31
Binary files /dev/null and b/res/drawable-hdpi/ic_action_search_light.png differ
diff --git a/res/drawable-hdpi/ic_action_send_dark.png b/res/drawable-hdpi/ic_action_send_dark.png
new file mode 100644
index 000000000..3ec4a6904
Binary files /dev/null and b/res/drawable-hdpi/ic_action_send_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_send_light.png b/res/drawable-hdpi/ic_action_send_light.png
new file mode 100644
index 000000000..073ca61d4
Binary files /dev/null and b/res/drawable-hdpi/ic_action_send_light.png differ
diff --git a/res/drawable-hdpi/ic_action_settings_dark.png b/res/drawable-hdpi/ic_action_settings_dark.png
new file mode 100644
index 000000000..d57b29053
Binary files /dev/null and b/res/drawable-hdpi/ic_action_settings_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_settings_light.png b/res/drawable-hdpi/ic_action_settings_light.png
new file mode 100644
index 000000000..4695ffb56
Binary files /dev/null and b/res/drawable-hdpi/ic_action_settings_light.png differ
diff --git a/res/drawable-hdpi/ic_action_single_message_options_dark.png b/res/drawable-hdpi/ic_action_single_message_options_dark.png
new file mode 100644
index 000000000..eb17c0192
Binary files /dev/null and b/res/drawable-hdpi/ic_action_single_message_options_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_single_message_options_light.png b/res/drawable-hdpi/ic_action_single_message_options_light.png
new file mode 100644
index 000000000..ff9dbdda9
Binary files /dev/null and b/res/drawable-hdpi/ic_action_single_message_options_light.png differ
diff --git a/res/drawable-hdpi/ic_action_sort_dark.png b/res/drawable-hdpi/ic_action_sort_dark.png
new file mode 100644
index 000000000..d1ba80647
Binary files /dev/null and b/res/drawable-hdpi/ic_action_sort_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_sort_light.png b/res/drawable-hdpi/ic_action_sort_light.png
new file mode 100644
index 000000000..449ac5bf1
Binary files /dev/null and b/res/drawable-hdpi/ic_action_sort_light.png differ
diff --git a/res/drawable-hdpi/ic_action_spam_dark.png b/res/drawable-hdpi/ic_action_spam_dark.png
new file mode 100644
index 000000000..26f854e63
Binary files /dev/null and b/res/drawable-hdpi/ic_action_spam_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_spam_light.png b/res/drawable-hdpi/ic_action_spam_light.png
new file mode 100644
index 000000000..003e3c9c0
Binary files /dev/null and b/res/drawable-hdpi/ic_action_spam_light.png differ
diff --git a/res/drawable-hdpi/ic_action_toggle_flag_dark.png b/res/drawable-hdpi/ic_action_toggle_flag_dark.png
new file mode 100755
index 000000000..dd047af3f
Binary files /dev/null and b/res/drawable-hdpi/ic_action_toggle_flag_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_toggle_flag_light.png b/res/drawable-hdpi/ic_action_toggle_flag_light.png
new file mode 100644
index 000000000..e7a143b4b
Binary files /dev/null and b/res/drawable-hdpi/ic_action_toggle_flag_light.png differ
diff --git a/res/drawable-hdpi/ic_action_toggle_read_dark.png b/res/drawable-hdpi/ic_action_toggle_read_dark.png
new file mode 100644
index 000000000..d3c6893f1
Binary files /dev/null and b/res/drawable-hdpi/ic_action_toggle_read_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_toggle_read_light.png b/res/drawable-hdpi/ic_action_toggle_read_light.png
new file mode 100644
index 000000000..0ed1e97d5
Binary files /dev/null and b/res/drawable-hdpi/ic_action_toggle_read_light.png differ
diff --git a/res/drawable-ldpi/ic_action_add_attachment_dark.png b/res/drawable-ldpi/ic_action_add_attachment_dark.png
new file mode 100644
index 000000000..552be859a
Binary files /dev/null and b/res/drawable-ldpi/ic_action_add_attachment_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_add_attachment_light.png b/res/drawable-ldpi/ic_action_add_attachment_light.png
new file mode 100644
index 000000000..73006e226
Binary files /dev/null and b/res/drawable-ldpi/ic_action_add_attachment_light.png differ
diff --git a/res/drawable-ldpi/ic_action_add_cc_bbc_light.png b/res/drawable-ldpi/ic_action_add_cc_bbc_light.png
new file mode 100644
index 000000000..1195f28b9
Binary files /dev/null and b/res/drawable-ldpi/ic_action_add_cc_bbc_light.png differ
diff --git a/res/drawable-ldpi/ic_action_add_cc_bcc_dark.png b/res/drawable-ldpi/ic_action_add_cc_bcc_dark.png
new file mode 100644
index 000000000..4f4bb37a9
Binary files /dev/null and b/res/drawable-ldpi/ic_action_add_cc_bcc_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_archive_dark.png b/res/drawable-ldpi/ic_action_archive_dark.png
new file mode 100644
index 000000000..511ab7742
Binary files /dev/null and b/res/drawable-ldpi/ic_action_archive_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_archive_light.png b/res/drawable-ldpi/ic_action_archive_light.png
new file mode 100644
index 000000000..f10021c5b
Binary files /dev/null and b/res/drawable-ldpi/ic_action_archive_light.png differ
diff --git a/res/drawable-ldpi/ic_action_compose_dark.png b/res/drawable-ldpi/ic_action_compose_dark.png
new file mode 100644
index 000000000..f9b216450
Binary files /dev/null and b/res/drawable-ldpi/ic_action_compose_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_compose_light.png b/res/drawable-ldpi/ic_action_compose_light.png
new file mode 100644
index 000000000..46681e033
Binary files /dev/null and b/res/drawable-ldpi/ic_action_compose_light.png differ
diff --git a/res/drawable-ldpi/ic_action_delete_dark.png b/res/drawable-ldpi/ic_action_delete_dark.png
new file mode 100644
index 000000000..08708bd6d
Binary files /dev/null and b/res/drawable-ldpi/ic_action_delete_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_delete_light.png b/res/drawable-ldpi/ic_action_delete_light.png
new file mode 100644
index 000000000..73fecae54
Binary files /dev/null and b/res/drawable-ldpi/ic_action_delete_light.png differ
diff --git a/res/drawable-ldpi/ic_action_move_or_copy_dark.png b/res/drawable-ldpi/ic_action_move_or_copy_dark.png
new file mode 100644
index 000000000..8419840be
Binary files /dev/null and b/res/drawable-ldpi/ic_action_move_or_copy_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_move_or_copy_light.png b/res/drawable-ldpi/ic_action_move_or_copy_light.png
new file mode 100644
index 000000000..cbea7ae44
Binary files /dev/null and b/res/drawable-ldpi/ic_action_move_or_copy_light.png differ
diff --git a/res/drawable-ldpi/ic_action_next_message_dark.png b/res/drawable-ldpi/ic_action_next_message_dark.png
new file mode 100644
index 000000000..a6b481300
Binary files /dev/null and b/res/drawable-ldpi/ic_action_next_message_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_next_message_light.png b/res/drawable-ldpi/ic_action_next_message_light.png
new file mode 100644
index 000000000..8d2d9e708
Binary files /dev/null and b/res/drawable-ldpi/ic_action_next_message_light.png differ
diff --git a/res/drawable-ldpi/ic_action_previous_message_dark.png b/res/drawable-ldpi/ic_action_previous_message_dark.png
new file mode 100644
index 000000000..c0d3d24b0
Binary files /dev/null and b/res/drawable-ldpi/ic_action_previous_message_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_previous_message_light.png b/res/drawable-ldpi/ic_action_previous_message_light.png
new file mode 100644
index 000000000..159cb68d6
Binary files /dev/null and b/res/drawable-ldpi/ic_action_previous_message_light.png differ
diff --git a/res/drawable-ldpi/ic_action_read_dark.png b/res/drawable-ldpi/ic_action_read_dark.png
new file mode 100644
index 000000000..aa3960de2
Binary files /dev/null and b/res/drawable-ldpi/ic_action_read_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_read_light.png b/res/drawable-ldpi/ic_action_read_light.png
new file mode 100644
index 000000000..18414db4e
Binary files /dev/null and b/res/drawable-ldpi/ic_action_read_light.png differ
diff --git a/res/drawable-ldpi/ic_action_refresh_dark.png b/res/drawable-ldpi/ic_action_refresh_dark.png
new file mode 100644
index 000000000..4fba39712
Binary files /dev/null and b/res/drawable-ldpi/ic_action_refresh_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_refresh_light.png b/res/drawable-ldpi/ic_action_refresh_light.png
new file mode 100644
index 000000000..806bd49ae
Binary files /dev/null and b/res/drawable-ldpi/ic_action_refresh_light.png differ
diff --git a/res/drawable-ldpi/ic_action_search_dark.png b/res/drawable-ldpi/ic_action_search_dark.png
new file mode 100644
index 000000000..975f86525
Binary files /dev/null and b/res/drawable-ldpi/ic_action_search_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_search_light.png b/res/drawable-ldpi/ic_action_search_light.png
new file mode 100644
index 000000000..ff6323884
Binary files /dev/null and b/res/drawable-ldpi/ic_action_search_light.png differ
diff --git a/res/drawable-ldpi/ic_action_send_dark.png b/res/drawable-ldpi/ic_action_send_dark.png
new file mode 100644
index 000000000..4cacef2e1
Binary files /dev/null and b/res/drawable-ldpi/ic_action_send_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_send_light.png b/res/drawable-ldpi/ic_action_send_light.png
new file mode 100644
index 000000000..00b5d1050
Binary files /dev/null and b/res/drawable-ldpi/ic_action_send_light.png differ
diff --git a/res/drawable-ldpi/ic_action_settings_dark.png b/res/drawable-ldpi/ic_action_settings_dark.png
new file mode 100644
index 000000000..c3927fd7c
Binary files /dev/null and b/res/drawable-ldpi/ic_action_settings_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_settings_light.png b/res/drawable-ldpi/ic_action_settings_light.png
new file mode 100644
index 000000000..35b47aa5b
Binary files /dev/null and b/res/drawable-ldpi/ic_action_settings_light.png differ
diff --git a/res/drawable-ldpi/ic_action_single_message_options_dark.png b/res/drawable-ldpi/ic_action_single_message_options_dark.png
new file mode 100644
index 000000000..7510c8a1a
Binary files /dev/null and b/res/drawable-ldpi/ic_action_single_message_options_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_single_message_options_light.png b/res/drawable-ldpi/ic_action_single_message_options_light.png
new file mode 100644
index 000000000..17952fc0a
Binary files /dev/null and b/res/drawable-ldpi/ic_action_single_message_options_light.png differ
diff --git a/res/drawable-ldpi/ic_action_sort_dark.png b/res/drawable-ldpi/ic_action_sort_dark.png
new file mode 100644
index 000000000..c7191b830
Binary files /dev/null and b/res/drawable-ldpi/ic_action_sort_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_sort_light.png b/res/drawable-ldpi/ic_action_sort_light.png
new file mode 100644
index 000000000..2cf7708ab
Binary files /dev/null and b/res/drawable-ldpi/ic_action_sort_light.png differ
diff --git a/res/drawable-ldpi/ic_action_spam_dark.png b/res/drawable-ldpi/ic_action_spam_dark.png
new file mode 100644
index 000000000..1bbe80064
Binary files /dev/null and b/res/drawable-ldpi/ic_action_spam_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_spam_light.png b/res/drawable-ldpi/ic_action_spam_light.png
new file mode 100644
index 000000000..02fcb4083
Binary files /dev/null and b/res/drawable-ldpi/ic_action_spam_light.png differ
diff --git a/res/drawable-ldpi/ic_action_toggle_flag_dark.png b/res/drawable-ldpi/ic_action_toggle_flag_dark.png
new file mode 100644
index 000000000..e9ac07d08
Binary files /dev/null and b/res/drawable-ldpi/ic_action_toggle_flag_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_toggle_flag_light.png b/res/drawable-ldpi/ic_action_toggle_flag_light.png
new file mode 100644
index 000000000..529815d10
Binary files /dev/null and b/res/drawable-ldpi/ic_action_toggle_flag_light.png differ
diff --git a/res/drawable-ldpi/ic_action_toggle_read_dark.png b/res/drawable-ldpi/ic_action_toggle_read_dark.png
new file mode 100644
index 000000000..b56dcc5a7
Binary files /dev/null and b/res/drawable-ldpi/ic_action_toggle_read_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_toggle_read_light.png b/res/drawable-ldpi/ic_action_toggle_read_light.png
new file mode 100644
index 000000000..4de40d45b
Binary files /dev/null and b/res/drawable-ldpi/ic_action_toggle_read_light.png differ
diff --git a/res/drawable-mdpi/ic_action_add_attachment_dark.png b/res/drawable-mdpi/ic_action_add_attachment_dark.png
new file mode 100644
index 000000000..7b66272c0
Binary files /dev/null and b/res/drawable-mdpi/ic_action_add_attachment_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_add_attachment_light.png b/res/drawable-mdpi/ic_action_add_attachment_light.png
new file mode 100644
index 000000000..2c4b2946c
Binary files /dev/null and b/res/drawable-mdpi/ic_action_add_attachment_light.png differ
diff --git a/res/drawable-mdpi/ic_action_add_cc_bbc_light.png b/res/drawable-mdpi/ic_action_add_cc_bbc_light.png
new file mode 100644
index 000000000..30c735098
Binary files /dev/null and b/res/drawable-mdpi/ic_action_add_cc_bbc_light.png differ
diff --git a/res/drawable-mdpi/ic_action_add_cc_bcc_dark.png b/res/drawable-mdpi/ic_action_add_cc_bcc_dark.png
new file mode 100644
index 000000000..af06adc72
Binary files /dev/null and b/res/drawable-mdpi/ic_action_add_cc_bcc_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_archive_dark.png b/res/drawable-mdpi/ic_action_archive_dark.png
new file mode 100644
index 000000000..7e46c2514
Binary files /dev/null and b/res/drawable-mdpi/ic_action_archive_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_archive_light.png b/res/drawable-mdpi/ic_action_archive_light.png
new file mode 100644
index 000000000..02eed0944
Binary files /dev/null and b/res/drawable-mdpi/ic_action_archive_light.png differ
diff --git a/res/drawable-mdpi/ic_action_compose_dark.png b/res/drawable-mdpi/ic_action_compose_dark.png
new file mode 100644
index 000000000..0532eeeeb
Binary files /dev/null and b/res/drawable-mdpi/ic_action_compose_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_compose_light.png b/res/drawable-mdpi/ic_action_compose_light.png
new file mode 100644
index 000000000..c34f3d660
Binary files /dev/null and b/res/drawable-mdpi/ic_action_compose_light.png differ
diff --git a/res/drawable-mdpi/ic_action_delete_dark.png b/res/drawable-mdpi/ic_action_delete_dark.png
new file mode 100644
index 000000000..729893f41
Binary files /dev/null and b/res/drawable-mdpi/ic_action_delete_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_delete_light.png b/res/drawable-mdpi/ic_action_delete_light.png
new file mode 100644
index 000000000..60903db9d
Binary files /dev/null and b/res/drawable-mdpi/ic_action_delete_light.png differ
diff --git a/res/drawable-mdpi/ic_action_move_or_copy_dark.png b/res/drawable-mdpi/ic_action_move_or_copy_dark.png
new file mode 100644
index 000000000..70109aee0
Binary files /dev/null and b/res/drawable-mdpi/ic_action_move_or_copy_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_move_or_copy_light.png b/res/drawable-mdpi/ic_action_move_or_copy_light.png
new file mode 100644
index 000000000..a8972a10f
Binary files /dev/null and b/res/drawable-mdpi/ic_action_move_or_copy_light.png differ
diff --git a/res/drawable-mdpi/ic_action_next_message_dark.png b/res/drawable-mdpi/ic_action_next_message_dark.png
new file mode 100644
index 000000000..dc675d5b5
Binary files /dev/null and b/res/drawable-mdpi/ic_action_next_message_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_next_message_light.png b/res/drawable-mdpi/ic_action_next_message_light.png
new file mode 100644
index 000000000..d80d0e112
Binary files /dev/null and b/res/drawable-mdpi/ic_action_next_message_light.png differ
diff --git a/res/drawable-mdpi/ic_action_previous_message_dark.png b/res/drawable-mdpi/ic_action_previous_message_dark.png
new file mode 100644
index 000000000..1eea4b0d6
Binary files /dev/null and b/res/drawable-mdpi/ic_action_previous_message_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_previous_message_light.png b/res/drawable-mdpi/ic_action_previous_message_light.png
new file mode 100644
index 000000000..498f7f4d2
Binary files /dev/null and b/res/drawable-mdpi/ic_action_previous_message_light.png differ
diff --git a/res/drawable-mdpi/ic_action_read_dark.png b/res/drawable-mdpi/ic_action_read_dark.png
new file mode 100644
index 000000000..cca47cb39
Binary files /dev/null and b/res/drawable-mdpi/ic_action_read_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_read_light.png b/res/drawable-mdpi/ic_action_read_light.png
new file mode 100644
index 000000000..b3ebbaeb0
Binary files /dev/null and b/res/drawable-mdpi/ic_action_read_light.png differ
diff --git a/res/drawable-mdpi/ic_action_refresh_dark.png b/res/drawable-mdpi/ic_action_refresh_dark.png
new file mode 100644
index 000000000..e5cd4d9e1
Binary files /dev/null and b/res/drawable-mdpi/ic_action_refresh_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_refresh_light.png b/res/drawable-mdpi/ic_action_refresh_light.png
new file mode 100644
index 000000000..eae201673
Binary files /dev/null and b/res/drawable-mdpi/ic_action_refresh_light.png differ
diff --git a/res/drawable-mdpi/ic_action_search_dark.png b/res/drawable-mdpi/ic_action_search_dark.png
new file mode 100644
index 000000000..bcad447ac
Binary files /dev/null and b/res/drawable-mdpi/ic_action_search_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_search_light.png b/res/drawable-mdpi/ic_action_search_light.png
new file mode 100644
index 000000000..a0d8dadb9
Binary files /dev/null and b/res/drawable-mdpi/ic_action_search_light.png differ
diff --git a/res/drawable-mdpi/ic_action_send_dark.png b/res/drawable-mdpi/ic_action_send_dark.png
new file mode 100644
index 000000000..1ae900ac3
Binary files /dev/null and b/res/drawable-mdpi/ic_action_send_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_send_light.png b/res/drawable-mdpi/ic_action_send_light.png
new file mode 100644
index 000000000..89a0fe8a2
Binary files /dev/null and b/res/drawable-mdpi/ic_action_send_light.png differ
diff --git a/res/drawable-mdpi/ic_action_settings_dark.png b/res/drawable-mdpi/ic_action_settings_dark.png
new file mode 100644
index 000000000..d90f1255e
Binary files /dev/null and b/res/drawable-mdpi/ic_action_settings_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_settings_light.png b/res/drawable-mdpi/ic_action_settings_light.png
new file mode 100644
index 000000000..4a192d4bc
Binary files /dev/null and b/res/drawable-mdpi/ic_action_settings_light.png differ
diff --git a/res/drawable-mdpi/ic_action_single_message_options_dark.png b/res/drawable-mdpi/ic_action_single_message_options_dark.png
new file mode 100644
index 000000000..6d876bbb8
Binary files /dev/null and b/res/drawable-mdpi/ic_action_single_message_options_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_single_message_options_light.png b/res/drawable-mdpi/ic_action_single_message_options_light.png
new file mode 100644
index 000000000..b08e56929
Binary files /dev/null and b/res/drawable-mdpi/ic_action_single_message_options_light.png differ
diff --git a/res/drawable-mdpi/ic_action_sort_dark.png b/res/drawable-mdpi/ic_action_sort_dark.png
new file mode 100644
index 000000000..43801c156
Binary files /dev/null and b/res/drawable-mdpi/ic_action_sort_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_sort_light.png b/res/drawable-mdpi/ic_action_sort_light.png
new file mode 100644
index 000000000..6926afbe8
Binary files /dev/null and b/res/drawable-mdpi/ic_action_sort_light.png differ
diff --git a/res/drawable-mdpi/ic_action_spam_dark.png b/res/drawable-mdpi/ic_action_spam_dark.png
new file mode 100644
index 000000000..f6da34b5d
Binary files /dev/null and b/res/drawable-mdpi/ic_action_spam_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_spam_light.png b/res/drawable-mdpi/ic_action_spam_light.png
new file mode 100644
index 000000000..c512d1a4b
Binary files /dev/null and b/res/drawable-mdpi/ic_action_spam_light.png differ
diff --git a/res/drawable-mdpi/ic_action_toggle_flag_dark.png b/res/drawable-mdpi/ic_action_toggle_flag_dark.png
new file mode 100755
index 000000000..dd634a743
Binary files /dev/null and b/res/drawable-mdpi/ic_action_toggle_flag_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_toggle_flag_light.png b/res/drawable-mdpi/ic_action_toggle_flag_light.png
new file mode 100644
index 000000000..3c8cea965
Binary files /dev/null and b/res/drawable-mdpi/ic_action_toggle_flag_light.png differ
diff --git a/res/drawable-mdpi/ic_action_toggle_read_dark.png b/res/drawable-mdpi/ic_action_toggle_read_dark.png
new file mode 100644
index 000000000..038e35df1
Binary files /dev/null and b/res/drawable-mdpi/ic_action_toggle_read_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_toggle_read_light.png b/res/drawable-mdpi/ic_action_toggle_read_light.png
new file mode 100644
index 000000000..4f4b42671
Binary files /dev/null and b/res/drawable-mdpi/ic_action_toggle_read_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_add_attachment_dark.png b/res/drawable-xhdpi/ic_action_add_attachment_dark.png
new file mode 100644
index 000000000..295437ff5
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_add_attachment_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_add_attachment_light.png b/res/drawable-xhdpi/ic_action_add_attachment_light.png
new file mode 100644
index 000000000..19ddf0f2d
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_add_attachment_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_add_cc_bbc_light.png b/res/drawable-xhdpi/ic_action_add_cc_bbc_light.png
new file mode 100644
index 000000000..c944e0d9d
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_add_cc_bbc_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_add_cc_bcc_dark.png b/res/drawable-xhdpi/ic_action_add_cc_bcc_dark.png
new file mode 100644
index 000000000..48834c43a
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_add_cc_bcc_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_archive_dark.png b/res/drawable-xhdpi/ic_action_archive_dark.png
new file mode 100644
index 000000000..f19730baf
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_archive_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_archive_light.png b/res/drawable-xhdpi/ic_action_archive_light.png
new file mode 100644
index 000000000..80f42280e
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_archive_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_compose_dark.png b/res/drawable-xhdpi/ic_action_compose_dark.png
new file mode 100644
index 000000000..8429bc152
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_compose_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_compose_light.png b/res/drawable-xhdpi/ic_action_compose_light.png
new file mode 100644
index 000000000..1faf38c69
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_compose_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_delete_dark.png b/res/drawable-xhdpi/ic_action_delete_dark.png
new file mode 100644
index 000000000..90d65dfb9
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_delete_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_delete_light.png b/res/drawable-xhdpi/ic_action_delete_light.png
new file mode 100644
index 000000000..311511330
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_delete_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_dark.png b/res/drawable-xhdpi/ic_action_move_or_copy_dark.png
new file mode 100644
index 000000000..d5a910c5d
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_move_or_copy_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_light.png b/res/drawable-xhdpi/ic_action_move_or_copy_light.png
new file mode 100644
index 000000000..5721c615c
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_move_or_copy_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_next_message_dark.png b/res/drawable-xhdpi/ic_action_next_message_dark.png
new file mode 100644
index 000000000..b03529e16
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_next_message_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_next_message_light.png b/res/drawable-xhdpi/ic_action_next_message_light.png
new file mode 100644
index 000000000..039afc39e
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_next_message_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_previous_message_dark.png b/res/drawable-xhdpi/ic_action_previous_message_dark.png
new file mode 100644
index 000000000..49b456400
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_previous_message_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_previous_message_light.png b/res/drawable-xhdpi/ic_action_previous_message_light.png
new file mode 100644
index 000000000..16443bba7
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_previous_message_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_read_dark.png b/res/drawable-xhdpi/ic_action_read_dark.png
new file mode 100644
index 000000000..e334e65da
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_read_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_read_light.png b/res/drawable-xhdpi/ic_action_read_light.png
new file mode 100644
index 000000000..926cdef30
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_read_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_refresh_dark.png b/res/drawable-xhdpi/ic_action_refresh_dark.png
new file mode 100644
index 000000000..2cec0c8d4
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_refresh_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_refresh_light.png b/res/drawable-xhdpi/ic_action_refresh_light.png
new file mode 100644
index 000000000..9ded06afb
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_refresh_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_search_dark.png b/res/drawable-xhdpi/ic_action_search_dark.png
new file mode 100644
index 000000000..be76f2fa4
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_search_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_search_light.png b/res/drawable-xhdpi/ic_action_search_light.png
new file mode 100644
index 000000000..f4acc174d
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_search_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_send_dark.png b/res/drawable-xhdpi/ic_action_send_dark.png
new file mode 100644
index 000000000..6e7d5d02f
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_send_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_send_light.png b/res/drawable-xhdpi/ic_action_send_light.png
new file mode 100644
index 000000000..6eb16bfe4
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_send_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_settings_dark.png b/res/drawable-xhdpi/ic_action_settings_dark.png
new file mode 100644
index 000000000..f2572c846
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_settings_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_settings_light.png b/res/drawable-xhdpi/ic_action_settings_light.png
new file mode 100644
index 000000000..86273ab2c
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_settings_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_single_message_options_dark.png b/res/drawable-xhdpi/ic_action_single_message_options_dark.png
new file mode 100644
index 000000000..643e7383f
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_single_message_options_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_single_message_options_light.png b/res/drawable-xhdpi/ic_action_single_message_options_light.png
new file mode 100644
index 000000000..0a1278649
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_single_message_options_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_sort_dark.png b/res/drawable-xhdpi/ic_action_sort_dark.png
new file mode 100644
index 000000000..fdff32265
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_sort_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_sort_light.png b/res/drawable-xhdpi/ic_action_sort_light.png
new file mode 100644
index 000000000..f14926228
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_sort_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_spam_dark.png b/res/drawable-xhdpi/ic_action_spam_dark.png
new file mode 100644
index 000000000..bed41cd4f
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_spam_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_spam_light.png b/res/drawable-xhdpi/ic_action_spam_light.png
new file mode 100644
index 000000000..d83ef256d
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_spam_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_flag_dark.png b/res/drawable-xhdpi/ic_action_toggle_flag_dark.png
new file mode 100755
index 000000000..0c4ef1571
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_toggle_flag_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_flag_light.png b/res/drawable-xhdpi/ic_action_toggle_flag_light.png
new file mode 100644
index 000000000..9ef985d53
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_toggle_flag_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_read_dark.png b/res/drawable-xhdpi/ic_action_toggle_read_dark.png
new file mode 100644
index 000000000..46f0896bb
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_toggle_read_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_toggle_read_light.png b/res/drawable-xhdpi/ic_action_toggle_read_light.png
new file mode 100644
index 000000000..4cd651b26
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_toggle_read_light.png differ
diff --git a/res/layout-land/actionbar_custom.xml b/res/layout-land/actionbar_custom.xml
new file mode 100644
index 000000000..ee40b173b
--- /dev/null
+++ b/res/layout-land/actionbar_custom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <LinearLayout
+        android:id="@+id/title_layout"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/actionbar_title_first"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="start"
+            android:singleLine="true"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/actionbar_title_sub"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/actionbar_unread_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="12dip"
+        android:paddingRight="12dip"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="32sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/actionbar_spinner.xml b/res/layout-land/actionbar_spinner.xml
new file mode 100644
index 000000000..cd6f9c784
--- /dev/null
+++ b/res/layout-land/actionbar_spinner.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/actionbar_title_first"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-4dip"
+        android:textSize="14sp"
+        android:singleLine="true"
+        android:ellipsize="start" />
+
+    <TextView
+        android:id="@+id/actionbar_title_sub"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="12sp"
+        android:singleLine="true"
+        android:ellipsize="end" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index d916e87bc..f05c883c1 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -8,34 +8,4 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         />
-    <LinearLayout 
-            android:id="@+id/empty"
-            android:orientation="vertical"
-            android:layout_height="fill_parent"
-            android:layout_width="fill_parent">
-    <ScrollView
-        android:layout_marginBottom="54dip" 
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent"
-        android:fadingEdge="none"
-        >
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical">
-            <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:textSize="14sp"
-                android:text="@string/accounts_welcome"
-                android:textColor="?android:attr/textColorPrimary"
-                android:padding="8dip"/>
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </ScrollView>
-    <include layout="@layout/wizard_next" />
-</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/actionbar_custom.xml b/res/layout/actionbar_custom.xml
new file mode 100644
index 000000000..6d7ac5677
--- /dev/null
+++ b/res/layout/actionbar_custom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <LinearLayout
+        android:id="@+id/title_layout"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/actionbar_title_first"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="start"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/actionbar_title_sub"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/actionbar_unread_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="12dip"
+        android:paddingRight="12dip"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="36sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/actionbar_indeterminate_progress.xml b/res/layout/actionbar_indeterminate_progress.xml
new file mode 100644
index 000000000..c7e8dbbf5
--- /dev/null
+++ b/res/layout/actionbar_indeterminate_progress.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingRight="12dp"
+    android:paddingLeft="12dp"
+    android:gravity="center_vertical">
+
+    <ProgressBar android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_alignParentRight="true"
+        style="?android:attr/indeterminateProgressStyle" />
+
+</RelativeLayout>
\ No newline at end of file
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/res/layout/actionbar_message_view.xml b/res/layout/actionbar_message_view.xml
new file mode 100644
index 000000000..c1488cc30
--- /dev/null
+++ b/res/layout/actionbar_message_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <com.fsck.k9.view.MessageTitleView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textSize="16sp"
+        android:includeFontPadding="false"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/actionbar_spinner.xml b/res/layout/actionbar_spinner.xml
new file mode 100644
index 000000000..494fefc05
--- /dev/null
+++ b/res/layout/actionbar_spinner.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/actionbar_title_first"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-4dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:singleLine="true"
+        android:ellipsize="start" />
+
+    <TextView
+        android:id="@+id/actionbar_title_sub"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true"
+        android:ellipsize="end" />
+
+</LinearLayout>
diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index dbcdd09f4..b664aecb0 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -12,5 +12,4 @@
         android:layout_weight="5"
 
     />
-    <include layout="@layout/message_list_batch_buttons"/>
 </LinearLayout>
diff --git a/res/layout/message_list_batch_buttons.xml b/res/layout/message_list_batch_buttons.xml
deleted file mode 100644
index f5e1a213a..000000000
--- a/res/layout/message_list_batch_buttons.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/batch_button_area"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:visibility="gone"
-        android:background="#CCCCCC"
-        >
-        <ImageButton
-            android:id="@+id/batch_read_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:src="@drawable/ic_button_mark_read"
-        />
-        <ImageButton
-            android:id="@+id/batch_delete_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_delete"
-        />
-        <ImageButton
-            android:id="@+id/batch_archive_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_archive"
-        />
-        <ImageButton
-            android:id="@+id/batch_move_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_move"
-        />
-        <ImageButton
-            android:id="@+id/batch_flag_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_flag"
-        />
-        <ImageButton
-            android:id="@+id/batch_done_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_close_clear_cancel"
-        />
-    </LinearLayout>
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 7bf2fb51c..29cb23973 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -7,8 +7,4 @@
 
     <include layout="@layout/message"/>
 
-    <include layout="@layout/message_view_move_buttons"/>
-
-    <include layout="@layout/message_view_bottom_buttons"/>
-
 </LinearLayout>
diff --git a/res/layout/message_view_bottom_buttons.xml b/res/layout/message_view_bottom_buttons.xml
deleted file mode 100644
index 28bd9ea9b..000000000
--- a/res/layout/message_view_bottom_buttons.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
-        android:id="@+id/bottom_buttons"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingRight="6dip"
-        android:background="@android:color/transparent"
-        android:gravity="center_vertical">
-        <Button
-            android:id="@+id/previous"
-            android:text="@string/message_view_prev_action"
-            android:contentDescription="@string/previous_action"
-            android:textSize="35dip"
-            android:padding="0dip"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-
-        <ImageButton
-            android:id="@+id/delete"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_button_delete"
-            android:textSize="0dip"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-       <Button
-            android:id="@+id/next"
-            android:text="@string/message_view_next_action"
-            android:contentDescription="@string/next_action"
-            android:textSize="35dip"
-            android:padding="0dip"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
-</merge>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 7a50fe98f..c9ef5a600 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -44,7 +44,8 @@
                         android:textSize="10sp"
                         android:textStyle="bold"
                         android:textColor="?android:attr/textColorSecondary"
-                        android:textAppearance="?android:attr/textAppearanceSmall"/>
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:visibility="gone"/>
 
                     <!-- From -->
                     <LinearLayout
@@ -163,25 +164,35 @@
 
                     </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/date"
+                    <LinearLayout
+                        android:id="@+id/date_time_container"
+                        android:orientation="horizontal"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:ellipsize="none"
-                        android:textSize="10sp"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:textAppearance="?android:attr/textAppearanceSmall"/>
+                        android:gravity="right">
 
-                    <TextView
-                        android:id="@+id/time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="10sp"
-                        android:singleLine="true"
-                        android:ellipsize="none"
-                        android:textColor="?android:attr/textColorPrimary"
-                        android:textAppearance="?android:attr/textAppearanceSmall"/>
+                        <TextView
+                            android:id="@+id/date"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:singleLine="true"
+                            android:ellipsize="none"
+                            android:textSize="10sp"
+                            android:paddingRight="3dip"
+                            android:textColor="?android:attr/textColorPrimary"
+                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+                        <TextView
+                            android:id="@+id/time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="10sp"
+                            android:singleLine="true"
+                            android:ellipsize="none"
+                            android:textColor="?android:attr/textColorPrimary"
+                            android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+                    </LinearLayout>
 
                 </LinearLayout>
 
diff --git a/res/layout/message_view_move_buttons.xml b/res/layout/message_view_move_buttons.xml
deleted file mode 100644
index 21af3210a..000000000
--- a/res/layout/message_view_move_buttons.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
-        android:id="@+id/move_buttons"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingRight="6dip"
-        android:background="@android:color/transparent"
-        android:gravity="center_vertical">
-        <Button
-            android:id="@+id/archive"
-            android:text="@string/message_view_archive_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/move"
-            android:text="@string/message_view_move_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/spam"
-            android:text="@string/message_view_spam_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
-
-
-</merge>
diff --git a/res/layout/welcome_message.xml b/res/layout/welcome_message.xml
new file mode 100644
index 000000000..70e019cf0
--- /dev/null
+++ b/res/layout/welcome_message.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginBottom="54dip"
+        android:fadingEdge="none" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:padding="8dip"
+                android:text="@string/accounts_welcome"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="14sp" />
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/wizard_next" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index 82ea3303f..9c5d10c3a 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/compose"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-		android:icon="@drawable/ic_menu_compose"
+    <item
+		android:id="@+id/check_mail"
+        android:alphabeticShortcut="r"
+		android:title="@string/check_mail_action"
+		android:icon="?attr/iconActionRefresh"
+		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/search"
 		android:title="@string/search_action"
-		android:icon="@android:drawable/ic_search_category_default"
+		android:icon="?attr/iconActionSearch"
+		android:showAsAction="always"
+	/>
+	<item
+		android:id="@+id/compose"
+        android:alphabeticShortcut="c"
+        android:title="@string/compose_action"
+		android:icon="?attr/iconActionCompose"
+		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/add_new_account"
 		android:title="@string/add_account_action"
-		android:icon="@drawable/ic_menu_add"
+		android:icon="?attr/iconMenuAdd"
 	/>
     <item
         android:id="@+id/about"
         android:title="@string/about_action"
         android:icon="@android:drawable/ic_menu_info_details"
     />
-	<item
-		android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_menu_refresh"
-	/>
 	<!-- 
 		<item android:id="@+id/search"
 		android:title="@string/search_action" />
@@ -34,6 +37,7 @@
         <item android:id="@+id/edit_prefs"
         android:title="@string/preferences_action" 
         android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction="never"
     />
         <item android:id="@+id/import_export"
             android:title="@string/import_export_action">
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 6af522cfd..256b1aafa 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/check_mail"
+        android:alphabeticShortcut="r"
+		android:title="@string/check_mail_action"
+		android:icon="?attr/iconActionRefresh"
+		android:showAsAction="always"
+	/>
    <item
 		android:id="@+id/compose"
         android:alphabeticShortcut="c"
 		android:title="@string/compose_action"
-		android:icon="@drawable/ic_menu_compose"
+        android:icon="?attr/iconActionCompose"
+		android:showAsAction="always"
 	/>
 	<item
         android:title="@string/folder_list_display_mode_label"
@@ -14,32 +22,32 @@
             <item
             android:id="@+id/display_all"
             android:title="@string/folder_list_display_mode_all"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_class"
             android:title="@string/folder_list_display_mode_first_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_and_2nd_class"
             android:title="@string/folder_list_display_mode_first_and_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_not_second_class"
             android:title="@string/folder_list_display_mode_not_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/list_folders"
             android:title="@string/refresh_folders_action"
-            android:icon="@drawable/ic_menu_refresh"
+            android:icon="?attr/iconMenuRefresh"
          />
            <item
             android:id="@+id/filter_folders"
             android:title="@string/filter_folders_action"
-            android:icon="@drawable/ic_menu_search"
+            android:icon="?attr/iconMenuSearch"
          />
         
         </menu>
@@ -48,23 +56,13 @@
 		android:id="@+id/empty_trash"
         android:alphabeticShortcut="e"
 		android:title="@string/empty_trash_action"
-		android:icon="@drawable/ic_menu_delete"
-	/>
-    <item
-		android:id="@+id/accounts"
-		android:title="@string/accounts_action"
-		android:icon="@drawable/ic_menu_account_list"
-	/>
-	<item
-		android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_menu_refresh"
+		android:icon="?attr/iconMenuDelete"
 	/>
     <item
         android:id="@+id/settings"
         android:title="@string/preferences_action"
-        android:icon="@drawable/ic_menu_preferences">
+        android:icon="?attr/iconMenuPreferences"
+        android:showAsAction="never">
         <menu>
         <item
             android:id="@+id/account_settings"
@@ -80,7 +78,7 @@
 	<item
 		android:id="@+id/send_messages"
 		android:title="@string/send_messages_action"
-		android:icon="@drawable/ic_menu_refresh"
+		android:icon="?attr/iconMenuRefresh"
 	/>
 	<item android:id="@+id/advanced"
         android:title="@string/advanced">
@@ -88,7 +86,7 @@
 		<item
 			android:id="@+id/compact"
 			android:title="@string/compact_action"
-			android:icon="@drawable/ic_menu_compact"
+			android:icon="?attr/iconMenuCompact"
 		/>
 		</menu>
     </item>
diff --git a/res/menu/folder_select_option.xml b/res/menu/folder_select_option.xml
index 8b9d7a240..adfb7a913 100644
--- a/res/menu/folder_select_option.xml
+++ b/res/menu/folder_select_option.xml
@@ -9,32 +9,32 @@
             <item
             android:id="@+id/display_all"
             android:title="@string/folder_list_display_mode_all"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_class"
             android:title="@string/folder_list_display_mode_first_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_1st_and_2nd_class"
             android:title="@string/folder_list_display_mode_first_and_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/display_not_second_class"
             android:title="@string/folder_list_display_mode_not_second_class"
-            android:icon="@drawable/ic_menu_clear"
+            android:icon="?attr/iconMenuClear"
            />
            <item
             android:id="@+id/list_folders"
             android:title="@string/refresh_folders_action"
-            android:icon="@drawable/ic_menu_refresh"
+            android:icon="?attr/iconMenuRefresh"
          />
            <item
             android:id="@+id/filter_folders"
             android:title="@string/filter_folders_action"
-            android:icon="@drawable/ic_menu_search"
+            android:icon="?attr/iconMenuSearch"
          />
         
     <!--     </menu>
diff --git a/res/menu/manage_identities_option.xml b/res/menu/manage_identities_option.xml
index 82922ddc0..9abbde191 100644
--- a/res/menu/manage_identities_option.xml
+++ b/res/menu/manage_identities_option.xml
@@ -4,6 +4,6 @@
 		android:id="@+id/new_identity"
         android:alphabeticShortcut="n"
 		android:title="@string/new_identity_action"
-		android:icon="@drawable/ic_menu_add"
+		android:icon="?attr/iconMenuAdd"
 	/>
 </menu>
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 41fdd141c..9e2189f13 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -1,51 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/send"
-        android:alphabeticShortcut="s"
-		android:title="@string/send_action"
-		android:icon="@drawable/ic_menu_send"
-	/>
 	<item
 		android:id="@+id/add_cc_bcc"
         android:alphabeticShortcut="c"
 		android:title="@string/add_cc_bcc_action"
-		android:icon="@drawable/ic_menu_cc"
+		android:icon="?attr/iconActionAddCcBcc"
+		android:showAsAction="always"
 	/>
 	<item
 		android:id="@+id/add_attachment"
         android:alphabeticShortcut="n"
 		android:title="@string/add_attachment_action"
-        android:icon="@drawable/ic_menu_attachment"
+        android:icon="?attr/iconActionAddAttachment"
+        android:showAsAction="always"
     />
+	<item
+		android:id="@+id/send"
+        android:alphabeticShortcut="s"
+		android:title="@string/send_action"
+		android:icon="?attr/iconActionSend"
+		android:showAsAction="always"
+	/>
 	<item
 		android:id="@+id/save"
         android:alphabeticShortcut="d"
 		android:title="@string/save_draft_action"
-		android:icon="@drawable/ic_menu_save_draft"
+		android:icon="?attr/iconMenuSaveDraft"
 	/>
 	<item
 		android:id="@+id/discard"
         android:alphabeticShortcut="q"
 		android:title="@string/discard_action"
-		android:icon="@drawable/ic_menu_close_clear_cancel"
+		android:icon="?attr/iconMenuCloseClearCancel"
 	/>
 	<item
 		android:id="@+id/read_receipt"
         android:alphabeticShortcut="r"
         android:title="@string/read_receipt"
-        android:icon="@drawable/ic_menu_reply_receipt"
+        android:icon="?attr/iconMenuReplyReceipt"
 	/>
 	<item
 		android:id="@+id/add_attachment_image"
 		android:title="@string/add_attachment_action_image"
-        android:icon="@drawable/ic_menu_attachment"
+        android:icon="?attr/iconMenuAttachment"
         android:visible="false" 
     />
 	<item
 		android:id="@+id/add_attachment_video"
 		android:title="@string/add_attachment_action_video"
-        android:icon="@drawable/ic_menu_attachment"
+        android:icon="?attr/iconMenuAttachment"
         android:visible="false"
     />
 </menu>
diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index 31f63f0c9..dfdefb1f5 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -1,68 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/open"
-        android:title="@string/open_action"
-    />
-    <item
-        android:id="@+id/select"
-        android:title="@string/select_action"
-    />
-    <item
-        android:id="@+id/deselect"
-        android:visible="false"
-        android:title="@string/deselect_action"
-    />
+        android:id="@+id/single_message_options"
+        android:icon="?attr/iconActionSingleMessageOptions"
+        android:showAsAction="always"
+        android:title="@string/single_message_options_action">
+        <menu>
+            <item
+                android:id="@+id/forward"
+                android:title="@string/forward_action"/>
+            <item
+                android:id="@+id/reply_all"
+                android:title="@string/reply_all_action"/>
+            <item
+                android:id="@+id/reply"
+                android:title="@string/reply_action"/>
+            <item
+                android:id="@+id/send_again"
+                android:title="@string/send_again_action"/>
+            <item
+			android:id="@+id/same_sender"
+			android:title="@string/from_same_sender" />
+        </menu>
+    </item>
     <item
         android:id="@+id/delete"
         android:title="@string/delete_action"
+        android:showAsAction="always"
+        android:icon="?attr/iconActionDelete"
     />
     <item
-        android:id="@+id/forward"
-        android:title="@string/forward_action"
-    />
-    <item
-        android:id="@+id/reply_all"
-        android:title="@string/reply_all_action"
-    />
-    <item
-        android:id="@+id/reply"
-        android:title="@string/reply_action"
-    />
-    <item
-        android:id="@+id/send_again"
-        android:title="@string/send_again_action"
-    />
-    <item
-        android:id="@+id/mark_as_read"
-        android:title="@string/mark_as_read_action"
-    />
-    <item
-        android:id="@+id/flag"
-        android:title="@string/flag_action"
+        android:id="@+id/read_toggle"
+        android:title="@string/read_toggle_action"
+        android:showAsAction="always"
+        android:icon="?attr/iconActionToggleRead"
     />
     <item
         android:id="@+id/archive"
         android:title="@string/archive_action"
+        android:showAsAction="always"
+        android:icon="?attr/iconActionArchive"
     />
     <item
+		android:id="@+id/move_or_copy"
+	    android:title="@string/move_or_copy_action"
+	    android:showAsAction="ifRoom"
+	    android:icon="?attr/iconActionMoveOrCopy">
+	    <menu>
+		    <item
+		        android:id="@+id/move"
+		        android:title="@string/move_action"
+		    />
+		    <item
+		        android:id="@+id/copy"
+		        android:title="@string/copy_action"
+		    />
+		</menu>
+	</item>
+	<item
+        android:id="@+id/flag_toggle"
+        android:title="@string/flag_toggle_action"
+        android:showAsAction="ifRoom"
+        android:icon="?attr/iconActionToggleFlag"
+    />
+	<item
         android:id="@+id/spam"
         android:title="@string/spam_action"
-    />
-    <item
-        android:id="@+id/move"
-        android:title="@string/move_action"
-    />
-    <item
-        android:id="@+id/copy"
-        android:title="@string/copy_action"
-    />
-    <item
-        android:id="@+id/send_alternate"
-        android:title="@string/send_alternate_action"
-    />
-    <item
-        android:id="@+id/same_sender"
-        android:title="@string/from_same_sender"
+        android:showAsAction="ifRoom"
+        android:icon="?attr/iconActionSpam"
     />
 </menu>
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index b8bbf03a7..549ff0f59 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -4,13 +4,15 @@
         android:id="@+id/compose"
         android:alphabeticShortcut="c"
         android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose"
+        android:icon="?attr/iconActionCompose"
+        android:showAsAction="always"
     />
     <item
         android:id="@+id/set_sort"
         android:title="@string/sort_by"
-        android:icon="@drawable/ic_menu_set_sort">
-        <menu>
+        android:icon="?attr/iconActionSort"
+        android:showAsAction="always" >
+		<menu>
             <item
                 android:id="@+id/set_sort_date"
                 android:title="@string/sort_by_date"
@@ -44,106 +46,39 @@
     <item
         android:id="@+id/select_all"
         android:title="@string/batch_select_all"
-        android:icon="@drawable/ic_menu_select_all"
-    />
-    <item
-        android:id="@+id/batch_ops"
-        android:title="@string/batch_ops"
-        android:icon="@drawable/ic_menu_batch">
-        <menu>
-            <item
-                android:id="@+id/batch_flag_mode"
-                android:title="@string/batch_flag_mode"
-                android:visible="false"
-            />
-            <item
-                android:id="@+id/batch_plain_mode"
-                android:title="@string/batch_plain_mode"
-                android:visible="false"
-            />
-            <item
-                android:id="@+id/batch_delete_op"
-                android:title="@string/batch_delete_op"
-            />
-            <item
-                android:id="@+id/batch_mark_read_op"
-                android:title="@string/batch_mark_read_op"
-            />
-            <item
-                android:id="@+id/batch_flag_op"
-                android:title="@string/batch_flag_op"
-            />
-            <item
-                android:id="@+id/batch_mark_unread_op"
-                android:title="@string/batch_mark_unread_op"
-            />
-            <item
-                android:id="@+id/batch_unflag_op"
-                android:title="@string/batch_unflag_op"
-            />
-            <item
-                android:id="@+id/batch_archive_op"
-                android:title="@string/batch_archive_op"
-            />
-            <item
-                android:id="@+id/batch_spam_op"
-                android:title="@string/batch_spam_op"
-            />
-            <item
-                android:id="@+id/batch_move_op"
-                android:title="@string/batch_move_op"
-            />
-            <item
-                android:id="@+id/batch_copy_op"
-                android:title="@string/batch_copy_op"
-            />
-            <item
-                android:id="@+id/batch_select_all"
-                android:title="@string/batch_select_all"
-            />
-            <item
-                android:id="@+id/batch_deselect_all"
-                android:title="@string/batch_deselect_all"
-            />
-        </menu>
-    </item>
-    <item
-        android:id="@+id/list_folders"
-        android:alphabeticShortcut="f"
-        android:title="@string/list_folders_action"
-        android:icon="@drawable/ic_menu_navigate"
+        android:icon="?attr/iconMenuSelectAll"
+        android:showAsAction="never"
     />
     <item
         android:id="@+id/send_messages"
         android:alphabeticShortcut="r"
         android:title="@string/send_messages_action"
-        android:icon="@drawable/ic_menu_refresh"
+        android:icon="?attr/iconActionRefresh"
+        android:showAsAction="never"
     />
     <item
         android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
         android:title="@string/check_mail_action"
-        android:icon="@drawable/ic_menu_refresh"
-    />
-    <item
-        android:id="@+id/accounts"
-        android:title="@string/accounts_action"
-        android:icon="@drawable/ic_menu_account_list"
+        android:icon="?attr/iconActionRefresh"
+        android:showAsAction="always"
     />
     <item
         android:id="@+id/mark_all_as_read"
         android:title="@string/mark_all_as_read_action"
-        android:icon="@drawable/ic_menu_inbox"
+        android:icon="?attr/iconMenuInbox"
+        android:showAsAction="never"
     />
     <item
         android:id="@+id/settings"
         android:title="@string/preferences_action"
-        android:icon="@drawable/ic_menu_preferences">
+        android:icon="?attr/iconMenuPreferences"
+        android:showAsAction="never">
         <menu>
             <item
                 android:id="@+id/folder_settings"
                 android:title="@string/folder_settings_action"
-                android:icon="@drawable/ic_menu_preferences"
+                android:icon="?attr/iconMenuPreferences"
             />
             <item
                 android:id="@+id/account_settings"
@@ -160,5 +95,6 @@
     <item
         android:id="@+id/expunge"
         android:title="@string/expunge_action"
+        android:showAsAction="never"
     />
 </menu>
diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
index fe1364847..ce5f5d52b 100644
--- a/res/menu/message_view_option.xml
+++ b/res/menu/message_view_option.xml
@@ -1,68 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/reply"
-        android:alphabeticShortcut="r"
-        android:title="@string/reply_action"
-        android:icon="@drawable/ic_menu_reply"
+        android:id="@+id/next_message"
+        android:title="@string/next_action"
+        android:icon="?attr/iconActionNextMessage"
+        android:showAsAction="always"
     />
     <item
-        android:id="@+id/reply_all"
-        android:alphabeticShortcut="a"
-        android:title="@string/reply_all_action"
-        android:icon="@drawable/ic_menu_reply_all"
-    />
-    <item
-        android:id="@+id/forward"
-        android:alphabeticShortcut="f"
-        android:title="@string/forward_action"
-        android:icon="@drawable/ic_menu_forward_mail"
-    />
-    <item
-        android:id="@+id/mark_as_unread"
-        android:alphabeticShortcut="u"
-        android:title="@string/mark_as_unread_action"
-        android:icon="@drawable/ic_menu_mark"
+        android:id="@+id/previous_message"
+        android:title="@string/previous_action"
+        android:icon="?attr/iconActionPreviousMessage"
+        android:showAsAction="always"
     />
     <item
         android:id="@+id/delete"
         android:alphabeticShortcut="q"
         android:title="@string/delete_action"
-        android:icon="@drawable/ic_menu_delete"
+        android:icon="?attr/iconActionDelete"
+        android:showAsAction="always"
     />
     <item
-        android:id="@+id/show_full_header"
-        android:title="@string/show_full_header_action"
-    />
-    <item
-        android:id="@+id/flag"
-        android:alphabeticShortcut="s"
-        android:title="@string/flag_action"
-        android:icon="@drawable/ic_menu_forward_mail"
-    />
-    <item
-        android:id="@+id/send_alternate"
-        android:title="@string/send_alternate_action"
-        android:icon="@drawable/ic_menu_forward_mail"
-    />
+        android:id="@+id/single_message_options"
+        android:icon="?attr/iconActionSingleMessageOptions"
+        android:showAsAction="ifRoom"
+        android:title="@string/single_message_options_action">
+        <menu>
+            <item
+                android:id="@+id/reply"
+                android:title="@string/reply_action"/>
+            <item
+                android:id="@+id/reply_all"
+                android:title="@string/reply_all_action"/>
+            <item
+                android:id="@+id/forward"
+                android:title="@string/forward_action"/>
+		    <item
+		        android:id="@+id/share"
+		        android:title="@string/send_alternate_action" />
+        </menu>
+    </item>
     <item
         android:id="@+id/archive"
         android:title="@string/archive_action"
+        android:icon="?attr/iconActionArchive"
+        android:showAsAction="ifRoom"
     />
     <item
         android:id="@+id/spam"
         android:title="@string/spam_action"
+        android:icon="?attr/iconActionSpam"
+        android:showAsAction="ifRoom"
     />
     <item
         android:id="@+id/move"
+            android:showAsAction="ifRoom"
+                android:icon="?attr/iconActionMoveOrCopy"
         android:title="@string/move_action"
     />
     <item
         android:id="@+id/copy"
         android:title="@string/copy_action"
+    />
+	<item
+        android:id="@+id/toggle_unread"
+        android:alphabeticShortcut="u"
+        android:title="@string/read_toggle_action"
+        android:icon="?attr/iconActionToggleRead"
+        android:showAsAction="never"
     />
 	<item
 		android:id="@+id/select_text"
 		android:title="@string/select_text_action"
+		android:showAsAction="never"
 	/>
 </menu>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 000000000..4475e4e78
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="K9Styles">
+		<attr name="iconMenuInfoDetails" format="reference" />
+		<attr name="iconActionAddAttachment" format="reference" />
+		<attr name="iconActionAddCcBcc" format="reference" />
+		<attr name="iconActionArchive" format="reference" />
+		<attr name="iconActionCompose" format="reference" />
+		<attr name="iconActionDelete" format="reference" />
+		<attr name="iconActionMoveOrCopy" format="reference" />
+		<attr name="iconActionNextMessage" format="reference" />
+		<attr name="iconActionPreviousMessage" format="reference" />
+		<attr name="iconActionRead" format="reference" />
+		<attr name="iconActionRefresh" format="reference" />
+		<attr name="iconActionSearch" format="reference" />
+		<attr name="iconActionSend" format="reference" />
+		<attr name="iconActionSettings" format="reference" />
+		<attr name="iconActionSingleMessageOptions" format="reference" />
+		<attr name="iconActionSort" format="reference" />
+		<attr name="iconActionSpam" format="reference" />
+		<attr name="iconActionToggleFlag" format="reference" />
+		<attr name="iconActionToggleRead" format="reference" />
+		<attr name="iconMenuAdd" format="reference" />
+		<attr name="iconMenuAttachment" format="reference" />
+		<attr name="iconMenuClear" format="reference" />
+		<attr name="iconMenuCloseClearCancel" format="reference" />
+		<attr name="iconMenuCompact" format="reference" />
+		<attr name="iconMenuDelete" format="reference" />
+		<attr name="iconMenuInbox" format="reference" />
+		<attr name="iconMenuPreferences" format="reference" />
+		<attr name="iconMenuRefresh" format="reference" />
+		<attr name="iconMenuReplyReceipt" format="reference" />
+		<attr name="iconMenuSaveDraft" format="reference" />
+		<attr name="iconMenuSearch" format="reference" />
+		<attr name="iconMenuSelectAll" format="reference" />
+		<attr name="iconMenuShowFolders" format="reference" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e51e0e844..dd90425c8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,6 +78,8 @@ http://k9mail.googlecode.com/
 
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="accounts_title">Accounts</string>
+    <string name="welcome_message_title">Welcome to K-9 Mail!</string>
+	<string name="folders_title">Folders</string>
     <string name="advanced">Advanced</string>
     <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
 
@@ -98,6 +100,8 @@ http://k9mail.googlecode.com/
     <string name="status_next_poll">\u0020(Next poll @ <xliff:g id="nexttime">%s</xliff:g>)</string>
     <string name="status_syncing_off">\u0020(Syncing disabled)</string>
 
+    <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> selected</string>
+    <string name="actionbar_string_selected"><xliff:g id="selection_count">\"%s\"</xliff:g> selected</string>
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Next</string> <!-- Used as part of a multi-step process -->
     <string name="previous_action">Previous</string> <!-- Used as part of a multi-step process -->
@@ -115,6 +119,8 @@ http://k9mail.googlecode.com/
     <string name="delete_all_action">Clear folder</string>
     <string name="forward_action">Forward</string>
     <string name="move_action">Move</string>
+    <string name="move_or_copy_action">Move or Copy</string>
+    <string name="single_message_options_action">Message Options</string>
     <string name="continue_action">Continue</string>
     <string name="back_action">Back</string>
     <string name="done_action">Done</string> <!--  Used to complete a multi-step process -->
@@ -142,6 +148,7 @@ http://k9mail.googlecode.com/
 
     <string name="accounts_action">Accounts</string>
     <string name="mark_as_read_action">Mark as read</string>
+    <string name="read_toggle_action">Toggle (un)read</string>
     <string name="send_alternate_action">Share</string>
     <string name="send_alternate_chooser_title">Choose sender</string>
 
@@ -150,6 +157,7 @@ http://k9mail.googlecode.com/
     messages in the folder that are not displayed in K-9)</string>
 
     <string name="flag_action">Add star</string>
+    <string name="flag_toggle_action">(Un)star</string>
     <string name="unflag_action">Remove star</string>
     <string name="copy_action">Copy</string>
     <string name="show_full_header_action">Show full header</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 01fe2b659..10e81ff29 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,12 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.K9.Light" parent="android:Theme.Light">
+    <style name="Theme.K9.Light" parent="Theme.Sherlock.Light">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
+		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
+		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_light</item>
+		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bbc_light</item>
+		<item name="iconActionArchive">@drawable/ic_action_archive_light</item>
+		<item name="iconActionCompose">@drawable/ic_action_compose_light</item>
+		<item name="iconActionDelete">@drawable/ic_action_delete_light</item>
+		<item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_light</item>
+		<item name="iconActionNextMessage">@drawable/ic_action_next_message_light</item>
+		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_light</item>
+		<item name="iconActionRead">@drawable/ic_action_read_light</item>
+		<item name="iconActionRefresh">@drawable/ic_action_refresh_light</item>
+		<item name="iconActionSearch">@drawable/ic_action_search_light</item>
+		<item name="iconActionSend">@drawable/ic_action_send_light</item>
+		<item name="iconActionSettings">@drawable/ic_action_settings_light</item>
+		<item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_light</item>
+		<item name="iconActionSort">@drawable/ic_action_sort_light</item>
+		<item name="iconActionSpam">@drawable/ic_action_spam_light</item>
+		<item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag_light</item>
+		<item name="iconActionToggleRead">@drawable/ic_action_toggle_read_light</item>
+		<item name="iconMenuAdd">@drawable/ic_menu_add</item>
+		<item name="iconMenuAttachment">@drawable/ic_menu_attachment</item>
+		<item name="iconMenuClear">@drawable/ic_menu_clear</item>
+		<item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
+		<item name="iconMenuCompact">@drawable/ic_menu_compact</item>
+		<item name="iconMenuDelete">@drawable/ic_menu_delete</item>
+		<item name="iconMenuInbox">@drawable/ic_menu_inbox</item>
+		<item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
+		<item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
+		<item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
+		<item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
+		<item name="iconMenuSearch">@drawable/ic_menu_search</item>
+		<item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
+		<item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
+
+
     </style>
 
-    <style name="Theme.K9.Dark" parent="@android:style/Theme">
+    <style name="Theme.K9.Dark" parent="Theme.Sherlock">
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
+		<item name="iconMenuInfoDetails">@android:drawable/ic_menu_info_details</item>
+		<item name="iconActionAddAttachment">@drawable/ic_action_add_attachment_dark</item>
+		<item name="iconActionAddCcBcc">@drawable/ic_action_add_cc_bcc_dark</item>
+		<item name="iconActionArchive">@drawable/ic_action_archive_dark</item>
+		<item name="iconActionCompose">@drawable/ic_action_compose_dark</item>
+		<item name="iconActionDelete">@drawable/ic_action_delete_dark</item>
+		<item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_dark</item>
+		<item name="iconActionNextMessage">@drawable/ic_action_next_message_dark</item>
+		<item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_dark</item>
+		<item name="iconActionRead">@drawable/ic_action_read_dark</item>
+		<item name="iconActionRefresh">@drawable/ic_action_refresh_dark</item>
+		<item name="iconActionSearch">@drawable/ic_action_search_dark</item>
+		<item name="iconActionSend">@drawable/ic_action_send_dark</item>
+		<item name="iconActionSettings">@drawable/ic_action_settings_dark</item>
+		<item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_dark</item>
+		<item name="iconActionSort">@drawable/ic_action_sort_dark</item>
+		<item name="iconActionSpam">@drawable/ic_action_spam_dark</item>
+		<item name="iconActionToggleFlag">@drawable/ic_action_toggle_flag_dark</item>
+		<item name="iconActionToggleRead">@drawable/ic_action_toggle_read_dark</item>
+		<item name="iconMenuAdd">@drawable/ic_menu_add</item>
+		<item name="iconMenuAttachment">@drawable/ic_menu_attachment</item>
+		<item name="iconMenuClear">@drawable/ic_menu_clear</item>
+		<item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
+		<item name="iconMenuCompact">@drawable/ic_menu_compact</item>
+		<item name="iconMenuDelete">@drawable/ic_menu_delete</item>
+		<item name="iconMenuInbox">@drawable/ic_menu_inbox</item>
+		<item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
+		<item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
+		<item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
+		<item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
+		<item name="iconMenuSearch">@drawable/ic_menu_search</item>
+		<item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
+		<item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
     </style>
 
 </resources>
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 71739ec1d..f9fa896ba 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -29,8 +29,10 @@ import android.util.Log;
 import android.util.SparseBooleanArray;
 import android.util.TypedValue;
 import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuItem;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -67,6 +69,7 @@ import com.fsck.k9.activity.misc.NonConfigurationInstance;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.AccountSetupBasics;
 import com.fsck.k9.activity.setup.Prefs;
+import com.fsck.k9.activity.setup.WelcomeMessage;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.helper.SizeFormatter;
@@ -87,7 +90,7 @@ import com.fsck.k9.preferences.SettingsImporter.ImportContents;
 import com.fsck.k9.preferences.SettingsImporter.ImportResults;
 
 
-public class Accounts extends K9ListActivity implements OnItemClickListener, OnClickListener {
+public class Accounts extends K9ListActivity implements OnItemClickListener {
 
     /**
      * Immutable empty {@link BaseAccount} array
@@ -127,6 +130,13 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     private SearchAccount integratedInboxAccount = null;
     private FontSizes mFontSizes = K9.getFontSizes();
 
+    private MenuItem mRefreshMenuItem;
+    private ActionBar mActionBar;
+
+    private TextView mActionBarTitle;
+    private TextView mActionBarSubTitle;
+    private TextView mActionBarUnread;
+
     /**
      * Contains information about objects that need to be retained on configuration changes.
      *
@@ -139,9 +149,17 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
     class AccountsHandler extends Handler {
         private void setViewTitle() {
-            String dispString = mListener.formatHeader(Accounts.this, getString(R.string.accounts_title), mUnreadMessageCount, getTimeFormat());
+            mActionBarTitle.setText(" " + getString(R.string.accounts_title));
+            mActionBarUnread.setText(String.valueOf(mUnreadMessageCount));
 
-            setTitle(dispString);
+            String operation = mListener.getOperation(Accounts.this, getTimeFormat());
+            operation.trim();
+            if (operation.length() < 1) {
+                mActionBarSubTitle.setVisibility(View.GONE);
+            } else {
+                mActionBarSubTitle.setVisibility(View.VISIBLE);
+                mActionBarSubTitle.setText(operation);
+            }
         }
         public void refreshTitle() {
             runOnUiThread(new Runnable() {
@@ -190,13 +208,23 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 }
             });
         }
-
         public void progress(final boolean progress) {
+            // Make sure we don't try this before the menu is initialized
+            // this could happen while the activity is initialized.
+            if (mRefreshMenuItem == null) {
+                return;
+            }
+
             runOnUiThread(new Runnable() {
                 public void run() {
-                    setProgressBarIndeterminateVisibility(progress);
+                    if (progress) {
+                        mRefreshMenuItem.setActionView(R.layout.actionbar_indeterminate_progress_actionview);
+                    } else {
+                        mRefreshMenuItem.setActionView(null);
+                    }
                 }
             });
+
         }
         public void progress(final int progress) {
             runOnUiThread(new Runnable() {
@@ -309,6 +337,13 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         context.startActivity(intent);
     }
 
+    public static void listAccountsClearTop(Context context) {
+        Intent intent = new Intent(context, Accounts.class);
+        intent.putExtra(EXTRA_STARTUP, false);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        context.startActivity(intent);
+    }
+
     @Override
     public void onNewIntent(Intent intent) {
         Uri uri = intent.getData();
@@ -337,6 +372,12 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         Intent intent = getIntent();
         //onNewIntent(intent);
 
+        // see if we should show the welcome message
+        if (accounts.length < 1) {
+            WelcomeMessage.showWelcomeMessage(this);
+            finish();
+        }
+
         boolean startup = intent.getBooleanExtra(EXTRA_STARTUP, true);
         if (startup && K9.startIntegratedInbox() && !K9.isHideSpecialAccounts()) {
             onOpenAccount(integratedInboxAccount);
@@ -347,18 +388,17 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             return;
         }
 
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         requestWindowFeature(Window.FEATURE_PROGRESS);
-
+        mActionBar = getSupportActionBar();
+        initializeActionBar();
         setContentView(R.layout.accounts);
         ListView listView = getListView();
         listView.setOnItemClickListener(this);
         listView.setItemsCanFocus(false);
-        listView.setEmptyView(findViewById(R.id.empty));
         listView.setScrollingCacheEnabled(false);
-        findViewById(R.id.next).setOnClickListener(this);
         registerForContextMenu(listView);
 
+
         if (icicle != null && icicle.containsKey(SELECTED_CONTEXT_ACCOUNT)) {
             String accountUuid = icicle.getString("selectedContextAccount");
             mSelectedContextAccount = Preferences.getPreferences(this).getAccount(accountUuid);
@@ -373,6 +413,18 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         }
     }
 
+    private void initializeActionBar() {
+	    mActionBar.setDisplayShowCustomEnabled(true);
+	    mActionBar.setCustomView(R.layout.actionbar_custom);
+
+        View customView = mActionBar.getCustomView();
+        mActionBarTitle = (TextView) customView.findViewById(R.id.actionbar_title_first);
+        mActionBarSubTitle = (TextView) customView.findViewById(R.id.actionbar_title_sub);
+        mActionBarUnread = (TextView) customView.findViewById(R.id.actionbar_unread_count);
+
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
     /**
      * Creates and initializes the special accounts ('Unified Inbox' and 'All Messages')
      */
@@ -464,6 +516,12 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     private void refresh() {
         accounts = Preferences.getPreferences(this).getAccounts();
 
+        // see if we should show the welcome message
+        if (accounts.length < 1) {
+            WelcomeMessage.showWelcomeMessage(this);
+            finish();
+        }
+
         List<BaseAccount> newAccounts;
         if (!K9.isHideSpecialAccounts() && accounts.length > 0) {
             if (integratedInboxAccount == null || unreadAccount == null) {
@@ -691,7 +749,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                     String outgoingPassword = null;
                     if (mOutgoingPasswordView != null) {
                         outgoingPassword = (mUseIncomingView.isChecked()) ?
-                                incomingPassword : mOutgoingPasswordView.getText().toString();
+                                           incomingPassword : mOutgoingPasswordView.getText().toString();
                     }
 
                     dialog.dismiss();
@@ -715,21 +773,21 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
             // Use the dialog's layout inflater so its theme is used (and not the activity's theme).
             View layout = mDialog.getLayoutInflater().inflate(
-                    R.layout.accounts_password_prompt, null);
+                              R.layout.accounts_password_prompt, null);
 
             // Set the intro text that tells the user what to do
             TextView intro = (TextView) layout.findViewById(R.id.password_prompt_intro);
             String serverPasswords = activity.getResources().getQuantityString(
-                    R.plurals.settings_import_server_passwords,
-                    (configureOutgoingServer) ? 2 : 1);
+                                         R.plurals.settings_import_server_passwords,
+                                         (configureOutgoingServer) ? 2 : 1);
             intro.setText(activity.getString(R.string.settings_import_activate_account_intro,
-                    mAccount.getDescription(), serverPasswords));
+                                             mAccount.getDescription(), serverPasswords));
 
             // Display the hostname of the incoming server
             TextView incomingText = (TextView) layout.findViewById(
-                    R.id.password_prompt_incoming_server);
+                                        R.id.password_prompt_incoming_server);
             incomingText.setText(activity.getString(R.string.settings_import_incoming_server,
-                    incoming.host));
+                                                    incoming.host));
 
             mIncomingPasswordView = (EditText) layout.findViewById(R.id.incoming_server_password);
             mIncomingPasswordView.addTextChangedListener(this);
@@ -737,16 +795,16 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             if (configureOutgoingServer) {
                 // Display the hostname of the outgoing server
                 TextView outgoingText = (TextView) layout.findViewById(
-                        R.id.password_prompt_outgoing_server);
+                                            R.id.password_prompt_outgoing_server);
                 outgoingText.setText(activity.getString(R.string.settings_import_outgoing_server,
-                        outgoing.host));
+                                                        outgoing.host));
 
                 mOutgoingPasswordView = (EditText) layout.findViewById(
-                        R.id.outgoing_server_password);
+                                            R.id.outgoing_server_password);
                 mOutgoingPasswordView.addTextChangedListener(this);
 
                 mUseIncomingView = (CheckBox) layout.findViewById(
-                        R.id.use_incoming_server_password);
+                                       R.id.use_incoming_server_password);
                 mUseIncomingView.setChecked(true);
                 mUseIncomingView.setOnCheckedChangeListener(new OnCheckedChangeListener() {
                     @Override
@@ -797,7 +855,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 // If the checkbox to use the incoming server password is checked we need to make
                 // sure that the password box for the outgoing server isn't empty.
                 else if (mUseIncomingView.isChecked() ||
-                        mOutgoingPasswordView.getText().length() > 0) {
+                         mOutgoingPasswordView.getText().length() > 0) {
                     enable = true;
                 }
             }
@@ -828,8 +886,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         private Application mApplication;
 
         protected SetPasswordsAsyncTask(Activity activity, Account account,
-                String incomingPassword, String outgoingPassword,
-                List<Account> remainingAccounts) {
+                                        String incomingPassword, String outgoingPassword,
+                                        List<Account> remainingAccounts) {
             super(activity);
             mAccount = account;
             mIncomingPassword = incomingPassword;
@@ -843,7 +901,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             String title = mActivity.getString(R.string.settings_import_activate_account_header);
             int passwordCount = (mOutgoingPassword == null) ? 1 : 2;
             String message = mActivity.getResources().getQuantityString(
-                    R.plurals.settings_import_setting_passwords, passwordCount);
+                                 R.plurals.settings_import_setting_passwords, passwordCount);
             mProgressDialog = ProgressDialog.show(mActivity, title, message, true);
         }
 
@@ -899,12 +957,6 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         }
     }
 
-    public void onClick(View view) {
-        if (view.getId() == R.id.next) {
-            onAddNewAccount();
-        }
-    }
-
     private void onDeleteAccount(Account account) {
         mSelectedContextAccount = account;
         showDialog(DIALOG_REMOVE_ACCOUNT);
@@ -915,101 +967,101 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         // Android recreates our dialogs on configuration changes even when they have been
         // dismissed. Make sure we have all information necessary before creating a new dialog.
         switch (id) {
-            case DIALOG_REMOVE_ACCOUNT: {
-                if (mSelectedContextAccount == null) {
-                    return null;
-                }
+        case DIALOG_REMOVE_ACCOUNT: {
+            if (mSelectedContextAccount == null) {
+                return null;
+            }
 
-                return ConfirmationDialog.create(this, id,
-                        R.string.account_delete_dlg_title,
-                        getString(R.string.account_delete_dlg_instructions_fmt,
-                                mSelectedContextAccount.getDescription()),
-                        R.string.okay_action,
-                        R.string.cancel_action,
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                if (mSelectedContextAccount instanceof Account) {
-                                    Account realAccount = (Account) mSelectedContextAccount;
-                                    try {
-                                        realAccount.getLocalStore().delete();
-                                    } catch (Exception e) {
-                                        // Ignore, this may lead to localStores on sd-cards that
-                                        // are currently not inserted to be left
-                                    }
-                                    MessagingController.getInstance(getApplication())
-                                            .notifyAccountCancel(Accounts.this, realAccount);
-                                    Preferences.getPreferences(Accounts.this)
-                                            .deleteAccount(realAccount);
-                                    K9.setServicesEnabled(Accounts.this);
-                                    refresh();
-                                }
-                            }
-                        });
-            }
-            case DIALOG_CLEAR_ACCOUNT: {
-                if (mSelectedContextAccount == null) {
-                    return null;
+            return ConfirmationDialog.create(this, id,
+                                             R.string.account_delete_dlg_title,
+                                             getString(R.string.account_delete_dlg_instructions_fmt,
+                                                     mSelectedContextAccount.getDescription()),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    if (mSelectedContextAccount instanceof Account) {
+                        Account realAccount = (Account) mSelectedContextAccount;
+                        try {
+                            realAccount.getLocalStore().delete();
+                        } catch (Exception e) {
+                            // Ignore, this may lead to localStores on sd-cards that
+                            // are currently not inserted to be left
+                        }
+                        MessagingController.getInstance(getApplication())
+                        .notifyAccountCancel(Accounts.this, realAccount);
+                        Preferences.getPreferences(Accounts.this)
+                        .deleteAccount(realAccount);
+                        K9.setServicesEnabled(Accounts.this);
+                        refresh();
+                    }
                 }
-
-                return ConfirmationDialog.create(this, id,
-                        R.string.account_clear_dlg_title,
-                        getString(R.string.account_clear_dlg_instructions_fmt,
-                                mSelectedContextAccount.getDescription()),
-                        R.string.okay_action,
-                        R.string.cancel_action,
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                if (mSelectedContextAccount instanceof Account) {
-                                    Account realAccount = (Account) mSelectedContextAccount;
-                                    mHandler.workingAccount(realAccount,
-                                            R.string.clearing_account);
-                                    MessagingController.getInstance(getApplication())
-                                            .clear(realAccount, null);
-                                }
-                            }
-                        });
+            });
+        }
+        case DIALOG_CLEAR_ACCOUNT: {
+            if (mSelectedContextAccount == null) {
+                return null;
             }
-            case DIALOG_RECREATE_ACCOUNT: {
-                if (mSelectedContextAccount == null) {
-                    return null;
+
+            return ConfirmationDialog.create(this, id,
+                                             R.string.account_clear_dlg_title,
+                                             getString(R.string.account_clear_dlg_instructions_fmt,
+                                                     mSelectedContextAccount.getDescription()),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    if (mSelectedContextAccount instanceof Account) {
+                        Account realAccount = (Account) mSelectedContextAccount;
+                        mHandler.workingAccount(realAccount,
+                                                R.string.clearing_account);
+                        MessagingController.getInstance(getApplication())
+                        .clear(realAccount, null);
+                    }
                 }
+            });
+        }
+        case DIALOG_RECREATE_ACCOUNT: {
+            if (mSelectedContextAccount == null) {
+                return null;
+            }
 
-                return ConfirmationDialog.create(this, id,
-                        R.string.account_recreate_dlg_title,
-                        getString(R.string.account_recreate_dlg_instructions_fmt,
-                                mSelectedContextAccount.getDescription()),
-                        R.string.okay_action,
-                        R.string.cancel_action,
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                if (mSelectedContextAccount instanceof Account) {
-                                    Account realAccount = (Account) mSelectedContextAccount;
-                                    mHandler.workingAccount(realAccount,
-                                            R.string.recreating_account);
-                                    MessagingController.getInstance(getApplication())
-                                            .recreate(realAccount, null);
-                                }
-                            }
-                        });
-            }
-            case DIALOG_NO_FILE_MANAGER: {
-                return ConfirmationDialog.create(this, id,
-                        R.string.import_dialog_error_title,
-                        getString(R.string.import_dialog_error_message),
-                        R.string.open_market,
-                        R.string.close,
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                Uri uri = Uri.parse(ANDROID_MARKET_URL);
-                                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                                startActivity(intent);
-                            }
-                        });
-            }
+            return ConfirmationDialog.create(this, id,
+                                             R.string.account_recreate_dlg_title,
+                                             getString(R.string.account_recreate_dlg_instructions_fmt,
+                                                     mSelectedContextAccount.getDescription()),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    if (mSelectedContextAccount instanceof Account) {
+                        Account realAccount = (Account) mSelectedContextAccount;
+                        mHandler.workingAccount(realAccount,
+                                                R.string.recreating_account);
+                        MessagingController.getInstance(getApplication())
+                        .recreate(realAccount, null);
+                    }
+                }
+            });
+        }
+        case DIALOG_NO_FILE_MANAGER: {
+            return ConfirmationDialog.create(this, id,
+                                             R.string.import_dialog_error_title,
+                                             getString(R.string.import_dialog_error_message),
+                                             R.string.open_market,
+                                             R.string.close,
+            new Runnable() {
+                @Override
+                public void run() {
+                    Uri uri = Uri.parse(ANDROID_MARKET_URL);
+                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                    startActivity(intent);
+                }
+            });
+        }
         }
 
         return super.onCreateDialog(id);
@@ -1019,28 +1071,28 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     public void onPrepareDialog(int id, Dialog d) {
         AlertDialog alert = (AlertDialog) d;
         switch (id) {
-            case DIALOG_REMOVE_ACCOUNT: {
-                alert.setMessage(getString(R.string.account_delete_dlg_instructions_fmt,
-                        mSelectedContextAccount.getDescription()));
-                break;
-            }
-            case DIALOG_CLEAR_ACCOUNT: {
-                alert.setMessage(getString(R.string.account_clear_dlg_instructions_fmt,
-                        mSelectedContextAccount.getDescription()));
-                break;
-            }
-            case DIALOG_RECREATE_ACCOUNT: {
-                alert.setMessage(getString(R.string.account_recreate_dlg_instructions_fmt,
-                        mSelectedContextAccount.getDescription()));
-                break;
-            }
+        case DIALOG_REMOVE_ACCOUNT: {
+            alert.setMessage(getString(R.string.account_delete_dlg_instructions_fmt,
+                                       mSelectedContextAccount.getDescription()));
+            break;
+        }
+        case DIALOG_CLEAR_ACCOUNT: {
+            alert.setMessage(getString(R.string.account_clear_dlg_instructions_fmt,
+                                       mSelectedContextAccount.getDescription()));
+            break;
+        }
+        case DIALOG_RECREATE_ACCOUNT: {
+            alert.setMessage(getString(R.string.account_recreate_dlg_instructions_fmt,
+                                       mSelectedContextAccount.getDescription()));
+            break;
+        }
         }
 
         super.onPrepareDialog(id, d);
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
+    public boolean onContextItemSelected(android.view.MenuItem item) {
         AdapterContextMenuInfo menuInfo = (AdapterContextMenuInfo)item.getMenuInfo();
         // submenus don't actually set the menuInfo, so the "advanced"
         // submenu wouldn't work.
@@ -1159,6 +1211,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         new String[] {"Commons IO", "http://commons.apache.org/io/"},
         new String[] {"Mime4j", "http://james.apache.org/mime4j/"},
         new String[] {"HtmlCleaner", "http://htmlcleaner.sourceforge.net/"},
+        new String[] {"ActionBarSherlock", "http://actionbarsherlock.com/"}
     };
 
     private void onAbout() {
@@ -1242,7 +1295,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.accounts_option, menu);
+        getSupportMenuInflater().inflate(R.menu.accounts_option, menu);
+        mRefreshMenuItem = menu.findItem(R.id.check_mail);
         return true;
     }
 
@@ -1262,7 +1316,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
         if (account instanceof SearchAccount) {
             for (int i = 0; i < menu.size(); i++) {
-                MenuItem item = menu.getItem(i);
+                android.view.MenuItem item = menu.getItem(i);
                 if (item.getItemId() != R.id.open) {
                     item.setVisible(false);
                 }
@@ -1295,7 +1349,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
         if (infos.size() > 0) {
             startActivityForResult(Intent.createChooser(i, null),
-                    ACTIVITY_REQUEST_PICK_SETTINGS_FILE);
+                                   ACTIVITY_REQUEST_PICK_SETTINGS_FILE);
         } else {
             showDialog(DIALOG_NO_FILE_MANAGER);
         }
@@ -1433,7 +1487,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
             int imported = mImportResults.importedAccounts.size();
             String accounts = activity.getResources().getQuantityString(
-                    R.plurals.settings_import_success, imported, imported);
+                                  R.plurals.settings_import_success, imported, imported);
             return activity.getString(R.string.settings_import_success, accounts, mFilename);
         }
 
@@ -1547,46 +1601,46 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             builder.setTitle(activity.getString(R.string.settings_import_selection));
             builder.setInverseBackgroundForced(true);
             builder.setPositiveButton(R.string.okay_action,
-                new DialogInterface.OnClickListener() {
+            new DialogInterface.OnClickListener() {
 
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        ListView listView = ((AlertDialog) dialog).getListView();
-                        SparseBooleanArray pos = listView.getCheckedItemPositions();
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    ListView listView = ((AlertDialog) dialog).getListView();
+                    SparseBooleanArray pos = listView.getCheckedItemPositions();
 
-                        boolean includeGlobals = mImportContents.globalSettings ? pos.get(0) : false;
-                        List<String> accountUuids = new ArrayList<String>();
-                        int start = mImportContents.globalSettings ? 1 : 0;
-                        for (int i = start, end = listView.getCount(); i < end; i++) {
-                            if (pos.get(i)) {
-                                accountUuids.add(mImportContents.accounts.get(i-start).uuid);
-                            }
+                    boolean includeGlobals = mImportContents.globalSettings ? pos.get(0) : false;
+                    List<String> accountUuids = new ArrayList<String>();
+                    int start = mImportContents.globalSettings ? 1 : 0;
+                    for (int i = start, end = listView.getCount(); i < end; i++) {
+                        if (pos.get(i)) {
+                            accountUuids.add(mImportContents.accounts.get(i - start).uuid);
                         }
-
-                        /*
-                         * TODO: Think some more about this. Overwriting could change the store
-                         * type. This requires some additional code in order to work smoothly
-                         * while the app is running.
-                         */
-                        boolean overwrite = false;
-
-                        dialog.dismiss();
-                        activity.setNonConfigurationInstance(null);
-
-                        ImportAsyncTask importAsyncTask = new ImportAsyncTask(activity,
-                                includeGlobals, accountUuids, overwrite, mUri);
-                        activity.setNonConfigurationInstance(importAsyncTask);
-                        importAsyncTask.execute();
                     }
-                });
+
+                    /*
+                     * TODO: Think some more about this. Overwriting could change the store
+                     * type. This requires some additional code in order to work smoothly
+                     * while the app is running.
+                     */
+                    boolean overwrite = false;
+
+                    dialog.dismiss();
+                    activity.setNonConfigurationInstance(null);
+
+                    ImportAsyncTask importAsyncTask = new ImportAsyncTask(activity,
+                            includeGlobals, accountUuids, overwrite, mUri);
+                    activity.setNonConfigurationInstance(importAsyncTask);
+                    importAsyncTask.execute();
+                }
+            });
             builder.setNegativeButton(R.string.cancel_action,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            dialog.dismiss();
-                            activity.setNonConfigurationInstance(null);
-                        }
-                    });
+            new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.dismiss();
+                    activity.setNonConfigurationInstance(null);
+                }
+            });
             mDialog = builder.show();
         }
     }
@@ -1824,7 +1878,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
 
         private ExportAsyncTask(Accounts activity, boolean includeGlobals,
-                Set<String> accountUuids) {
+                                Set<String> accountUuids) {
             super(activity);
             mIncludeGlobals = includeGlobals;
             mAccountUuids = accountUuids;
@@ -1841,7 +1895,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         protected Boolean doInBackground(Void... params) {
             try {
                 mFileName = SettingsExporter.exportToFile(mContext, mIncludeGlobals,
-                        mAccountUuids);
+                            mAccountUuids);
             } catch (SettingsImportExportException e) {
                 Log.w(K9.LOG_TAG, "Exception during export", e);
                 return false;
@@ -1860,11 +1914,11 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
             if (success) {
                 activity.showSimpleDialog(R.string.settings_export_success_header,
-                        R.string.settings_export_success, mFileName);
+                                          R.string.settings_export_success, mFileName);
             } else {
                 //TODO: better error messages
                 activity.showSimpleDialog(R.string.settings_export_failed_header,
-                        R.string.settings_export_failure);
+                                          R.string.settings_export_failure);
             }
         }
     }
@@ -1880,7 +1934,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         private ImportResults mImportResults;
 
         private ImportAsyncTask(Accounts activity, boolean includeGlobals,
-                List<String> accountUuids, boolean overwrite, Uri uri) {
+                                List<String> accountUuids, boolean overwrite, Uri uri) {
             super(activity);
             mIncludeGlobals = includeGlobals;
             mAccountUuids = accountUuids;
@@ -1901,11 +1955,13 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 InputStream is = mContext.getContentResolver().openInputStream(mUri);
                 try {
                     mImportResults = SettingsImporter.importSettings(mContext, is,
-                            mIncludeGlobals, mAccountUuids, mOverwrite);
+                                     mIncludeGlobals, mAccountUuids, mOverwrite);
                 } finally {
                     try {
                         is.close();
-                    } catch (IOException e) { /* Ignore */ }
+                    } catch (IOException e) {
+                        /* Ignore */
+                    }
                 }
             } catch (SettingsImportExportException e) {
                 Log.w(K9.LOG_TAG, "Exception during import", e);
@@ -1935,7 +1991,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             if (success && (globalSettings || imported > 0)) {
                 if (imported == 0) {
                     activity.showSimpleDialog(R.string.settings_import_success_header,
-                            R.string.settings_import_global_settings_success, filename);
+                                              R.string.settings_import_global_settings_success, filename);
                 } else {
                     activity.showAccountsImportedDialog(mImportResults, filename);
                 }
@@ -1944,7 +2000,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             } else {
                 //TODO: better error messages
                 activity.showSimpleDialog(R.string.settings_import_failed_header,
-                        R.string.settings_import_failure, filename);
+                                          R.string.settings_import_failure, filename);
             }
         }
     }
@@ -1976,13 +2032,14 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 } finally {
                     try {
                         is.close();
-                    } catch (IOException e) { /* Ignore */ }
+                    } catch (IOException e) {
+                        /* Ignore */
+                    }
                 }
             } catch (SettingsImportExportException e) {
                 Log.w(K9.LOG_TAG, "Exception during export", e);
                 return false;
-            }
-            catch (FileNotFoundException e) {
+            } catch (FileNotFoundException e) {
                 Log.w(K9.LOG_TAG, "Couldn't read content from URI " + mUri);
                 return false;
             }
@@ -2004,7 +2061,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 String filename = mUri.getLastPathSegment();
                 //TODO: better error messages
                 activity.showSimpleDialog(R.string.settings_import_failed_header,
-                        R.string.settings_import_failure, filename);
+                                          R.string.settings_import_failure, filename);
             }
         }
     }
diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/src/com/fsck/k9/activity/ActivityListener.java
index 803158fc0..329a64677 100644
--- a/src/com/fsck/k9/activity/ActivityListener.java
+++ b/src/com/fsck/k9/activity/ActivityListener.java
@@ -23,6 +23,13 @@ public class ActivityListener extends MessagingListener {
 
 
     public String formatHeader(Context context, String activityPrefix, int unreadMessageCount, DateFormat timeFormat) {
+	String operation = getOperation(context, timeFormat);
+        return context.getString(R.string.activity_header_format, activityPrefix,
+                                 (unreadMessageCount > 0 ? context.getString(R.string.activity_unread_count, unreadMessageCount) : ""),
+                                 operation);
+    }
+
+    public String getOperation(Context context, DateFormat timeFormat){
         String operation = null;
         String progress = null;
         if (mLoadingAccountDescription  != null
@@ -66,11 +73,7 @@ public class ActivityListener extends MessagingListener {
             }
         }
 
-        return context.getString(R.string.activity_header_format, activityPrefix,
-                                 (unreadMessageCount > 0 ? context.getString(R.string.activity_unread_count, unreadMessageCount) : ""),
-                                 operation);
-
-
+        return operation;
     }
 
     public void informUserOfStatus() {
diff --git a/src/com/fsck/k9/activity/ChooseFolder.java b/src/com/fsck/k9/activity/ChooseFolder.java
index a5aa71849..1ac7ca9ae 100644
--- a/src/com/fsck/k9/activity/ChooseFolder.java
+++ b/src/com/fsck/k9/activity/ChooseFolder.java
@@ -14,10 +14,11 @@ import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.Window;
+
 import android.view.View;
-import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
@@ -142,7 +143,7 @@ public class ChooseFolder extends K9ListActivity {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case MSG_PROGRESS: {
-                    setProgressBarIndeterminateVisibility(msg.arg1 != 0);
+                    setSupportProgressBarIndeterminateVisibility(msg.arg1 != 0);
                     break;
                 }
                 case MSG_SET_SELECTED_FOLDER: {
@@ -170,7 +171,7 @@ public class ChooseFolder extends K9ListActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.folder_select_option, menu);
+        getSupportMenuInflater().inflate(R.menu.folder_select_option, menu);
         return true;
     }
 
diff --git a/src/com/fsck/k9/activity/FolderInfoHolder.java b/src/com/fsck/k9/activity/FolderInfoHolder.java
index f493e5e71..11f4fa272 100644
--- a/src/com/fsck/k9/activity/FolderInfoHolder.java
+++ b/src/com/fsck/k9/activity/FolderInfoHolder.java
@@ -97,7 +97,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
 
         this.status = truncateStatus(folder.getStatus());
 
-        this.displayName = getDisplayName(context, folder);
+        this.displayName = getDisplayName(context, account, name);
     }
 
     /**
@@ -109,16 +109,15 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
      *
      * @param context
      *         A {@link Context} instance that is used to get the string resources.
-     * @param folder
-     *         The {@link Folder} instance for which to return the display name.
+     * @param account
+     *         The {@link Account} the folder belongs to.
+     * @param name
+     *         The name of the folder for which to return the display name.
      *
      * @return The localized name for the provided folder if it's a special folder or the original
      *         folder name if it's a non-special folder.
      */
-    public static String getDisplayName(Context context, Folder folder) {
-        Account account = folder.getAccount();
-        String name = folder.getName();
-
+    public static String getDisplayName(Context context, Account account, String name) {
         final String displayName;
         if (name.equals(account.getSpamFolderName())) {
             displayName = String.format(
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 1b25aeb87..b408aca6f 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1,5 +1,11 @@
 package com.fsck.k9.activity;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -13,20 +19,46 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.*;
+import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.*;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
 
-import com.fsck.k9.*;
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
+import com.actionbarsherlock.view.ActionMode;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.Window;
+import com.fsck.k9.Account;
 import com.fsck.k9.Account.FolderMode;
-import com.fsck.k9.activity.FolderInfoHolder;
+import com.fsck.k9.AccountStats;
+import com.fsck.k9.BaseAccount;
+import com.fsck.k9.FontSizes;
+import com.fsck.k9.K9;
+import com.fsck.k9.Preferences;
+import com.fsck.k9.R;
+import com.fsck.k9.SearchSpecification;
 import com.fsck.k9.activity.FolderList.FolderListAdapter.FolderListFilter;
-import com.fsck.k9.activity.setup.Prefs;
+import com.fsck.k9.activity.misc.ActionBarNavigationSpinner;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
+import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.helper.SizeFormatter;
@@ -35,21 +67,16 @@ import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
-import com.fsck.k9.mail.store.LocalStore.LocalFolder;
 import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.store.LocalStore.LocalFolder;
 import com.fsck.k9.service.MailService;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * FolderList is the primary user interface for the program. This
  * Activity shows list of the Account's folders
  */
 
-public class FolderList extends K9ListActivity {
+public class FolderList extends K9ListActivity implements OnNavigationListener {
     /*
      * Constants for showDialog() etc.
      */
@@ -79,16 +106,29 @@ public class FolderList extends K9ListActivity {
     private FontSizes mFontSizes = K9.getFontSizes();
     private Context context;
 
+	private MenuItem mRefreshMenuItem;
+	private View mActionBarProgressView;
+    private ActionBar mActionBar;
+    private ActionMode mActionMode;
+
+    private TextView mActionBarTitle;
+    private TextView mActionBarSubTitle;
+    private TextView mActionBarUnread;
+
     class FolderListHandler extends Handler {
 
         public void refreshTitle() {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    String dispString = mAdapter.mListener.formatHeader(FolderList.this,
-                                        getString(R.string.folder_list_title, mAccount.getDescription()), mUnreadMessageCount, getTimeFormat());
+			mActionBarTitle.setText(getString(R.string.folders_title));
+                    mActionBarUnread.setText(String.valueOf(mUnreadMessageCount));
 
-
-                    setTitle(dispString);
+                    String operation = mAdapter.mListener.getOperation(FolderList.this, getTimeFormat()).trim();
+                    if (operation.length() < 1) {
+                        mActionBarSubTitle.setText(mAccount.getEmail());
+                    } else {
+                        mActionBarSubTitle.setText(operation);
+                    }
                 }
             });
         }
@@ -141,9 +181,19 @@ public class FolderList extends K9ListActivity {
         }
 
         public void progress(final boolean progress) {
+            // Make sure we don't try this before the menu is initialized
+            // this could happen while the activity is initialized.
+            if (mRefreshMenuItem == null) {
+                return;
+            }
+
             runOnUiThread(new Runnable() {
                 public void run() {
-                    setProgressBarIndeterminateVisibility(progress);
+			if (progress) {
+                        mRefreshMenuItem.setActionView(mActionBarProgressView);
+                    } else {
+                        mRefreshMenuItem.setActionView(null);
+                    }
                 }
             });
 
@@ -242,8 +292,9 @@ public class FolderList extends K9ListActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
+        mActionBarProgressView = getLayoutInflater().inflate(R.layout.actionbar_indeterminate_progress_actionview, null);
+        mActionBar = getSupportActionBar();
+        initializeActionBar();
         setContentView(R.layout.folder_list);
         mListView = getListView();
         mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
@@ -266,6 +317,31 @@ public class FolderList extends K9ListActivity {
         context = this;
     }
 
+    private void initializeActionBar() {
+        mActionBar.setDisplayShowCustomEnabled(true);
+        mActionBar.setCustomView(R.layout.actionbar_custom);
+
+        View customView = mActionBar.getCustomView();
+        mActionBarTitle = (TextView) customView.findViewById(R.id.actionbar_title_first);
+        mActionBarSubTitle = (TextView) customView.findViewById(R.id.actionbar_title_sub);
+        mActionBarUnread = (TextView) customView.findViewById(R.id.actionbar_unread_count);
+
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(int itemPosition, long itemId) {
+        if (itemId == ActionBarNavigationSpinner.AB_NAVIGATION_INBOX) {
+            onOpenFolder(mAccount.getInboxFolderName());
+            return true;
+        } else if (itemId == ActionBarNavigationSpinner.AB_NAVIGATION_ACCOUNTS) {
+            onAccounts();
+            return true;
+        }
+
+        return false;
+    }
+
     @Override
     public void onNewIntent(Intent intent) {
         setIntent(intent); // onNewIntent doesn't autoset our "internal" intent
@@ -308,7 +384,7 @@ public class FolderList extends K9ListActivity {
         setListAdapter(mAdapter);
         getListView().setTextFilterEnabled(mAdapter.getFilter() != null); // should never be false but better safe then sorry
 
-        setTitle(mAccount.getDescription());
+        mHandler.refreshTitle();
 
     }
 
@@ -372,8 +448,7 @@ public class FolderList extends K9ListActivity {
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         //Shortcuts that work no matter what is selected
         switch (keyCode) {
-        case KeyEvent.KEYCODE_Q:
-        {
+        case KeyEvent.KEYCODE_Q: {
             onAccounts();
             return true;
         }
@@ -495,6 +570,11 @@ public class FolderList extends K9ListActivity {
 
     @Override public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+        case android.R.id.home:
+            onAccounts();
+
+            return true;
+
         case R.id.compose:
             MessageCompose.actionCompose(this, mAccount);
 
@@ -507,9 +587,6 @@ public class FolderList extends K9ListActivity {
 
         case R.id.send_messages:
             MessagingController.getInstance(getApplication()).sendPendingMessages(mAccount, null);
-            return true;
-        case R.id.accounts:
-            onAccounts();
 
             return true;
 
@@ -578,11 +655,12 @@ public class FolderList extends K9ListActivity {
 
     @Override public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.folder_list_option, menu);
+        getSupportMenuInflater().inflate(R.menu.folder_list_option, menu);
+        mRefreshMenuItem = menu.findItem(R.id.check_mail);
         return true;
     }
 
-    @Override public boolean onContextItemSelected(MenuItem item) {
+    @Override public boolean onContextItemSelected(android.view.MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo();
         FolderInfoHolder folder = (FolderInfoHolder) mAdapter.getItem(info.position);
 
@@ -653,59 +731,63 @@ public class FolderList extends K9ListActivity {
     @Override
     public Dialog onCreateDialog(int id) {
         switch (id) {
-            case DIALOG_MARK_ALL_AS_READ:
-                return ConfirmationDialog.create(this, id, R.string.mark_all_as_read_dlg_title,
-                        getString(R.string.mark_all_as_read_dlg_instructions_fmt,
-                            mSelectedContextFolder.displayName),
-                        R.string.okay_action, R.string.cancel_action,
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                markAllAsRead();
-                            }
-                        });
-            case DIALOG_FIND_FOLDER: {
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(R.string.filter_folders_action);
+        case DIALOG_MARK_ALL_AS_READ:
+            return ConfirmationDialog.create(this, id, R.string.mark_all_as_read_dlg_title,
+                                             getString(R.string.mark_all_as_read_dlg_instructions_fmt,
+                                                     mSelectedContextFolder.displayName),
+                                             R.string.okay_action, R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    markAllAsRead();
+                }
+            });
+        case DIALOG_FIND_FOLDER: {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.filter_folders_action);
 
-                final EditText input = new EditText(this);
-                input.setId(R.id.filter_folders);
-                input.setHint(R.string.folder_list_filter_hint);
-                input.addTextChangedListener(new TextWatcher() {
-                    @Override
-                    public void onTextChanged(CharSequence s, int start, int before, int count) {
-                        mAdapter.getFilter().filter(input.getText());
-                    }
+            final EditText input = new EditText(this);
+            input.setId(R.id.filter_folders);
+            input.setHint(R.string.folder_list_filter_hint);
+            input.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    mAdapter.getFilter().filter(input.getText());
+                }
 
-                    @Override
-                    public void beforeTextChanged(CharSequence s, int start, int count,
-                            int after) { /* not used */ }
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count,
+                int after) {
+                    /* not used */
+                }
 
-                    @Override
-                    public void afterTextChanged(Editable s) { /* not used */ }
-                });
+                @Override
+                public void afterTextChanged(Editable s) {
+                    /* not used */
+                }
+            });
 
-                builder.setView(input);
+            builder.setView(input);
 
-                builder.setPositiveButton(getString(R.string.okay_action),
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int whichButton) {
-                                String value = input.getText().toString();
-                                mAdapter.getFilter().filter(value);
-                            }
-                        });
+            builder.setPositiveButton(getString(R.string.okay_action),
+            new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int whichButton) {
+                    String value = input.getText().toString();
+                    mAdapter.getFilter().filter(value);
+                }
+            });
 
-                builder.setNegativeButton(getString(R.string.cancel_action),
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int whichButton) {
-                                mAdapter.getFilter().filter(null);
-                            }
-                        });
+            builder.setNegativeButton(getString(R.string.cancel_action),
+            new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int whichButton) {
+                    mAdapter.getFilter().filter(null);
+                }
+            });
 
-                return builder.create();
-            }
+            return builder.create();
+        }
         }
 
         return super.onCreateDialog(id);
@@ -714,27 +796,27 @@ public class FolderList extends K9ListActivity {
     @Override
     public void onPrepareDialog(int id, Dialog dialog) {
         switch (id) {
-            case DIALOG_MARK_ALL_AS_READ: {
-                AlertDialog alertDialog = (AlertDialog) dialog;
-                alertDialog.setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt,
-                        mSelectedContextFolder.displayName));
-                break;
-            }
-            case DIALOG_FIND_FOLDER: {
-                AlertDialog alertDialog = (AlertDialog) dialog;
-                EditText input = (EditText) alertDialog.findViewById(R.id.filter_folders);
+        case DIALOG_MARK_ALL_AS_READ: {
+            AlertDialog alertDialog = (AlertDialog) dialog;
+            alertDialog.setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt,
+                                             mSelectedContextFolder.displayName));
+            break;
+        }
+        case DIALOG_FIND_FOLDER: {
+            AlertDialog alertDialog = (AlertDialog) dialog;
+            EditText input = (EditText) alertDialog.findViewById(R.id.filter_folders);
 
-                // Populate the EditText with the current search term
-                FolderListFilter filter = (FolderListFilter) mAdapter.getFilter();
-                input.setText(filter.getSearchTerm());
+            // Populate the EditText with the current search term
+            FolderListFilter filter = (FolderListFilter) mAdapter.getFilter();
+            input.setText(filter.getSearchTerm());
 
-                // Place the cursor at the end of the text
-                input.setSelection(input.getText().length());
-                break;
-            }
-            default: {
-                super.onPrepareDialog(id, dialog);
-            }
+            // Place the cursor at the end of the text
+            input.setSelection(input.getText().length());
+            break;
+        }
+        default: {
+            super.onPrepareDialog(id, dialog);
+        }
         }
     }
 
diff --git a/src/com/fsck/k9/activity/K9Activity.java b/src/com/fsck/k9/activity/K9Activity.java
index 228477489..afd9c5bf8 100644
--- a/src/com/fsck/k9/activity/K9Activity.java
+++ b/src/com/fsck/k9/activity/K9Activity.java
@@ -3,7 +3,6 @@ package com.fsck.k9.activity;
 
 import java.util.Locale;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
@@ -15,10 +14,12 @@ import android.view.MotionEvent;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.TranslateAnimation;
+
+import com.actionbarsherlock.app.SherlockActivity;
 import com.fsck.k9.K9;
 
 
-public class K9Activity extends Activity {
+public class K9Activity extends SherlockActivity {
     protected static final int BEZEL_SWIPE_THRESHOLD = 20;
 
     protected GestureDetector mGestureDetector;
diff --git a/src/com/fsck/k9/activity/K9ListActivity.java b/src/com/fsck/k9/activity/K9ListActivity.java
index 613b22119..91427e505 100644
--- a/src/com/fsck/k9/activity/K9ListActivity.java
+++ b/src/com/fsck/k9/activity/K9ListActivity.java
@@ -1,15 +1,20 @@
 package com.fsck.k9.activity;
 
-import android.app.ListActivity;
 import android.util.Log;
+import android.view.GestureDetector;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.os.Bundle;
+
+import com.actionbarsherlock.app.SherlockListActivity;
 import com.fsck.k9.K9;
 import com.fsck.k9.helper.DateFormatter;
 
-public class K9ListActivity extends ListActivity {
+public class K9ListActivity extends SherlockListActivity {
+    protected GestureDetector mGestureDetector;
+
     @Override
     public void onCreate(Bundle icicle) {
         K9Activity.setLanguage(this, K9.getK9Language());
@@ -87,4 +92,12 @@ public class K9ListActivity extends ListActivity {
         }
         return super.onKeyUp(keyCode, event);
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (mGestureDetector != null) {
+            mGestureDetector.onTouchEvent(ev);
+        }
+        return super.dispatchTouchEvent(ev);
+    }
 }
diff --git a/src/com/fsck/k9/activity/K9PreferenceActivity.java b/src/com/fsck/k9/activity/K9PreferenceActivity.java
index fff69b028..5fa44cb76 100644
--- a/src/com/fsck/k9/activity/K9PreferenceActivity.java
+++ b/src/com/fsck/k9/activity/K9PreferenceActivity.java
@@ -1,20 +1,28 @@
 package com.fsck.k9.activity;
 
+import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.fsck.k9.K9;
+
+import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
 import android.preference.ListPreference;
 import android.preference.Preference;
 
 
-public class K9PreferenceActivity extends PreferenceActivity {
+public class K9PreferenceActivity extends SherlockPreferenceActivity {
     @Override
     public void onCreate(Bundle icicle) {
         K9Activity.setLanguage(this, K9.getK9Language());
-        // http://code.google.com/p/k9mail/issues/detail?id=2439
-        // Re-enable themeing support in preferences when
-        // http://code.google.com/p/android/issues/detail?id=4611 is resolved
-        // setTheme(K9.getK9Theme());
+
+        if (Build.VERSION.SDK_INT >= 6 && Build.VERSION.SDK_INT < 11) {
+            // there's a display bug in 2.1, 2.2, 2.3 (unsure about 2.0)
+            // which causes PreferenceScreens to have a black background.
+            // http://code.google.com/p/android/issues/detail?id=4611
+            setTheme(K9.getK9ThemeResourceId(K9.THEME_DARK));
+        } else {
+            setTheme(K9.getK9ThemeResourceId());
+        }
+
         super.onCreate(icicle);
     }
 
diff --git a/src/com/fsck/k9/activity/ManageIdentities.java b/src/com/fsck/k9/activity/ManageIdentities.java
index a15aaaa6f..7f69bf50d 100644
--- a/src/com/fsck/k9/activity/ManageIdentities.java
+++ b/src/com/fsck/k9/activity/ManageIdentities.java
@@ -1,12 +1,16 @@
 package com.fsck.k9.activity;
 
 import android.content.Intent;
-import android.view.*;
+import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ListView;
 import android.widget.Toast;
+
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import com.fsck.k9.Identity;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
@@ -40,7 +44,7 @@ public class ManageIdentities extends ChooseIdentity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.manage_identities_option, menu);
+        getSupportMenuInflater().inflate(R.menu.manage_identities_option, menu);
         return true;
     }
 
@@ -66,7 +70,7 @@ public class ManageIdentities extends ChooseIdentity {
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
+    public boolean onContextItemSelected(android.view.MenuItem item) {
         AdapterContextMenuInfo menuInfo = (AdapterContextMenuInfo)item.getMenuInfo();
         switch (item.getItemId()) {
         case R.id.edit:
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 3d177de80..c0aa2f433 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -22,13 +22,14 @@ import android.text.util.Rfc822Tokenizer;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.Window;
+
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.AutoCompleteTextView.Validator;
@@ -282,6 +283,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
     private String mReferences;
     private String mInReplyTo;
+    private Menu mMenu;
 
     private boolean mSourceProcessed = false;
 
@@ -322,10 +324,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
             case MSG_PROGRESS_ON:
-                setProgressBarIndeterminateVisibility(true);
+                setSupportProgressBarIndeterminateVisibility(true);
                 break;
             case MSG_PROGRESS_OFF:
-                setProgressBarIndeterminateVisibility(false);
+                setSupportProgressBarIndeterminateVisibility(false);
                 break;
             case MSG_UPDATE_TITLE:
                 updateTitle();
@@ -448,6 +450,16 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         context.startActivity(i);
     }
 
+    /*
+     * This is a workaround for an annoying ( temporarly? ) issue:
+     * https://github.com/JakeWharton/ActionBarSherlock/issues/449
+     */
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+	super.onPostCreate(savedInstanceState);
+	setSupportProgressBarIndeterminateVisibility(false);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -1783,6 +1795,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private void onAddCcBcc() {
         mCcWrapper.setVisibility(View.VISIBLE);
         mBccWrapper.setVisibility(View.VISIBLE);
+        mMenu.findItem(R.id.add_cc_bcc).setVisible(false);
     }
 
     private void onReadReceipt() {
@@ -2180,7 +2193,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.message_compose_option, menu);
+        getSupportMenuInflater().inflate(R.menu.message_compose_option, menu);
+
+        mMenu = menu;
 
         // Disable the 'Save' menu option if Drafts folder is set to -NONE-
         if (!mAccount.hasDraftsFolder()) {
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 281ddf747..0fcdfcac1 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1,6 +1,7 @@
 package com.fsck.k9.activity;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumMap;
@@ -25,33 +26,31 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.ActionMode;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.Window;
 import com.fsck.k9.Account;
 import com.fsck.k9.Account.SortType;
 import com.fsck.k9.AccountStats;
@@ -60,6 +59,8 @@ import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import com.fsck.k9.SearchSpecification;
+import com.fsck.k9.activity.misc.SwipeGestureDetector;
+import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
 import com.fsck.k9.activity.setup.Prefs;
@@ -81,9 +82,8 @@ import com.fsck.k9.mail.store.StorageManager;
  * shows a list of messages.
  * From this Activity the user can perform all standard message operations.
  */
-public class MessageList
-    extends K9Activity
-    implements OnClickListener, AdapterView.OnItemClickListener, AnimationListener {
+public class MessageList extends K9ListActivity implements OnItemClickListener,
+        OnSwipeGestureListener {
 
     /**
      * Reverses the result of a {@link Comparator}.
@@ -298,24 +298,14 @@ public class MessageList
     private boolean mCheckboxes = true;
     private int mSelectedCount = 0;
 
-    private View mBatchButtonArea;
-    private ImageButton mBatchReadButton;
-    private ImageButton mBatchDeleteButton;
-    private ImageButton mBatchFlagButton;
-    private ImageButton mBatchArchiveButton;
-    private ImageButton mBatchMoveButton;
-    private ImageButton mBatchDoneButton;
-
     private FontSizes mFontSizes = K9.getFontSizes();
 
+    private MenuItem mRefreshMenuItem;
+    private ActionBar mActionBar;
+    private ActionMode mActionMode;
+    private View mActionBarProgressView;
     private Bundle mState = null;
 
-    /**
-     * Remember the selection to be consistent between menu display and menu item
-     * selection
-     */
-    private MessageInfoHolder mSelectedMessage;
-
     /**
      * Relevant messages for the current context when we have to remember the
      * chosen messages between user interactions (eg. Selecting a folder for
@@ -330,6 +320,10 @@ public class MessageList
 
     private StorageManager.StorageListener mStorageListener = new StorageListenerImplementation();
 
+    private TextView mActionBarTitle;
+    private TextView mActionBarSubTitle;
+    private TextView mActionBarUnread;
+
     private final class StorageListenerImplementation implements StorageManager.StorageListener {
         @Override
         public void onUnmount(String providerId) {
@@ -515,35 +509,61 @@ public class MessageList
             }
         }
 
-        getWindow().setFeatureInt(Window.FEATURE_PROGRESS, level);
+        setSupportProgress(level);
     }
 
     private void setWindowTitle() {
-        String displayName;
-
+        // regular folder content display
         if (mFolderName != null) {
-            displayName  = mFolderName;
+            String displayName = FolderInfoHolder.getDisplayName(MessageList.this, mAccount,
+                mFolderName);
 
-            if (mAccount.getInboxFolderName().equalsIgnoreCase(displayName)) {
-                displayName = getString(R.string.special_mailbox_name_inbox);
-            } else if (mAccount.getOutboxFolderName().equals(displayName)) {
-                displayName = getString(R.string.special_mailbox_name_outbox);
-            }
+            mActionBarTitle.setText(displayName);
 
-            String dispString = mAdapter.mListener.formatHeader(MessageList.this, getString(R.string.message_list_title, mAccount.getDescription(), displayName), mUnreadMessageCount, getTimeFormat());
-            setTitle(dispString);
-        } else if (mQueryString != null) {
-            if (mTitle != null) {
-                String dispString = mAdapter.mListener.formatHeader(MessageList.this, mTitle, mUnreadMessageCount, getTimeFormat());
-                setTitle(dispString);
+            String operation = mAdapter.mListener.getOperation(MessageList.this, getTimeFormat()).trim();
+            if (operation.length() < 1) {
+                mActionBarSubTitle.setText(mAccount.getEmail());
             } else {
-                setTitle(getString(R.string.search_results) + ": " + mQueryString);
+                mActionBarSubTitle.setText(operation);
+            }
+        } else if (mQueryString != null) {
+            // query result display.  This may be for a search folder as opposed to a user-initiated search.
+            if (mTitle != null) {
+                // This was a search folder; the search folder has overridden our title.
+                mActionBarTitle.setText(mTitle);
+            } else {
+                // This is a search result; set it to the default search result line.
+                mActionBarTitle.setText(getString(R.string.search_results));
+            }
+        }
+
+        // set unread count
+        if (mUnreadMessageCount == 0) {
+            mActionBarUnread.setVisibility(View.GONE);
+        } else {
+            if (mQueryString != null && mTitle == null) {
+                // This is a search result.  The unread message count is easily confused
+                // with total number of messages in the search result, so let's hide it.
+                mActionBarUnread.setVisibility(View.GONE);
+            } else {
+                mActionBarUnread.setText(Integer.toString(mUnreadMessageCount));
+                mActionBarUnread.setVisibility(View.VISIBLE);
             }
         }
     }
 
     private void progress(final boolean progress) {
-        showProgressIndicator(progress);
+        // Make sure we don't try this before the menu is initialized
+        // this could happen while the activity is initialized.
+        if (mRefreshMenuItem == null) {
+            return;
+        }
+
+        if (progress) {
+            mRefreshMenuItem.setActionView(mActionBarProgressView);
+        } else {
+            mRefreshMenuItem.setActionView(null);
+        }
     }
 
     /**
@@ -636,7 +656,7 @@ public class MessageList
     }
 
     public static void actionHandle(Context context, String title,
-            SearchSpecification searchSpecification) {
+                                    SearchSpecification searchSpecification) {
         Intent intent = actionHandleAccountIntent(context, title, searchSpecification);
         context.startActivity(intent);
     }
@@ -652,9 +672,7 @@ public class MessageList
 
         MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(position);
         if (mSelectedCount > 0) {
-            // In multiselect mode make sure that clicking on the item results
-            // in toggling the 'selected' checkbox.
-            setSelected(Collections.singletonList(message), !message.selected);
+		handleContextRelatedClick(position);
         } else {
             onOpenMessage(message);
         }
@@ -665,7 +683,14 @@ public class MessageList
         context = this;
         super.onCreate(savedInstanceState);
 
+        mActionBarProgressView = getLayoutInflater().inflate(R.layout.actionbar_indeterminate_progress_actionview, null);
+
+        // need this for actionbar initialization
+        mQueryString = getIntent().getStringExtra(EXTRA_QUERY);
+
         mInflater = getLayoutInflater();
+        mActionBar = getSupportActionBar();
+        initializeActionBar();
         initializeLayout();
 
         // Only set "touchable" when we're first starting up the activity.
@@ -674,9 +699,27 @@ public class MessageList
         mPreviewLines = K9.messageListPreviewLines();
 
         initializeMessageList(getIntent(), true);
+        getListView().setVerticalFadingEdgeEnabled(false);
 
         // Enable gesture detection for MessageLists
-        mGestureDetector = new GestureDetector(new MyGestureDetector(true));
+        mGestureDetector = new GestureDetector(new SwipeGestureDetector(this, this));
+
+        // Enable context action bar behaviour
+        getListView().setOnItemLongClickListener(new OnItemLongClickListener() {
+			@Override
+			public boolean onItemLongClick(AdapterView<?> parent, View view,
+					int position, long id) {
+				return handleContextRelatedClick(position);
+			}});
+
+        // Correcting for screen rotation when in ActionMode
+        mSelectedCount = getSelectionFromCheckboxes().size();
+        if (mSelectedCount > 0) {
+            mActionMode = MessageList.this.startActionMode(mActionModeCallback);
+            mActionMode.setTitle(String.format(
+                    getString(R.string.actionbar_selected),
+                    mSelectedCount));
+        }
     }
 
     @Override
@@ -687,7 +730,7 @@ public class MessageList
 
     private void initializeMessageList(Intent intent, boolean create) {
         boolean returnFromMessageView = intent.getBooleanExtra(
-                EXTRA_RETURN_FROM_MESSAGE_VIEW, false);
+                                            EXTRA_RETURN_FROM_MESSAGE_VIEW, false);
 
         if (!create && returnFromMessageView) {
             // We're returning from the MessageView activity with "Manage back button" enabled.
@@ -835,12 +878,12 @@ public class MessageList
                 mController.listLocalMessages(mAccount, mFolderName,  mAdapter.mListener);
                 // Hide the archive button if we don't have an archive folder.
                 if (!mAccount.hasArchiveFolder()) {
-                    mBatchArchiveButton.setVisibility(View.GONE);
+//                    mBatchArchiveButton.setVisibility(View.GONE);
                 }
             } else if (mQueryString != null) {
                 mController.searchLocalMessages(mAccountUuids, mFolderNames, null, mQueryString, mIntegrate, mQueryFlags, mForbiddenFlags, mAdapter.mListener);
                 // Don't show the archive button if this is a search.
-                mBatchArchiveButton.setVisibility(View.GONE);
+//                mBatchArchiveButton.setVisibility(View.GONE);
             }
 
         } else {
@@ -879,12 +922,25 @@ public class MessageList
         refreshTitle();
     }
 
-    private void initializeLayout() {
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        requestWindowFeature(Window.FEATURE_PROGRESS);
-        setContentView(R.layout.message_list);
+    private void initializeActionBar() {
+        mActionBar.setDisplayShowCustomEnabled(true);
+        mActionBar.setCustomView(R.layout.actionbar_custom);
 
-        mListView = (ListView) findViewById(R.id.message_list);
+        View customView = mActionBar.getCustomView();
+        mActionBarTitle = (TextView) customView.findViewById(R.id.actionbar_title_first);
+        mActionBarSubTitle = (TextView) customView.findViewById(R.id.actionbar_title_sub);
+        mActionBarUnread = (TextView) customView.findViewById(R.id.actionbar_unread_count);
+
+        if (mQueryString != null) {
+            mActionBarSubTitle.setVisibility(View.GONE);
+        }
+
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    private void initializeLayout() {
+        mListView = getListView();
+        mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
         mListView.setLongClickable(true);
         mListView.setFastScrollEnabled(true);
         mListView.setScrollingCacheEnabled(false);
@@ -892,29 +948,9 @@ public class MessageList
         mListView.addFooterView(getFooterView(mListView));
 
         registerForContextMenu(mListView);
-
-        mBatchButtonArea = findViewById(R.id.batch_button_area);
-        mBatchReadButton = (ImageButton) findViewById(R.id.batch_read_button);
-        mBatchReadButton.setOnClickListener(this);
-        mBatchDeleteButton = (ImageButton) findViewById(R.id.batch_delete_button);
-        mBatchDeleteButton.setOnClickListener(this);
-        mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button);
-        mBatchFlagButton.setOnClickListener(this);
-        mBatchArchiveButton = (ImageButton) findViewById(R.id.batch_archive_button);
-        mBatchArchiveButton.setOnClickListener(this);
-        mBatchMoveButton = (ImageButton) findViewById(R.id.batch_move_button);
-        mBatchMoveButton.setOnClickListener(this);
-        mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button);
-        mBatchDoneButton.setOnClickListener(this);
-
-        mBatchReadButton.setVisibility(K9.batchButtonsMarkRead() ? View.VISIBLE : View.GONE);
-        mBatchDeleteButton.setVisibility(K9.batchButtonsDelete() ? View.VISIBLE : View.GONE);
-        mBatchArchiveButton.setVisibility(K9.batchButtonsArchive() ? View.VISIBLE : View.GONE);
-        mBatchMoveButton.setVisibility(K9.batchButtonsMove() ? View.VISIBLE : View.GONE);
-        mBatchFlagButton.setVisibility(K9.batchButtonsFlag() ? View.VISIBLE : View.GONE);
-        mBatchDoneButton.setVisibility(K9.batchButtonsUnselect() ? View.VISIBLE : View.GONE);
     }
 
+
     /**
      * Container for values to be kept while the device configuration is
      * modified at runtime (keyboard, orientation, etc.) and Android restarts
@@ -1004,20 +1040,6 @@ public class MessageList
             }
             return false;
         }
-        case KeyEvent.KEYCODE_DPAD_LEFT: {
-            if (mBatchButtonArea.hasFocus()) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        case KeyEvent.KEYCODE_DPAD_RIGHT: {
-            if (mBatchButtonArea.hasFocus()) {
-                return false;
-            } else {
-                return true;
-            }
-        }
         case KeyEvent.KEYCODE_C: {
             onCompose();
             return true;
@@ -1063,18 +1085,6 @@ public class MessageList
                         onDelete(selection);
                         return true;
                     }
-                    case KeyEvent.KEYCODE_F: {
-                        onForward(message);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_A: {
-                        onReplyAll(message);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_R: {
-                        onReply(message);
-                        return true;
-                    }
                     case KeyEvent.KEYCODE_G: {
                         setFlag(selection, Flag.FLAGGED, !message.flagged);
                         return true;
@@ -1117,11 +1127,6 @@ public class MessageList
         return super.onKeyUp(keyCode, event);
     }
 
-
-    private void onResendMessage(MessageInfoHolder message) {
-        MessageCompose.actionEditDraft(this, message.message.getFolder().getAccount(), message.message);
-    }
-
     private void onOpenMessage(MessageInfoHolder message) {
         if (message.folder.name.equals(message.message.getFolder().getAccount().getDraftsFolderName())) {
             MessageCompose.actionEditDraft(this, message.message.getFolder().getAccount(), message.message);
@@ -1174,6 +1179,22 @@ public class MessageList
         }
     }
 
+    private void onReply(MessageInfoHolder holder) {
+        MessageCompose.actionReply(this, holder.message.getFolder().getAccount(), holder.message, false, null);
+    }
+
+    private void onReplyAll(MessageInfoHolder holder) {
+        MessageCompose.actionReply(this, holder.message.getFolder().getAccount(), holder.message, true, null);
+    }
+
+    private void onForward(MessageInfoHolder holder) {
+        MessageCompose.actionForward(this, holder.message.getFolder().getAccount(), holder.message, null);
+    }
+
+    private void onResendMessage(MessageInfoHolder message) {
+        MessageCompose.actionEditDraft(this, message.message.getFolder().getAccount(), message.message);
+    }
+
     private void onEditPrefs() {
         Prefs.actionPrefs(this);
     }
@@ -1290,9 +1311,9 @@ public class MessageList
             }
 
             final String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER);
+            final List<MessageInfoHolder> holders = mActiveMessages;
 
             if (destFolderName != null) {
-                final List<MessageInfoHolder> holders = mActiveMessages;
 
                 mActiveMessages = null; // don't need it any more
 
@@ -1314,18 +1335,6 @@ public class MessageList
         }
     }
 
-    private void onReply(MessageInfoHolder holder) {
-        MessageCompose.actionReply(this, holder.message.getFolder().getAccount(), holder.message, false, null);
-    }
-
-    private void onReplyAll(MessageInfoHolder holder) {
-        MessageCompose.actionReply(this, holder.message.getFolder().getAccount(), holder.message, true, null);
-    }
-
-    private void onForward(MessageInfoHolder holder) {
-        MessageCompose.actionForward(this, holder.message.getFolder().getAccount(), holder.message, null);
-    }
-
     private void onMarkAllAsRead(final Account account, final String folder) {
         if (K9.confirmMarkAllAsRead()) {
             showDialog(DIALOG_MARK_ALL_AS_READ);
@@ -1429,24 +1438,46 @@ public class MessageList
         }
     }
 
-    private void onToggleRead(MessageInfoHolder holder) {
-        LocalMessage message = holder.message;
-        Folder folder = message.getFolder();
-        Account account = folder.getAccount();
-        String folderName = folder.getName();
-        mController.setFlag(account, folderName, new Message[] { message }, Flag.SEEN, !holder.read);
-        holder.read = !holder.read;
-        mAdapter.sortMessages();
+    private void onToggleRead(final List<MessageInfoHolder> holders) {
+    	LocalMessage message;
+    	Folder folder;
+    	Account account;
+    	String folderName;
+
+        int i = 0;
+        for (final Iterator<MessageInfoHolder> iterator = holders.iterator(); iterator.hasNext(); i++) {
+            final MessageInfoHolder messageInfo = iterator.next();
+            message = messageInfo.message;
+            folder = message.getFolder();
+            account = folder.getAccount();
+            folderName = message.getFolder().getName();
+
+            mController.setFlag(account, folderName, new Message[]{message}, Flag.SEEN, !messageInfo.read);
+
+            messageInfo.read = !messageInfo.read;
+            mAdapter.sortMessages();
+        }
     }
 
-    private void onToggleFlag(MessageInfoHolder holder) {
-        LocalMessage message = holder.message;
-        Folder folder = message.getFolder();
-        Account account = folder.getAccount();
-        String folderName = folder.getName();
-        mController.setFlag(account, folderName, new Message[] { message }, Flag.FLAGGED, !holder.flagged);
-        holder.flagged = !holder.flagged;
-        mAdapter.sortMessages();
+    private void onToggleFlag(final List<MessageInfoHolder> holders) {
+        LocalMessage message;
+        Folder folder;
+        Account account;
+        String folderName;
+
+        int i = 0;
+        for (final Iterator<MessageInfoHolder> iterator = holders.iterator(); iterator.hasNext(); i++) {
+            final MessageInfoHolder messageInfo = iterator.next();
+            message = messageInfo.message;
+            folder = message.getFolder();
+            account = folder.getAccount();
+            folderName = message.getFolder().getName();
+
+            mController.setFlag(account, folderName, new Message[]{message}, Flag.FLAGGED, !messageInfo.flagged);
+
+            messageInfo.flagged = !messageInfo.flagged;
+            mAdapter.sortMessages();
+        }
     }
 
     private void checkMail(Account account, String folderName) {
@@ -1456,16 +1487,23 @@ public class MessageList
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
         int itemId = item.getItemId();
         switch (itemId) {
+        case android.R.id.home: {
+            if (mQueryString == null) {
+		onShowFolderList();
+            } else {
+		onAccounts();
+            }
+            return true;
+        }
         case R.id.compose: {
             onCompose();
             return true;
         }
-        case R.id.accounts: {
-            onAccounts();
-            return true;
+        case R.id.check_mail: {
+		checkMail(mAccount, mFolderName);
+		return true;
         }
         case R.id.set_sort_date: {
             changeSort(SortType.SORT_DATE);
@@ -1496,36 +1534,8 @@ public class MessageList
             return true;
         }
         case R.id.select_all:
-        case R.id.batch_select_all: {
-            setAllSelected(true);
-            toggleBatchButtons();
-            return true;
-        }
-        case R.id.batch_deselect_all: {
-            setAllSelected(false);
-            toggleBatchButtons();
-            return true;
-        }
-        case R.id.batch_delete_op: {
-            onDelete(selection);
-            return true;
-        }
-        case R.id.batch_mark_read_op: {
-            setFlag(selection, Flag.SEEN, true);
-            return true;
-        }
-        case R.id.batch_mark_unread_op: {
-            setFlag(selection, Flag.SEEN, false);
-            return true;
-        }
-        case R.id.batch_flag_op: {
-            setFlag(selection, Flag.FLAGGED, true);
-            return true;
-        }
-        case R.id.batch_unflag_op: {
-            setFlag(selection, Flag.FLAGGED, false);
-            return true;
-        }
+		toggleAllSelected();
+		return true;
         case R.id.app_settings: {
             onEditPrefs();
             return true;
@@ -1539,20 +1549,10 @@ public class MessageList
         }
 
         switch (itemId) {
-        case R.id.check_mail: {
-            if (mFolderName != null) {
-                checkMail(mAccount, mFolderName);
-            }
-            return true;
-        }
         case R.id.send_messages: {
             mController.sendPendingMessages(mAccount, mAdapter.mListener);
             return true;
         }
-        case R.id.list_folders: {
-            onShowFolderList();
-            return true;
-        }
         case R.id.mark_all_as_read: {
             if (mFolderName != null) {
                 onMarkAllAsRead(mAccount, mFolderName);
@@ -1569,22 +1569,6 @@ public class MessageList
             onEditAccount();
             return true;
         }
-        case R.id.batch_copy_op: {
-            onCopy(selection);
-            return true;
-        }
-        case R.id.batch_archive_op: {
-            onArchive(selection);
-            return true;
-        }
-        case R.id.batch_spam_op: {
-            onSpam(selection);
-            return true;
-        }
-        case R.id.batch_move_op: {
-            onMove(selection);
-            return true;
-        }
         case R.id.expunge: {
             if (mCurrentFolder != null) {
                 onExpunge(mAccount, mCurrentFolder.name);
@@ -1597,36 +1581,20 @@ public class MessageList
         }
     }
 
-    private final int[] batch_ops = { R.id.batch_copy_op, R.id.batch_delete_op, R.id.batch_flag_op,
-                                      R.id.batch_unflag_op, R.id.batch_mark_read_op, R.id.batch_mark_unread_op,
-                                      R.id.batch_archive_op, R.id.batch_spam_op, R.id.batch_move_op,
-                                      R.id.batch_select_all, R.id.batch_deselect_all
-                                    };
-
-    private void setOpsState(Menu menu, boolean state, boolean enabled) {
-        for (int id : batch_ops) {
-            menu.findItem(id).setVisible(state);
-            menu.findItem(id).setEnabled(enabled);
-        }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getSupportMenuInflater().inflate(R.menu.message_list_option, menu);
+        mRefreshMenuItem = menu.findItem(R.id.check_mail);
+        return true;
     }
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        boolean anySelected = anySelected();
-
-        menu.findItem(R.id.select_all).setVisible(! anySelected);
-        menu.findItem(R.id.batch_ops).setVisible(anySelected);
-
-        setOpsState(menu, true, anySelected);
 
         if (mQueryString != null) {
             menu.findItem(R.id.mark_all_as_read).setVisible(false);
-            menu.findItem(R.id.list_folders).setVisible(false);
             menu.findItem(R.id.expunge).setVisible(false);
-            menu.findItem(R.id.batch_archive_op).setVisible(false);
-            menu.findItem(R.id.batch_spam_op).setVisible(false);
-            menu.findItem(R.id.batch_move_op).setVisible(false);
-            menu.findItem(R.id.batch_copy_op).setVisible(false);
             menu.findItem(R.id.check_mail).setVisible(false);
             menu.findItem(R.id.send_messages).setVisible(false);
             menu.findItem(R.id.folder_settings).setVisible(false);
@@ -1641,12 +1609,6 @@ public class MessageList
             if (mCurrentFolder != null && K9.ERROR_FOLDER_NAME.equals(mCurrentFolder.name)) {
                 menu.findItem(R.id.expunge).setVisible(false);
             }
-            if (!mAccount.hasArchiveFolder()) {
-                menu.findItem(R.id.batch_archive_op).setVisible(false);
-            }
-            if (!mAccount.hasSpamFolder()) {
-                menu.findItem(R.id.batch_spam_op).setVisible(false);
-            }
 
             if (!mController.isMoveCapable(mAccount)) {
                 // FIXME: Really we want to do this for all local-only folders
@@ -1654,141 +1616,21 @@ public class MessageList
                         !mAccount.getInboxFolderName().equals(mCurrentFolder.name)) {
                     menu.findItem(R.id.check_mail).setVisible(false);
                 }
-                menu.findItem(R.id.batch_archive_op).setVisible(false);
-                menu.findItem(R.id.batch_spam_op).setVisible(false);
-                menu.findItem(R.id.batch_move_op).setVisible(false);
-                menu.findItem(R.id.batch_copy_op).setVisible(false);
                 menu.findItem(R.id.expunge).setVisible(false);
             }
         }
 
-        boolean newFlagState = computeBatchDirection(true);
-        boolean newReadState = computeBatchDirection(false);
-        menu.findItem(R.id.batch_flag_op).setVisible(newFlagState);
-        menu.findItem(R.id.batch_unflag_op).setVisible(!newFlagState);
-        menu.findItem(R.id.batch_mark_read_op).setVisible(newReadState);
-        menu.findItem(R.id.batch_mark_unread_op).setVisible(!newReadState);
-        menu.findItem(R.id.batch_deselect_all).setVisible(anySelected);
-        menu.findItem(R.id.batch_select_all).setEnabled(true);
-
         return true;
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.message_list_option, menu);
-
-        return true;
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        final MessageInfoHolder holder = mSelectedMessage == null ? (MessageInfoHolder) mAdapter.getItem(info.position) : mSelectedMessage;
-        // don't need this anymore
-        mSelectedMessage = null;
-
-        final List<MessageInfoHolder> selection = getSelectionFromMessage(holder);
-        switch (item.getItemId()) {
-        case R.id.open: {
-            onOpenMessage(holder);
-            break;
-        }
-        case R.id.select: {
-            setSelected(selection, true);
-            break;
-        }
-        case R.id.deselect: {
-            setSelected(selection, false);
-            break;
-        }
-        case R.id.delete: {
-            onDelete(selection);
-            break;
-        }
-        case R.id.reply: {
-            onReply(holder);
-            break;
-        }
-        case R.id.reply_all: {
-            onReplyAll(holder);
-            break;
-        }
-        case R.id.forward: {
-            onForward(holder);
-            break;
-        }
-        case R.id.send_again: {
-            onResendMessage(holder);
-            break;
-
-        }
-        case R.id.mark_as_read: {
-            onToggleRead(holder);
-            break;
-        }
-        case R.id.flag: {
-            onToggleFlag(holder);
-            break;
-        }
-        case R.id.archive: {
-            onArchive(selection);
-            break;
-        }
-        case R.id.spam: {
-            onSpam(selection);
-            break;
-        }
-        case R.id.move: {
-            onMove(selection);
-            break;
-        }
-        case R.id.copy: {
-            onCopy(selection);
-            break;
-        }
-        case R.id.send_alternate: {
-            onSendAlternate(mAccount, holder);
-            break;
-        }
-        case R.id.same_sender: {
-            MessageList.actionHandle(MessageList.this,
-                                     "From " + holder.sender, holder.senderAddress, false,
-                                     null, null);
-            break;
-        }
-        }
-        return super.onContextItemSelected(item);
-    }
-
-    public void onSendAlternate(Account account, MessageInfoHolder holder) {
-        mController.sendAlternate(this, account, holder.message);
-    }
-
-    public void showProgressIndicator(boolean status) {
-        setProgressBarIndeterminateVisibility(status);
-        ProgressBar bar = (ProgressBar)mListView.findViewById(R.id.message_list_progress);
-        if (bar == null) {
-            return;
-        }
-
-        bar.setIndeterminate(true);
-        if (status) {
-            bar.setVisibility(ProgressBar.VISIBLE);
-        } else {
-            bar.setVisibility(ProgressBar.INVISIBLE);
-        }
-    }
-
-    @Override
-    protected void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
+    public void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
         // Handle right-to-left as an un-select
         handleSwipe(e1, false);
     }
 
     @Override
-    protected void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2) {
+    public void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2) {
         // Handle left-to-right as a select.
         handleSwipe(e1, true);
     }
@@ -1803,68 +1645,7 @@ public class MessageList
         mListView.getLocationOnScreen(listPosition);
         int position = mListView.pointToPosition((int) downMotion.getRawX() - listPosition[0], (int) downMotion.getRawY() - listPosition[1]);
         if (position != AdapterView.INVALID_POSITION) {
-            MessageInfoHolder msgInfoHolder = (MessageInfoHolder) mAdapter.getItem(position);
-
-            if (msgInfoHolder != null && msgInfoHolder.selected != selected) {
-                msgInfoHolder.selected = selected;
-                mSelectedCount += (selected ? 1 : -1);
-                mAdapter.notifyDataSetChanged();
-                toggleBatchButtons();
-            }
-        }
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, v, menuInfo);
-
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
-        MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(info.position);
-        // remember which message was originally selected, in case the list changes while the
-        // dialog is up
-        mSelectedMessage = message;
-
-        if (message == null) {
-            return;
-        }
-
-        getMenuInflater().inflate(R.menu.message_list_context, menu);
-
-        menu.setHeaderTitle(message.message.getSubject());
-
-        if (message.read) {
-            menu.findItem(R.id.mark_as_read).setTitle(R.string.mark_as_unread_action);
-        }
-
-        if (message.flagged) {
-            menu.findItem(R.id.flag).setTitle(R.string.unflag_action);
-        }
-
-        Account account = message.message.getFolder().getAccount();
-        if (!mController.isCopyCapable(account)) {
-            menu.findItem(R.id.copy).setVisible(false);
-        }
-
-        if (!mController.isMoveCapable(account)) {
-            menu.findItem(R.id.move).setVisible(false);
-            menu.findItem(R.id.archive).setVisible(false);
-            menu.findItem(R.id.spam).setVisible(false);
-        }
-
-        if (!account.hasArchiveFolder()) {
-            menu.findItem(R.id.archive).setVisible(false);
-        }
-
-        if (!account.hasSpamFolder()) {
-            menu.findItem(R.id.spam).setVisible(false);
-        }
-
-        if (message.selected) {
-            menu.findItem(R.id.select).setVisible(false);
-            menu.findItem(R.id.deselect).setVisible(true);
-        } else {
-            menu.findItem(R.id.select).setVisible(true);
-            menu.findItem(R.id.deselect).setVisible(false);
+            handleContextRelatedClick(position);
         }
     }
 
@@ -2066,7 +1847,18 @@ public class MessageList
             resetUnreadCount();
 
             notifyDataSetChanged();
-            toggleBatchButtons();
+        }
+
+        /**
+         * Set the selection state for all messages at once.
+         * @param selected Selection state to set.
+         */
+        public void setSelectionForAllMesages(final boolean selected) {
+            for (MessageInfoHolder message : mMessages) {
+                message.selected = selected;
+            }
+
+            notifyDataSetChanged();
         }
 
         public void addMessages(final List<MessageInfoHolder> messages) {
@@ -2281,7 +2073,7 @@ public class MessageList
             public void onClick(View v) {
                 // Perform action on clicks
                 MessageInfoHolder message = (MessageInfoHolder) getItem((Integer)v.getTag());
-                onToggleFlag(message);
+                onToggleFlag(Arrays.asList(new MessageInfoHolder[]{message}));
             }
         };
 
@@ -2560,7 +2352,6 @@ public class MessageList
                             selected.setVisibility(View.GONE);
                         }
                     }
-                    toggleBatchButtons();
                 }
             }
         }
@@ -2605,176 +2396,11 @@ public class MessageList
         }
     }
 
-    private void hideBatchButtons() {
-        if (mBatchButtonArea.getVisibility() != View.GONE) {
-            mBatchButtonArea.setVisibility(View.GONE);
-            mBatchButtonArea.startAnimation(
-                AnimationUtils.loadAnimation(this, R.anim.footer_disappear));
-        }
-    }
-
-    private void showBatchButtons() {
-        if (mBatchButtonArea.getVisibility() != View.VISIBLE) {
-            mBatchButtonArea.setVisibility(View.VISIBLE);
-            Animation animation = AnimationUtils.loadAnimation(this, R.anim.footer_appear);
-            animation.setAnimationListener(this);
-            mBatchButtonArea.startAnimation(animation);
-        }
-    }
-
-    private void toggleBatchButtons() {
-
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-
-                if (mSelectedCount < 0) {
-                    mSelectedCount = 0;
-                }
-
-                int readButtonIconId;
-                int flagButtonIconId;
-
-                if (mSelectedCount == 0) {
-                    readButtonIconId = R.drawable.ic_button_mark_read;
-                    flagButtonIconId = R.drawable.ic_button_flag;
-                    hideBatchButtons();
-                } else {
-                    boolean newReadState = computeBatchDirection(false);
-                    if (newReadState) {
-                        readButtonIconId = R.drawable.ic_button_mark_read;
-                    } else {
-                        readButtonIconId = R.drawable.ic_button_mark_unread;
-                    }
-                    boolean newFlagState = computeBatchDirection(true);
-                    if (newFlagState) {
-                        flagButtonIconId = R.drawable.ic_button_flag;
-                    } else {
-                        flagButtonIconId = R.drawable.ic_button_unflag;
-                    }
-                    showBatchButtons();
-                }
-
-                mBatchReadButton.setImageResource(readButtonIconId);
-                mBatchFlagButton.setImageResource(flagButtonIconId);
-
-
-            }
-        });
-    }
-
     static class FooterViewHolder {
         public ProgressBar progress;
         public TextView main;
     }
 
-
-    private boolean computeBatchDirection(boolean flagged) {
-        boolean newState = false;
-
-        for (MessageInfoHolder holder : mAdapter.getMessages()) {
-            if (holder.selected) {
-                if (flagged) {
-                    if (!holder.flagged) {
-                        newState = true;
-                        break;
-                    }
-                } else {
-                    if (!holder.read) {
-                        newState = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return newState;
-    }
-
-    private boolean anySelected() {
-        for (MessageInfoHolder holder : mAdapter.getMessages()) {
-            if (holder.selected) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onClick(View v) {
-        boolean newState = false;
-        List<Message> messageList = new ArrayList<Message>();
-        List<MessageInfoHolder> removeHolderList = new ArrayList<MessageInfoHolder>();
-
-        if (v == mBatchDoneButton) {
-            setAllSelected(false);
-            return;
-        }
-
-        if (v == mBatchFlagButton) {
-            newState = computeBatchDirection(true);
-        } else {
-            newState = computeBatchDirection(false);
-        }
-
-        if (v == mBatchArchiveButton) {
-            final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
-            onArchive(selection);
-            return;
-        }
-
-        if (v == mBatchMoveButton) {
-            final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
-            onMove(selection);
-            return;
-        }
-
-        for (MessageInfoHolder holder : mAdapter.getMessages()) {
-            if (holder.selected) {
-                if (v == mBatchDeleteButton) {
-                    removeHolderList.add(holder);
-                } else if (v == mBatchFlagButton) {
-                    holder.flagged = newState;
-                } else if (v == mBatchReadButton) {
-                    holder.read = newState;
-                }
-                messageList.add(holder.message);
-            }
-        }
-
-        mAdapter.removeMessages(removeHolderList);
-
-        if (!messageList.isEmpty()) {
-            if (v == mBatchDeleteButton) {
-                mController.deleteMessages(messageList.toArray(EMPTY_MESSAGE_ARRAY), null);
-                mSelectedCount = 0;
-                toggleBatchButtons();
-            } else {
-                mController.setFlag(messageList.toArray(EMPTY_MESSAGE_ARRAY), (v == mBatchReadButton ? Flag.SEEN : Flag.FLAGGED), newState);
-            }
-        } else {
-            // Should not happen
-            Toast.makeText(this, R.string.no_message_seletected_toast, Toast.LENGTH_SHORT).show();
-        }
-
-        mAdapter.sortMessages();
-    }
-
-    @Override
-    public void onAnimationEnd(Animation animation) {
-    }
-
-    @Override
-    public void onAnimationRepeat(Animation animation) {
-    }
-
-    @Override
-    public void onAnimationStart(Animation animation) {
-    }
-
-
-
     private void setAllSelected(boolean isSelected) {
         mSelectedCount = 0;
 
@@ -2784,7 +2410,30 @@ public class MessageList
         }
 
         mAdapter.notifyDataSetChanged();
-        toggleBatchButtons();
+    }
+
+    /**
+     * Toggle all selected message states.  Sort of.  If anything selected, unselect everything.  If nothing is
+     * selected, select everything.
+     */
+    private void toggleAllSelected() {
+        boolean newState = true;
+
+        // If there was anything selected, unselect everything.
+        if (mSelectedCount > 0) {
+            newState = false;
+        }
+
+        mAdapter.setSelectionForAllMesages(newState);
+
+        if (newState) {
+            mSelectedCount = mAdapter.getCount();
+            mActionMode = MessageList.this.startActionMode(mActionModeCallback);
+            mActionMode.setTitle(String.format(getString(R.string.actionbar_selected), mSelectedCount));
+        } else {
+            mSelectedCount = 0;
+            mActionMode.finish();
+        }
     }
 
     private void setSelected(final List<MessageInfoHolder> holders, final boolean newState) {
@@ -2795,7 +2444,21 @@ public class MessageList
             }
         }
         mAdapter.notifyDataSetChanged();
-        toggleBatchButtons();
+    }
+
+    private void toggleMessageSelect(final MessageInfoHolder holder){
+	if (holder.selected) {
+		holder.selected = false;
+		mSelectedCount -= 1;
+	} else {
+		holder.selected = true;
+		mSelectedCount += 1;
+	}
+        mAdapter.notifyDataSetChanged();
+		mActionMode.setTitle(String.format(getString(R.string.actionbar_selected), mSelectedCount));
+
+		// make sure the onPrepareActionMode is called
+		mActionMode.invalidate();
     }
 
     /**
@@ -3081,6 +2744,7 @@ public class MessageList
         Accounts.listAccounts(this);
     }
 
+
     /**
      * Return the currently "open" account if available.
      *
@@ -3102,4 +2766,204 @@ public class MessageList
 
         return account;
     }
+
+    private boolean handleContextRelatedClick(int position){
+	MessageInfoHolder holder = (MessageInfoHolder) mAdapter.getItem(position);
+		if (mActionMode != null) {
+			if (mSelectedCount > 1) {
+				toggleMessageSelect(holder);
+			} else {
+				if (holder.selected) {
+				    mActionMode.finish();
+				} else {
+				    toggleMessageSelect(holder);
+				}
+			}
+		} else {
+			mActionMode = MessageList.this.startActionMode(mActionModeCallback);
+			toggleMessageSelect(holder);
+		}
+
+		return true;
+    }
+
+    private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {
+
+		@Override
+		public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+
+			// enable or disable forward, reply,....
+            menu.findItem(R.id.single_message_options)
+					.setVisible(mSelectedCount > 1 ? false : true);
+
+			if (mQueryString != null) {
+				// show all
+	            menu.findItem(R.id.move).setVisible(true);
+	            menu.findItem(R.id.archive).setVisible(true);
+	            menu.findItem(R.id.spam).setVisible(true);
+	            menu.findItem(R.id.copy).setVisible(true);
+
+	            // hide uncapable
+				/*
+				 *  TODO think of a better way then looping over all
+				 *  messages.
+				 */
+				final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
+				Account account;
+
+				for (MessageInfoHolder holder : selection) {
+					account = holder.message.getFolder().getAccount();
+					setContextCapabilities(account, menu);
+				}
+
+			}
+			return true;
+		}
+
+		@Override
+		public void onDestroyActionMode(ActionMode mode) {
+			mActionMode = null;
+			setAllSelected(false);
+		}
+
+		@Override
+		public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+			MenuInflater inflater = mode.getMenuInflater();
+			inflater.inflate(R.menu.message_list_context, menu);
+
+			// check capabilities
+			if (mQueryString == null) {
+				setContextCapabilities(mAccount, menu);
+			}
+
+			return true;
+		}
+
+		/**
+		 * Disables menu options based on if the account supports it or not.
+		 * It also checks the controller and for now the 'mode' the messagelist
+		 * is operation in ( query or not ).
+		 *
+		 * @param mAccount Account to check capabilities of.
+		 * @param menu Menu to adapt.
+		 */
+		private void setContextCapabilities(Account mAccount, Menu menu) {
+			/*
+			 * TODO get rid of this when we finally split the messagelist into
+			 * a folder content display and a search result display
+			 */
+			if (mQueryString != null) {
+	            menu.findItem(R.id.move).setVisible(false);
+	            menu.findItem(R.id.copy).setVisible(false);
+
+	            menu.findItem(R.id.archive).setVisible(false);
+	            menu.findItem(R.id.spam).setVisible(false);
+
+	            return;
+			}
+
+			// hide unsupported
+	        if (!mController.isCopyCapable(mAccount)) {
+	            menu.findItem(R.id.copy).setVisible(false);
+	        }
+
+	        if (!mController.isMoveCapable(mAccount)) {
+	            menu.findItem(R.id.move).setVisible(false);
+	            menu.findItem(R.id.archive).setVisible(false);
+	            menu.findItem(R.id.spam).setVisible(false);
+	        }
+
+	        if (!mAccount.hasArchiveFolder()) {
+	            menu.findItem(R.id.archive).setVisible(false);
+	        }
+
+	        if (!mAccount.hasSpamFolder()) {
+	            menu.findItem(R.id.spam).setVisible(false);
+	        }
+		}
+
+		@Override
+		public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+			final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
+
+			/*
+			 * In the following we assume that we can't move or copy
+			 * mails to the same folder. Also that spam isn't available if we are
+			 * in the spam folder,same for archive.
+			 *
+			 * This is the case currently so safe assumption.
+			 */
+			switch (item.getItemId()) {
+			case R.id.delete: {
+				onDelete(selection);
+				mSelectedCount = 0;
+				break;
+			}
+			case R.id.read_toggle: {
+				onToggleRead(selection);
+				break;
+			}
+			case R.id.flag_toggle: {
+				onToggleFlag(selection);
+				break;
+			}
+
+			// only if the account supports this
+			case R.id.archive: {
+				onArchive(selection);
+				mSelectedCount = 0;
+				break;
+			}
+			case R.id.spam: {
+				onSpam(selection);
+				mSelectedCount = 0;
+				break;
+			}
+			case R.id.move: {
+				onMove(selection);
+				mSelectedCount = 0;
+				break;
+			}
+			case R.id.copy: {
+				onCopy(selection);
+				mSelectedCount = 0;
+				break;
+			}
+
+			// only if a single message is selected
+	        case R.id.reply: {
+	            onReply(selection.get(0));
+				mSelectedCount = 0;
+	            break;
+	        }
+	        case R.id.reply_all: {
+	            onReplyAll(selection.get(0));
+				mSelectedCount = 0;
+	            break;
+	        }
+	        case R.id.forward: {
+	            onForward(selection.get(0));
+				mSelectedCount = 0;
+	            break;
+	        }
+	        case R.id.send_again: {
+	            onResendMessage(selection.get(0));
+				mSelectedCount = 0;
+	            break;
+	        }
+	        case R.id.same_sender: {
+                MessageList.actionHandle(MessageList.this, "From " + selection.get(0).sender,
+                    selection.get(0).senderAddress, false, null, null);
+                mSelectedCount = 0;
+	            break;
+	        }
+			}
+
+			if (mSelectedCount == 0) {
+				mActionMode.finish();
+			}
+
+			return true;
+		}
+	};
 }
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index d96b5f6af..3eebea478 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -1,5 +1,10 @@
 package com.fsck.k9.activity;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -8,29 +13,40 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
-import android.view.*;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.*;
-import com.fsck.k9.*;
+import android.widget.Toast;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.Window;
+import com.fsck.k9.Account;
+import com.fsck.k9.K9;
+import com.fsck.k9.Preferences;
+import com.fsck.k9.R;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.crypto.PgpData;
 import com.fsck.k9.helper.FileBrowserHelper;
 import com.fsck.k9.helper.FileBrowserHelper.FileBrowserFailOverCallback;
-import com.fsck.k9.mail.*;
+import com.fsck.k9.mail.Flag;
+import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.store.LocalStore.LocalMessage;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.view.AttachmentView;
-import com.fsck.k9.view.SingleMessageView;
 import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
-
-import java.io.File;
-import java.util.*;
+import com.fsck.k9.view.MessageTitleView;
+import com.fsck.k9.view.SingleMessageView;
 
 public class MessageView extends K9Activity implements OnClickListener {
     private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
     private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
-    private static final String EXTRA_NEXT = "com.fsck.k9.MessageView_next";
     private static final String EXTRA_MESSAGE_LIST_EXTRAS = "com.fsck.k9.MessageView_messageListExtras";
     private static final String STATE_PGP_DATA = "pgpData";
     private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
@@ -38,15 +54,10 @@ public class MessageView extends K9Activity implements OnClickListener {
     private static final int ACTIVITY_CHOOSE_DIRECTORY = 3;
 
     private SingleMessageView mMessageView;
+    private MessageTitleView mTitleView;
 
     private PgpData mPgpData;
-
-    private View mNext;
-    private View mPrevious;
-    private View mDelete;
-    private View mArchive;
-    private View mMove;
-    private View mSpam;
+    private Menu mMenu;
     private Account mAccount;
     private MessageReference mMessageReference;
     private ArrayList<MessageReference> mMessageReferences;
@@ -251,7 +262,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         public void progress(final boolean progress) {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    setProgressBarIndeterminateVisibility(progress);
+                    setSupportProgressBarIndeterminateVisibility(progress);
                 }
             });
         }
@@ -301,7 +312,6 @@ public class MessageView extends K9Activity implements OnClickListener {
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.message_view);
 
         mMessageView = (SingleMessageView) findViewById(R.id.message_view);
@@ -334,6 +344,8 @@ public class MessageView extends K9Activity implements OnClickListener {
         });
 
         mMessageView.initialize(this);
+        mMessageView.downloadRemainderButton().setOnClickListener(this);
+        initializeActionBar();
 
         setTitle("");
         final Intent intent = getIntent();
@@ -383,51 +395,14 @@ public class MessageView extends K9Activity implements OnClickListener {
         }
 
         mAccount = Preferences.getPreferences(this).getAccount(mMessageReference.accountUuid);
-
-
-        if (K9.DEBUG)
-            Log.d(K9.LOG_TAG, "MessageView got message " + mMessageReference);
-        if (intent.getBooleanExtra(EXTRA_NEXT, false)) {
-            mNext.requestFocus();
-        }
-
         mScreenWidthInPixels = getResources().getDisplayMetrics().widthPixels;
 
         // Enable gesture detection for MessageViews
         mGestureDetector = new GestureDetector(new MyGestureDetector(false));
 
-        setupButtonViews();
         displayMessage(mMessageReference);
     }
 
-    private void setupButtonViews() {
-        setOnClickListener(R.id.from);
-        setOnClickListener(R.id.reply);
-        setOnClickListener(R.id.reply_all);
-        setOnClickListener(R.id.delete);
-        setOnClickListener(R.id.forward);
-        setOnClickListener(R.id.next);
-        setOnClickListener(R.id.previous);
-        setOnClickListener(R.id.archive);
-        setOnClickListener(R.id.move);
-        setOnClickListener(R.id.spam);
-        setOnClickListener(R.id.download_remainder);
-
-
-        mNext = findViewById(R.id.next);
-        mPrevious = findViewById(R.id.previous);
-        mDelete = findViewById(R.id.delete);
-
-        mArchive = findViewById(R.id.archive);
-        mMove = findViewById(R.id.move);
-        mSpam = findViewById(R.id.spam);
-
-        if (!mAccount.getEnableMoveButtons()) {
-            View buttons = findViewById(R.id.move_buttons);
-            buttons.setVisibility(View.GONE);
-        }
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -443,6 +418,18 @@ public class MessageView extends K9Activity implements OnClickListener {
         mMessageView.updateCryptoLayout(mAccount.getCryptoProvider(), mPgpData, mMessage);
     }
 
+    private void initializeActionBar() {
+        final ActionBar actionBar = getSupportActionBar();
+
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowCustomEnabled(true);
+        actionBar.setCustomView(R.layout.actionbar_message_view);
+
+        final View customView = actionBar.getCustomView();
+        mTitleView = (MessageTitleView) customView.findViewById(android.R.id.title);
+        mTitleView.setMessageHeader(mMessageView.getMessageHeaderView());
+    }
+
     private void displayMessage(MessageReference ref) {
         mMessageReference = ref;
         if (K9.DEBUG)
@@ -457,46 +444,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         mMessageView.resetHeaderView();
 
         mController.loadMessageForView(mAccount, mMessageReference.folderName, mMessageReference.uid, mListener);
-        setupDisplayMessageButtons();
-    }
-
-    private void setupDisplayMessageButtons() {
-        mDelete.setEnabled(true);
-        mNext.setEnabled(mNextMessage != null);
-        mPrevious.setEnabled(mPreviousMessage != null);
-        // If moving isn't support at all, then all of them must be disabled anyway.
-        if (mController.isMoveCapable(mAccount)) {
-            // Only enable the button if they have an archive folder and it's not the current folder.
-            mArchive.setEnabled(!mMessageReference.folderName.equals(mAccount.getArchiveFolderName()) &&
-                                mAccount.hasArchiveFolder());
-            // Only enable the button if the Spam folder is not the current folder and not NONE.
-            mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) &&
-                             mAccount.hasSpamFolder());
-            mMove.setEnabled(true);
-        } else {
-            disableMoveButtons();
-        }
-    }
-
-    private void disableButtons() {
-        mMessageView.setLoadPictures(false);
-        disableMoveButtons();
-        mNext.setEnabled(false);
-        mPrevious.setEnabled(false);
-        mDelete.setEnabled(false);
-    }
-
-    private void disableMoveButtons() {
-        mArchive.setEnabled(false);
-        mMove.setEnabled(false);
-        mSpam.setEnabled(false);
-    }
-
-    private void setOnClickListener(int viewCode) {
-        View thisView = findViewById(viewCode);
-        if (thisView != null) {
-            thisView.setOnClickListener(this);
-        }
+        configureMenu(mMenu);
     }
 
     private void findSurroundingMessagesUid() {
@@ -547,7 +495,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         if (mMessage != null) {
             // Disable the delete button after it's tapped (to try to prevent
             // accidental clicks)
-            disableButtons();
+            mMenu.findItem(R.id.delete).setEnabled(false);
             Message messageToDelete = mMessage;
             showNextMessageOrReturn();
             mController.deleteMessages(new Message[] {messageToDelete}, null);
@@ -755,12 +703,11 @@ public class MessageView extends K9Activity implements OnClickListener {
             return;
         }
         mLastDirection = NEXT;
-        disableButtons();
+        //toggleActionsState(mMenu, false);
         if (K9.showAnimations()) {
             mMessageView.startAnimation(outToLeftAnimation());
         }
         displayMessage(mNextMessage);
-        mNext.requestFocus();
     }
 
     protected void onPrevious() {
@@ -770,12 +717,11 @@ public class MessageView extends K9Activity implements OnClickListener {
             return;
         }
         mLastDirection = PREVIOUS;
-        disableButtons();
+        //toggleActionsState(mMenu, false);
         if (K9.showAnimations()) {
             mMessageView.startAnimation(inFromRightAnimation());
         }
         displayMessage(mPreviousMessage);
-        mPrevious.requestFocus();
     }
 
     private void onToggleRead() {
@@ -785,6 +731,7 @@ public class MessageView extends K9Activity implements OnClickListener {
             mMessageView.setHeaders(mMessage, mAccount);
             String subject = mMessage.getSubject();
             setTitle(subject);
+            updateUnreadToggleTitle();
         }
     }
 
@@ -799,33 +746,6 @@ public class MessageView extends K9Activity implements OnClickListener {
 
     public void onClick(View view) {
         switch (view.getId()) {
-        case R.id.reply:
-            onReply();
-            break;
-        case R.id.reply_all:
-            onReplyAll();
-            break;
-        case R.id.delete:
-            onDelete();
-            break;
-        case R.id.forward:
-            onForward();
-            break;
-        case R.id.archive:
-            onRefile(mAccount.getArchiveFolderName());
-            break;
-        case R.id.spam:
-            onRefile(mAccount.getSpamFolderName());
-            break;
-        case R.id.move:
-            onMove();
-            break;
-        case R.id.next:
-            onNext();
-            break;
-        case R.id.previous:
-            onPrevious();
-            break;
         case R.id.download:
             ((AttachmentView)view).saveFile();
             break;
@@ -838,6 +758,15 @@ public class MessageView extends K9Activity implements OnClickListener {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+        case android.R.id.home:
+            finish();
+            break;
+        case R.id.next_message:
+            onNext();
+            break;
+        case R.id.previous_message:
+            onPrevious();
+            break;
         case R.id.delete:
             onDelete();
             break;
@@ -850,15 +779,12 @@ public class MessageView extends K9Activity implements OnClickListener {
         case R.id.forward:
             onForward();
             break;
-        case R.id.send_alternate:
+        case R.id.share:
             onSendAlternate();
             break;
-        case R.id.mark_as_unread:
+        case R.id.toggle_unread:
             onToggleRead();
             break;
-        case R.id.flag:
-            onFlag();
-            break;
         case R.id.archive:
             onRefile(mAccount.getArchiveFolderName());
             break;
@@ -871,14 +797,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         case R.id.copy:
             onCopy();
             break;
-        case R.id.show_full_header:
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mMessageView.showAllHeaders();
-                }
-            });
-            break;
         case R.id.select_text:
             mMessageView.beginSelectingText();
             break;
@@ -891,22 +809,91 @@ public class MessageView extends K9Activity implements OnClickListener {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.message_view_option, menu);
-        if (!mController.isCopyCapable(mAccount)) {
-            menu.findItem(R.id.copy).setVisible(false);
+        getSupportMenuInflater().inflate(R.menu.message_view_option, menu);
+        mMenu = menu;
+        configureMenu(menu);
+        return true;
+    }
+
+    private void configureMenu(Menu menu) {
+        // first run displayMessage() gets called before onCreateOptionMenu()
+        if (menu == null) {
+            return;
         }
-        if (!mController.isMoveCapable(mAccount)) {
+
+        // enable them all
+        menu.findItem(R.id.copy).setVisible(true);
+        menu.findItem(R.id.move).setVisible(true);
+        menu.findItem(R.id.archive).setVisible(true);
+        menu.findItem(R.id.spam).setVisible(true);
+        toggleActionsState(menu, true);
+
+        if (mNextMessage != null) {
+
+            menu.findItem(R.id.next_message).setEnabled(true);
+            menu.findItem(R.id.next_message).getIcon().setAlpha(255);
+        } else {
+            menu.findItem(R.id.next_message).getIcon().setAlpha(127);
+            menu.findItem(R.id.next_message).setEnabled(false);
+        }
+
+        if (mPreviousMessage != null) {
+            menu.findItem(R.id.previous_message).setEnabled(true);
+            menu.findItem(R.id.previous_message).getIcon().setAlpha(255);
+        } else {
+            menu.findItem(R.id.previous_message).getIcon().setAlpha(127);
+            menu.findItem(R.id.previous_message).setEnabled(false);
+        }
+
+        updateUnreadToggleTitle();
+
+        // comply with the setting
+        if (!mAccount.getEnableMoveButtons()) {
             menu.findItem(R.id.move).setVisible(false);
             menu.findItem(R.id.archive).setVisible(false);
             menu.findItem(R.id.spam).setVisible(false);
+        } else {
+            // check message, folder capability
+            if (!mController.isCopyCapable(mAccount)) {
+                menu.findItem(R.id.copy).setVisible(false);
+            }
+
+            if (mController.isMoveCapable(mAccount)) {
+                menu.findItem(R.id.move).setVisible(true);
+
+                menu.findItem(R.id.archive).setVisible(
+                    !mMessageReference.folderName.equals(mAccount.getArchiveFolderName())
+                        && mAccount.hasArchiveFolder());
+
+                menu.findItem(R.id.spam).setVisible(
+                    !mMessageReference.folderName.equals(mAccount.getSpamFolderName())
+                        && mAccount.hasSpamFolder());
+            } else {
+                menu.findItem(R.id.copy).setVisible(false);
+                menu.findItem(R.id.move).setVisible(false);
+                menu.findItem(R.id.archive).setVisible(false);
+                menu.findItem(R.id.spam).setVisible(false);
+            }
         }
-        if (!mAccount.hasArchiveFolder()) {
-            menu.findItem(R.id.archive).setVisible(false);
+    }
+
+    /**
+     * Set the title of the "Toggle Unread" menu item based upon the current read state of the message.
+     */
+    public void updateUnreadToggleTitle() {
+        if (mMessage != null && mMenu != null) {
+            if (mMessage.isSet(Flag.SEEN)) {
+                mMenu.findItem(R.id.toggle_unread).setTitle(R.string.mark_as_unread_action);
+            } else {
+                mMenu.findItem(R.id.toggle_unread).setTitle(R.string.mark_as_read_action);
+            }
         }
-        if (!mAccount.hasSpamFolder()) {
-            menu.findItem(R.id.spam).setVisible(false);
+    }
+
+    private void toggleActionsState(Menu menu, boolean state) {
+        for (int i = 0; i < menu.size(); ++i) {
+            menu.getItem(i).setEnabled(state);
         }
-        return true;
     }
 
     // TODO: when switching to API version 8, override onCreateDialog(int, Bundle)
@@ -953,28 +940,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         return super.onCreateDialog(id);
     }
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (menu != null) {
-            MenuItem flagItem = menu.findItem(R.id.flag);
-            if (flagItem != null && mMessage != null) {
-                flagItem.setTitle((mMessage.isSet(Flag.FLAGGED) ? R.string.unflag_action : R.string.flag_action));
-            }
-            MenuItem additionalHeadersItem = menu.findItem(R.id.show_full_header);
-            if (additionalHeadersItem != null) {
-                additionalHeadersItem.setTitle(mMessageView.additionalHeadersVisible() ?
-                                               R.string.hide_full_header_action : R.string.show_full_header_action);
-            }
-
-            if (mMessage != null) {
-                int actionTitle = mMessage.isSet(Flag.SEEN) ?
-                        R.string.mark_as_unread_action : R.string.mark_as_read_action;
-                menu.findItem(R.id.mark_as_unread).setTitle(actionTitle);
-            }
-        }
-        return super.onPrepareOptionsMenu(menu);
-    }
-
     class Listener extends MessagingListener {
         @Override
         public void loadMessageForViewHeadersAvailable(final Account account, String folder, String uid,
@@ -1006,6 +971,12 @@ public class MessageView extends K9Activity implements OnClickListener {
                         mMessageView.showStatusMessage(text);
                     }
                     mMessageView.setHeaders(clonedMessage, account);
+                    final String subject = clonedMessage.getSubject();
+                    if (subject == null || subject.equals("")) {
+                        setTitle(getString(R.string.general_no_subject));
+                    } else {
+                        setTitle(clonedMessage.getSubject());
+                    }
                     mMessageView.setOnFlagListener(new OnClickListener() {
                         @Override
                         public void onClick(View v) {
@@ -1032,6 +1003,7 @@ public class MessageView extends K9Activity implements OnClickListener {
                         mMessage = message;
                         mMessageView.setMessage(account, (LocalMessage) message, mPgpData,
                                 mController, mListener);
+                        updateUnreadToggleTitle();
 
                     } catch (MessagingException e) {
                         Log.v(K9.LOG_TAG, "loadMessageForViewBodyAvailable", e);
@@ -1048,7 +1020,7 @@ public class MessageView extends K9Activity implements OnClickListener {
             }
             mHandler.post(new Runnable() {
                 public void run() {
-                    setProgressBarIndeterminateVisibility(false);
+                    setSupportProgressBarIndeterminateVisibility(false);
                     if (t instanceof IllegalArgumentException) {
                         mHandler.invalidIdError();
                     } else {
@@ -1070,7 +1042,7 @@ public class MessageView extends K9Activity implements OnClickListener {
             }
             mHandler.post(new Runnable() {
                 public void run() {
-                    setProgressBarIndeterminateVisibility(false);
+                    setSupportProgressBarIndeterminateVisibility(false);
                     mMessageView.setShowDownloadButton(message);
                 }
             });
@@ -1084,7 +1056,7 @@ public class MessageView extends K9Activity implements OnClickListener {
             }
             mHandler.post(new Runnable() {
                 public void run() {
-                    setProgressBarIndeterminateVisibility(true);
+                    setSupportProgressBarIndeterminateVisibility(true);
                 }
             });
         }
@@ -1153,4 +1125,14 @@ public class MessageView extends K9Activity implements OnClickListener {
             Log.e(K9.LOG_TAG, "displayMessageBody failed", e);
         }
     }
+
+    /**
+     * Set the title of the view.  Since we're using a custom ActionBar view, the normal setTitle() doesn't do what we
+     * think.  This version sets the text value into the proper ActionBar title view.
+     * @param title Title to set.
+     */
+    @Override
+    public void setTitle(CharSequence title) {
+        mTitleView.setText(title);
+    }
 }
diff --git a/src/com/fsck/k9/activity/misc/ActionBarNavigationSpinner.java b/src/com/fsck/k9/activity/misc/ActionBarNavigationSpinner.java
new file mode 100644
index 000000000..912ee07d7
--- /dev/null
+++ b/src/com/fsck/k9/activity/misc/ActionBarNavigationSpinner.java
@@ -0,0 +1,90 @@
+package com.fsck.k9.activity.misc;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import com.fsck.k9.R;
+
+
+public class ActionBarNavigationSpinner extends ArrayAdapter<String> implements SpinnerAdapter {
+
+    public static final long AB_NAVIGATION_INBOX = 0L;
+    public static final long AB_NAVIGATION_FOLDERS = 1L;
+    public static final long AB_NAVIGATION_ACCOUNTS = 2L;
+
+    private String mTitle = "";
+    private String mSubTitle = "";
+    private long[] mIds;
+    private Context mContext;
+
+    public ActionBarNavigationSpinner(Context context, String[] objects, long[] ids) {
+        super(context, R.layout.actionbar_spinner, objects);
+        setDropDownViewResource(android.R.layout.simple_list_item_1);
+        mIds = ids;
+        this.mContext = context;
+    }
+
+    public boolean setTitle(String title) {
+        if (!title.equals(mTitle)) {
+            mTitle = title;
+            notifyDataSetChanged();
+            return true;
+        }
+        return false;
+    }
+
+    public boolean setSubTitle(String subtitle) {
+        if (!subtitle.equals(mSubTitle)) {
+            mSubTitle = subtitle;
+            notifyDataSetChanged();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+        // TODO Auto-generated method stub
+        return super.getDropDownView(position, convertView, parent);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View row = convertView;
+
+        if (row == null) {
+            LayoutInflater inflater = LayoutInflater.from(mContext);
+            row = inflater.inflate(R.layout.actionbar_spinner, parent, false);
+        }
+
+        TextView title = (TextView) row.findViewById(R.id.actionbar_title_first);
+        TextView subtitle = (TextView) row.findViewById(R.id.actionbar_title_sub);
+
+        title.setText(mTitle);
+        subtitle.setText(mSubTitle);
+
+        return row;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mIds[position];
+    }
+
+    public static ActionBarNavigationSpinner getDefaultSpinner(Context context) {
+        return new ActionBarNavigationSpinner(context,
+                new String[] {
+                        context.getString(R.string.special_mailbox_name_inbox),
+                        context.getString(R.string.folders_title),
+                        context.getString(R.string.accounts_title) },
+                new long[] {
+                        ActionBarNavigationSpinner.AB_NAVIGATION_INBOX,
+                        ActionBarNavigationSpinner.AB_NAVIGATION_FOLDERS,
+                        ActionBarNavigationSpinner.AB_NAVIGATION_ACCOUNTS });
+    }
+}
diff --git a/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java b/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java
new file mode 100644
index 000000000..f020e41fc
--- /dev/null
+++ b/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java
@@ -0,0 +1,87 @@
+package com.fsck.k9.activity.misc;
+
+import android.content.Context;
+import android.view.MotionEvent;
+import android.view.GestureDetector.SimpleOnGestureListener;
+
+
+public class SwipeGestureDetector extends SimpleOnGestureListener {
+    private static final float SWIPE_MAX_OFF_PATH_DIP = 250f;
+    private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f;
+
+    private final OnSwipeGestureListener mListener;
+    private int mMinVelocity;
+    private int mMaxOffPath;
+    private MotionEvent mLastOnDownEvent = null;
+
+    public SwipeGestureDetector(Context context, OnSwipeGestureListener listener) {
+        super();
+
+        if (listener == null) {
+            throw new IllegalArgumentException("'listener' may not be null");
+        }
+
+        mListener = listener;
+
+        // Calculate the minimum distance required for this to count as a swipe.
+        // Convert the constant dips to pixels.
+        float gestureScale = context.getResources().getDisplayMetrics().density;
+        mMinVelocity = (int) (SWIPE_THRESHOLD_VELOCITY_DIP * gestureScale + 0.5f);
+        mMaxOffPath = (int) (SWIPE_MAX_OFF_PATH_DIP * gestureScale + 0.5f);
+    }
+
+    @Override
+    public boolean onDown(MotionEvent e) {
+        mLastOnDownEvent = e;
+        return super.onDown(e);
+    }
+
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+        // Apparently sometimes e1 is null
+        // Found a workaround here: http://stackoverflow.com/questions/4151385/
+        if (e1 == null) {
+            e1 = mLastOnDownEvent;
+        }
+
+        // Make sure we avoid NullPointerExceptions
+        if (e1 == null || e2 == null) {
+            return false;
+        }
+
+        // Calculate how much was actually swiped.
+        final float deltaX = e2.getX() - e1.getX();
+        final float deltaY = e2.getY() - e1.getY();
+
+        // Calculate the minimum distance required for this to be considered a swipe.
+        final int minDistance = (int) Math.abs(deltaY * 4);
+
+        try {
+            if (Math.abs(deltaY) > mMaxOffPath || Math.abs(velocityX) < mMinVelocity) {
+                return false;
+            }
+
+            if (deltaX < (minDistance * -1)) {
+                mListener.onSwipeRightToLeft(e1, e2);
+            } else if (deltaX > minDistance) {
+                mListener.onSwipeLeftToRight(e1, e2);
+            } else {
+                return false;
+            }
+
+            // successful fling, cancel the 2nd event to prevent any other action from happening
+            // see http://code.google.com/p/android/issues/detail?id=8497
+            e2.setAction(MotionEvent.ACTION_CANCEL);
+        } catch (Exception e) {
+            // nothing
+        }
+
+        return false;
+    }
+
+
+    public interface OnSwipeGestureListener {
+        void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2);
+        void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2);
+    }
+}
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupNames.java b/src/com/fsck/k9/activity/setup/AccountSetupNames.java
index 6079f3825..95c8ee490 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupNames.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupNames.java
@@ -13,6 +13,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.Accounts;
 import com.fsck.k9.activity.K9Activity;
 import com.fsck.k9.helper.Utility;
 
@@ -85,6 +86,7 @@ public class AccountSetupNames extends K9Activity implements OnClickListener {
         }
         mAccount.setName(mName.getText().toString());
         mAccount.save(Preferences.getPreferences(this));
+        Accounts.listAccountsClearTop(this);
         finish();
     }
 
diff --git a/src/com/fsck/k9/activity/setup/FolderSettings.java b/src/com/fsck/k9/activity/setup/FolderSettings.java
index 53f01a13a..29e2a32f6 100644
--- a/src/com/fsck/k9/activity/setup/FolderSettings.java
+++ b/src/com/fsck/k9/activity/setup/FolderSettings.java
@@ -74,7 +74,7 @@ public class FolderSettings extends K9PreferenceActivity {
 
         addPreferencesFromResource(R.xml.folder_settings_preferences);
 
-        String displayName = FolderInfoHolder.getDisplayName(this, mFolder);
+        String displayName = FolderInfoHolder.getDisplayName(this, mAccount, mFolder.getName());
         Preference category = findPreference(PREFERENCE_TOP_CATERGORY);
         category.setTitle(displayName);
 
diff --git a/src/com/fsck/k9/activity/setup/FontSizeSettings.java b/src/com/fsck/k9/activity/setup/FontSizeSettings.java
index f0d1cda18..81d3e0260 100644
--- a/src/com/fsck/k9/activity/setup/FontSizeSettings.java
+++ b/src/com/fsck/k9/activity/setup/FontSizeSettings.java
@@ -1,4 +1,3 @@
-
 package com.fsck.k9.activity.setup;
 
 import android.content.Context;
diff --git a/src/com/fsck/k9/activity/setup/WelcomeMessage.java b/src/com/fsck/k9/activity/setup/WelcomeMessage.java
new file mode 100644
index 000000000..1aaefff2b
--- /dev/null
+++ b/src/com/fsck/k9/activity/setup/WelcomeMessage.java
@@ -0,0 +1,33 @@
+package com.fsck.k9.activity.setup;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+import com.fsck.k9.R;
+import com.fsck.k9.activity.K9Activity;
+
+public class WelcomeMessage extends K9Activity implements OnClickListener{
+
+	public static void showWelcomeMessage(Context context) {
+        Intent intent = new Intent(context, WelcomeMessage.class);
+        context.startActivity(intent);
+	}
+
+	@Override
+	public void onCreate(Bundle icicle) {
+		super.onCreate(icicle);
+		setContentView(R.layout.welcome_message);
+		((Button) findViewById(R.id.next)).setOnClickListener(this);
+	}
+
+    public void onClick(View view) {
+        if (view.getId() == R.id.next) {
+            AccountSetupBasics.actionNewAccount(this);
+            finish();
+        }
+    }
+}
diff --git a/src/com/fsck/k9/view/MessageHeader.java b/src/com/fsck/k9/view/MessageHeader.java
index f85510f95..4c101f7b6 100644
--- a/src/com/fsck/k9/view/MessageHeader.java
+++ b/src/com/fsck/k9/view/MessageHeader.java
@@ -25,6 +25,7 @@ import com.fsck.k9.R;
 import com.fsck.k9.helper.Contacts;
 import com.fsck.k9.Account;
 import com.fsck.k9.helper.DateFormatter;
+import com.fsck.k9.helper.StringUtils;
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Message;
@@ -238,8 +239,8 @@ public class MessageHeader extends ScrollView implements OnClickListener {
         mAccount = account;
 
         initializeLayout();
-        String subject = message.getSubject();
-        if (subject == null || subject.equals("")) {
+        final String subject = message.getSubject();
+        if (StringUtils.isNullOrEmpty(subject)) {
             mSubjectView.setText(mContext.getText(R.string.general_no_subject));
         } else {
             mSubjectView.setText(subject);
@@ -429,4 +430,11 @@ public class MessageHeader extends ScrollView implements OnClickListener {
             mOnLayoutChangedListener.onLayoutChanged();
         }
     }
+
+    /**
+     * The subject line defaults to GONE.  Make it visible.
+     */
+    public void showSubjectLine() {
+        mSubjectView.setVisibility(VISIBLE);
+    }
 }
diff --git a/src/com/fsck/k9/view/MessageTitleView.java b/src/com/fsck/k9/view/MessageTitleView.java
new file mode 100644
index 000000000..96a3b23d3
--- /dev/null
+++ b/src/com/fsck/k9/view/MessageTitleView.java
@@ -0,0 +1,55 @@
+package com.fsck.k9.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.TextView;
+import com.fsck.k9.K9;
+
+/**
+ * This {@link TextView} is used in the title of the {@link com.fsck.k9.activity.MessageView} ActionBar.
+ * It'll un-hide the subject line {@link MessageHeader} if it doesn't fit in the ActionBar's title area.
+ */
+public class MessageTitleView extends TextView {
+    private static final String LOG_PREFIX = "MessageTitleView: ";
+    private MessageHeader mHeader;
+
+    public MessageTitleView(Context context) {
+        this(context, null);
+    }
+
+    public MessageTitleView(Context context, AttributeSet attrs) {
+        this(context, attrs, android.R.attr.textViewStyle);
+    }
+
+    public MessageTitleView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    /**
+     * Check to see if we need to unhide the subject line in the MessageHeader or not.
+     * @param canvas Canvas to draw on.
+     */
+    @Override
+    public void onDraw(Canvas canvas) {
+        if(mHeader != null && getLayout() != null) {
+            if(getLayout().getEllipsisCount(1) > 0) {
+                if(K9.DEBUG) {
+                    Log.d(K9.LOG_TAG, LOG_PREFIX +
+                        "Subject was truncated; enabling the subject line in the message header.");
+                }
+                mHeader.showSubjectLine();
+            } else {
+                if (K9.DEBUG) {
+                    Log.d(K9.LOG_TAG, LOG_PREFIX + "Subject was fully shown in ActionBar.");
+                }
+            }
+        }
+        super.onDraw(canvas);
+    }
+
+    public void setMessageHeader(final MessageHeader header) {
+        this.mHeader = header;
+    }
+}
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index aa8b29984..4e32a6c71 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -495,6 +495,15 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
         mShowAttachmentsAction.setVisibility(show ? View.VISIBLE : View.GONE);
     }
 
+    /**
+     * Fetch the message header view.  This is not the same as the message headers; this is the View shown at the top
+     * of messages.
+     * @return MessageHeader View.
+     */
+    public MessageHeader getMessageHeaderView() {
+        return mHeaderContainer;
+    }
+
     public void setHeaders(final Message message, Account account) {
         try {
             mHeaderContainer.populate(message, account);