diff --git a/.gitmodules b/.gitmodules
index de1ccfffa..af4079948 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "plugins/ActionBarSherlock"]
 	path = plugins/ActionBarSherlock
 	url = https://github.com/JakeWharton/ActionBarSherlock
+[submodule "plugins/Android-PullToRefresh"]
+	path = plugins/Android-PullToRefresh
+	url = https://github.com/chrisbanes/Android-PullToRefresh.git
diff --git a/Android-PullToRefresh.iml b/Android-PullToRefresh.iml
new file mode 100644
index 000000000..3a3282fba
--- /dev/null
+++ b/Android-PullToRefresh.iml
@@ -0,0 +1,58 @@
+<?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/Android-PullToRefresh/library/target/generated-sources/r" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/plugins/Android-PullToRefresh/library/target/generated-sources/aidl" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/plugins/Android-PullToRefresh/library/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/Android-PullToRefresh/library/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/Android-PullToRefresh/library/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/Android-PullToRefresh/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/Android-PullToRefresh/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/Android-PullToRefresh/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/Android-PullToRefresh/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/Android-PullToRefresh/library/target/classes" />
+    <output-test url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/target/test-classes" />
+    <content url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library">
+      <sourceFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/r" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/gen" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/combined-assets" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/combined-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/extracted-dependencies" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:2.2.1" 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="PROVIDED" 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="inheritedJdk" />
+  </component>
+</module>
+
diff --git a/k9mail.iml b/k9mail.iml
index 64b1b8bc5..d3fbb78e7 100644
--- a/k9mail.iml
+++ b/k9mail.iml
@@ -41,6 +41,7 @@
     <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="module" module-name="Android-PullToRefresh" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
diff --git a/k9mail.ipr b/k9mail.ipr
index 36cd53d09..99cfa9623 100644
--- a/k9mail.ipr
+++ b/k9mail.ipr
@@ -114,6 +114,8 @@
       <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" />
+      <directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/gen" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library/target/generated-sources/r" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -141,12 +143,14 @@
   </component>
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
     <file url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/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" />
+    <file type="android" url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library" />
   </component>
   <component name="IdProvider" IDEtalkID="71055AFE08650FC251AC52E23DE3F795" />
   <component name="InspectionProjectProfileManager">
@@ -199,6 +203,7 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/plugins/ActionBarSherlock/library/pom.xml" />
+        <option value="$PROJECT_DIR$/plugins/Android-PullToRefresh/library/pom.xml" />
       </list>
     </option>
     <option name="activeProfiles">
@@ -389,6 +394,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/ActionBarSherlock.iml" filepath="$PROJECT_DIR$/ActionBarSherlock.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Android-PullToRefresh.iml" filepath="$PROJECT_DIR$/Android-PullToRefresh.iml" />
       <module fileurl="file://$PROJECT_DIR$/k9mail.iml" filepath="$PROJECT_DIR$/k9mail.iml" />
     </modules>
   </component>
@@ -412,6 +418,7 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/plugins/ActionBarSherlock" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/plugins/Android-PullToRefresh" vcs="Git" />
   </component>
   <component name="VssConfiguration">
     <option name="CLIENT_PATH" value="" />
@@ -474,6 +481,17 @@
         <root url="jar://$PROJECT_DIR$/libs/htmlcleaner-2.2-all.zip!/HtmlCleaner/src/test/java" />
       </SOURCES>
     </library>
+    <library name="Maven: com.google.android:android:2.2.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/2.2.1/android-2.2.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/2.2.1/android-2.2.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/2.2.1/android-2.2.1-sources.jar!/" />
+      </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!/" />
@@ -652,3 +670,4 @@
     </library>
   </component>
 </project>
+
diff --git a/plugins/Android-PullToRefresh b/plugins/Android-PullToRefresh
new file mode 160000
index 000000000..cbd7ab815
--- /dev/null
+++ b/plugins/Android-PullToRefresh
@@ -0,0 +1 @@
+Subproject commit cbd7ab815ad510921459c31364491dbbe7bf0377