diff --git a/Android.mk b/Android.mk
index 794feec44..e7c3d42b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,6 +28,8 @@ LOCAL_JAVA_STATIC_LIBRARIES := android-common
 
 LOCAL_PACKAGE_NAME := Email
 
+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
index 9e23353ed..718360509 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -153,3 +153,7 @@
 
 -keep class com.android.email.mail.Flag
 
+-keepclasseswithmembers class com.android.email.mail.PackedString$Builder {
+  <init>(...);
+  *** get(...);
+}