diff --git a/proguard.flags b/proguard.flags
index 718360509..be627dbbf 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -157,3 +157,15 @@
   <init>(...);
   *** get(...);
 }
+
+-keep class org.apache.james.mime4j.field.Field {
+  *** getBody(...);
+}
+
+# The following classes are used only by unit tests.
+# We should move them into tests/ if possible.
+
+-keep class org.apache.james.mime4j.message.Message {
+  *;
+}
+
diff --git a/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java b/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
index 24fd88116..f1bad95be 100644
--- a/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
+++ b/tests/src/com/android/exchange/utility/SimpleIcsWriterTests.java
@@ -45,8 +45,6 @@ public class SimpleIcsWriterTests extends TestCase {
         final String actual = TestUtils.fromUtf8(ics.getBytes());
 
         assertEquals(
-                "TAG1:0" + CRLF +
-                "TAG2:0" + CRLF +
                 "TAG3:xyz" + CRLF +
                 "SUMMARY:TEST-TEST\\,\\;\\n\\\\TEST" + CRLF + // escaped
                 "SUMMARY2:TEST-TEST,;\r\n\\TEST" + CRLF // not escaped