diff --git a/Android.mk b/Android.mk
index 794feec44..484e62179 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,6 +28,9 @@ LOCAL_JAVA_STATIC_LIBRARIES := android-common
 
 LOCAL_PACKAGE_NAME := Email
 
+LOCAL_PROGUARD_ENABLED := full
+LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+
 include $(BUILD_PACKAGE)
 
 # additionally, build unit tests in a separate .apk
diff --git a/proguard.flags b/proguard.flags
new file mode 100644
index 000000000..18eb34ab1
--- /dev/null
+++ b/proguard.flags
@@ -0,0 +1,20 @@
+# keep names that are used by reflection.
+-keep class com.android.email.provider.EmailContent$Account
+-keepclasseswithmembers class * {
+  public static void actionEditIncomingSettings(android.app.Activity, com.android.email.provider.EmailContent$Account);
+}
+
+-keepclasseswithmembers class * {
+  public static void actionEditOutgoingSettings(android.app.Activity, com.android.email.provider.EmailContent$Account);
+}
+
+-keepclasseswithmembers class * {
+  public *** newInstance(android.content.Context, java.lang.String);
+}
+
+-keep class com.android.email.mail.Store$PersistentDataCallbacks
+-keepclasseswithmembers class * {
+  public *** newInstance(java.lang.String, android.content.Context, com.android.email.mail.Store$PersistentDataCallbacks);
+}
+
+-keep class * extends org.apache.james.mime4j.util.TempStorage
diff --git a/tests/Android.mk b/tests/Android.mk
index c4e7fd425..9dc368667 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -33,5 +33,6 @@ LOCAL_INSTRUMENTATION_FOR := Email
 
 LOCAL_SDK_VERSION := current
 
-include $(BUILD_PACKAGE)
+LOCAL_PROGUARD_ENABLED := full
 
+include $(BUILD_PACKAGE)