diff --git a/proguard.flags b/proguard.flags
index 478a7631c..c919077ad 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -36,7 +36,7 @@
   *** setProviderContext(android.content.Context);
 }
 
--keepclasseswithmembers class com.android.email.mail.Address {
+-keepclasseswithmembers class com.android.emailcommon.mail.Address {
   <init>(java.lang.String);
   <init>(java.lang.String,java.lang.String);
   *** parseAndPack(java.lang.String);
@@ -47,7 +47,7 @@
   *** setContext(android.content.Context);
 }
 
--keepclasseswithmembers class com.android.email.SecurityPolicy$PolicySet {
+-keepclasseswithmembers class com.android.emailcommon.service.PolicySet {
   <init>(com.android.email.provider.EmailContent$Account);
   <init>(int, int, int, int, boolean, int, int, boolean);
 }
@@ -88,29 +88,26 @@
   *** getAccountByContentUri(android.net.Uri);
 }
 
--keep class com.android.email.mail.Message$RecipientType
+-keep class com.android.emailcommon.mail.Message$RecipientType
 
--keepclasseswithmembers class com.android.email.mail.Message {
-  *** setRecipient(com.android.email.mail.Message$RecipientType, com.android.email.mail.Address);
+-keepclasseswithmembers class com.android.emailcommon.mail.Message {
+  *** setRecipient(com.android.emailcommon.mail.Message$RecipientType, com.android.emailcommon.mail.Address);
 }
 
--keepclasseswithmembers class com.android.email.mail.internet.MimeMessage {
-  *** writeToString();
-}
-
--keepclasseswithmembers class com.android.email.mail.internet.MimeMessage {
+-keepclasseswithmembers class com.android.emailcommon.internet.MimeMessage {
   <init>();
   <init>(java.io.InputStream);
   *** getExtendedHeader(java.lang.String);
   *** setExtendedHeader(java.lang.String, java.lang.String);
   *** getExtendedHeaders();
   *** setExtendedHeaders(java.lang.String);
+  *** writeToString();
 }
 
--keepclasseswithmembers class com.android.email.mail.internet.MimeUtility {
+-keepclasseswithmembers class com.android.emailcommon.internet.MimeUtility {
   *** foldAndEncode(java.lang.String);
-  *** findPartByContentId(com.android.email.mail.Part, java.lang.String);
-  *** findFirstPartByMimeType(com.android.email.mail.Part, java.lang.String);
+  *** findPartByContentId(com.android.emailcommon.mail.Part, java.lang.String);
+  *** findFirstPartByMimeType(com.android.emailcommon.mail.Part, java.lang.String);
 }
 
 -keepclasseswithmembers class com.android.email.mail.transport.SmtpSender {
@@ -126,9 +123,9 @@
 }
 
 -keepclasseswithmembers class com.android.email.mail.store.ImapStore$ImapFolder {
-  *** getMessages(int, int, com.android.email.mail.Folder$MessageRetrievalListener);
-  *** getMessages(com.android.email.mail.Folder$MessageRetrievalListener);
-  *** getMessages(java.lang.String[], com.android.email.mail.Folder$MessageRetrievalListener);
+  *** getMessages(int, int, com.android.emailcommon.mail.Folder$MessageRetrievalListener);
+  *** getMessages(com.android.emailcommon.mail.Folder$MessageRetrievalListener);
+  *** getMessages(java.lang.String[], com.android.emailcommon.mail.Folder$MessageRetrievalListener);
   *** getUnreadMessageCount();
 }
 
@@ -137,24 +134,24 @@
 }
 
 -keepclasseswithmembers class com.android.email.mail.store.Pop3Store$Pop3Folder {
-  *** getMessages(int, int, com.android.email.mail.Folder$MessageRetrievalListener);
-  *** getMessages(com.android.email.mail.Folder$MessageRetrievalListener);
-  *** getMessages(java.lang.String[], com.android.email.mail.Folder$MessageRetrievalListener);
+  *** getMessages(int, int, com.android.emailcommon.mail.Folder$MessageRetrievalListener);
+  *** getMessages(com.android.emailcommon.mail.Folder$MessageRetrievalListener);
+  *** getMessages(java.lang.String[], com.android.emailcommon.mail.Folder$MessageRetrievalListener);
   *** getUnreadMessageCount();
   *** isOpen();
 }
 
--keep class com.android.email.mail.Flag
+-keep class com.android.emailcommon.mail.Flag
 
--keepclasseswithmembers class com.android.email.mail.Folder {
+-keepclasseswithmembers class com.android.emailcommon.mail.Folder {
   *** getUnreadMessageCount();
   *** delete(boolean);
   *** getRole();
 }
 
--keep class com.android.email.mail.Folder$FolderRole
+-keep class com.android.emailcommon.mail.Folder$FolderRole
 
--keepclasseswithmembers class com.android.email.mail.PackedString$Builder {
+-keepclasseswithmembers class com.android.emailcommon.mail.PackedString$Builder {
   <init>();
   <init>(java.lang.String);
   *** get(java.lang.String);