diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index f4fbf272a..6aea359d5 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -18,8 +18,8 @@
 package com.android.exchange;
 
 import com.android.email.SecurityPolicy;
-import com.android.email.SecurityPolicy.PolicySet;
 import com.android.email.Utility;
+import com.android.email.SecurityPolicy.PolicySet;
 import com.android.email.mail.Address;
 import com.android.email.mail.AuthenticationFailedException;
 import com.android.email.mail.MeetingInfo;
diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 034e4fbd0..a1f30861d 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -18,10 +18,10 @@
 package com.android.exchange.adapter;
 
 import com.android.email.Email;
+import com.android.email.Utility;
 import com.android.email.provider.EmailContent;
 import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.Message;
-import com.android.email.Utility;
 import com.android.exchange.EasOutboxService;
 import com.android.exchange.EasSyncService;
 import com.android.exchange.utility.CalendarUtilities;
@@ -1064,7 +1064,7 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
 
         if (!isException) {
             String desc = entityValues.getAsString(Events.DESCRIPTION);
-            if (desc != null) {
+            if (desc != null && desc.length() > 0) {
                 if (mService.mProtocolVersionDouble >= 12.0) {
                     s.start(Tags.BASE_BODY);
                     s.data(Tags.BASE_TYPE, "1");
diff --git a/src/com/android/exchange/adapter/Serializer.java b/src/com/android/exchange/adapter/Serializer.java
index bc8e9d7ff..daedec2cf 100644
--- a/src/com/android/exchange/adapter/Serializer.java
+++ b/src/com/android/exchange/adapter/Serializer.java
@@ -37,7 +37,7 @@ import java.util.Hashtable;
 public class Serializer {
 
     private static final String TAG = "Serializer";
-    private static final boolean logging = false;    // DO NOT CHECK IN WITH THIS TRUE!
+    private boolean logging = false;    // DO NOT CHECK IN WITH THIS TRUE!
 
     private static final int NOT_PENDING = -1;
 
@@ -58,6 +58,11 @@ public class Serializer {
         this(true);
     }
 
+    public Serializer(boolean startDocument, boolean _logging) {
+        this(true);
+        logging = _logging;
+    }
+
     public Serializer(boolean startDocument) {
         super();
         if (startDocument) {
@@ -203,7 +208,7 @@ public class Serializer {
 
     void writeStringValue (ContentValues cv, String key, int tag) throws IOException {
         String value = cv.getAsString(key);
-        if (value != null) {
+        if (value != null && value.length() > 0) {
             data(tag, value);
         }
     }