diff --git a/ActionBarSherlock.iml b/ActionBarSherlock.iml
index a84a667c6..ba5bef1f1 100644
--- a/ActionBarSherlock.iml
+++ b/ActionBarSherlock.iml
@@ -35,10 +35,10 @@
     <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" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ActionBarSherlock/library/test" isTestSource="true" />
       <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" />
diff --git a/Android-PullToRefresh.iml b/Android-PullToRefresh.iml
index 1d63a6dee..100d12c41 100644
--- a/Android-PullToRefresh.iml
+++ b/Android-PullToRefresh.iml
@@ -38,12 +38,14 @@
       <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" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/target/classes" />
       <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" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/Android-PullToRefresh/library/target/test-classes" />
     </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: com.google.android:android:4.1.1.4" 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" />
diff --git a/k9mail.ipr b/k9mail.ipr
index 99cfa9623..4355fc00f 100644
--- a/k9mail.ipr
+++ b/k9mail.ipr
@@ -389,7 +389,11 @@
     </option>
   </component>
   <component name="ProjectDictionaryState">
-    <dictionary name="achen" />
+    <dictionary name="achen">
+      <words>
+        <w>ringtone</w>
+      </words>
+    </dictionary>
   </component>
   <component name="ProjectModuleManager">
     <modules>
@@ -481,17 +485,6 @@
         <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!/" />
@@ -503,6 +496,17 @@
         <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:android:4.1.1.4">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.1.1.4/android-4.1.1.4.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.1.1.4/android-4.1.1.4-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/google/android/android/4.1.1.4/android-4.1.1.4-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!/" />