diff --git a/Android.mk b/Android.mk
index 7184bd38b..bff1139ac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,21 +7,38 @@ LOCAL_STATIC_JAVA_LIBRARIES += libio
 LOCAL_STATIC_JAVA_LIBRARIES += libjutf
 LOCAL_STATIC_JAVA_LIBRARIES += libjzlib
 LOCAL_STATIC_JAVA_LIBRARIES += libhtmlcleaner
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
 
 LOCAL_MODULE_TAGS := eng
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES += $(call all-java-files-under, plugins/ActionBarSherlock/library/src)
+LOCAL_SRC_FILES += $(call all-java-files-under, plugins/Android-PullToRefresh/library/src)
+LOCAL_SRC_FILES += $(call all-java-files-under, plugins/ckChangeLog/library/src)
+LOCAL_SRC_FILES += $(call all-java-files-under, plugins/HoloColorPicker/src)
+
+res_dir := res plugins/ActionBarSherlock/library/res plugins/Android-PullToRefresh/library/res plugins/ckChangeLog/library/res plugins/HoloColorPicker/res
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
 
 LOCAL_SDK_VERSION := current
 
 LOCAL_PACKAGE_NAME := Email
 
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages de.cketti.library.changelog
+LOCAL_AAPT_FLAGS += --extra-packages android.support.v4.app
+LOCAL_AAPT_FLAGS += --extra-packages com.actionbarsherlock
+LOCAL_AAPT_FLAGS += --extra-packages com.handmark.pulltorefresh.library
+LOCAL_AAPT_FLAGS += --extra-packages com.larswerkman.colorpicker
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
+
 include $(BUILD_PACKAGE)
 ##################################################
 include $(CLEAR_VARS)
 
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libcore:libs/apache-mime4j-core-0.7-SNAPSHOT.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libdom:libs/apache-mime4j-dom-0.7-SNAPSHOT.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libcore:libs/apache-mime4j-core-0.7.2.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libdom:libs/apache-mime4j-dom-0.7.2.jar
 LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libio:libs/commons-io-2.0.1.jar
 LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjutf:libs/jutf7-1.0.1-SNAPSHOT.jar
 LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjzlib:libs/jzlib-1.0.7.jar
@@ -29,7 +46,3 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libhtmlcleaner:libs/htmlcleaner-2.2.jar
 
 include $(BUILD_MULTI_PREBUILT)
 
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/proguard.cfg b/proguard.cfg
index b1cdf17b5..3abb0dca8 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -2,6 +2,8 @@
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
 -dontpreverify
+-dontwarn org.htmlcleaner.HtmlCleanerForAnt
+-dontwarn org.htmlcleaner.JDomSerializer
 -verbose
 -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
 
@@ -38,3 +40,7 @@
 -keep class * implements android.os.Parcelable {
   public static final android.os.Parcelable$Creator *;
 }
+
+-keepclassmembers class * extends com.actionbarsherlock.ActionBarSherlock {
+  <init>(android.app.Activity, int);
+}
diff --git a/src/com/fsck/k9/helper/MergeCursor.java b/src/com/fsck/k9/helper/MergeCursor.java
index 3325a6e36..e70cf8f01 100644
--- a/src/com/fsck/k9/helper/MergeCursor.java
+++ b/src/com/fsck/k9/helper/MergeCursor.java
@@ -460,4 +460,8 @@ public class MergeCursor implements Cursor {
     public Bundle respond(Bundle extras) {
         throw new RuntimeException("Not implemented");
     }
+
+    public Uri getNotificationUri() {
+        return null;
+    }
 }
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index 989ee5e16..2d2c45ec0 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -821,6 +821,10 @@ public class MessageProvider extends ContentProvider {
             checkClosed();
             return mCursor.getType(columnIndex);
         }
+
+        public Uri getNotificationUri() {
+            return null;
+        }
     }
 
     protected class ThrottlingQueryHandler implements QueryHandler {